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=9aa58f1b562d2cc46fcfc857cff4c9595b53a9fd;hpb=d07cc97b4b5493a5fc67231ee09d1c931c993161;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 9aa58f1..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
@@ -852,7 +854,7 @@ static void cycle_snarfed_rt( uta_ctx_t* ctx ) {
 		return;
 	}
 
-	if( (snarf_fname = getenv(  ENV_STASH_RT )) == NULL ) {			// specific place to stash the rt not given
+	if( (snarf_fname = getenv(  ENV_STASH_RT )) == NULL ) {				// specific place to stash the rt not given
 		if( (seed_fname = getenv( ENV_SEED_RT )) != NULL ) {			// no seed, we leave in the default file
 			memset( wfname, 0, sizeof( wfname ) );
 			snprintf( wfname, sizeof( wfname ) - 1, "%s.stash", seed_fname );
@@ -861,6 +863,7 @@ static void cycle_snarfed_rt( uta_ctx_t* ctx ) {
 	}
 
 	if( snarf_fname == NULL ) {
+		rmr_vlog( RMR_VL_DEBUG, "cycle_snarf: no file to save in" );
 		return;
 	}
 
@@ -891,7 +894,7 @@ static void cycle_snarfed_rt( uta_ctx_t* ctx ) {
 	if( ctx->snarf_rt_fd < 0 ) {
 		rmr_vlog( RMR_VL_WARN, "rmr_rtc: unable to open trt file: %s: %s\n", tfname, strerror( errno ) );
 	} else {
-		if( DEBUG ) rmr_vlog( RMR_VL_DEBUG, "rmr_rtc: rt snarf file opened: %s: %s\n", tfname );
+		if( DEBUG ) rmr_vlog( RMR_VL_DEBUG, "rmr_rtc: rt snarf file opened: %s\n", tfname );
 	}
 }
 
@@ -1018,6 +1021,7 @@ static void parse_rt_rec( uta_ctx_t* ctx,  uta_ctx_t* pctx, char* buf, int vleve
 
 						send_rt_ack( pctx, mbuf, ctx->table_id, RMR_OK, NULL );
 						ctx->rtable_ready = 1;							// route based sends can now happen
+						ctx->flags |= CFL_FULLRT;						// indicate we have seen a complete route table
 					} else {
 						if( DEBUG > 1 ) rmr_vlog_force( RMR_VL_DEBUG, "end of route table noticed, but one was not started!\n" );
 						ctx->new_rtable = NULL;
@@ -1079,12 +1083,17 @@ 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
+					rmr_vlog( RMR_VL_WARN, "route table update ignored: full table not previously recevied" );
+					break;
+				}
+
 				tokens[1] = clip( tokens[1] );
 				if( strcmp( tokens[1], "end" ) == 0 ) {				// wrap up the table we were building
 					if( ctx->new_rtable == NULL ) {					// update table not in progress
 						break;
 					}
-					if( ctx && ctx->snarf_rt_fd >= 0 ) {
+					if( ctx->snarf_rt_fd >= 0 ) {
 						cycle_snarfed_rt( ctx );					// make it available and open a new one
 					}
 
@@ -1158,8 +1167,13 @@ static void read_static_rt( uta_ctx_t* ctx, int vlevel ) {
 	char*	eor;				// end of the record
 	int		rcount = 0;			// record count for debug
 
-	if( (fname = getenv( ENV_SEED_RT )) == NULL ) {
-		return;
+	if( (fname = ctx->seed_rt_fname) == NULL ) {
+		if( (fname = getenv( ENV_SEED_RT )) == NULL ) {
+			return;
+		}
+
+		ctx->seed_rt_fname = strdup( fname );
+		fname = ctx->seed_rt_fname;
 	}
 
 	if( (fbuf = ensure_nlterm( uta_fib( fname ) ) ) == NULL ) {			// read file into a single buffer (nil terminated string)