CU testing fixes

[o-du/l2.git] / src / cu_stub / cu_f1ap_msg_hdl.c

diff --git a/src/cu_stub/cu_f1ap_msg_hdl.c b/src/cu_stub/cu_f1ap_msg_hdl.c
index ac6a842..0cfc141 100644 (file)
--- a/src/cu_stub/cu_f1ap_msg_hdl.c
+++ b/src/cu_stub/cu_f1ap_msg_hdl.c
@@ -224,11 +224,7 @@ S16 SendF1APMsg(Region region, Pool pool)
 
 S16 BuildNrCellId(BIT_STRING_t *nrcell)
 {
-   uint8_t tmp;
-   for (tmp = 0 ; tmp < nrcell->size-1; tmp++)
-   {
-      nrcell->buf[tmp] = 0;
-   }
+   memset(nrcell->buf, 0, nrcell->size);
    nrcell->buf[4]   = 16; 
    nrcell->bits_unused = 4;
    nrcell->size = 5 * sizeof(uint8_t);
@@ -1639,7 +1635,7 @@ uint8_t BuildAndSendDLRRCMessageTransfer(uint8_t rrcMsgType)
    dlRRCMsg->protocolIEs.list.array[idx]->criticality  =   Criticality_reject;
    dlRRCMsg->protocolIEs.list.array[idx]->value.present = \
                                                          DLRRCMessageTransferIEs__value_PR_SRBID;
-   dlRRCMsg->protocolIEs.list.array[idx]->value.choice.SRBID = SRB1;
+   dlRRCMsg->protocolIEs.list.array[idx]->value.choice.SRBID = SRB0;
 
    /* RRCContainer */
    idx++;
@@ -1815,9 +1811,9 @@ uint8_t procInitULRRCMsg(F1AP_PDU_t *f1apMsg)
 uint8_t BuildNrcgi(NRCGI_t *nrcgi)
 {
    uint8_t ret;
-   uint8_t unused = 4;
+   uint8_t unused_bits = 4;
    uint8_t byteSize = 5;
-   uint8_t val = 16;
+   uint8_t val = 1;
    /* Allocate Buffer Memory */
    nrcgi->pLMN_Identity.size = 3 * sizeof(uint8_t);
    CU_ALLOC(nrcgi->pLMN_Identity.buf, nrcgi->pLMN_Identity.size);
@@ -1837,11 +1833,17 @@ uint8_t BuildNrcgi(NRCGI_t *nrcgi)
    {
       return RFAILED;
    }
+#if 0
    ret = fillBitString(&nrcgi->nRCellIdentity, unused, byteSize, val);
    if(ret != ROK)
    {
       return RFAILED;
    }
+#endif
+   memset(nrcgi->nRCellIdentity.buf, 0, nrcgi->nRCellIdentity.size);
+   nrcgi->nRCellIdentity.buf[0] |= val;
+   nrcgi->nRCellIdentity.bits_unused = unused_bits;
+
    return ROK;
 }
 /*******************************************************************