Changing rmr-data to rmrdata

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

diff --git a/pkg/xapp/types.go b/pkg/xapp/types.go
index 71338ad..b6fc49b 100755 (executable)
--- a/pkg/xapp/types.go
+++ b/pkg/xapp/types.go
@@ -23,25 +23,61 @@ import (
        "unsafe"
 )
 
-// To be removed ...
-type RMRStatistics struct{}
-
 type RMRClient struct {
-       context       unsafe.Pointer
-       ready         int
-       wg            sync.WaitGroup
-       mux           sync.Mutex
-       stat          map[string]Counter
-       consumers     []MessageConsumer
-       readyCb       ReadyCB
-       readyCbParams interface{}
+       contextMux        sync.Mutex
+       context           unsafe.Pointer
+       ready             int
+       wg                sync.WaitGroup
+       mux               sync.Mutex
+       stat              map[string]Counter
+       consumers         []MessageConsumer
+       readyCb           ReadyCB
+       readyCbParams     interface{}
+       maxRetryOnFailure int
 }
 
 type RMRMeid struct {
-       PlmnID string
-       EnbID  string
+       PlmnID  string
+       EnbID   string
+       RanName string
+}
+
+func (meid *RMRMeid) String() string {
+       str := "meid("
+       pad := ""
+       if len(meid.PlmnID) > 0 {
+               str += pad + "PlmnID=" + meid.PlmnID
+               pad = " "
+       }
+       if len(meid.EnbID) > 0 {
+               str += pad + "EnbID=" + meid.EnbID
+               pad = " "
+       }
+       if len(meid.RanName) > 0 {
+               str += pad + "RanName=" + meid.RanName
+               pad = " "
+       }
+       str += ")"
+       return str
+}
+
+type MessageConsumerFunc func(*RMRParams) error
+
+func (fn MessageConsumerFunc) Consume(params *RMRParams) error {
+       return fn(params)
 }
 
 type MessageConsumer interface {
-       Consume(mtype int, sid int, payload []byte, meid *RMRMeid) error
+       Consume(params *RMRParams) error
+}
+
+type PortData struct {
+       Name              string
+       Port              int
+       MaxSize           int
+       ThreadType        int
+       LowLatency        bool
+       FastAck           bool
+       Policies          []int
+       MaxRetryOnFailure int
 }