X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=src%2Frmr%2Fnng%2Fsrc%2Frmr_nng.c;fp=src%2Frmr%2Fnng%2Fsrc%2Frmr_nng.c;h=8a91544c448c37f9a413ae315ebf4040c08e469a;hb=68d09fa5028e47e763c44c30647da31e77eda64a;hp=77f539eddc9fb5493dc5cced87911396dd2dac93;hpb=b5f659837dd6c01bffde1f2f449328b42b47ccf5;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 77f539e..8a91544 100644
--- a/src/rmr/nng/src/rmr_nng.c
+++ b/src/rmr/nng/src/rmr_nng.c
@@ -248,7 +248,7 @@ extern rmr_mbuf_t*  rmr_rts_msg( void* vctx, rmr_mbuf_t* msg ) {
 	uta_ctx_t*	ctx;
 	int			state;
 	char*		hold_src;			// we need the original source if send fails
-	int			sock_ok;			// true if we found a valid endpoint socket
+	int			sock_ok = 0;		// true if we found a valid endpoint socket
 
 	if( (ctx = (uta_ctx_t *) vctx) == NULL || msg == NULL ) {		// bad stuff, bail fast
 		errno = EINVAL;												// if msg is null, this is their clue
@@ -266,18 +266,23 @@ extern rmr_mbuf_t*  rmr_rts_msg( void* vctx, rmr_mbuf_t* msg ) {
 	}
 
 	((uta_mhdr_t *) msg->header)->flags &= ~HFL_CALL_MSG;			// must ensure call flag is off
-	sock_ok = uta_epsock_byname( ctx->rtable, (char *) ((uta_mhdr_t *)msg->header)->src, &nn_sock );			// socket of specific endpoint
+	if( HDR_VERSION( msg->header ) > 2 ) {							// new version uses sender's ip address for rts
+		sock_ok = uta_epsock_byname( ctx->rtable, (char *) ((uta_mhdr_t *)msg->header)->srcip, &nn_sock );			// default to IP based rts
+	}
 	if( ! sock_ok ) {
-		msg->state = RMR_ERR_NOENDPT;
-		return msg;							// preallocated msg can be reused since not given back to nn
+		sock_ok = uta_epsock_byname( ctx->rtable, (char *) ((uta_mhdr_t *)msg->header)->src, &nn_sock );		// IP  not in rt, try name
+		if( ! sock_ok ) {
+			msg->state = RMR_ERR_NOENDPT;
+			return msg;																// preallocated msg can be reused since not given back to nn
+		}
 	}
 
 	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
-	strncpy( (char *) ((uta_mhdr_t *)msg->header)->src, ctx->my_name, RMR_MAX_SID );	// must overlay the source to be ours
+	strncpy( (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 ) {
-		strncpy( (char *) ((uta_mhdr_t *)msg->header)->src, hold_src, RMR_MAX_SID );	// always return original source so rts can be called again
+		strncpy( (char *) ((uta_mhdr_t *)msg->header)->src, hold_src, RMR_MAX_SRC );	// always return original source so rts can be called again
 		msg->flags |= MFL_ADDSRC;														// if msg given to send() it must add source
 	}
 
@@ -641,13 +646,29 @@ static void* init(  char* uproto_port, int max_msg_size, int flags ) {
 	if( (tok = strchr( wbuf, '.' )) != NULL ) {
 		*tok = 0;									// we don't keep domain portion
 	}
-	ctx->my_name = (char *) malloc( sizeof( char ) * RMR_MAX_SID );
-	if( snprintf( ctx->my_name, RMR_MAX_SID, "%s:%s", wbuf, port ) >= RMR_MAX_SID ) {			// our registered name is host:port
-		fprintf( stderr, "[CRI] rmr_init: hostname + port must be less than %d characters; %s:%s is not\n", RMR_MAX_SID, wbuf, port );
+	ctx->my_name = (char *) malloc( sizeof( char ) * RMR_MAX_SRC );
+	if( snprintf( ctx->my_name, RMR_MAX_SRC, "%s:%s", wbuf, port ) >= RMR_MAX_SRC ) {			// our registered name is host:port
+		fprintf( stderr, "[CRI] rmr_init: hostname + port must be less than %d characters; %s:%s is not\n", RMR_MAX_SRC, wbuf, port );
 		return NULL;
 	}
 
-	ctx->ip_list = mk_ip_list( port );		// suss out all IP addresses we can find on the box, and bang on our port for RT comparisons
+	if( (tok = getenv( ENV_NAME_ONLY )) != NULL ) {
+		if( atoi( tok ) > 0 ) {
+			flags |= RMRFL_NAME_ONLY;					// don't allow IP addreess to go out in messages
+		}
+	}
+
+	ctx->ip_list = mk_ip_list( port );				// suss out all IP addresses we can find on the box, and bang on our port for RT comparisons
+	if( flags & RMRFL_NAME_ONLY ) {
+		ctx->my_ip = strdup( ctx->my_name );			// user application or env var has specified that IP address is NOT sent out, use name
+	} else {
+		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 ) {
+			fprintf( stderr, "[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
+		}
+	}
+	if( DEBUG ) fprintf( stderr, "[DBUG] default ip address: %s\n", ctx->my_ip );