X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FrmrCgo%2FrmrCgoUtils.go;h=c9d11471de030b5b2ffb05568156fe4059dd6db9;hb=0249b5fc410b6c6814906b185dfdf25b27621148;hp=8b895c0c0b2f9b3f3496a1307e3efec2f74652be;hpb=a75da9a56d61ca4754650d44a54bbf0b04f610d1;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/rmrCgo/rmrCgoUtils.go b/E2Manager/rmrCgo/rmrCgoUtils.go
index 8b895c0..c9d1147 100644
--- a/E2Manager/rmrCgo/rmrCgoUtils.go
+++ b/E2Manager/rmrCgo/rmrCgoUtils.go
@@ -45,8 +45,11 @@ func convertToMBuf(logger *logger.Logger, m *C.rmr_mbuf_t) *MBuf {
 		Len:   int(m.len),
 		Payload: &payloadArr,
 		XAction: &xActionArr,
+		msgSrc: C.CBytes(make([]byte, RMR_MAX_SRC_LEN)),
 	}
 
+	C.rmr_get_src(m, (*C.uchar)(mbuf.msgSrc)) // Capture message source
+
 	meidBuf := make([]byte, RMR_MAX_MEID_LEN)
 	if meidCstr := C.rmr_get_meid(m, (*C.uchar)(unsafe.Pointer(&meidBuf[0]))); meidCstr != nil {
 		mbuf.Meid =	strings.TrimRight(string(meidBuf), "\000")
@@ -60,6 +63,9 @@ func (ctx *Context) getAllocatedCRmrMBuf(logger *logger.Logger, mBuf *MBuf, maxM
 	var meidBuf[RMR_MAX_MEID_LEN]byte
 
 	cMBuf = C.rmr_alloc_msg(ctx.RmrCtx, C.int(maxMsgSize))
+	if cMBuf == nil {
+		return nil
+	}
 	cMBuf.mtype = C.int(mBuf.MType)
 	cMBuf.len = C.int(mBuf.Len)
 
@@ -102,9 +108,9 @@ func (ctx *Context) getAllocatedCRmrMBuf(logger *logger.Logger, mBuf *MBuf, maxM
 //TODO: change to assert or return error
 func (ctx *Context) checkContextInitialized() {
 	if ctx.RmrCtx == nil {
-		if ctx.Logger != nil {
+		/*if ctx.Logger != nil {
 			ctx.Logger.DPanicf("#rmrCgoUtils.checkContextInitialized - The RMR router has not been initialized")
-		}
+		}*/
 		panic("#rmrCgoUtils.checkContextInitialized - The RMR router has not been initialized. To initialize router please call Init() method")
 	}
 }