X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_egtp.c;h=a75e7bfb165d5e8db1b7cea38d98b3d191fe31d2;hb=refs%2Fchanges%2F77%2F4377%2F11;hp=120085befaefebe595066aa66ce1427abddbc282;hpb=80a4fa9d0aede180472530cab6efa6acc925424b;p=o-du%2Fl2.git

diff --git a/src/du_app/du_egtp.c b/src/du_app/du_egtp.c
index 120085bef..a75e7bfb1 100644
--- a/src/du_app/du_egtp.c
+++ b/src/du_app/du_egtp.c
@@ -17,8 +17,12 @@
 *******************************************************************************/
  
 /* This file contains all EGTP related functionality */
-
-#include <stdio.h>
+#include "common_def.h"
+#include "lrg.h"
+#include "lkw.x"
+#include "lrg.x"
+#include "legtp.h"
+#include "du_cfg.h"
 #include "du_egtp.h"
 #include "du_ue_mgr.h"
 
@@ -222,7 +226,7 @@ S16 egtpFillRspPst(Pst *pst, Pst *rspPst)
    rspPst->dstEnt = pst->srcEnt;
    rspPst->dstInst = pst->srcInst;
    rspPst->dstProcId = pst->srcProcId;
-   rspPst->selector = DU_SELECTOR_LC;
+   rspPst->selector = ODU_SELECTOR_LC;
    rspPst->pool= DU_POOL;
     
    return ROK;
@@ -256,19 +260,19 @@ S16 egtpSrvOpenReq(Pst *pst)
    DU_LOG("\nEGTP : Received EGTP open server request");
  
    sockType = CM_INET_DGRAM;
-  
-   /* Opening and Binding receiver socket */
-   if(ret = egtpSrvOpenPrc(sockType, &(egtpCb.recvTptSrvr)) != ROK)
+   ret = egtpSrvOpenPrc(sockType, &(egtpCb.recvTptSrvr));
+	/* Opening and Binding receiver socket */
+   if(ret != ROK)
    {
       DU_LOG("\nEGTP : Failed while opening receiver transport server");
-      return RFAILED;
+      return ret;
    }
-
    /* Opening and Binding sender socket */
-   if(ret = egtpSrvOpenPrc(sockType, &(egtpCb.dstCb.sendTptSrvr)) != ROK)
+	ret = egtpSrvOpenPrc(sockType, &(egtpCb.dstCb.sendTptSrvr));
+   if(ret != ROK)
    {
       DU_LOG("\nEGTP : Failed while opening sender transport server");
-      return RFAILED;
+      return ret;
    }
 
    DU_LOG("\nEGTP : Receiver socket[%d] and Sender socket[%d] open", egtpCb.recvTptSrvr.sockFd.fd, egtpCb.dstCb.sendTptSrvr.sockFd.fd);
@@ -281,7 +285,7 @@ S16 egtpSrvOpenReq(Pst *pst)
    rspPst.event = EVTSRVOPENCFM;
    packEgtpSrvOpenCfm(&rspPst, cfm);
 
-   return ROK;
+   return ret;
 }
 
 /*******************************************************************
@@ -303,21 +307,21 @@ S16 egtpSrvOpenReq(Pst *pst)
 
 S16 egtpSrvOpenPrc(U8 sockType, EgtpTptSrvr *server)
 {
-   S8 ret;
-
-   if(ret = (cmInetSocket(sockType, &(server->sockFd), protType)) != ROK)
+   S8 ret=ROK;
+   ret = cmInetSocket(sockType, &(server->sockFd), protType); 
+	if(ret != ROK)
    {  
       DU_LOG("\nEGTP : Failed to open UDP socket");
-      return RFAILED;
+      return ret;
    }
-      
-   if(ret = cmInetBind(&(server->sockFd), &(server->addr)) != ROK)
+   ret = cmInetBind(&(server->sockFd), &(server->addr));  
+   if(ret != ROK)
    {  
       DU_LOG("\nEGTP : Failed to bind socket");
-      return RFAILED;
+      return ret;
    }
    
-   return ROK;
+   return ret;
 }
 
 /**************************************************************************