X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Frmr%2Fcommon%2Fsrc%2Frt_generic_static.c;h=c2fd5f899b68da18ae6c7c4eeacb2728da191d55;hb=fa454008020483ac35e1d20300cddfe877d8dd6d;hp=dcedb49448c3d34b0797312e14b48dc14494a9a6;hpb=c8e651e15839411c85e105d16fd2ffc14c1cc1dd;p=ric-plt%2Flib%2Frmr.git

diff --git a/src/rmr/common/src/rt_generic_static.c b/src/rmr/common/src/rt_generic_static.c
index dcedb49..c2fd5f8 100644
--- a/src/rmr/common/src/rt_generic_static.c
+++ b/src/rmr/common/src/rt_generic_static.c
@@ -1,4 +1,4 @@
-// :vi sw=4 ts=4 noet:
+ // :vi sw=4 ts=4 noet2
 /*
 ==================================================================================
 	Copyright (c) 2019-2020 Nokia
@@ -361,7 +361,8 @@ static void alarm_if_drops( uta_ctx_t* uctx, uta_ctx_t* pctx ) {
 			if( time( NULL ) > ok2clear ) {			// things still stable after expiry
 				rmr_vlog( RMR_VL_INFO, "drop alarm cleared\n" );
 				alarm_raised = 0;
-				uta_alarm( pctx, ALARM_DROPS | ALARM_CLEAR, prob_id++, "RMR message dropping has stopped" );
+				uta_alarm( pctx, ALARM_DROPS | ALARM_CLEAR, prob_id, "RMR message dropping has stopped" );
+				prob_id++;
 			}
 		}
 	}
@@ -574,7 +575,6 @@ static void build_entry( uta_ctx_t* ctx, char* ts_field, uint32_t subid, char* r
 	uint64_t key = 0;			// the symtab key will be mtype or sub_id+mtype
 	char*	tokens[128];
 	char*	gtokens[64];
-	int		i;
 	int		ngtoks;				// number of tokens in the group list
 	int		grp;				// index into group list
 	int		cgidx;				// contiguous group index (prevents the addition of a contiguous group without ep)
@@ -599,6 +599,8 @@ static void build_entry( uta_ctx_t* ctx, char* ts_field, uint32_t subid, char* r
 			rte->mtype = atoi( ts_field );													// capture mtype for debugging
 
 			for( grp = 0, cgidx = 0; grp < ngtoks; grp++ ) {
+				int		i;					// avoid sonar grumbling by defining this here
+
 				if( (ntoks = uta_rmip_tokenise( gtokens[grp], ctx->ip_list, tokens, 64, ',' )) > 0 ) {		// remove any references to our ip addrs
 					for( i = 0; i < ntoks; i++ ) {
 						if( strcmp( tokens[i], ctx->my_name ) != 0 ) {					// don't add if it is us -- cannot send to ourself
@@ -1081,7 +1083,7 @@ static void parse_rt_rec( uta_ctx_t* ctx,  uta_ctx_t* pctx, char* buf, int vleve
 				break;
 
 			case 'u':												// update current table, not a total replacement
-				if( ! ctx->flags & CFL_FULLRT ) {					// we cannot update until we have a full table from route generator
+				if( ! (ctx->flags & CFL_FULLRT) ) {					// we cannot update until we have a full table from route generator
 					rmr_vlog( RMR_VL_WARN, "route table update ignored: full table not previously recevied" );
 					break;
 				}