X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FrmrCgo%2FrmrCgoTypes.go;h=31292ca9ea64f88b4cb89c6d112af3b3d954c7be;hb=04ff63f1708020673dd9be975476e0f76f179a81;hp=3f8b1892a6c94771cc92906b237e0d23109c0469;hpb=15d3982b5eda43a5b5b9054d7ecb026448c6ca16;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/rmrCgo/rmrCgoTypes.go b/E2Manager/rmrCgo/rmrCgoTypes.go
index 3f8b189..31292ca 100644
--- a/E2Manager/rmrCgo/rmrCgoTypes.go
+++ b/E2Manager/rmrCgo/rmrCgoTypes.go
@@ -1,6 +1,7 @@
 //
 // Copyright 2019 AT&T Intellectual Property
 // Copyright 2019 Nokia
+// Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,10 +18,9 @@
 //  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 <rmr/rmr.h>
 // #include <rmr/RIC_message_types.h>
 // #include <stdlib.h>
@@ -31,13 +31,14 @@ import (
 	"unsafe"
 )
 
-func NewMBuf(mType int, len int, meid string, payload *[]byte, xAction *[]byte) *MBuf {
+func NewMBuf(mType int, len int, meid string, payload *[]byte, xAction *[]byte, msgSrc unsafe.Pointer) *MBuf {
 	return &MBuf{
-		MType:   mType,
-		Len:     len,
-		Meid:    meid,
-		Payload: payload,
-		XAction: xAction,
+		mType,
+		len,
+		meid,
+		payload,
+		xAction,
+		msgSrc,
 	}
 }
 
@@ -70,15 +71,29 @@ const (
 	RIC_SCTP_CLEAR_ALL                   = C.RIC_SCTP_CLEAR_ALL
 	RIC_X2_RESET_RESP                    = C.RIC_X2_RESET_RESP
 	RIC_X2_RESET                         = C.RIC_X2_RESET
-	RIC_E2_TERM_INIT 					 = C.E2_TERM_INIT
-	RAN_CONNECTED						 = C.RAN_CONNECTED
-	RAN_RESTARTED						 = C.RAN_RESTARTED
-	RAN_RECONFIGURED					 = C.RAN_RECONFIGURED
+	RIC_E2_TERM_INIT                     = C.E2_TERM_INIT
+	RAN_CONNECTED                        = C.RAN_CONNECTED
+	RAN_RESTARTED                        = C.RAN_RESTARTED
+	RAN_RECONFIGURED                     = C.RAN_RECONFIGURED
+	E2_TERM_KEEP_ALIVE_REQ               = C.E2_TERM_KEEP_ALIVE_REQ
+	E2_TERM_KEEP_ALIVE_RESP              = C.E2_TERM_KEEP_ALIVE_RESP
+	RIC_E2_SETUP_REQ                     = C.RIC_E2_SETUP_REQ
+	RIC_E2_SETUP_RESP                    = C.RIC_E2_SETUP_RESP
+	RIC_E2_SETUP_FAILURE                 = C.RIC_E2_SETUP_FAILURE
+	RIC_SERVICE_QUERY                    = C.RIC_SERVICE_QUERY
+	RIC_SERVICE_UPDATE                   = C.RIC_SERVICE_UPDATE
+	RIC_SERVICE_UPDATE_ACK               = C.RIC_SERVICE_UPDATE_ACK
+	RIC_SERVICE_UPDATE_FAILURE           = C.RIC_SERVICE_UPDATE_FAILURE
+	RIC_E2NODE_CONFIG_UPDATE             = C.RIC_E2NODE_CONFIG_UPDATE
+	RIC_E2NODE_CONFIG_UPDATE_ACK         = C.RIC_E2NODE_CONFIG_UPDATE_ACK
+	RIC_E2NODE_CONFIG_UPDATE_FAILURE     = C.RIC_E2NODE_CONFIG_UPDATE_FAILURE
+	RIC_E2_RESET_REQ                     = C.RIC_E2_RESET_REQ
 )
 
 const (
 	RMR_MAX_XACTION_LEN = int(C.RMR_MAX_XID)
 	RMR_MAX_MEID_LEN    = int(C.RMR_MAX_MEID)
+	RMR_MAX_SRC_LEN     = int(C.RMR_MAX_SRC)
 
 	//states
 	RMR_OK             = C.RMR_OK
@@ -124,12 +139,17 @@ type MBuf struct {
 	Meid    string //Managed entity id (RAN name)
 	Payload *[]byte
 	XAction *[]byte
+	msgSrc  unsafe.Pointer
 }
 
 func (m MBuf) String() string {
 	return fmt.Sprintf("{ MType: %d, Len: %d, Meid: %q, Xaction: %q, Payload: [%x] }", m.MType, m.Len, m.Meid, m.XAction, m.Payload)
 }
 
+func (m MBuf) GetMsgSrc() unsafe.Pointer {
+	return m.msgSrc
+}
+
 type Context struct {
 	MaxMsgSize int
 	Flags      int
@@ -138,10 +158,10 @@ type Context struct {
 }
 
 type RmrMessenger interface {
-	Init(port string, maxMsgSize int, flags int, logger *logger.Logger) *RmrMessenger
-	SendMsg(msg *MBuf) (*MBuf, error)
+	Init(port string, maxMsgSize int, flags int, logger *logger.Logger) RmrMessenger
+	SendMsg(msg *MBuf, printLogs bool) (*MBuf, error)
+	WhSendMsg(msg *MBuf, printLogs bool) (*MBuf, error)
 	RecvMsg() (*MBuf, error)
-	RtsMsg(msg *MBuf)
 	IsReady() bool
 	Close()
 }