Add license file

[ric-plt/xapp-frame.git] / pkg / xapp / rmr.go

diff --git a/pkg/xapp/rmr.go b/pkg/xapp/rmr.go
old mode 100755 (executable)
new mode 100644 (file)
index c0e1c8f..56e0eb1
--- a/pkg/xapp/rmr.go
+++ b/pkg/xapp/rmr.go
@@ -136,6 +136,8 @@ func (m *RMRClient) parseMessage(rxBuffer *C.rmr_mbuf_t) {
        meidBuf := make([]byte, int(C.RMR_MAX_MEID))
        if meidCstr := C.rmr_get_meid(rxBuffer, (*C.uchar)(unsafe.Pointer(&meidBuf[0]))); meidCstr != nil {
                params.Meid.RanName = strings.TrimRight(string(meidBuf), "\000")
+               //params.Meid.PlmnID = strings.TrimRight(string(meidBuf[0:16]), "\000")
+               //params.Meid.EnbID = strings.TrimRight(string(meidBuf[16:32]), "\000")
        }
 
        xidBuf := make([]byte, int(C.RMR_MAX_XID))
@@ -165,10 +167,16 @@ func (m *RMRClient) Allocate() *C.rmr_mbuf_t {
        if buf == nil {
                Logger.Error("rmrClient: Allocating message buffer failed!")
        }
-
        return buf
 }
 
+func (m *RMRClient) Free(mbuf *C.rmr_mbuf_t) {
+       if mbuf == nil {
+               return
+       }
+       C.rmr_free_msg(mbuf)
+}
+
 func (m *RMRClient) SendMsg(params *RMRParams) bool {
        return m.Send(params, false)
 }
@@ -178,16 +186,16 @@ func (m *RMRClient) SendRts(params *RMRParams) bool {
 }
 
 func (m *RMRClient) Send(params *RMRParams, isRts bool) bool {
-       buf := params.Mbuf
-       if buf == nil {
-               buf = m.Allocate()
+       txBuffer := params.Mbuf
+       if txBuffer == nil {
+               txBuffer = m.Allocate()
        }
 
-       buf.mtype = C.int(params.Mtype)
-       buf.sub_id = C.int(params.SubId)
-       buf.len = C.int(len(params.Payload))
+       txBuffer.mtype = C.int(params.Mtype)
+       txBuffer.sub_id = C.int(params.SubId)
+       txBuffer.len = C.int(len(params.Payload))
        if params.PayloadLen != 0 {
-                buf.len = C.int(params.PayloadLen)
+               txBuffer.len = C.int(params.PayloadLen)
        }
        datap := C.CBytes(params.Payload)
        defer C.free(datap)
@@ -196,48 +204,58 @@ func (m *RMRClient) Send(params *RMRParams, isRts bool) bool {
                if params.Meid != nil {
                        b := make([]byte, int(C.RMR_MAX_MEID))
                        copy(b, []byte(params.Meid.RanName))
-                       C.rmr_bytes2meid(buf, (*C.uchar)(unsafe.Pointer(&b[0])), C.int(len(b)))
+                       //copy(b, []byte(params.Meid.PlmnID))
+                       //copy(b[16:], []byte(params.Meid.EnbID))
+                       C.rmr_bytes2meid(txBuffer, (*C.uchar)(unsafe.Pointer(&b[0])), C.int(len(b)))
                }
                xidLen := len(params.Xid)
                if xidLen > 0 && xidLen <= C.RMR_MAX_XID {
-                       b := make([]byte, int(C.RMR_MAX_MEID))
+                       b := make([]byte, int(C.RMR_MAX_XID))
                        copy(b, []byte(params.Xid))
-                       C.rmr_bytes2xact(buf, (*C.uchar)(unsafe.Pointer(&b[0])), C.int(len(b)))
+                       C.rmr_bytes2xact(txBuffer, (*C.uchar)(unsafe.Pointer(&b[0])), C.int(len(b)))
                }
        }
-       C.write_bytes_array(buf.payload, datap, buf.len)
+       C.write_bytes_array(txBuffer.payload, datap, txBuffer.len)
 
-       return m.SendBuf(buf, isRts)
+       return m.SendBuf(txBuffer, isRts)
 }
 
 func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t, isRts bool) bool {
-       for i := 0; i < 10; i++ {
-               txBuffer.state = 0
+       var (
+               currBuffer  *C.rmr_mbuf_t
+               state       bool   = true
+               counterName string = "Transmitted"
+       )
+
+       txBuffer.state = 0
+       if isRts {
+               currBuffer = C.rmr_rts_msg(m.context, txBuffer)
+       } else {
+               currBuffer = C.rmr_send_msg(m.context, txBuffer)
+       }
+
+       if currBuffer == nil {
+               m.UpdateStatCounter("TransmitError")
+               return false
+       }
+
+       // Just quick retry seems to help for K8s issue
+       for j := 0; j < 3 && currBuffer != nil && currBuffer.state == C.RMR_ERR_RETRY; j++ {
                if isRts {
-                       txBuffer = C.rmr_rts_msg(m.context, txBuffer)
+                       currBuffer = C.rmr_rts_msg(m.context, currBuffer)
                } else {
-                       txBuffer = C.rmr_send_msg(m.context, txBuffer)
-               }
-
-               if txBuffer == nil {
-                       break
-               } else if txBuffer.state != C.RMR_OK {
-                       if txBuffer.state != C.RMR_ERR_RETRY {
-                               time.Sleep(100 * time.Microsecond)
-                               m.UpdateStatCounter("TransmitError")
-                       }
-                       for j := 0; j < 100 && txBuffer.state == C.RMR_ERR_RETRY; j++ {
-                               txBuffer = C.rmr_send_msg(m.context, txBuffer)
-                       }
+                       currBuffer = C.rmr_send_msg(m.context, currBuffer)
                }
+       }
 
-               if txBuffer.state == C.RMR_OK {
-                       m.UpdateStatCounter("Transmitted")
-                       return true
-               }
+       if currBuffer.state != C.RMR_OK {
+               state = false
+               counterName = "TransmitError"
        }
-       m.UpdateStatCounter("TransmitError")
-       return false
+
+       m.UpdateStatCounter(counterName)
+       m.Free(currBuffer)
+       return state
 }
 
 func (m *RMRClient) UpdateStatCounter(name string) {