X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fnanomsg%2Fsrc%2Fsr_static.c;h=44e00ea0c1ab2da6095457ac4d5c4e0ca62019bf;hb=68c5cf1104e89f5c43786a3e48f5c6a1e757f59f;hp=cddb662e25a253a42e3f2b367304ce1a5de98f83;hpb=fd9cc7a5b3355146388ebdf4d558cb284c66c5f1;p=ric-plt%2Flib%2Frmr.git

diff --git a/src/nanomsg/src/sr_static.c b/src/nanomsg/src/sr_static.c
index cddb662..44e00ea 100644
--- a/src/nanomsg/src/sr_static.c
+++ b/src/nanomsg/src/sr_static.c
@@ -69,6 +69,7 @@
 */
 static rmr_mbuf_t* alloc_zcmsg( uta_ctx_t* ctx, rmr_mbuf_t* msg, int size, int state ) {
 	int	mlen;
+	uta_mhdr_t*	hdr;
 
 	mlen = sizeof( uta_mhdr_t );						// figure size should we not have a msg buffer
 	mlen += (size > 0 ? size  : ctx->max_plen);			// add user requested size or size set during init
@@ -90,10 +91,16 @@ static rmr_mbuf_t* alloc_zcmsg( uta_ctx_t* ctx, rmr_mbuf_t* msg, int size, int s
 		exit( 1 );
 	}
 
-	((uta_mhdr_t *) msg->header)->rmr_ver = RMR_MSG_VER;	// version info should we need to recognised old style messages someday
+	hdr = (uta_mhdr_t *) msg->header;
+	hdr->rmr_ver = htonl( RMR_MSG_VER );								// current version
+	SET_HDR_LEN( hdr );
+	SET_HDR_TR_LEN( hdr, ctx->trace_data_len );
+	//SET_HDR_D1_LEN( hdr, ctx->d1_len );					// moot until we actually need these data areas
+	//SET_HDR_D2_LEN( hdr, ctx->d1_len );
+
 	msg->len = 0;											// length of data in the payload
 	msg->alloc_len = mlen;									// length of allocated payload
-	msg->payload = msg->header + sizeof( uta_mhdr_t );		// point past header to payload (single buffer allocation above)
+	msg->payload = msg->header + PAYLOAD_OFFSET( hdr );		// point at the payload in transport
 	msg->xaction = ((uta_mhdr_t *)msg->header)->xid;						// point at transaction id in header area
 	msg->state = state;										// fill in caller's state (likely the state of the last operation)
 	msg->flags |= MFL_ZEROCOPY;								// this is a zerocopy sendable message
@@ -128,14 +135,15 @@ static inline rmr_mbuf_t* clone_msg( rmr_mbuf_t* old_msg  ) {
 		exit( 1 );
 	}
 
+	memcpy( nm->header, old_msg->header, RMR_HDR_LEN( old_msg->header ) );     // copy complete header, trace and other data
+
 	nm->mtype = old_msg->mtype;
 	nm->len = old_msg->len;									// length of data in the payload
 	nm->alloc_len = mlen;									// length of allocated payload
-	nm->payload = nm->header + sizeof( uta_mhdr_t );		// point past header to payload (single buffer allocation above)
+	nm->payload = nm->header + PAYLOAD_OFFSET( nm->header );
 	nm->xaction = ((uta_mhdr_t *)nm->header)->xid;			// point at transaction id in header area
 	nm->state = old_msg->state;								// fill in caller's state (likely the state of the last operation)
 	nm->flags |= MFL_ZEROCOPY;								// this is a zerocopy sendable message
-	memcpy( ((uta_mhdr_t *)nm->header)->src, ((uta_mhdr_t *)old_msg->header)->src, RMR_MAX_SID );
 	memcpy( nm->payload, old_msg->payload, old_msg->len );
 
 	return nm;
@@ -166,14 +174,14 @@ static rmr_mbuf_t* rcv_msg( uta_ctx_t* ctx, rmr_mbuf_t* old_msg ) {
 	if( msg->state > (int) sizeof( uta_mhdr_t ) ) {						// we need more than just a header here
 		hdr = (uta_mhdr_t *) msg->header;
 		msg->len = ntohl( hdr->plen );						// length of data in the payload (likely < payload size)
-		if( msg->len > msg->state - sizeof( uta_mhdr_t ) ) {
-			fprintf( stderr, "[WARN] rmr_rcv indicated payload length < rcvd payload: expected %d got %ld\n", 
-				msg->len, msg->state - sizeof( uta_mhdr_t ) );
+		if( msg->len > msg->state - RMR_HDR_LEN( hdr ) ) {
+			msg->state = RMR_ERR_TRUNC;
+			msg->len = msg->state - RMR_HDR_LEN( hdr );
 		}
 		msg->mtype = ntohl( hdr->mtype );								// capture and convert from network order to local order
 		msg->state = RMR_OK;
 		msg->flags |= MFL_ADDSRC;										// turn on so if user app tries to send this buffer we reset src
-		msg->payload = msg->header + sizeof( uta_mhdr_t );
+		msg->payload = msg->header + PAYLOAD_OFFSET( msg->header );
 		msg->xaction = &hdr->xid[0];							// provide user with ref to fixed space xaction id
 		if( DEBUG > 1 ) fprintf( stderr, "[DBUG] rcv_msg: got something: type=%d state=%d len=%d diff=%ld\n", 
 				msg->mtype, msg->state, msg->len,  msg->payload - (unsigned char *) msg->header );