X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Frmr.go;h=9342828c8482ef2174399bfb4c090d302fc178fa;hb=40bc000e6cafe3a7eea32e4361268574050c12c4;hp=94070242c02ab2ab52604035f630ed1cf70e1a68;hpb=e525989b4fe86190faa820cc0a6e2f48ddb65e70;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/rmr.go b/pkg/xapp/rmr.go
index 9407024..9342828 100755
--- a/pkg/xapp/rmr.go
+++ b/pkg/xapp/rmr.go
@@ -70,6 +70,8 @@ import (
 	"strings"
 	"time"
 	"unsafe"
+
+	"github.com/spf13/viper"
 )
 
 var RMRCounterOpts = []CounterOpts{
@@ -168,7 +170,17 @@ func NewRMRClientWithParams(params *RMRClientParams) *RMRClient {
 }
 
 func NewRMRClient() *RMRClient {
-	p := GetPortData("rmr-data")
+	p := GetPortData("rmrdata")
+	if p.Port == 0 || viper.IsSet("rmr.protPort") {
+		// Old xApp descriptor used, fallback to rmr section
+		fmt.Sscanf(viper.GetString("rmr.protPort"), "tcp:%d", &p.Port)
+		p.MaxSize = viper.GetInt("rmr.maxSize")
+		p.ThreadType = viper.GetInt("rmr.threadType")
+		p.LowLatency = viper.GetBool("rmr.lowLatency")
+		p.FastAck = viper.GetBool("rmr.fastAck")
+		p.MaxRetryOnFailure = viper.GetInt("rmr.maxRetryOnFailure")
+	}
+
 	return NewRMRClientWithParams(
 		&RMRClientParams{
 			RmrData:  p,
@@ -268,19 +280,21 @@ func (m *RMRClient) parseMessage(rxBuffer *C.rmr_mbuf_t) {
 		return
 	}
 
-	// Special case for multiple consumers
-	for _, c := range m.consumers {
-		cptr := unsafe.Pointer(rxBuffer.payload)
-		params.Payload = C.GoBytes(cptr, C.int(rxBuffer.len))
-		params.PayloadLen = int(rxBuffer.len)
-		params.Mtype = int(rxBuffer.mtype)
-		params.SubId = int(rxBuffer.sub_id)
+	/*
+		// Special case for multiple consumers
+		for _, c := range m.consumers {
+			cptr := unsafe.Pointer(rxBuffer.payload)
+			params.Payload = C.GoBytes(cptr, C.int(rxBuffer.len))
+			params.PayloadLen = int(rxBuffer.len)
+			params.Mtype = int(rxBuffer.mtype)
+			params.SubId = int(rxBuffer.sub_id)
 
-		err := c.Consume(params)
-		if err != nil {
-			Logger.Warn("rmrClient: Consumer returned error: %v", err)
+			err := c.Consume(params)
+			if err != nil {
+				Logger.Warn("rmrClient: Consumer returned error: %v", err)
+			}
 		}
-	}
+	*/
 }
 
 func (m *RMRClient) Allocate(size int) *C.rmr_mbuf_t {