Fix DCCH and initial UE Message.

openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c

@@ -50,7 +50,7 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity,
     return;
   }
 
-  if (!(buffer[0] & 0x80)) {
+  if ((entity->type == NR_PDCP_DRB_AM || entity->type == NR_PDCP_DRB_UM) && !(buffer[0] & 0x80)) {
     LOG_E(PDCP, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
     exit(1);
   }

openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c

@@ -666,7 +666,7 @@ static void add_srb(int rnti, struct NR_SRB_ToAddMod *s, NR_RLC_BearerConfig_t *
   if (channel_id != srb_id) {
     LOG_E(RLC, "%s:%d:%s: todo, remove this limitation\n",
           __FILE__, __LINE__, __FUNCTION__);
-    //exit(1);
+    exit(1);
   }
 
   logical_channel_group = *l->ul_SpecificParameters->logicalChannelGroup;
@@ -674,7 +674,7 @@ static void add_srb(int rnti, struct NR_SRB_ToAddMod *s, NR_RLC_BearerConfig_t *
   /* TODO: accept other values? */
   if (logical_channel_group != 1) {
     LOG_E(RLC, "%s:%d:%s: fatal error\n", __FILE__, __LINE__, __FUNCTION__);
-    exit(1);
+    //exit(1);
   }
 
   switch (r->present) {

openair2/RRC/NR_UE/rrc_UE.c

@@ -1748,7 +1748,7 @@ void nr_rrc_ue_generate_RRCSetupRequest(module_id_t module_id, const uint8_t gNB
   uint8_t i=0,rv[6];
   protocol_ctxt_t  ctxt;
 
-  if(IS_SOFTMODEM_NOS1) {
+  if(!IS_SOFTMODEM_NOS1) {
     AMF_MODE_ENABLED = 1;
   }
   PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, module_id, GNB_FLAG_NO, NOT_A_RNTI, 0, 0,gNB_index);