From 0d4b7069d87272ddddf1f9b533baba22173a91f9 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Wed, 11 Jul 2018 13:17:49 +0200
Subject: [PATCH] Testing MIB ASN1 encoder fail

---
 openair1/SCHED_NR/fapi_nr_l1.c      | 4 ++--
 openair2/RRC/NR/L2_nr_interface.c   | 7 ++++---
 openair2/RRC/NR/MESSAGES/asn1_msg.c | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/openair1/SCHED_NR/fapi_nr_l1.c b/openair1/SCHED_NR/fapi_nr_l1.c
index e4a5a6eaf0..ebfe00b1cd 100644
--- a/openair1/SCHED_NR/fapi_nr_l1.c
+++ b/openair1/SCHED_NR/fapi_nr_l1.c
@@ -45,7 +45,7 @@ void handle_nr_nfapi_bch_pdu(PHY_VARS_gNB *gNB,
   AssertFatal(dl_config_pdu->bch_pdu_rel15.length == 3, "BCH PDU has length %d != 3\n",
               dl_config_pdu->bch_pdu_rel15.length);
 
-  LOG_D(PHY,"bch_pdu: %x,%x,%x\n",sdu[0],sdu[1],sdu[2]);
+  LOG_I(PHY,"bch_pdu: %x,%x,%x\n",sdu[0],sdu[1],sdu[2]);
   gNB->pbch_pdu[0] = sdu[2];
   gNB->pbch_pdu[1] = sdu[1];
   gNB->pbch_pdu[2] = sdu[0];
@@ -111,4 +111,4 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){
     oai_nfapi_nr_dl_config_req(Sched_INFO->DL_req); // DJP - .dl_config_request_body.dl_config_pdu_list[0]); // DJP - FIXME TODO - yuk - only copes with 1 pdu
   }
 
-}
\ No newline at end of file
+}
diff --git a/openair2/RRC/NR/L2_nr_interface.c b/openair2/RRC/NR/L2_nr_interface.c
index 2eaf7a43fd..3d1e15330b 100644
--- a/openair2/RRC/NR/L2_nr_interface.c
+++ b/openair2/RRC/NR/L2_nr_interface.c
@@ -22,7 +22,7 @@ int8_t mac_rrc_nr_data_req(const module_id_t Mod_idP,
   asn_enc_rval_t enc_rval;
   //SRB_INFO *Srb_info;
   //uint8_t Sdu_size                = 0;
-  uint8_t sfn                     = (uint8_t)((frameP>>4)&0xff);
+  uint8_t sfn                     = (uint8_t)((frameP>>4)&0x3f);
 
 #ifdef DEBUG_RRC
   int i;
@@ -44,10 +44,11 @@ int8_t mac_rrc_nr_data_req(const module_id_t Mod_idP,
                                      (void *)mib,
                                      carrier->MIB,
                                      24);
-    LOG_D(RRC,"Encoded MIB for frame %d (%p), bits %lu\n",sfn,carrier->MIB,enc_rval.encoded);
+    LOG_I(NR_RRC,"Encoded MIB for frame %d (%p), bits %lu\n",sfn,carrier->MIB,enc_rval.encoded);
     buffer_pP[0]=carrier->MIB[0];
     buffer_pP[1]=carrier->MIB[1];
     buffer_pP[2]=carrier->MIB[2];
+    LOG_I(NR_RRC,"MIB PDU buffer_pP[0]=%x , buffer_pP[1]=%x, buffer_pP[2]=%x\n",buffer_pP[0],buffer_pP[1],buffer_pP[2]);
     AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %lu)!\n",
                  enc_rval.failed_type->name, enc_rval.encoded);
     return(3);
@@ -59,4 +60,4 @@ int8_t mac_rrc_nr_data_req(const module_id_t Mod_idP,
 
   return(0);
 
-}
\ No newline at end of file
+}
diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.c b/openair2/RRC/NR/MESSAGES/asn1_msg.c
index f83527160f..403857f7c9 100644
--- a/openair2/RRC/NR/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/NR/MESSAGES/asn1_msg.c
@@ -205,7 +205,7 @@ uint8_t do_MIB_NR(rrc_gNB_carrier_data_t *carrier,
   mib->message.choice.mib = CALLOC(1,sizeof(struct NR_MIB));
   memset(mib->message.choice.mib,0,sizeof(struct NR_MIB));
   //36.331 SFN BIT STRING (SIZE (8)  , 38.331 SFN BIT STRING (SIZE (6))
-  uint8_t sfn = (uint8_t)((frame>>4)&0xff);
+  uint8_t sfn = (uint8_t)((frame>>4)&0x3f);
   mib->message.choice.mib->systemFrameNumber.buf = &sfn;
   mib->message.choice.mib->systemFrameNumber.size = 1;
   mib->message.choice.mib->systemFrameNumber.bits_unused=0;