X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FrmrCgo%2FrmrCgoUtils.go;h=f26d168eb00dd97e0d8ca4debbd9e77d17a53772;hb=b3805a9d29e2c7f6f14e3fedfa1ba504f734eea9;hp=b0ce30c34cfb1f720bb4f2e191693e33c82bf522;hpb=07ef76dd471a0892a893c90e0ab06713aee34be1;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/rmrCgo/rmrCgoUtils.go b/E2Manager/rmrCgo/rmrCgoUtils.go index b0ce30c..f26d168 100644 --- a/E2Manager/rmrCgo/rmrCgoUtils.go +++ b/E2Manager/rmrCgo/rmrCgoUtils.go @@ -13,11 +13,14 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// + +// This source code is part of the near-RT RIC (RAN Intelligent Controller) +// platform project (RICP). + package rmrCgo -// #cgo LDFLAGS: -L/usr/local/lib -lrmr_nng -lnng +// #cgo LDFLAGS: -L/usr/local/lib -lrmr_si // #include // #include import "C" @@ -31,7 +34,7 @@ import ( func convertToMBuf(logger *logger.Logger, m *C.rmr_mbuf_t) *MBuf { payloadArr := C.GoBytes(unsafe.Pointer(m.payload),C.int(m.len)) - xActionArr := C.GoBytes(unsafe.Pointer(m.xaction),RMR_MAX_XACTION_LEN) + xActionArr := C.GoBytes(unsafe.Pointer(m.xaction),C.int(RMR_MAX_XACTION_LEN)) // Trim padding (space and 0) xActionStr := strings.TrimRight(string(xActionArr),"\040\000") @@ -42,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")