X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FrmrCgo%2FrmrCgoApi.go;h=d247efb73954ced897d34aef54a5c51bfc97ac77;hb=011bb9161ca8e7ad0d0cf282b818672a88a5dfbf;hp=d7d0870b60184cab4d4a34f0bb58db1cbc58fee3;hpb=15d3982b5eda43a5b5b9054d7ecb026448c6ca16;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/rmrCgo/rmrCgoApi.go b/E2Manager/rmrCgo/rmrCgoApi.go
index d7d0870..d247efb 100644
--- a/E2Manager/rmrCgo/rmrCgoApi.go
+++ b/E2Manager/rmrCgo/rmrCgoApi.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"
@@ -34,7 +34,7 @@ import (
 	"e2mgr/logger"
 )
 
-func (*Context) Init(port string, maxMsgSize int, flags int, logger *logger.Logger) *RmrMessenger {//TODO remove pointer from interface
+func (*Context) Init(port string, maxMsgSize int, flags int, logger *logger.Logger) RmrMessenger {
 	pp := C.CString(port)
 	defer C.free(unsafe.Pointer(pp))
 	logger.Debugf("#rmrCgoApi.Init - Going to initiate RMR router")
@@ -54,35 +54,36 @@ func (*Context) Init(port string, maxMsgSize int, flags int, logger *logger.Logg
 	// Each round is about 1000 attempts with a short sleep between each round.
 	C.rmr_set_stimeout(ctx.RmrCtx, C.int(1000))
 	r := RmrMessenger(ctx)
-	return &r
+	return r
 }
 
-func (ctx *Context) SendMsg(msg *MBuf) (*MBuf, error) {
+func (ctx *Context) SendMsg(msg *MBuf, printLogs bool) (*MBuf, error) {
 	ctx.checkContextInitialized()
 	ctx.Logger.Debugf("#rmrCgoApi.SendMsg - Going to send message. MBuf: %v", *msg)
 	allocatedCMBuf := ctx.getAllocatedCRmrMBuf(ctx.Logger, msg, ctx.MaxMsgSize)
-	defer C.rmr_free_msg(allocatedCMBuf)
 	state := allocatedCMBuf.state
 	if state != RMR_OK {
 		errorMessage := fmt.Sprintf("#rmrCgoApi.SendMsg - Failed to get allocated message. state: %v - %s", state, states[int(state)])
 		return nil, errors.New(errorMessage)
 	}
 
-	//TODO: if debug enabled
-	transactionId := string(*msg.XAction)
-	tmpTid := strings.TrimSpace(transactionId)
-	ctx.Logger.Infof("[E2 Manager -> RMR] #rmrCgoApi.SendMsg - Going to send message %v for transaction id: %s", *msg, tmpTid)
+	if printLogs {
+		//TODO: if debug enabled
+		transactionId := string(*msg.XAction)
+		tmpTid := strings.TrimSpace(transactionId)
+		ctx.Logger.Infof("[E2 Manager -> RMR] #rmrCgoApi.SendMsg - Going to send message %v for transaction id: %s", *msg, tmpTid)
+	}
 
 	currCMBuf := C.rmr_send_msg(ctx.RmrCtx, allocatedCMBuf)
+	defer C.rmr_free_msg(currCMBuf)
+
 	state = currCMBuf.state
-	ctx.Logger.Debugf("#rmrCgoApi.SendMsg - The current message  state: %v, message buffer:%v", state, currCMBuf)
 
 	if state != RMR_OK {
 		errorMessage := fmt.Sprintf("#rmrCgoApi.SendMsg - Failed to send message. state: %v - %s", state, states[int(state)])
 		return nil, errors.New(errorMessage)
 	}
 
-	ctx.Logger.Debugf("#rmrCgoApi.SendMsg - The message has been sent successfully ")
 	return convertToMBuf(ctx.Logger, currCMBuf), nil
 }
 
@@ -90,9 +91,10 @@ func (ctx *Context) RecvMsg() (*MBuf, error) {
 	ctx.checkContextInitialized()
 	ctx.Logger.Debugf("#rmrCgoApi.RecvMsg - Going to receive message")
 	allocatedCMBuf := C.rmr_alloc_msg(ctx.RmrCtx, C.int(ctx.MaxMsgSize))
-	defer C.rmr_free_msg(allocatedCMBuf)
 
 	currCMBuf := C.rmr_rcv_msg(ctx.RmrCtx, allocatedCMBuf)
+	defer C.rmr_free_msg(currCMBuf)
+
 	state := currCMBuf.state
 
 	if state != RMR_OK {
@@ -102,18 +104,14 @@ func (ctx *Context) RecvMsg() (*MBuf, error) {
 	}
 
 	mbuf := convertToMBuf(ctx.Logger, currCMBuf)
-	transactionId := string(*mbuf.XAction)
-	tmpTid := strings.TrimSpace(transactionId)
-	ctx.Logger.Infof("[RMR -> E2 Manager] #rmrCgoApi.RecvMsg - message %v has been received for transaction id: %s", *mbuf, tmpTid)
-	return mbuf, nil
-}
 
-func (ctx *Context) RtsMsg(msg *MBuf) {
-	ctx.checkContextInitialized()
-	ctx.Logger.Debugf("#rmrCgoApi.RtsMsg - Going to return message to the sender")
-	allocatedCMBuf := C.rmr_alloc_msg(ctx.RmrCtx, C.int(ctx.MaxMsgSize))
-	defer C.rmr_free_msg(allocatedCMBuf)
-	C.rmr_rts_msg(ctx.RmrCtx, allocatedCMBuf)
+	if mbuf.MType != E2_TERM_KEEP_ALIVE_RESP {
+
+		transactionId := string(*mbuf.XAction)
+		tmpTid := strings.TrimSpace(transactionId)
+		ctx.Logger.Infof("[RMR -> E2 Manager] #rmrCgoApi.RecvMsg - message %v has been received for transaction id: %s", *mbuf, tmpTid)
+	}
+	return mbuf, nil
 }
 
 func (ctx *Context) IsReady() bool {
@@ -125,4 +123,4 @@ func (ctx *Context) Close() {
 	ctx.Logger.Debugf("#rmrCgoApi.Close - Going to close RMR context")
 	C.rmr_close(ctx.RmrCtx)
 	time.Sleep(100 * time.Millisecond)
-}
+}
\ No newline at end of file