X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Frmr%2Fcommon%2Fsrc%2Fmbuf_api.c;h=58225c457e54fc419fa38312b3f14f4877d6dcc4;hb=fd4477a9698a46ce5755d614b663c18ceadf43c4;hp=f7309581bfcb120d6db5f96f270f6ab3720857eb;hpb=d9de79acd9c205dc4f795e90a98331628ed6c85b;p=ric-plt%2Flib%2Frmr.git

diff --git a/src/rmr/common/src/mbuf_api.c b/src/rmr/common/src/mbuf_api.c
index f730958..58225c4 100644
--- a/src/rmr/common/src/mbuf_api.c
+++ b/src/rmr/common/src/mbuf_api.c
@@ -23,7 +23,7 @@
 	Abstract:	These are common functions which work only on the mbuf and
 				thus (because they do not touch an endpoint or context)
 				can be agnostic to the underlying transport, or the transport
-				layer provides a transport specific function (e.g. payload 
+				layer provides a transport specific function (e.g. payload
 				reallocation).
 
 	Author:		E. Scott Daniels
@@ -40,6 +40,10 @@
 
 #include "rmr.h"				// things the users see
 #include "rmr_agnostic.h"		// agnostic things (must be included before private)
+#include "rmr_logging.h"
+
+//#define BUF_TOOLS_ONLY 1
+#include "tools_static.c"
 
 
 // ---------- some wrappers need explicit copy-in functions, also header field setters -----
@@ -53,6 +57,12 @@
 		EINVAL id poitner, buf or buf header are bad.
 		EOVERFLOW if the bytes given would have overrun
 
+	We have been told that the meid will be a string, so we enforce that even if
+	the user is copying in bytes.  We will add a 0 byte at len+1 when len is less
+	than the field size, or as the last byte (doing damage to their string) if
+	the caller didn't play by the rules. If they pass a non-nil terminated set
+	of bytes which are the field length, we'll indicate truncation.
+
 */
 extern int rmr_bytes2meid( rmr_mbuf_t* mbuf, unsigned char const* src, int len ) {
 	uta_mhdr_t* hdr;
@@ -71,6 +81,15 @@ extern int rmr_bytes2meid( rmr_mbuf_t* mbuf, unsigned char const* src, int len )
 	hdr = (uta_mhdr_t *) mbuf->header;
 	memcpy( hdr->meid, src, len );
 
+	if( len == RMR_MAX_MEID ) {
+		if( *(hdr->meid+len-1) != 0 ) {
+			*(hdr->meid+len-1) = 0;
+			errno = EOVERFLOW;
+		}
+	} else {
+		*(hdr->meid+len) = 0;
+	}
+
 	return len;
 }
 
@@ -224,7 +243,7 @@ extern unsigned char*  rmr_get_xact( rmr_mbuf_t* mbuf, unsigned char* dest ) {
 }
 
 /*
-	Extracts the meid (managed equipment) from the header and copies the bytes
+	Extracts the meid (managed entity) from the header and copies the bytes
 	to the user supplied area. If the user supplied pointer is nil, then
 	a buffer will be allocated and it is the user's responsibilty to free.
 	A pointer is returned to the destination memory (allocated or not)
@@ -265,6 +284,10 @@ extern unsigned char*  rmr_get_meid( rmr_mbuf_t* mbuf, unsigned char* dest ) {
 	The return value is the number of bytes actually coppied. If 0 bytes are coppied
 	errno should indicate the reason. If 0 is returned and errno is 0, then size
 	passed was 0.  The state in the message is left UNCHANGED.
+
+	Regardless of action taken (actual realloc or not) the caller's reference to mbuf
+	is still valid follwing the call and will point to the correct spot (same tp
+	buffer if no realloc needed, or the new one if there was).
 */
 extern int rmr_set_trace( rmr_mbuf_t* msg, unsigned const char* data, int size ) {
 	uta_mhdr_t*	hdr;
@@ -293,7 +316,7 @@ extern int rmr_set_trace( rmr_mbuf_t* msg, unsigned const char* data, int size )
 
 	if( len != size ) {							// different sized trace data, must realloc the buffer
 		nm = rmr_realloc_msg( msg, size );		// realloc with changed trace size
-		old_tp_buf = msg->tp_buf;
+		old_tp_buf = msg->tp_buf;				// hold to repoint new mbuf at small buffer
 		old_hdr = msg->header;
 
 		msg->tp_buf = nm->tp_buf;				// reference the reallocated buffer
@@ -302,7 +325,7 @@ extern int rmr_set_trace( rmr_mbuf_t* msg, unsigned const char* data, int size )
 		msg->xaction = nm->xaction;
 		msg->payload = nm->payload;
 
-		nm->tp_buf = old_tp_buf;				// set to free
+		nm->tp_buf = old_tp_buf;				// set to free; point to the small buffer
 		nm->header = old_hdr;					// nano frees on hdr, so must set both
 		rmr_free_msg( nm );
 
@@ -414,7 +437,7 @@ extern unsigned char* rmr_get_src( rmr_mbuf_t* msg, unsigned char* dest ) {
 
 	if( dest != NULL ) {
 		hdr = msg->header;
-		strcpy( dest, hdr->src );
+		zt_buf_fill( dest, hdr->src, RMR_MAX_SRC );
 	}
 
 	return dest;
@@ -438,11 +461,11 @@ extern unsigned char* rmr_get_srcip( rmr_mbuf_t* msg, unsigned char* dest ) {
 		hdr = msg->header;
 		if( HDR_VERSION( msg->header ) > 2 ) {		// src ip was not present in hdr until ver 3
 			errno = 0;
-			strcpy( dest, hdr->srcip );
+			zt_buf_fill( dest, hdr->srcip, RMR_MAX_SRC );
 			rstr = dest;
 		} else  {
 			errno = 0;
-			strcpy( dest, hdr->src );				// reutrn the name:port for old messages
+			zt_buf_fill( dest, hdr->src, RMR_MAX_SRC );				// reutrn the name:port for old messages
 			rstr = dest;
 		}
 	}