X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Frmr%2Fsi%2Fsrc%2Frmr_si.c;h=9b2444af984466fd024720591e4a96bab06f823f;hb=5ec64c5253b3b7611ec69cc1487989fae45eca26;hp=7a2bc96d79aaadcc553fbbb8ec5350b1447f533f;hpb=cf4413c47ce274d7fc08c3bcfc8c4de3d465ad4d;p=ric-plt%2Flib%2Frmr.git

diff --git a/src/rmr/si/src/rmr_si.c b/src/rmr/si/src/rmr_si.c
index 7a2bc96..9b2444a 100644
--- a/src/rmr/si/src/rmr_si.c
+++ b/src/rmr/si/src/rmr_si.c
@@ -302,7 +302,7 @@ extern rmr_mbuf_t*  rmr_rts_msg( void* vctx, rmr_mbuf_t* msg ) {
 	msg->state = RMR_OK;																// ensure it is clear before send
 	hold_src = strdup( (char *) ((uta_mhdr_t *)msg->header)->src );						// the dest where we're returning the message to
 	hold_ip = strdup( (char *) ((uta_mhdr_t *)msg->header)->srcip );					// both the src host and src ip
-	strncpy( (char *) ((uta_mhdr_t *)msg->header)->src, ctx->my_name, RMR_MAX_SRC );	// must overlay the source to be ours
+	zt_buf_fill( (char *) ((uta_mhdr_t *)msg->header)->src, ctx->my_name, RMR_MAX_SRC );	// must overlay the source to be ours
 	msg = send_msg( ctx, msg, nn_sock, -1 );
 	if( msg ) {
 		if( ep != NULL ) {
@@ -321,8 +321,8 @@ extern rmr_mbuf_t*  rmr_rts_msg( void* vctx, rmr_mbuf_t* msg ) {
 					break;
 			}
 		}
-		strncpy( (char *) ((uta_mhdr_t *)msg->header)->src, hold_src, RMR_MAX_SRC );	// always return original source so rts can be called again
-		strncpy( (char *) ((uta_mhdr_t *)msg->header)->srcip, hold_ip, RMR_MAX_SRC );	// always return original source so rts can be called again
+		zt_buf_fill( (char *) ((uta_mhdr_t *)msg->header)->src, hold_src, RMR_MAX_SRC );	// always replace original source & ip so rts can be called again
+		zt_buf_fill( (char *) ((uta_mhdr_t *)msg->header)->srcip, hold_ip, RMR_MAX_SRC );
 		msg->flags |= MFL_ADDSRC;														// if msg given to send() it must add source
 	}
 
@@ -556,14 +556,16 @@ static void* init(  char* uproto_port, int def_msg_size, int flags ) {
 	int		old_vlevel;
 
 	old_vlevel = rmr_vlog_init();			// initialise and get the current level
-	rmr_set_vlevel( RMR_VL_INFO );		// we WILL announce our version etc
 
 	if( ! announced ) {
+		rmr_set_vlevel( RMR_VL_INFO );		// we WILL announce our version
 		rmr_vlog( RMR_VL_INFO, "ric message routing library on SI95/g mv=%d flg=%02x (%s %s.%s.%s built: %s)\n",
 			RMR_MSG_VER, flags, QUOTE_DEF(GIT_ID), QUOTE_DEF(MAJOR_VER), QUOTE_DEF(MINOR_VER), QUOTE_DEF(PATCH_VER), __DATE__ );
 		announced = 1;
+
+		rmr_set_vlevel( old_vlevel );		// return logging to the desired state
+		uta_dump_env();							// spit out environment settings meaningful to us if in info mode
 	}
-	rmr_set_vlevel( old_vlevel );		// return logging to the desired state
 
 	errno = 0;
 	if( uproto_port == NULL ) {
@@ -609,9 +611,6 @@ static void* init(  char* uproto_port, int def_msg_size, int flags ) {
 		ctx->max_plen = def_msg_size;
 	}
 
-	// we're using a listener to get rtg updates, so we do NOT need this.
-	//uta_lookup_rtg( ctx );							// attempt to fill in rtg info; rtc will handle missing values/errors
-
 	ctx->si_ctx = SIinitialise( SI_OPT_FG );		// FIX ME: si needs to streamline and drop fork/bg stuff
 	if( ctx->si_ctx == NULL ) {
 		rmr_vlog( RMR_VL_CRIT, "unable to initialise SI95 interface\n" );
@@ -650,6 +649,7 @@ static void* init(  char* uproto_port, int def_msg_size, int flags ) {
 	} else {
 		if( (gethostname( wbuf, sizeof( wbuf ) )) != 0 ) {
 			rmr_vlog( RMR_VL_CRIT, "rmr_init: cannot determine localhost name: %s\n", strerror( errno ) );
+			free_ctx( ctx );
 			return NULL;
 		}
 		if( (tok = strchr( wbuf, '.' )) != NULL ) {
@@ -702,7 +702,21 @@ static void* init(  char* uproto_port, int def_msg_size, int flags ) {
 												// finish all flag setting before threads to keep helgrind quiet
 	ctx->flags |= CFL_MTC_ENABLED;				// for SI threaded receiver is the only way
 
-	ctx->rtable = rt_clone_space( NULL, NULL, 0 );		// create an empty route table so that wormhole/rts calls can be used
+
+	// ---------------- setup for route table collector before invoking ----------------------------------
+	ctx->rtgate = (pthread_mutex_t *) malloc( sizeof( *ctx->rtgate ) );		// single mutex required to gate access to moving rtables
+	if( ctx->rtgate != NULL ) {
+		pthread_mutex_init( ctx->rtgate, NULL );
+	}
+
+	ctx->ephash = rmr_sym_alloc( 129 );					// host:port to ep symtab exists outside of any route table
+	if( ctx->ephash == NULL ) {
+		rmr_vlog( RMR_VL_CRIT, "rmr_init: unable to allocate ep hash\n" );
+		free_ctx( ctx );
+		return NULL;
+	}
+
+	ctx->rtable = rt_clone_space( ctx, NULL, NULL, 0 );	// create an empty route table so that wormhole/rts calls can be used
 	if( flags & RMRFL_NOTHREAD ) {						// no thread prevents the collector start for very special cases
 		ctx->rtable_ready = 1;							// route based sends will always fail, but rmr is ready for the non thread case
 	} else {
@@ -797,13 +811,6 @@ extern int rmr_get_rcvfd( void* vctx ) {
 		return -1;
 	}
 
-/*
-	if( (state = nng_getopt_int( ctx->nn_sock, NNG_OPT_RECVFD, &fd )) != 0 ) {
-		rmr_vlog( RMR_VL_WARN, "rmr cannot get recv fd: %s\n", nng_strerror( state ) );
-		return -1;
-	}
-*/
-
 	return uta_ring_getpfd( ctx->mring );
 }