X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Frmr%2Fnng%2Fsrc%2Frmr_nng.c;h=8d55b441100bfa21f735e3fcbae660f334709dda;hb=338fe5e46223df8145b53cdf52dab358f18c7f26;hp=fc72b36d3c3ce64f13c05a69155de5a0f8c90b41;hpb=0d4def6c7b673f3be486338ced65ccdd25a859ed;p=ric-plt%2Flib%2Frmr.git

diff --git a/src/rmr/nng/src/rmr_nng.c b/src/rmr/nng/src/rmr_nng.c
index fc72b36..8d55b44 100644
--- a/src/rmr/nng/src/rmr_nng.c
+++ b/src/rmr/nng/src/rmr_nng.c
@@ -630,7 +630,7 @@ static void* init(  char* uproto_port, int max_msg_size, int flags ) {
 	rmr_set_vlevel( RMR_VL_INFO );		// we WILL announce our version etc
 
 	if( ! announced ) {
-		rmr_vlog( RMR_VL_INFO, "ric message routing library on NNG mv=%d flg=%02x (%s %s.%s.%s built: %s)\n",
+		rmr_vlog( RMR_VL_INFO, "ric message routing library on NNG/d 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;
 	}
@@ -700,6 +700,7 @@ static void* init(  char* uproto_port, int max_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( proto_port );
 			return NULL;
 		}
 		if( (tok = strchr( wbuf, '.' )) != NULL ) {
@@ -726,7 +727,7 @@ static void* init(  char* uproto_port, int max_msg_size, int flags ) {
 		ctx->my_ip = get_default_ip( ctx->ip_list );	// and (guess) at what should be the default to put into messages as src
 		if( ctx->my_ip == NULL ) {
 			rmr_vlog( RMR_VL_WARN, "rmr_init: default ip address could not be sussed out, using name\n" );
-			strcpy( ctx->my_ip, ctx->my_name );			// if we cannot suss it out, use the name rather than a nil pointer
+			ctx->my_ip = strdup( ctx->my_name );		// if we cannot suss it out, use the name rather than a nil pointer
 		}
 	}
 	if( DEBUG ) rmr_vlog( RMR_VL_DEBUG, "default ip address: %s\n", ctx->my_ip );
@@ -747,13 +748,22 @@ static void* init(  char* uproto_port, int max_msg_size, int flags ) {
 	if( (state = nng_listen( ctx->nn_sock, bind_info, NULL, NO_FLAGS )) != 0 ) {
 		rmr_vlog( RMR_VL_CRIT, "rmr_init: unable to start nng listener for %s: %s\n", bind_info, nng_strerror( state ) );
 		nng_close( ctx->nn_sock );
+		free( proto_port );
 		free_ctx( ctx );
 		return NULL;
 	}
 
-	if( !(flags & FL_NOTHREAD) ) {										// skip if internal function that doesnt need an rtc
-		if( pthread_create( &ctx->rtc_th,  NULL, rtc, (void *) ctx ) ) { 	// kick the rt collector thread
-			rmr_vlog( RMR_VL_WARN, "rmr_init: unable to start route table collector thread: %s", strerror( errno ) );
+	if( flags & FL_NOTHREAD ) {								// if no rtc thread, we still need an empty route table for wormholes
+		ctx->rtable = rt_clone_space( NULL, NULL, 0 );		// so create one
+	} else {
+		if( (tok = getenv( ENV_RTG_RAW )) != NULL  && *tok == '0' ) {			// use RMR for Rmgr comm only when specifically off
+			if( pthread_create( &ctx->rtc_th,  NULL, rtc, (void *) ctx ) ) { 	// kick the rmr based rt collector thread
+				rmr_vlog( RMR_VL_WARN, "rmr_init: unable to start route table collector thread: %s", strerror( errno ) );
+			}
+		} else {
+			if( pthread_create( &ctx->rtc_th,  NULL, raw_rtc, (void *) ctx ) ) { 	// kick the raw msg rt collector thread
+				rmr_vlog( RMR_VL_WARN, "rmr_init: unable to start route table collector thread: %s", strerror( errno ) );
+			}
 		}
 	}
 
@@ -968,23 +978,15 @@ extern rmr_mbuf_t* rmr_mt_rcv( void* vctx, rmr_mbuf_t* mbuf, int max_wait ) {
 	return mbuf;
 }
 
-/*
-	Accept a message buffer and caller ID, send the message and then wait
-	for the receiver to tickle the semaphore letting us know that a message
-	has been received. The call_id is a value between 2 and 255, inclusive; if
-	it's not in this range an error will be returned. Max wait is the amount
-	of time in millaseconds that the call should block for. If 0 is given
-	then no timeout is set.
 
-	If the mt_call feature has not been initialised, then the attempt to use this
-	funciton will fail with RMR_ERR_NOTSUPP
+/*
+	This does the real work behind both of the outward facing call functions. See 
+	the rmr_mt_call() description for details modulo the comments blow.
 
-	If no matching message is received before the max_wait period expires, a
-	nil pointer is returned, and errno is set to ETIMEOUT. If any other error
-	occurs after the message has been sent, then a nil pointer is returned
-	with errno set to some other value.
+	If ep is given, then we skip the normal route table endpoint selection. This is
+	likely a wormhole call.
 */
-extern rmr_mbuf_t* rmr_mt_call( void* vctx, rmr_mbuf_t* mbuf, int call_id, int max_wait ) {
+static rmr_mbuf_t* mt_call( void* vctx, rmr_mbuf_t* mbuf, int call_id, int max_wait, endpoint_t* ep ) {
 	rmr_mbuf_t* ombuf;			// original mbuf passed in
 	uta_ctx_t*	ctx;
 	uta_mhdr_t*	hdr;			// header in the transport buffer
@@ -1052,7 +1054,11 @@ extern rmr_mbuf_t* rmr_mt_call( void* vctx, rmr_mbuf_t* mbuf, int call_id, int m
 		seconds = 1;										// use as flag later to invoked timed wait
 	}
 
-	mbuf = mtosend_msg( ctx, mbuf, 0 );						// use internal function so as not to strip call-id; should be nil on success!
+	if( ep != NULL ) {
+		mbuf = mtosend_msg( ctx, mbuf, 0 );					// use internal function so as not to strip call-id; should be nil on success!
+	} else {
+		mbuf = send_msg( ctx, mbuf, ep->nn_sock, -1 );
+	}
 	if( mbuf ) {
 		if( mbuf->state != RMR_OK ) {
 			mbuf->tp_state = errno;
@@ -1060,7 +1066,7 @@ extern rmr_mbuf_t* rmr_mt_call( void* vctx, rmr_mbuf_t* mbuf, int call_id, int m
 		}
 	}
 
-	state = 0;
+	state = -1;												
 	errno = 0;
 	while( chute->mbuf == NULL && ! errno ) {
 		if( seconds ) {
@@ -1086,13 +1092,38 @@ extern rmr_mbuf_t* rmr_mt_call( void* vctx, rmr_mbuf_t* mbuf, int call_id, int m
 		return NULL;					// leave errno as set by sem wait call
 	}
 
-	mbuf = chute->mbuf;
-	mbuf->state = RMR_OK;
+	if( (mbuf = chute->mbuf) != NULL ) {
+		mbuf->state = RMR_OK;
+	}
 	chute->mbuf = NULL;
 
 	return mbuf;
 }
 
+/*
+	Accept a message buffer and caller ID, send the message and then wait
+	for the receiver to tickle the semaphore letting us know that a message
+	has been received. The call_id is a value between 2 and 255, inclusive; if
+	it's not in this range an error will be returned. Max wait is the amount
+	of time in millaseconds that the call should block for. If 0 is given
+	then no timeout is set.
+
+	If the mt_call feature has not been initialised, then the attempt to use this
+	funciton will fail with RMR_ERR_NOTSUPP
+
+	If no matching message is received before the max_wait period expires, a
+	nil pointer is returned, and errno is set to ETIMEOUT. If any other error
+	occurs after the message has been sent, then a nil pointer is returned
+	with errno set to some other value.
+
+	This is now just a wrapper to the real work horse so that we can provide
+	this and wormhole call functions without duplicating code.
+
+*/
+extern rmr_mbuf_t* rmr_mt_call( void* vctx, rmr_mbuf_t* mbuf, int call_id, int max_wait ) {
+	return mt_call( vctx, mbuf, call_id, max_wait, NULL );
+}
+
 /*
 	Given an existing message buffer, reallocate the payload portion to
 	be at least new_len bytes.  The message header will remain such that