X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Frmr%2Fsi%2Fsrc%2Fmt_call_si_static.c;h=76b56b21a0f04437ded7c7d157870f9704c05238;hb=9c2f0c74adb03a21646742702813b6ba4a4ae288;hp=2d422bb2a6892787eeae1ae64fea9523f5be0f2e;hpb=c113b0836f3ebd58911c30de1636a707174efe55;p=ric-plt%2Flib%2Frmr.git

diff --git a/src/rmr/si/src/mt_call_si_static.c b/src/rmr/si/src/mt_call_si_static.c
index 2d422bb..76b56b2 100644
--- a/src/rmr/si/src/mt_call_si_static.c
+++ b/src/rmr/si/src/mt_call_si_static.c
@@ -110,14 +110,26 @@ static void buf2mbuf( uta_ctx_t* ctx, char *raw_msg, int msg_size, int sender_fd
 	byte order. If <mark> is not present, we use <int1>. This allows
 	old versions of RMR to continue to work with new versions that now
 	do the right thing with byte ordering.
+
+	If the receiver of a message is a backlevel RMR, and it uses RTS to
+	return a message, it will only update the old size, but when the
+	message is received back at a new RMR application it will appear that
+	the message came from a new instance.  Therefore, we must compare
+	the old and new sizes and if they are different we must use the old
+	size assuming that this is the case.
 */
 static inline uint32_t extract_mlen( unsigned char* buf ) {
 	uint32_t	size;		// adjusted (if needed) size for return
+	uint32_t	osize;		// old size
 	uint32_t*	blen;		// length in the buffer to extract
 
 	blen = (uint32_t *) buf;
 	if( *(buf + sizeof( int ) * 2 ) == TP_SZ_MARKER ) {
+		osize = *blen;							// old size
 		size = ntohl( *(blen+1) );				// pick up the second integer
+		if( osize != size ) {					// assume back level return to sender
+			size = osize;						// MUST use old size
+		}
 		if( DEBUG > 1 ) rmr_vlog( RMR_VL_DEBUG, "extract msg len converted from net order to: %d\n", size );
 	} else {
 		size = *blen;							// old sender didn't encode size
@@ -234,7 +246,7 @@ static int mt_data_cb( void* vctx, int fd, char* buf, int buflen ) {
 			remain = 0;
 		} else {
 			need = river->msg_size - river->ipt;						// bytes from transport we need to have complete message
-			if( DEBUG ) rmr_vlog( RMR_VL_DEBUG, "data callback enough in the buffer size=%d need=%d remain=%d\n", river->msg_size, need, remain );
+			if( DEBUG ) rmr_vlog( RMR_VL_DEBUG, "data callback enough in the buffer size=%d need=%d remain=%d flgs=%02x\n", river->msg_size, need, remain, river->flags );
 			if( (river->flags & RF_DROP) == 0  ) {
 				memcpy( &river->accum[river->ipt], buf+bidx, need );				// grab just what is needed (might be more)
 				buf2mbuf( ctx, river->accum, river->nbytes, fd );					// build an RMR mbuf and queue
@@ -242,7 +254,7 @@ static int mt_data_cb( void* vctx, int fd, char* buf, int buflen ) {
 				river->accum = (char *) malloc( sizeof( char ) *  river->nbytes );	// fresh accumulator
 			} else {
 				if( !(river->flags & RF_NOTIFIED) ) {
-					rmr_vlog( RMR_VL_WARN, "message larger than max (%d) have arrived on fd %d\n", river->nbytes, fd );
+					rmr_vlog( RMR_VL_WARN, "message larger than allocated buffer (%d) arrived on fd %d\n", river->nbytes, fd );
 					river->flags |= RF_NOTIFIED;
 				}
 			}