Proper setting for dedicated_DRB flag so as to sent the S1AP InitialContextSetupRequest

openair2/RRC/LTE/rrc_eNB.c

@@ -6807,7 +6807,7 @@ rrc_eNB_decode_dcch(
 	/*FK: left the condition as is for the case MME is used (S1 mode) but setting  dedicated_DRB = 1 otherwise (noS1 mode) so that no second RRCReconfiguration message activationg more DRB is sent as this causes problems with the nasmesh driver.*/
         if (EPC_MODE_ENABLED) {
   	  if (ue_context_p->ue_context.Status == RRC_RECONFIGURED){
-  	    dedicated_DRB = 1;
+  	    //dedicated_DRB = 1;
   	    LOG_I(RRC,
   		  PROTOCOL_RRC_CTXT_UE_FMT" UE State = RRC_RECONFIGURED (dedicated DRB, xid %ld)\n",
   		  PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),ul_dcch_msg->message.choice.c1.choice.rrcConnectionReconfigurationComplete.rrc_TransactionIdentifier);
@@ -6847,7 +6847,7 @@ rrc_eNB_decode_dcch(
 	  		}
   	  		ue_context_p->ue_context.reestablishment_xid = -1;
         } else {
-  	  dedicated_DRB = 1;
+  	  //dedicated_DRB = 1;
   	  ue_context_p->ue_context.Status = RRC_RECONFIGURED;
   	  LOG_I(RRC,
   	      PROTOCOL_RRC_CTXT_UE_FMT" UE State = RRC_RECONFIGURED (dedicated DRB, xid %ld)\n",
@@ -6912,6 +6912,7 @@ if (ue_context_p->ue_context.nb_of_modify_e_rabs > 0) {
           }
   }else if(dedicated_DRB == 0){
           if(ue_context_p->ue_context.reestablishment_cause == ReestablishmentCause_spare1){
+          	LOG_I(RRC, "Sending rrc_eNB_send_S1AP_INITIAL_CONTEXT_SETUP_RESP\n");
 	    rrc_eNB_send_S1AP_INITIAL_CONTEXT_SETUP_RESP(ctxt_pP,
 						       ue_context_p);
           } else {