Resolve remaining conflicts after merge of develop into NR_RRC_harq_hacks

openair2/RRC/NR/rrc_gNB_nsa.c

@@ -147,80 +147,6 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
                         carrier->initial_csi_index[rrc->Nb_ue]);
   ue_context_p->ue_id_rnti = ue_context_p->ue_context.secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity;
   NR_CG_Config_t *CG_Config = calloc(1,sizeof(*CG_Config));
-<<<<<<< HEAD
-  memset((void*)CG_Config,0,sizeof(*CG_Config));
-
-  __attribute__((unused))int CG_Config_size = generate_CG_Config(rrc,CG_Config,ue_context_p->ue_context.reconfig,ue_context_p->ue_context.rb_config);
-
-  if(m!=NULL){
-	  uint8_t inde_list[m->nb_e_rabs_tobeadded];
-	  memset(inde_list, 0, m->nb_e_rabs_tobeadded*sizeof(uint8_t));
-
-	  if (m->nb_e_rabs_tobeadded>0){
-		  for (int i=0; i<m->nb_e_rabs_tobeadded; i++){
-			  // Add the new E-RABs at the corresponding rrc ue context of the gNB
-			  ue_context_p->ue_context.e_rab[i].param.e_rab_id = m->e_rabs_tobeadded[i].e_rab_id;
-			  ue_context_p->ue_context.e_rab[i].param.gtp_teid = m->e_rabs_tobeadded[i].gtp_teid;
-			  memcpy(&ue_context_p->ue_context.e_rab[i].param.sgw_addr, &m->e_rabs_tobeadded[i].sgw_addr, sizeof(transport_layer_addr_t));
-			  ue_context_p->ue_context.nb_of_e_rabs++;
-  			  //Fill the required E-RAB specific information for the creation of the S1-U tunnel between the gNB and the SGW
-			  create_tunnel_req.eps_bearer_id[i]       = ue_context_p->ue_context.e_rab[i].param.e_rab_id;
-			  create_tunnel_req.sgw_S1u_teid[i]        = ue_context_p->ue_context.e_rab[i].param.gtp_teid;
-			  memcpy(&create_tunnel_req.sgw_addr[i], &ue_context_p->ue_context.e_rab[i].param.sgw_addr, sizeof(transport_layer_addr_t));
-			  inde_list[i] = i;
-                          LOG_I(RRC,"S1-U tunnel: index %d target sgw ip %d.%d.%d.%d length %d gtp teid %u\n",
-			  		   	        	 i,
-			  		      	        	create_tunnel_req.sgw_addr[i].buffer[0],
-			  		      	            create_tunnel_req.sgw_addr[i].buffer[1],
-			  		      	            create_tunnel_req.sgw_addr[i].buffer[2],
-			  		      	            create_tunnel_req.sgw_addr[i].buffer[3],
-			  		      	            create_tunnel_req.sgw_addr[i].length,
-			  		      	            create_tunnel_req.sgw_S1u_teid[i]);   
-		  }
-		  //PM: Is this where we should extract the rnti from?
-		  create_tunnel_req.rnti           = ue_context_p->ue_id_rnti;
-		  create_tunnel_req.num_tunnels    = m->nb_e_rabs_tobeadded;
-		  RB_INSERT(rrc_nr_ue_tree_s, &RC.nrrrc[rrc->module_id]->rrc_ue_head, ue_context_p);
-
-		  PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, rrc->module_id, GNB_FLAG_YES, ue_context_p->ue_id_rnti, 0, 0,rrc->module_id);
-		  gtpv1u_create_s1u_tunnel(
-				  ctxt.instance,
-				  &create_tunnel_req,
-				  &create_tunnel_resp);
-		  rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(
-				  &ctxt,
-				  &create_tunnel_resp,
-				  &inde_list[0]);
-		  X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).nb_e_rabs_admitted_tobeadded = m->nb_e_rabs_tobeadded;
-		  for(int i=0; i<ue_context_p->ue_context.nb_of_e_rabs; i++){
-			  X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).e_rabs_admitted_tobeadded[i].e_rab_id = ue_context_p->ue_context.e_rab[i].param.e_rab_id;
-			  X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).e_rabs_admitted_tobeadded[i].gtp_teid = create_tunnel_resp.enb_S1u_teid[i];
-			  memcpy(&X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).e_rabs_admitted_tobeadded[i].gnb_addr, &create_tunnel_resp.enb_addr, sizeof(transport_layer_addr_t));
-
-			 //The length field in the X2AP targetting structure is expected in bits but the create_tunnel_resp returns the address length in bytes
-		         X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).e_rabs_admitted_tobeadded[i].gnb_addr.length = create_tunnel_resp.enb_addr.length*8;
-
-                          LOG_I(RRC,"S1-U create_tunnel_resp tunnel: index %d target gNB ip %d.%d.%d.%d length %d gtp teid %u\n",
-					  i,
-					  create_tunnel_resp.enb_addr.buffer[0],
-					  create_tunnel_resp.enb_addr.buffer[1],
-					  create_tunnel_resp.enb_addr.buffer[2],
-					  create_tunnel_resp.enb_addr.buffer[3],
-					  create_tunnel_resp.enb_addr.length,
-					  create_tunnel_resp.enb_S1u_teid[i]);
-			  LOG_I(RRC,"X2AP sGNB Addition Request: index %d target gNB ip %d.%d.%d.%d length %d gtp teid %u\n",
-					  i,
-					  X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).e_rabs_admitted_tobeadded[i].gnb_addr.buffer[0],
-					  X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).e_rabs_admitted_tobeadded[i].gnb_addr.buffer[1],
-					  X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).e_rabs_admitted_tobeadded[i].gnb_addr.buffer[2],
-					  X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).e_rabs_admitted_tobeadded[i].gnb_addr.buffer[3],
-					  X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).e_rabs_admitted_tobeadded[i].gnb_addr.length,
-					  X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).e_rabs_admitted_tobeadded[i].gtp_teid);
-		  }
-	  }
-	  else
-		  LOG_W(RRC, "No E-RAB to be added received from SgNB Addition Request message \n");
-=======
   memset((void *)CG_Config,0,sizeof(*CG_Config));
   //int CG_Config_size = generate_CG_Config(rrc,CG_Config,ue_context_p->ue_context.reconfig,ue_context_p->ue_context.rb_config);
   generate_CG_Config(rrc,CG_Config,ue_context_p->ue_context.reconfig,ue_context_p->ue_context.rb_config);
@@ -291,7 +217,6 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
       }
     } else
       LOG_W(RRC, "No E-RAB to be added received from SgNB Addition Request message \n");
->>>>>>> origin/develop
   }
 
   //X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).rrc_buffer_size = CG_Config_size; //Need to verify correct value for the buffer_size