From 6bbc81694bb7c33ad53e7d06155f8a472680c5d4 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Sun, 23 Sep 2018 16:06:40 -0400
Subject: [PATCH] Control plane is functional. Still need to handle
 RRCConnectionRelease in DU

---
 openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.c | 2 +-
 openair2/LAYER2/RLC/rlc.c                            | 9 +++++----
 openair2/RRC/LTE/L2_interface.c                      | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.c
index 8f56ac3d31..d24a935a00 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.c
@@ -150,7 +150,7 @@ boolean_t pdcp_is_rx_seq_number_valid(uint16_t seq_num, pdcp_t* pdcp_entity,srb_
 
   uint16_t  reordering_window = 0;
 
-  LOG_D(PDCP, "Incoming RX Sequence number is %04d\n", seq_num);
+  LOG_D(PDCP, "Incoming RX Sequence number is %04d (next %04d\n", seq_num, pdcp_entity->next_pdcp_rx_sn);
 
   if (pdcp_is_seq_num_size_valid(pdcp_entity) == FALSE || pdcp_is_seq_num_valid(seq_num, pdcp_entity->seq_num_size) == FALSE) {
     return FALSE;
diff --git a/openair2/LAYER2/RLC/rlc.c b/openair2/LAYER2/RLC/rlc.c
index d54938d400..152820bd87 100644
--- a/openair2/LAYER2/RLC/rlc.c
+++ b/openair2/LAYER2/RLC/rlc.c
@@ -635,10 +635,11 @@ void rlc_data_ind     (
          break;
        case ngran_eNB_DU    : 
        case ngran_gNB_DU    :
-         DU_send_UL_RRC_MESSAGE_TRANSFER(ctxt_pP,
-					 rb_idP,
-					 sdu_sizeP,
-					 sdu_pP->data);
+         if (srb_flagP == 1)
+           DU_send_UL_RRC_MESSAGE_TRANSFER(ctxt_pP,
+	  				   rb_idP,
+					   sdu_sizeP,
+					   sdu_pP->data);
          break;
 
        default:
diff --git a/openair2/RRC/LTE/L2_interface.c b/openair2/RRC/LTE/L2_interface.c
index dafc24d9df..27712073b9 100644
--- a/openair2/RRC/LTE/L2_interface.c
+++ b/openair2/RRC/LTE/L2_interface.c
@@ -132,7 +132,7 @@ mac_rrc_data_req(
 					 (void*)mib,
 					 carrier->MIB,
 					 24);
-	LOG_D(RRC,"Encoded MIB for frame %d (%p), bits %lu\n",sfn,carrier->MIB,enc_rval.encoded);
+//	LOG_D(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];
@@ -149,10 +149,10 @@ mac_rrc_data_req(
       eNB_RRC_UE_t *ue_p = &ue_context_p->ue_context; 
       LOG_T(RRC,"[eNB %d] Frame %d CCCH request (Srb_id %d, rnti %x)\n",Mod_idP,frameP, Srb_id,rnti);
 
-      if(ue_p->Srb0.Active==0) {
+/*      if(ue_p->Srb0.Active==0) {
         LOG_E(RRC,"[eNB %d] CCCH Not active (%p, rnti %x)\n",Mod_idP,ue_p,ue_p->rnti);
         return(0);
-      }
+      } */
 
       Srb_info=&ue_p->Srb0;