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

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

diff --git a/src/cm/lsctp.c b/src/cm/lsctp.c
index 46ce345..12f673d 100644 (file)
--- a/src/cm/lsctp.c
+++ b/src/cm/lsctp.c
@@ -17,9 +17,8 @@
 *******************************************************************************/
 
 /* This file contains DU APP and SCTP interface functions */
-
-#include "du_sctp.h"
-
+#include "common_def.h"
+#include "lsctp.h"
 
 /*******************************************************************
  *
@@ -38,30 +37,30 @@
  *
  * ****************************************************************/
 
-S16 cmPkSctpNtfy(Pst *pst, CmInetSctpNotification *ntfy)
+uint8_t cmPkSctpNtfy(Pst *pst, CmInetSctpNotification *ntfy)
 {
    Buffer *mBuf;
 
-   if(SGetMsg(DU_APP_MEM_REGION, DU_POOL, &mBuf) != ROK)
+   if(ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK)
    {
-      printf("\nSCTP : Failed to allocate memory");
-      RETVALUE(RFAILED);
+      DU_LOG("\nERROR  -->  SCTP : Failed to allocate memory");
+      return RFAILED;
    }
 
    if(ntfy->header.nType == CM_INET_SCTP_ASSOC_CHANGE)
    {
-      SPkU16(ntfy->u.assocChange.state, mBuf);
-      SPkU16(ntfy->u.assocChange.assocId, mBuf);
+      oduUnpackUInt16(ntfy->u.assocChange.state, mBuf);
+      oduUnpackUInt32(ntfy->u.assocChange.assocId, mBuf);
    }
-   SPkU16(ntfy->header.nType, mBuf);
+   oduUnpackUInt16(ntfy->header.nType, mBuf);
 
-   if (SPstTsk(pst, mBuf) != ROK)
+   if (ODU_POST_TASK(pst, mBuf) != ROK)
    {
-      printf("\nSCTP : SPstTsk failed while sending SCTP notification");
-      RETVALUE(RFAILED);
+      DU_LOG("\nERROR  -->  SCTP : ODU_POST_TASK failed while sending SCTP notification");
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 /*******************************************************************
@@ -81,19 +80,19 @@ S16 cmPkSctpNtfy(Pst *pst, CmInetSctpNotification *ntfy)
  *
  * ****************************************************************/
 
-S16 cmUnpkSctpNtfy(SctpNtfy func, Pst *pst, Buffer *mBuf)
+uint8_t cmUnpkSctpNtfy(SctpNtfy func, Pst *pst, Buffer *mBuf)
 {
    CmInetSctpNotification ntfy;
-   cmMemset((U8*)&ntfy, 0, sizeof(CmInetSctpNotification));
+   memset(&ntfy, 0, sizeof(CmInetSctpNotification));
 
-   SUnpkU16(&(ntfy.header.nType), mBuf);
+   oduPackUInt16(&(ntfy.header.nType), mBuf);
    if(ntfy.header.nType == CM_INET_SCTP_ASSOC_CHANGE)
    {
-      SUnpkU16(&(ntfy.u.assocChange.assocId), mBuf);
-      SUnpkU16(&(ntfy.u.assocChange.state), mBuf);
+      oduPackUInt32(&(ntfy.u.assocChange.assocId), mBuf);
+      oduPackUInt16(&(ntfy.u.assocChange.state), mBuf);
    }
 
-   RETVALUE((*func)(mBuf, &ntfy));
+   return ((*func)(mBuf, &ntfy));
 }
 
 /**********************************************************************