X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Flegtp.c;h=1c0791650cbbbe4ad7eb993b603fa73d170563b9;hb=49856df248fd976b4a9882ca4e650fc0bc3e4ee3;hp=5e676741aa8299edd510ab0fc375ada9bdb16b74;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git

diff --git a/src/cm/legtp.c b/src/cm/legtp.c
index 5e676741a..1c0791650 100644
--- a/src/cm/legtp.c
+++ b/src/cm/legtp.c
@@ -39,8 +39,8 @@
  ******************************************************************/
 uint8_t packEgtpCfmStatus(CmStatus cfm, Buffer *mBuf)
 {
-   oduUnpackUInt16(cfm.status, mBuf);
-   oduUnpackUInt16(cfm.reason, mBuf);
+   oduPackUInt16(cfm.status, mBuf);
+   oduPackUInt16(cfm.reason, mBuf);
    
    return ROK;
 }
@@ -65,8 +65,8 @@ uint8_t packEgtpCfmStatus(CmStatus cfm, Buffer *mBuf)
 
 uint8_t unpackEgtpCfmStatus(CmStatus *cfm, Buffer *mBuf)
 {
-   oduPackUInt16(&(cfm->reason), mBuf);
-   oduPackUInt16(&(cfm->status), mBuf);
+   oduUnpackUInt16(&(cfm->reason), mBuf);
+   oduUnpackUInt16(&(cfm->status), mBuf);
 
    return ROK;
 }
@@ -92,27 +92,27 @@ uint8_t packEgtpCfgReq(Pst *pst, EgtpConfig egtpCfg)
 {
    Buffer *mBuf;
 
-   if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK)
+   if(ODU_GET_MSG_BUF(DFLT_REGION, pst->pool, &mBuf) != ROK)
    {
-      printf("\nDU_APP : Failed to allocate memory");
+      DU_LOG("\nERROR  -->  DU_APP : Failed to allocate memory");
       return RFAILED;
    }
    if(egtpCfg.localIp.ipV4Pres)
    {
-      oduUnpackUInt32(egtpCfg.localIp.ipV4Addr, mBuf);
+      oduPackUInt32(egtpCfg.localIp.ipV4Addr, mBuf);
    }
    oduPackBool(egtpCfg.localIp.ipV4Pres, mBuf);
-   oduUnpackUInt16(egtpCfg.localPort, mBuf);
+   oduPackUInt16(egtpCfg.localPort, mBuf);
 
    if(egtpCfg.destIp.ipV4Pres)
    {
-      oduUnpackUInt32(egtpCfg.destIp.ipV4Addr, mBuf);
+      oduPackUInt32(egtpCfg.destIp.ipV4Addr, mBuf);
    }
    oduPackBool(egtpCfg.destIp.ipV4Pres, mBuf);
-   oduUnpackUInt16(egtpCfg.destPort, mBuf);
+   oduPackUInt16(egtpCfg.destPort, mBuf);
 
-   oduUnpackUInt32(egtpCfg.minTunnelId, mBuf);
-   oduUnpackUInt32(egtpCfg.maxTunnelId, mBuf);
+   oduPackUInt32(egtpCfg.minTunnelId, mBuf);
+   oduPackUInt32(egtpCfg.maxTunnelId, mBuf);
 
    ODU_POST_TASK(pst, mBuf);
 
@@ -141,26 +141,26 @@ uint8_t unpackEgtpCfgReq(EgtpCfgReq func, Pst *pst, Buffer *mBuf)
 {
    EgtpConfig egtpCfg;
 
-   memset((uint8_t *)&egtpCfg, 0, sizeof(EgtpConfig));
+   memset(&egtpCfg, 0, sizeof(EgtpConfig));
 
-   oduPackUInt32(&(egtpCfg.maxTunnelId), mBuf);
-   oduPackUInt32(&(egtpCfg.minTunnelId), mBuf);
+   oduUnpackUInt32(&(egtpCfg.maxTunnelId), mBuf);
+   oduUnpackUInt32(&(egtpCfg.minTunnelId), mBuf);
   
-   oduPackUInt16(&(egtpCfg.destPort), mBuf);
+   oduUnpackUInt16(&(egtpCfg.destPort), mBuf);
    oduUnpackBool(&(egtpCfg.destIp.ipV4Pres), mBuf);
    if(egtpCfg.destIp.ipV4Pres)
    {  
-      oduPackUInt32(&(egtpCfg.destIp.ipV4Addr), mBuf);
+      oduUnpackUInt32(&(egtpCfg.destIp.ipV4Addr), mBuf);
    }
 
-   oduPackUInt16(&(egtpCfg.localPort), mBuf);
+   oduUnpackUInt16(&(egtpCfg.localPort), mBuf);
    oduUnpackBool(&(egtpCfg.localIp.ipV4Pres), mBuf);
    if(egtpCfg.localIp.ipV4Pres)
    {
-      oduPackUInt32(&(egtpCfg.localIp.ipV4Addr), mBuf);
+      oduUnpackUInt32(&(egtpCfg.localIp.ipV4Addr), mBuf);
    }
    
-   ODU_PUT_MSG(mBuf);
+   ODU_PUT_MSG_BUF(mBuf);
  
    return ((*func)(pst, egtpCfg));
 }
@@ -188,9 +188,9 @@ uint8_t packEgtpCfgCfm(Pst *pst, CmStatus cfm)
 {
    Buffer *mBuf;
   
-   if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK)
+   if(ODU_GET_MSG_BUF(DFLT_REGION, pst->pool, &mBuf) != ROK)
    {
-      printf("\nEGTP : Failed to allocate memory");
+      DU_LOG("\nERROR  -->  EGTP : Failed to allocate memory");
       return RFAILED;
    }
  
@@ -221,7 +221,7 @@ uint8_t unpackEgtpCfgCfm(EgtpCfgCfm func, Buffer *mBuf)
 {
    CmStatus cfm;
    
-   memset((uint8_t *)&cfm, 0, sizeof(CmStatus));
+   memset(&cfm, 0, sizeof(CmStatus));
    unpackEgtpCfmStatus(&cfm, mBuf);
 
    return ((*func)(cfm));
@@ -247,9 +247,9 @@ uint8_t packEgtpSrvOpenReq(Pst *pst)
 {
    Buffer *mBuf;
  
-   if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK)
+   if(ODU_GET_MSG_BUF(DFLT_REGION, pst->pool, &mBuf) != ROK)
    {
-      printf("\nDU_APP : Failed to allocate memory");
+      DU_LOG("\nERROR  -->  DU_APP : Failed to allocate memory");
       return RFAILED;
    }
   
@@ -300,9 +300,9 @@ uint8_t packEgtpSrvOpenCfm(Pst *pst, CmStatus cfm)
 {
    Buffer *mBuf;
  
-   if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK)
+   if(ODU_GET_MSG_BUF(DFLT_REGION, pst->pool, &mBuf) != ROK)
    {
-      printf("\nEGTP : Failed to allocate memory");
+      DU_LOG("\nERROR  -->  EGTP : Failed to allocate memory");
       return RFAILED;
    }
  
@@ -333,7 +333,7 @@ uint8_t unpackEgtpSrvOpenCfm(EgtpSrvOpenCfm func, Buffer *mBuf)
 {
    CmStatus cfm;
     
-   memset((uint8_t *)&cfm, 0, sizeof(CmStatus));
+   memset(&cfm, 0, sizeof(CmStatus));
    unpackEgtpCfmStatus(&cfm, mBuf);
 
    return ((*func)(cfm));
@@ -362,15 +362,15 @@ uint8_t packEgtpTnlMgmtReq(Pst *pst, EgtpTnlEvt tnlEvt)
 {
    Buffer *mBuf;
 
-   if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK)
+   if(ODU_GET_MSG_BUF(DFLT_REGION, pst->pool, &mBuf) != ROK)
    {
-      printf("\nDU_APP : Failed to allocate memory");
+      DU_LOG("\nERROR  -->  DU_APP : Failed to allocate memory");
       return RFAILED;
    }
 
-   oduUnpackUInt8(tnlEvt.action, mBuf);
-   oduUnpackUInt32(tnlEvt.lclTeid, mBuf);
-   oduUnpackUInt32(tnlEvt.remTeid, mBuf);
+   oduPackUInt8(tnlEvt.action, mBuf);
+   oduPackUInt32(tnlEvt.lclTeid, mBuf);
+   oduPackUInt32(tnlEvt.remTeid, mBuf);
 
    ODU_POST_TASK(pst, mBuf);
    return ROK;
@@ -399,11 +399,11 @@ uint8_t unpackEgtpTnlMgmtReq(EgtpTnlMgmtReq func, Pst *pst, Buffer *mBuf)
 {
    EgtpTnlEvt tnlEvt;
 
-   memset((uint8_t *)&tnlEvt, 0, sizeof(EgtpTnlEvt));
+   memset(&tnlEvt, 0, sizeof(EgtpTnlEvt));
 
-   oduPackUInt32(&(tnlEvt.remTeid), mBuf);
-   oduPackUInt32(&(tnlEvt.lclTeid), mBuf);
-   oduPackUInt8(&(tnlEvt.action), mBuf);
+   oduUnpackUInt32(&(tnlEvt.remTeid), mBuf);
+   oduUnpackUInt32(&(tnlEvt.lclTeid), mBuf);
+   oduUnpackUInt8(&(tnlEvt.action), mBuf);
 
    return ((* func)(pst, tnlEvt));
 
@@ -432,15 +432,15 @@ uint8_t packEgtpTnlMgmtCfm(Pst *pst, EgtpTnlEvt tnlEvt)
 {
    Buffer *mBuf;
 
-   if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK)
+   if(ODU_GET_MSG_BUF(DFLT_REGION, pst->pool, &mBuf) != ROK)
    {
-      printf("\nEGTP : Failed to allocate memory");
+      DU_LOG("\nERROR  -->  EGTP : Failed to allocate memory");
       return RFAILED;
    }
     
-   oduUnpackUInt8(tnlEvt.action, mBuf);
-   oduUnpackUInt32(tnlEvt.lclTeid, mBuf);
-   oduUnpackUInt32(tnlEvt.remTeid, mBuf);
+   oduPackUInt8(tnlEvt.action, mBuf);
+   oduPackUInt32(tnlEvt.lclTeid, mBuf);
+   oduPackUInt32(tnlEvt.remTeid, mBuf);
    
    packEgtpCfmStatus(tnlEvt.cfmStatus, mBuf);
     
@@ -471,12 +471,12 @@ uint8_t unpackEgtpTnlMgmtCfm(EgtpTnlMgmtCfm func, Buffer *mBuf)
 {
    EgtpTnlEvt tnlEvt;
  
-   memset((uint8_t *)&tnlEvt, 0, sizeof(EgtpTnlEvt));
+   memset(&tnlEvt, 0, sizeof(EgtpTnlEvt));
 
    unpackEgtpCfmStatus(&(tnlEvt.cfmStatus), mBuf); 
-   oduPackUInt32(&(tnlEvt.remTeid), mBuf);
-   oduPackUInt32(&(tnlEvt.lclTeid), mBuf);
-   oduPackUInt8(&(tnlEvt.action), mBuf);
+   oduUnpackUInt32(&(tnlEvt.remTeid), mBuf);
+   oduUnpackUInt32(&(tnlEvt.lclTeid), mBuf);
+   oduUnpackUInt8(&(tnlEvt.action), mBuf);
  
    return ((* func)(tnlEvt));
  
@@ -484,52 +484,34 @@ uint8_t unpackEgtpTnlMgmtCfm(EgtpTnlMgmtCfm func, Buffer *mBuf)
 
 /*******************************************************************
  *
- * @brief Packs Slot indication and sends to EGTP
+ * @brief Packs Polling requesting and sends to EGTP
  *
  * @details
  *
- *    Function : packEgtpSlotInd
+ *    Function : packEgtpStartPollingReq
  *
  *    Functionality:
- *       Packs slot indication and sends tp EGTP
+ *       Packs polling request and sends to EGTP
  *
  * @params[in] Post structure
  * @return ROK     - success
  *         RFAILED - failure
  *
  *******************************************************************/
-uint8_t packEgtpSlotInd(Pst *pst)
+uint8_t packEgtpStartPollingReq(Pst *pst)
 {
    Buffer *mBuf;
 
-   if(ODU_GET_MSG(DFLT_REGION, pst->pool, &mBuf) != ROK)
+   if(ODU_GET_MSG_BUF(DFLT_REGION, pst->pool, &mBuf) != ROK)
    {
-      printf("\nDU_APP : Failed to allocate memory");
+      DU_LOG("\nERROR  -->  DU_APP : Failed to allocate memory");
       return RFAILED;
    }
 
    ODU_POST_TASK(pst, mBuf);
    return ROK;
- 
 }
 
-/*******************************************************************
- *
- * @brief Unpacks slot indication
- *
- * @details
- *
- *    Function : unpackEgtpSlotInd
- *
- *    Functionality:
- *       Unpacks slot indication
- *
- * @params[in]
- * @return ROK     - success
- *         RFAILED - failure
- *
-******************************************************************/
-uint8_t unpackEgtpSlotInd(EgtpSlotInd func, Pst *pst, Buffer *mBuf)
-{
-    return ((*func)());
-}
+/**********************************************************************
+         End of file
+**********************************************************************/