From 197f4abee4ee0909e4509d6a2fbba78c500be7fe Mon Sep 17 00:00:00 2001 From: Balaji Shankaran Date: Fri, 29 May 2020 20:32:47 +0530 Subject: [PATCH] Change tag in the yaml file and console errors Change-Id: I6a69ae0623957fad00fc146ed75fafae79dc1a12 Signed-off-by: Balaji Shankaran --- Dockerfile | 2 +- Dockerfile-cu-stub | 2 +- container-tag.yaml | 2 +- src/cm/cm_inet.c | 13 +++++-------- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 15f89a8c2..28a5f0bf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,4 +7,4 @@ RUN apt-get update && apt-get install -y libpcap-dev RUN cd build/odu && make clean_odu odu MACHINE=BIT64 MODE=FDD -#CMD /opt/o-du-l2/bin/odu/odu -f ../config/ssi_mem +#CMD /opt/o-du-l2/bin/odu/odu diff --git a/Dockerfile-cu-stub b/Dockerfile-cu-stub index 19db6d150..6a1d80935 100644 --- a/Dockerfile-cu-stub +++ b/Dockerfile-cu-stub @@ -7,4 +7,4 @@ RUN apt-get update && apt-get install -y libpcap-dev RUN cd build/odu && make clean_cu cu_stub NODE=TEST_STUB MACHINE=BIT64 MODE=FDD -#CMD /opt/o-du-l2/bin/cu_stub/cu_stub -f ../config/ssi_mem +#CMD /opt/o-du-l2/bin/cu_stub/cu_stub diff --git a/container-tag.yaml b/container-tag.yaml index 1c479024f..c76c788f8 100644 --- a/container-tag.yaml +++ b/container-tag.yaml @@ -1,4 +1,4 @@ # The Jenkins job requires a tag to build the Docker image. # Global-JJB script assumes this file is in the repo root. --- -tag: 1.0.1 +tag: 1.0.2 diff --git a/src/cm/cm_inet.c b/src/cm/cm_inet.c index e7c600e4a..85dca984b 100644 --- a/src/cm/cm_inet.c +++ b/src/cm/cm_inet.c @@ -152,6 +152,7 @@ extern "C" { #ifdef NTL_LIB #include "ntl_lib.h" #endif +#include "du_log.h" /* local defines */ @@ -2296,10 +2297,8 @@ U16 port; /* port number */ " sockFd->fd(%ld)\n", INET_ERR_CODE, port, sockFd->fd); CMINETLOGERROR(ERRCLS_DEBUG, ECMINET010, 0, prntBuf); #else - /* cm_inet_c_001.main_62:Warning fix */ - snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "CmInetSctpConnectx() Failed : error(%d), port(0x%1x)," - " sockFd->fd(%d)\n", INET_ERR_CODE, port, sockFd->fd); - CMINETLOGERROR(ERRCLS_DEBUG, ECMINET010, 0, prntBuf); + DU_LOG("\nCmInetSctpConnectx() Failed : error(%d), port(0x%1x),\ + sockFd->fd(%d)\n", INET_ERR_CODE, port, sockFd->fd); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ @@ -2778,10 +2777,8 @@ CmInetSctpNotification *ntfy; /* notification parameters */ " sockFd->fd(%ld)\n", INET_ERR_CODE, sockFd->fd); CMINETLOGERROR(ERRCLS_DEBUG, ECMINET014, 0, prntBuf); #else - /* cm_inet_c_001.main_62:Warning fix */ - snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "cmInetSctpRecvMsg() Failed : error(%d)," - " sockFd->fd(%d)\n", INET_ERR_CODE, sockFd->fd); - CMINETLOGERROR(ERRCLS_DEBUG, ECMINET014, 0, prntBuf); + DU_LOG("\ncmInetSctpRecvMsg() Failed : error(%d), sockFd->fd(%d)", \ + INET_ERR_CODE, sockFd->fd); #endif /*ALIGN_64BIT*/ #endif /* CMINETDBG */ -- 2.16.6