X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Frmr%2Fnng%2Fsrc%2Fsr_nng_static.c;h=d24a9000abb688f703e81b9dce63fd1c6ae87a74;hb=bc3de17c3b959fcc6a5ba42f5d3b09402bf89687;hp=3146fa29761cc9298ce418ea7474c0201f989361;hpb=d9de79acd9c205dc4f795e90a98331628ed6c85b;p=ric-plt%2Flib%2Frmr.git

diff --git a/src/rmr/nng/src/sr_nng_static.c b/src/rmr/nng/src/sr_nng_static.c
index 3146fa2..d24a900 100644
--- a/src/rmr/nng/src/sr_nng_static.c
+++ b/src/rmr/nng/src/sr_nng_static.c
@@ -467,10 +467,10 @@ static inline rmr_mbuf_t* realloc_payload( rmr_mbuf_t* old_msg, int payload_len,
 
 	if( copy ) {																// if we need to copy the old payload too
 		if( DEBUG ) fprintf( stderr, "[DBUG] rmr_realloc_payload: copy payload into new message: %d bytes\n", old_psize );
-		memcpy( nm->header, omhdr, sizeof( char ) * old_psize );
+		memcpy( nm->header, omhdr, sizeof( char ) * (old_psize + RMR_HDR_LEN( omhdr )) );
 	} else {																	// just need to copy header
 		if( DEBUG ) fprintf( stderr, "[DBUG] rmr_realloc_payload: copy only header into new message: %d bytes\n", RMR_HDR_LEN( nm->header ) );
-		memcpy( nm->header, omhdr, sizeof( char ) * RMR_HDR_LEN( nm->header ) );
+		memcpy( nm->header, omhdr, sizeof( char ) * RMR_HDR_LEN( omhdr ) );
 	}
 
 	ref_tpbuf( nm, mlen );			// set payload and other pointers in the message to the new tp buffer
@@ -794,7 +794,12 @@ static  rmr_mbuf_t* mtosend_msg( void* vctx, rmr_mbuf_t* msg, int max_to ) {
 	send_again = 1;											// force loop entry
 	group = 0;												// always start with group 0
 	while( send_again ) {
-		sock_ok = uta_epsock_rr( rte, group, &send_again, &nn_sock, &ep );		// select endpt from rr group and set again if more groups
+		if( rte->nrrgroups > 0 ) {							// this is a round robin entry
+			sock_ok = uta_epsock_rr( rte, group, &send_again, &nn_sock, &ep );		// select endpt from rr group and set again if more groups
+		} else {
+			sock_ok = epsock_meid( ctx->rtable, msg, &nn_sock, &ep );
+			send_again = 0;
+		}
 
 		if( DEBUG ) fprintf( stderr, "[DBUG] mtosend_msg: flgs=0x%04x type=%d again=%d group=%d len=%d sock_ok=%d\n",
 				msg->flags, msg->mtype, send_again, group, msg->len, sock_ok );