fix merge conflict

common/utils/ocp_itti/intertask_interface.cpp

@@ -45,8 +45,14 @@ extern "C" {
   }
 
   void free_mem_block (mem_block_t *leP, const char *caller) {
-    AssertFatal(leP!=NULL,"");
+//    AssertFatal(leP!=NULL,"");
+    if (leP != NULL) {
     free(leP);
+    LOG_I(TMR, "intertask_interface free_mem_block is called, after free leP is %p\n", leP);
+    leP = NULL; //prevent double free
+    } else {
+      LOG_I(TMR, "intertask_interface free_mem_block is called, but before free leP is NULL\n");
+    }
   }
 
   mem_block_t *get_free_mem_block (uint32_t sizeP, const char *caller) {

nfapi/oai_integration/nfapi_pnf.c

@@ -79,7 +79,7 @@ extern void handle_nfapi_bch_pdu(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, nfapi_d
 
 
 
-nfapi_tx_request_pdu_t *tx_request_pdu[1023][10][10]; // [frame][subframe][max_num_pdus]
+nfapi_tx_request_pdu_t *tx_request_pdu[1024][10][10]; // [frame][subframe][max_num_pdus]
 
 uint8_t tx_pdus[32][8][4096];
 
@@ -796,6 +796,7 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request
 
         uint8_t *dlsch_sdu = tx_pdus[UE_id][harq_pid];
         memcpy(dlsch_sdu, tx_pdu->segments[0].segment_data, tx_pdu->segments[0].segment_length);
+        tx_request_pdu[sfn][sf][rel8_pdu->pdu_index] = NULL;
         //NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() DLSCH:pdu_index:%d handle_nfapi_dlsch_pdu(eNB, proc_rxtx, dlsch_pdu, transport_blocks:%d sdu:%p) eNB->pdcch_vars[proc->subframe_tx & 1].num_pdcch_symbols:%d\n", __FUNCTION__, rel8_pdu->pdu_index, rel8_pdu->transport_blocks, dlsch_sdu, eNB->pdcch_vars[proc->subframe_tx & 1].num_pdcch_symbols);
         handle_nfapi_dlsch_pdu( eNB, sfn,sf, &eNB->proc.L1_proc, &dl_config_pdu_list[i], rel8_pdu->transport_blocks-1, dlsch_sdu);
       } else {

openair1/PHY/LTE_TRANSPORT/dci_tools.c

@@ -81,7 +81,7 @@ int16_t find_ulsch(uint16_t rnti, PHY_VARS_eNB *eNB,find_type_t type)
   int16_t first_free_index=-1;
 
   AssertFatal(eNB!=NULL,"eNB is null\n");
-  for (i=0; i<NUMBER_OF_UE_MAX; i++) {
+  for (i=0; i<=NUMBER_OF_UE_MAX; i++) {
     AssertFatal(eNB->ulsch[i]!=NULL,"eNB->ulsch[%d] is null\n",i);
     if ((eNB->ulsch[i]->harq_mask >0) &&
         (eNB->ulsch[i]->rnti==rnti))       return i;
@@ -1739,7 +1739,7 @@ void fill_dci0(PHY_VARS_eNB *eNB,int frame,int subframe,L1_rxtx_proc_t *proc,
 
   uint32_t        ndi = pdu->dci_pdu_rel8.new_data_indication_1;
 
-  uint16_t UE_id   = -1;
+  int16_t UE_id   = -1;
 
 #ifdef T_TRACER
   T(T_ENB_PHY_ULSCH_UE_DCI, T_INT(eNB->Mod_id), T_INT(frame), T_INT(subframe),

openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_receiver.c

@@ -269,6 +269,7 @@ rlc_am_receive_routing (
         rlc_pP->stat_rx_control_bytes += tb_size_in_bytes;
         rlc_pP->stat_rx_control_pdu += 1;
         rlc_am_receive_process_control_pdu (ctxt_pP, rlc_pP, tb_p, &first_byte_p, &tb_size_in_bytes);
+        tb_p = NULL;
         // Test if remaining bytes not processed (up to know, highest probability is bug in MAC)
 //Assertion(eNB)_PRAN_DesignDocument_annex No.767
   if(tb_size_in_bytes != 0)
@@ -347,6 +348,10 @@ rlc_am_receive_process_data_pdu (
             rlc_pP->vr_x);
 
       pdu_status = rlc_am_rx_list_check_duplicate_insert_pdu(ctxt_pP, rlc_pP,tb_pP);
+      if(pdu_status == RLC_AM_DATA_PDU_STATUS_FREE_STATE){
+        tb_pP = NULL;
+      }
+
       if (pdu_status != RLC_AM_DATA_PDU_STATUS_OK) {
         rlc_pP->stat_rx_data_pdu_dropped     += 1;
         rlc_pP->stat_rx_data_bytes_dropped   += tb_size_in_bytesP;
@@ -410,20 +415,24 @@ rlc_am_receive_process_data_pdu (
         }
 
         if (pdu_info_p->sn == rlc_pP->vr_r) {
-mem_block_t*       cursor_p                    = rlc_pP->receiver_buffer.head;
-rlc_am_rx_pdu_management_t * pdu_cursor_mgnt_p = (rlc_am_rx_pdu_management_t *) (cursor_p->data);
-if( (((rlc_am_rx_pdu_management_t*)(tb_pP->data))->all_segments_received) == (pdu_cursor_mgnt_p->all_segments_received)){
+          mem_block_t*       cursor_p                    = rlc_pP->receiver_buffer.head;
+          if (cursor_p != NULL) {
+            rlc_am_rx_pdu_management_t * pdu_cursor_mgnt_p = (rlc_am_rx_pdu_management_t *) (cursor_p->data);
+            if( (((rlc_am_rx_pdu_management_t*)(tb_pP->data))->all_segments_received) == (pdu_cursor_mgnt_p->all_segments_received)){
               if (((rlc_am_rx_pdu_management_t*)(tb_pP->data))->all_segments_received) {
                 rlc_am_rx_update_vr_r(ctxt_pP, rlc_pP, tb_pP);
                 rlc_pP->vr_mr = (rlc_pP->vr_r + RLC_AM_WINDOW_SIZE) & RLC_AM_SN_MASK;
               }
               reassemble = rlc_am_rx_check_vr_reassemble(ctxt_pP, rlc_pP);
               //TODO : optimization : check whether a reassembly is needed by looking at LI, FI, SO, etc...
-}else{
+            }else{
               LOG_E(RLC, "BAD all_segments_received!!! discard buffer!!!\n");
               /* Discard received block if out of window, duplicate or header error */
               free_mem_block (tb_pP, __func__);
-}
+            }
+          }else{
+            LOG_E(RLC,"cursor_p is NULL!!!\n");
+          }
         }
 
         //FNA: fix check VrX out of receiving window

openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_rx_list.c

@@ -716,7 +716,7 @@ rlc_am_rx_pdu_status_t rlc_am_rx_list_handle_pdu_segment(
 		  /* Free original PDU Segment */
 		  free_mem_block(tb_pP, __func__);
 
-		  return RLC_AM_DATA_PDU_STATUS_OK;
+		  return RLC_AM_DATA_PDU_STATUS_FREE_STATE;
 	  }
 	  else {
 		  return RLC_AM_DATA_PDU_STATUS_BUFFER_FULL;
@@ -882,7 +882,7 @@ rlc_am_rx_pdu_status_t rlc_am_rx_list_handle_pdu(
 			  /* Free original PDU */
 			  free_mem_block(tb_pP, __func__);
 
-			  return pdu_status;
+			  return RLC_AM_DATA_PDU_STATUS_FREE_STATE;
 		  }
 		  else {
 			  return RLC_AM_DATA_PDU_STATUS_BUFFER_FULL;
@@ -1107,6 +1107,7 @@ rlc_am_rx_list_reassemble_rlc_sdus(
     if (rlc_am_rx_pdu_management_p->all_segments_received > 0) {
       cursor_p = list2_remove_head(&rlc_pP->receiver_buffer);
       rlc_am_reassemble_pdu(ctxt_pP, rlc_pP, cursor_p,TRUE);
+      cursor_p = NULL;
       rlc_am_rx_old_pdu_management = rlc_am_rx_pdu_management_p;
       cursor_p = list2_get_head(&rlc_pP->receiver_buffer);
 

openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_status_report.c

@@ -276,6 +276,7 @@ rlc_am_receive_process_control_pdu(
     if(ack_sn >= RLC_AM_SN_MODULO || rlc_pP->control_pdu_info.num_nack >= RLC_AM_MAX_NACK_IN_STATUS_PDU) {
       LOG_E(RLC, PROTOCOL_RLC_AM_CTXT_FMT" illegal ack_sn %d, num_nack %d\n",
             PROTOCOL_RLC_AM_CTXT_ARGS(ctxt_pP,rlc_pP), ack_sn, rlc_pP->control_pdu_info.num_nack);
+      free_mem_block(tb_pP, __func__);
       return;
     }
 

openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_structs.h

@@ -269,8 +269,9 @@ typedef enum rlc_am_rx_pdu_status
     /** Unknown bearer */
 	RLC_AM_DATA_PDU_STATUS_INVALID_BEARER         = 6,
     /** RLC in wrong state */
-	RLC_AM_DATA_PDU_STATUS_WRONG_STATE            = 7
-
+	RLC_AM_DATA_PDU_STATUS_WRONG_STATE            = 7,
+    /*  sdu free state */
+       RLC_AM_DATA_PDU_STATUS_FREE_STATE            = 8
 } rlc_am_rx_pdu_status_t;
 
 /*! \cond PRIVATE */

openair2/RRC/LTE/rrc_eNB.c

@@ -7219,6 +7219,18 @@ rrc_eNB_decode_ccch(
                "reconfigurationFailure"));
         {
           uint16_t                          c_rnti = 0;
+          c_rnti = BIT_STRING_to_uint16(&rrcConnectionReestablishmentRequest->ue_Identity.c_RNTI);
+          LOG_D(RRC, "c_rnti is %x\n", c_rnti);
+          ue_context_p = rrc_eNB_get_ue_context(RC.rrc[ctxt_pP->module_id], c_rnti);
+
+          if (ue_context_p == NULL) {
+            LOG_E(RRC,
+                  PROTOCOL_RRC_CTXT_UE_FMT" LTE_RRCConnectionReestablishmentRequest without UE context, let's reject the UE\n",
+                  PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
+            LOG_E(RRC,PROTOCOL_RRC_CTXT_UE_FMT" ue_context_p is NULL , do not run rrc_eNB_generate_RRCConnectionReestablishmentReject\n",PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
+         //   rrc_eNB_generate_RRCConnectionReestablishmentReject(ctxt_pP, ue_context_p, CC_id);
+            break;
+          }
 
           if (rrcConnectionReestablishmentRequest->ue_Identity.physCellId != RC.rrc[ctxt_pP->module_id]->carrier[CC_id].physCellId) {
             LOG_E(RRC,
@@ -7246,18 +7258,6 @@ rrc_eNB_decode_ccch(
             break;
           }
 
-          c_rnti = BIT_STRING_to_uint16(&rrcConnectionReestablishmentRequest->ue_Identity.c_RNTI);
-          LOG_D(RRC, "c_rnti is %x\n", c_rnti);
-          ue_context_p = rrc_eNB_get_ue_context(RC.rrc[ctxt_pP->module_id], c_rnti);
-
-          if (ue_context_p == NULL) {
-            LOG_E(RRC,
-                  PROTOCOL_RRC_CTXT_UE_FMT" LTE_RRCConnectionReestablishmentRequest without UE context, let's reject the UE\n",
-                  PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
-            rrc_eNB_generate_RRCConnectionReestablishmentReject(ctxt_pP, ue_context_p, CC_id);
-            break;
-          }
-
           int UE_id = find_UE_id(ctxt_pP->module_id, c_rnti);
 
           if(UE_id == -1) {
@@ -7491,9 +7491,10 @@ rrc_eNB_decode_ccch(
 
               if ((ue_context_p = rrc_eNB_ue_context_stmsi_exist(ctxt_pP, mme_code, m_tmsi))) {
                 LOG_I(RRC," S-TMSI exists, ue_context_p %p, old rnti %x => %x\n",ue_context_p,ue_context_p->ue_context.rnti,ctxt_pP->rnti);
+                rnti_t      oldrnti = ue_context_p->ue_context.rnti;
 
                 if (!NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type)) {
-                  rrc_mac_remove_ue(ctxt_pP->module_id, ue_context_p->ue_context.rnti);
+                  //rrc_mac_remove_ue(ctxt_pP->module_id, ue_context_p->ue_context.rnti);
                 }
                 else {
                   MessageDef *m = itti_alloc_new_message(TASK_RRC_ENB, F1AP_UE_CONTEXT_RELEASE_CMD);
@@ -7513,6 +7514,12 @@ rrc_eNB_decode_ccch(
                 ue_context_p->ue_id_rnti = ctxt_pP->rnti;
                 ue_context_p->ue_context.rnti = ctxt_pP->rnti;
                 RB_INSERT(rrc_ue_tree_s, &RC.rrc[ctxt_pP->module_id]->rrc_ue_head, ue_context_p);
+
+                /* release old rnti */
+                if (!NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type)) {
+                  put_UE_in_freelist(ctxt_pP->module_id, oldrnti, 0);
+                }
+
                 /* reset timers */
                 ue_context_p->ue_context.ul_failure_timer = 0;
                 ue_context_p->ue_context.ue_release_timer = 0;

targets/RT/USER/lte-ru.c

@@ -2306,6 +2306,7 @@ void kill_RU_proc(RU_t *ru) {
   int ret;
   RU_proc_t *proc = &ru->proc;
 #if defined(PRE_SCD_THREAD)
+  if (NFAPI_MODE == NFAPI_MONOLITHIC || NFAPI_MODE == NFAPI_MODE_VNF) {
   AssertFatal((ret=pthread_mutex_lock(&proc->mutex_pre_scd))==0,"mutex_lock returns %d\n",ret);
   ru->proc.instance_pre_scd = 0;
   pthread_cond_signal(&proc->cond_pre_scd);
@@ -2313,6 +2314,7 @@ void kill_RU_proc(RU_t *ru) {
   pthread_join(proc->pthread_pre_scd, NULL);
   pthread_mutex_destroy(&proc->mutex_pre_scd);
   pthread_cond_destroy(&proc->cond_pre_scd);
+  }
 #endif
 #ifdef PHY_TX_THREAD
   AssertFatal((ret=pthread_mutex_lock(&proc->mutex_phy_tx))==0,"mutex_lock returns %d\n",ret);
@@ -2718,7 +2720,7 @@ void stop_ru(RU_t *ru) {
 #endif
   printf("Stopping RU %p processing threads\n",(void*)ru);
 #if defined(PRE_SCD_THREAD)
-  if(ru){
+  if(ru && (NFAPI_MODE == NFAPI_MONOLITHIC || NFAPI_MODE == NFAPI_MODE_VNF)){
     ru->proc.instance_pre_scd = 0;
     pthread_cond_signal( &ru->proc.cond_pre_scd );
     pthread_join(ru->proc.pthread_pre_scd, (void**)&status );