Merge "[Epic-ID: ODUHIGH-405][Task-ID: ODUHIGH-437] Establishing communication betwee...

[o-du/l2.git] / src / cm / ckw.c

diff --git a/src/cm/ckw.c b/src/cm/ckw.c
index 83a6372..d4afe91 100755 (executable)
--- a/src/cm/ckw.c
+++ b/src/cm/ckw.c
@@ -227,7 +227,7 @@ Buffer         *mBuf
           }
        case CKW_CFG_DIR_UL:
           {
-             CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.reOrdTmr, mBuf);
+             CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.reAsmblTmr, mBuf);
              CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.snLen, mBuf);
              break;
           }
@@ -235,7 +235,7 @@ Buffer         *mBuf
        case CKW_CFG_DIR_BOTH:
           {
              CMCHKPK(oduUnpackUInt8, param->m.umInfo.dl.snLen, mBuf);
-             CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.reOrdTmr, mBuf);
+             CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.reAsmblTmr, mBuf);
              CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.snLen, mBuf);
              break;
           }
@@ -266,7 +266,7 @@ Buffer         *mBuf
 {
 
     /* UP LINK */
-    CMCHKPK(oduUnpackUInt8, param->ul.reOrdTmr, mBuf);
+    CMCHKPK(oduUnpackUInt8, param->ul.reAsmblTmr, mBuf);
     CMCHKPK(oduUnpackUInt16, param->ul.staProhTmr, mBuf);
     CMCHKPK(oduUnpackUInt8, param->ul.snLen, mBuf);
 
@@ -533,7 +533,7 @@ RlcCfgCfmInfo     *cfgCfmInfo
                 return ( ret1 );
              }
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
-             if (SPutSBuf(pst->region, pst->pool, (Data *)cfgCfmInfo,
+             if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)cfgCfmInfo,
                       sizeof(RlcCfgCfmInfo)) != ROK)
              {
                 SPutMsg(mBuf);
@@ -618,14 +618,14 @@ CkwUeInfo *newUeInfo
     }
 
     CMCHKPK(cmPkCkwUeInfo, newUeInfo, mBuf);
-    if (SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo,
+    if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)newUeInfo,
              sizeof(CkwUeInfo)) != ROK)
     {
        SPutMsg(mBuf);
        return RFAILED;
     }
     CMCHKPK(cmPkCkwUeInfo, ueInfo, mBuf);
-    if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo,
+    if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo,
              sizeof(CkwUeInfo)) != ROK)
     {
        SPutMsg(mBuf);
@@ -681,7 +681,7 @@ CmStatus    status
     
     CMCHKPK(cmPkCmStatus, &status, mBuf); 
     CMCHKPK(cmPkCkwUeInfo, ueInfo, mBuf);
-    if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo,
+    if (SPutSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data *)ueInfo,
              sizeof(CkwUeInfo)) != ROK)
     {
        SPutMsg(mBuf);
@@ -849,14 +849,14 @@ Buffer         *mBuf
        case CKW_CFG_DIR_UL:
           {
              CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.snLen), mBuf);
-             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.reOrdTmr), mBuf);
+             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.reAsmblTmr), mBuf);
              break;
           }
        /* Patch ckw_c_001.main_3 */
        case CKW_CFG_DIR_BOTH:
           {
              CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.snLen), mBuf);
-             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.reOrdTmr), mBuf);
+             CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.reAsmblTmr), mBuf);
              CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.dl.snLen), mBuf);
              break;
           }
@@ -896,7 +896,7 @@ Buffer         *mBuf
     /* UP LINK */
     CMCHKUNPK(oduPackUInt8, &(param->ul.snLen), mBuf);
     CMCHKUNPK(oduPackUInt16, &(param->ul.staProhTmr), mBuf);
-    CMCHKUNPK(oduPackUInt8, &(param->ul.reOrdTmr), mBuf);
+    CMCHKUNPK(oduPackUInt8, &(param->ul.reAsmblTmr), mBuf);
 
     return ROK;
 } /* cmUnpkRlcAmInfo */
@@ -1127,7 +1127,7 @@ Buffer            *mBuf
     RlcCfgCfmInfo  *cfgCfmInfo = NULLP;
     
 
-    if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&cfgCfmInfo,\
+    if((ret1 = SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&cfgCfmInfo,\
                 sizeof(RlcCfgCfmInfo))) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1227,7 +1227,7 @@ Buffer            *mBuf
     CMCHKUNPK(SUnpkS16, &(spId), mBuf);
     CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW037, pst);
 
-    if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo,\
+    if((ret1 = SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ueInfo,\
                 sizeof(CkwUeInfo))) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1254,7 +1254,7 @@ Buffer            *mBuf
     }
 #endif /* ERRCLASS & ERRCLS_DEBUG */
 
-    if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&newUeInfo,\
+    if((ret1 = SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&newUeInfo,\
                 sizeof(CkwUeInfo))) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1319,7 +1319,7 @@ Buffer            *mBuf
     CMCHKUNPK(SUnpkS16, &suId, mBuf);
     CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW042, pst);
 
-    if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo,\
+    if((ret1 = SGetSBufNewForDebug(__FILE__,__FUNCTION__,__LINE__,pst->region, pst->pool, (Data **)&ueInfo,\
                 sizeof(CkwUeInfo))) != ROK)
     {
 #if (ERRCLASS & ERRCLS_ADD_RES)