X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fcu_stub%2Fcu_f1ap_msg_hdl.c;h=04b0c70a7c3c0ba62795bbab18f899315c9be896;hb=694adde1a08c393a8443fd5bbd4f036f5cf85403;hp=fb6220eb4070ee1c854a980361e8fbfd9a1903ab;hpb=cfe7ea3ab6cb69d18ed91d79c1bf66b3bc8bdc98;p=o-du%2Fl2.git

diff --git a/src/cu_stub/cu_f1ap_msg_hdl.c b/src/cu_stub/cu_f1ap_msg_hdl.c
index fb6220eb4..04b0c70a7 100644
--- a/src/cu_stub/cu_f1ap_msg_hdl.c
+++ b/src/cu_stub/cu_f1ap_msg_hdl.c
@@ -305,8 +305,8 @@ S16 BuildAndSendF1SetupRsp()
       CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
       return RFAILED;
    }
-   buildPlmnId(cuCfgParams.plmn , &cellToActivate->list.array[0]->value.choice.\
-	 Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity);
+   buildPlmnId(cuCfgParams.plmn , cellToActivate->list.array[0]->value.choice.\
+	 Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity.buf);
    cellToActivate->list.array[0]->value.choice.Cells_to_be_Activated_List_Item.\
       nRCGI.nRCellIdentity.size = 5;
    CU_ALLOC(cellToActivate->list.array[0]->value.choice.\
@@ -469,7 +469,7 @@ S16 BuildAndSendF1SetupRsp()
    xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
    /* Encode the F1SetupRequest type as UPER */
-   cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
+   memset(encBuf, 0, ENC_BUF_MAX_LEN);
    encBufSize = 0;
    encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf);
 
@@ -598,7 +598,7 @@ S16 BuildAndSendDUUpdateAck()
    xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
    /* Encode the F1SetupRequest type as UPER */
-   cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
+   memset(encBuf, 0, ENC_BUF_MAX_LEN);
    encBufSize = 0;
    enRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf);
 
@@ -769,7 +769,7 @@ uint8_t BuildAndSendF1ResetReq()
        xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
        /* Encode the F1SetupRequest type as APER */
-       memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+       memset(encBuf, 0, ENC_BUF_MAX_LEN);
        encBufSize = 0;
        encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
                    encBuf);
@@ -991,7 +991,7 @@ uint8_t	BuildDLRRCContainer(RRCContainer_t *rrcContainer)
 	       {
 		  /* encode DL-CCCH message into RRC Container */
 		  xer_fprint(stdout, &asn_DEF_DL_CCCH_MessageType, &dl_CCCH_Msg);
-		  cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
+		  memset(encBuf, 0, ENC_BUF_MAX_LEN);
 		  encBufSize = 0;
 		  encRetVal = aper_encode(&asn_DEF_DL_CCCH_MessageType, 0, &dl_CCCH_Msg, PrepFinalEncBuf, encBuf);
 		  /* Encode results */
@@ -1171,7 +1171,7 @@ S16 BuildAndSendDLRRCMessageTransfer()
    xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
    /* Encode the F1SetupRequest type as APER */
-   cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
+   memset(encBuf, 0, ENC_BUF_MAX_LEN);
    encBufSize = 0;
    encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
 	 encBuf);
@@ -1317,7 +1317,7 @@ S16 BuildAndSendUESetRsp()
    xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
    /* Encode the F1SetupRequest type as APER */
-   cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
+   memset(encBuf, 0, ENC_BUF_MAX_LEN);
    encBufSize = 0;
    encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
 	 encBuf);
@@ -1432,7 +1432,7 @@ uint8_t BuildNrcgi(NRCGI_t *nrcgi)
    {
       return RFAILED;
    }
-   ret = buildPlmnId(cuCfgParams.plmn , &nrcgi->pLMN_Identity);
+   ret = buildPlmnId(cuCfgParams.plmn , nrcgi->pLMN_Identity.buf);
 
    if(ret != ROK)
    {
@@ -2461,7 +2461,7 @@ uint8_t BuildAndSendUESetReq(uint8_t cuUeF1apId, uint8_t duUeF1apId, \
       xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
       /* Encode the F1SetupRequest type as APER */
-      cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
       encBufSize = 0;
       encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
 	    encBuf);
@@ -2666,7 +2666,7 @@ uint8_t BuildAndSendF1ResetAck()
         xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
         /* Encode the F1SetupRequest type as UPER */
-        cmMemset((U8 *)encBuf, 0, ENC_BUF_MAX_LEN);
+        memset(encBuf, 0, ENC_BUF_MAX_LEN);
         encBufSize = 0;
         encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf);
 
@@ -2730,7 +2730,7 @@ void F1APMsgHdlr(Buffer *mBuf)
    ODU_PRINT_MSG(mBuf, 0,0);
 
    /* Copy mBuf into char array to decode it */
-   ODU_FIND_MSG_LEN(mBuf, &recvBufLen);
+   ODU_GET_MSG_LEN(mBuf, &recvBufLen);
    CU_ALLOC(recvBuf, (Size)recvBufLen);
 
    if(recvBuf == NULLP)