From c4c43df0169c3ec3856c5fbde95b358f471e8c1f Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Tue, 28 Apr 2020 00:06:39 +0000
Subject: [PATCH] Updating RMR to 4.0.2

Change-Id: Ia8f351deb382b3487630b0c1f2fe79ede187e951
Signed-off-by: wahidw <abdulwahid.w@nokia.com>
---
 Dockerfile            | 8 ++++----
 RELNOTES              | 4 ++++
 build-rtmgr-ubuntu.sh | 2 +-
 container-tag.yaml    | 2 +-
 pkg/nbi/control.go    | 1 +
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e4b3873..37ffdac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,13 +23,13 @@
 # a Docker tag from the string in file container-tag.yaml
 
 #FROM golang:1.12.1 as rtmgrbuild
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:6-u18.04-nng as rtmgrbuild
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:7-u18.04 as rtmgrbuild
 
 # Install RMr shared library
-ARG RMRVERSION=3.8.2
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
+ARG RMRVERSION=4.0.2
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 # Install RMr development header files
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
 
 ENV GOLANG_VERSION 1.12.1
 RUN wget --quiet https://dl.google.com/go/go$GOLANG_VERSION.linux-amd64.tar.gz \
diff --git a/RELNOTES b/RELNOTES
index ea9abef..5034b0e 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,5 +1,9 @@
+### v0.5.8
+* Updating to RMR version 4.0.2
+
 ### v0.5.7-3
 * Updating to RMR version 3.8.2
+
 ### v0.5.7-2
 * Supporting of reading subscriptions from subscription manager while restarting rtmgr
 
diff --git a/build-rtmgr-ubuntu.sh b/build-rtmgr-ubuntu.sh
index f0f4153..d0e5cdc 100755
--- a/build-rtmgr-ubuntu.sh
+++ b/build-rtmgr-ubuntu.sh
@@ -20,7 +20,7 @@ set -eux
 
 echo "--> rtmgr-build-ubuntu.sh"
 curdir=`pwd`
-RMRVERSION=3.8.2
+RMRVERSION=4.0.2
 wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
 
diff --git a/container-tag.yaml b/container-tag.yaml
index cdf9e79..5349da6 100644
--- a/container-tag.yaml
+++ b/container-tag.yaml
@@ -2,4 +2,4 @@
 # By default this file is in the docker build directory,
 # but the location can configured in the JJB template.
 ---
-tag: 0.5.7-3
+tag: 0.5.8
diff --git a/pkg/nbi/control.go b/pkg/nbi/control.go
index 8d9e6c4..ccf4e57 100644
--- a/pkg/nbi/control.go
+++ b/pkg/nbi/control.go
@@ -73,6 +73,7 @@ func (c *Control) controlLoop(sbiEngine sbi.Engine, sdlEngine sdl.Engine, rpeEng
 			err := errors.New("Message Type " + strconv.Itoa(msg.Mtype) + " is discarded")
 			xapp.Logger.Error("Unknown message type: %v", err)
 		}
+		xapp.Rmr.Free(msg.Mbuf)
 	}
 }
 
-- 
2.16.6