X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Frmr%2Fcommon%2Fsrc%2Fmbuf_api.c;h=e88ab233436c13ea550a9b240078eb44a464a956;hb=4ac73e3b9c0ff7aef80ad45f1bfead52bb2ffc99;hp=6d9042a1500b1b87c30dcdc107c7423c5bde49d3;hpb=68d09fa5028e47e763c44c30647da31e77eda64a;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 6d9042a..e88ab23 100644
--- a/src/rmr/common/src/mbuf_api.c
+++ b/src/rmr/common/src/mbuf_api.c
@@ -188,6 +188,39 @@ extern int rmr_str2xact( rmr_mbuf_t* mbuf, unsigned char const* str ) {
 	return RMR_OK;
 }
 
+/*
+	Extracts the transaction bytes from the header and places into a
+	user supplied buffer (dest). The buffer must be at least RMR_MAX_XID
+	bytes in length as this function will copy the entire field (even if
+	the sender saved a shorter "string." If the user supplies a nil poniter
+	as the destination, a buffer is allocated; the caller must free when
+	finished.  The buffer will be exactly RMR_MAX_XID bytes long.
+
+	The return value is a pointer to the buffer that was filled (to
+	the dest buffer provided, or the buffer we allocated). If there is an
+	error, a nil pointer is returned, and errno should suggest the root
+	cause of the issue (invalid message or no memory).
+*/
+extern unsigned char*  rmr_get_xact( rmr_mbuf_t* mbuf, unsigned char* dest ) {
+	errno = 0;
+
+	if( mbuf == NULL || mbuf->xaction == NULL ) {
+		errno = EINVAL;
+		return NULL;
+	}
+
+	if( ! dest ) {
+		if( (dest = (unsigned char *) malloc( sizeof( unsigned char ) * RMR_MAX_XID )) == NULL ) {
+			errno = ENOMEM;
+			return NULL;
+		}
+	}
+
+	memcpy( dest, mbuf->xaction, RMR_MAX_XID );
+
+	return dest;
+}
+
 /*
 	Extracts the meid (managed equipment) from the header and copies the bytes
 	to the user supplied area. If the user supplied pointer is nil, then
@@ -200,6 +233,8 @@ extern int rmr_str2xact( rmr_mbuf_t* mbuf, unsigned char const* str ) {
 extern unsigned char*  rmr_get_meid( rmr_mbuf_t* mbuf, unsigned char* dest ) {
 	uta_mhdr_t* hdr;
 
+	errno = 0;
+
 	if( mbuf == NULL || mbuf->header == NULL ) {
 		errno = EINVAL;
 		return NULL;
@@ -213,7 +248,7 @@ extern unsigned char*  rmr_get_meid( rmr_mbuf_t* mbuf, unsigned char* dest ) {
 	}
 
 	hdr = (uta_mhdr_t *) mbuf->header;
-	memcpy( dest, hdr->meid, RMR_MAX_XID );
+	memcpy( dest, hdr->meid, RMR_MAX_MEID );
 
 	return dest;
 }
@@ -279,6 +314,41 @@ extern int rmr_set_trace( rmr_mbuf_t* msg, unsigned const char* data, int size )
 }
 
 
+/*
+	Returns a pointer (reference) to the trace data in the message. If sizeptr
+	is supplied, then the trace data size is assigned to the referenced
+	integer so that the caller doesn't need to make a second call to get the
+	value.
+
+	CAUTION:  user programmes should avoid writing to the referenced trace
+			area (use rmr_set_trace() to avoid possible data overruns. This
+			function is a convenience, and it is expected that users will
+			use the trace data as read-only so as a copy is not necessary.
+*/
+extern void* rmr_trace_ref( rmr_mbuf_t* msg, int* sizeptr ) {
+	uta_mhdr_t*	hdr = NULL;
+	int size = 0;
+
+	if( sizeptr != NULL ) {
+		*sizeptr = 0;					// ensure reset if we bail
+	}
+
+	if( msg == NULL ) {
+		return NULL;
+	}
+
+	hdr = msg->header;
+	if( (size = RMR_TR_LEN( hdr )) <= 0 ) {
+		return NULL;
+	}
+
+	if( sizeptr != NULL ) {
+		*sizeptr = size;
+	}
+
+	return (void *) TRACE_ADDR( hdr );
+}
+
 /*
 	Copies the trace bytes from the message header into the buffer provided by
 	the user. If the trace data in the header is less than size, then only
@@ -351,7 +421,7 @@ extern unsigned char* rmr_get_src( rmr_mbuf_t* msg, unsigned char* dest ) {
 /*
 	Returns the string with the IP address as reported by the sender. This is
 	the IP address that the sender has sussed off of one of the interfaces
-	and cannot be guarenteed to be the acutal IP address which was used to 
+	and cannot be guarenteed to be the acutal IP address which was used to
 	establish the connection.   The caller must provide a buffer of at least
 	64 bytes; the string will be nil terminated. A pointer to the user's buffer
 	is returned on success, nil on failure.