From 3dfda27d3cb6b6e63ce92ceaa840a51e641cb00d Mon Sep 17 00:00:00 2001 From: Dave Marples Date: Sun, 27 Oct 2024 23:10:10 +0000 Subject: [PATCH] Fix legacy port reflection when monitoring is not switched on --- Src/orbuculum.c | 7 ++----- Src/symbols.c | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Src/orbuculum.c b/Src/orbuculum.c index 8dd7ded4..93caaf4a 100644 --- a/Src/orbuculum.c +++ b/Src/orbuculum.c @@ -1009,11 +1009,8 @@ static void _handleBlock( struct RunTime *r, ssize_t fillLevel, uint8_t *buffer if ( r->usingOFLOW ) { - if ( r->options->intervalReportTime ) - { - /* We need to decode this so we can get the stats out of it .. we don't bother if we don't need stats */ - OFLOWPump( &r->oflow, buffer, fillLevel, _OFLOWpacketRxed, r ); - } + /* We need to decode this so we can get the stats out of it, and to reflect it out */ + OFLOWPump( &r->oflow, buffer, fillLevel, _OFLOWpacketRxed, r ); /* ...and reflect this packet to the outgoing OFLOW channels, if we don't need to reconstruct them */ if ( !r->options->useTPIU ) diff --git a/Src/symbols.c b/Src/symbols.c index 16251145..c9baf22b 100644 --- a/Src/symbols.c +++ b/Src/symbols.c @@ -262,9 +262,9 @@ static enum LineType _getLineType( char *sourceLine, char *p1, char *p2, char *p if ( 2 == sscanf( sourceLine, "%[0-9a-fA-F] <%[^>]>", p1, p2 ) ) { /* Demangled C++ names may have multiple ">" characters. Expand until last one. */ - const char *const beg = strchr(sourceLine, '<') + 1; - const char *const end = strrchr(beg, '>'); - (void)memcpy(p2, beg, end - beg); + const char *const beg = strchr( sourceLine, '<' ) + 1; + const char *const end = strrchr( beg, '>' ); + ( void )memcpy( p2, beg, end - beg ); p2[end - beg] = '\0'; return LT_PROC_LABEL; }