X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2FrmrCgo%2FrmrCgoUtils.go;h=64ff50fa53c30a372b7f6f150b2f4ada119083b9;hb=70954308ad87e986f654b1fc7809ed5074cfcae5;hp=ca2974787fd38349d18974af1afaeb5271ae769e;hpb=15d3982b5eda43a5b5b9054d7ecb026448c6ca16;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/rmrCgo/rmrCgoUtils.go b/E2Manager/rmrCgo/rmrCgoUtils.go
index ca29747..64ff50f 100644
--- a/E2Manager/rmrCgo/rmrCgoUtils.go
+++ b/E2Manager/rmrCgo/rmrCgoUtils.go
@@ -20,7 +20,7 @@
 
 package rmrCgo
 
-// #cgo LDFLAGS: -L/usr/local/lib -lrmr_nng -lnng
+// #cgo LDFLAGS: -L/usr/local/lib -lrmr_si
 // #include <rmr/rmr.h>
 // #include <stdlib.h>
 import "C"
@@ -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")
@@ -102,9 +105,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")
 	}
 }