ENDC path switch S1-U: Remove warnings

openair2/RRC/LTE/rrc_eNB_S1AP.c

@@ -2291,8 +2291,6 @@ int rrc_eNB_send_E_RAB_Modification_Indication(const protocol_ctxt_t *const ctxt
   int e_rab = 0;
   int e_rab_modify_index = 0;
   int e_rab_notmodify_index = 0;
-  rrc_ue_s1ap_ids_t  *rrc_ue_s1ap_ids_p = NULL;
-  hashtable_rc_t      h_rc;
 
   uint8_t inde_list[ue_context_pP->ue_context.nb_of_e_rabs];
   memset(inde_list, 0, ue_context_pP->ue_context.nb_of_e_rabs*sizeof(uint8_t));

openair2/RRC/NR/rrc_gNB_GTPV1U.c

@@ -4,6 +4,7 @@
 # include "rrc_eNB_GTPV1U.h"
 # include "rrc_eNB_UE_context.h"
 # include "msc.h"
+# include "openair2/RRC/NR/rrc_gNB_UE_context.h"
 
 //# if defined(ENABLE_ITTI)
 #   include "asn1_conversions.h"

openair2/RRC/NR/rrc_gNB_UE_context.h

@@ -58,7 +58,7 @@ int rrc_gNB_compare_ue_rnti_id(
   struct rrc_gNB_ue_context_s* c2_pP
 );
 
-RB_PROTOTYPE(rrc_ue_tree_s, rrc_gNB_ue_context_s, entries, rrc_gNB_compare_ue_rnti_id);
+RB_PROTOTYPE(rrc_nr_ue_tree_s, rrc_gNB_ue_context_s, entries, rrc_gNB_compare_ue_rnti_id);
 
 struct rrc_gNB_ue_context_s*
 rrc_gNB_allocate_new_UE_context(

openair2/X2AP/x2ap_eNB_generate_messages.c

@@ -1516,8 +1516,6 @@ int x2ap_eNB_generate_ENDC_x2_SgNB_addition_request(
 	int uEaggregateMaximumBitRateDownlink = 100000000;
 	int uEaggregateMaximumBitRateUplink = 100000000;
 	int e_rabs_tobeadded = 1;
-	int e_RAB_ID = 1;
-	int drb_ID = 2;
 	long int pDCPatSgNB = X2AP_EN_DC_ResourceConfiguration__pDCPatSgNB_present;
 	long int mCGresources = X2AP_EN_DC_ResourceConfiguration__mCGresources_not_present;
 	long int sCGresources = X2AP_EN_DC_ResourceConfiguration__sCGresources_not_present;
@@ -1691,13 +1689,7 @@ int x2ap_gNB_generate_ENDC_x2_SgNB_addition_request_ACK( x2ap_eNB_instance_t *in
 
 		// Currently hardcoded (dummy) values filling the fields of SgNB_addition_request message. To be substituted
 		// with values coming from RRC.
-		uint16_t nRencryptionAlgorithms = 0;
-		uint16_t nRintegrityProtectionAlgorithms = 0;
-		uint8_t  SgNBSecurityKey[32] = { 0 };
-		int uEaggregateMaximumBitRateDownlink = 100000000;
-		int uEaggregateMaximumBitRateUplink = 100000000;
 		int e_rabs_admitted_tobeadded = 1;
-		int e_RAB_ID = 1;
 		long int pDCPatSgNB = X2AP_EN_DC_ResourceConfiguration__pDCPatSgNB_present;
 		long int mCGresources = X2AP_EN_DC_ResourceConfiguration__mCGresources_not_present;
 		long int sCGresources = X2AP_EN_DC_ResourceConfiguration__sCGresources_not_present;

openair2/X2AP/x2ap_eNB_handler.c

@@ -1771,7 +1771,6 @@ int x2ap_gNB_handle_ENDC_sGNB_addition_request (instance_t instance,
   X2AP_FIND_PROTOCOLIE_BY_ID(X2AP_SgNBAdditionRequest_IEs_t, ie, x2SgNBAdditionRequest,
 		  X2AP_ProtocolIE_ID_id_MeNBtoSgNBContainer, true);
 
-  X2AP_MeNBtoSgNBContainer_t *container = &ie->value.choice.MeNBtoSgNBContainer;
 
     if (ie->value.choice.MeNBtoSgNBContainer.size > 8192 ) // TODO: this is the size of rrc_buffer in struct x2ap_handover_req_s
       { printf("%s:%d: fatal: buffer too big\n", __FILE__, __LINE__); abort(); }
@@ -1943,7 +1942,6 @@ int x2ap_gNB_handle_ENDC_sGNB_reconfiguration_complete (instance_t instance,
 	x2ap_eNB_instance_t                *instance_p;
 	x2ap_eNB_data_t                    *x2ap_eNB_data;
 	MessageDef                         *msg;
-	int                                ue_id;
 
 		  DevAssert (pdu != NULL);
 		  x2SgNBReconfigurationComplete = &pdu->choice.initiatingMessage.value.choice.SgNBReconfigurationComplete;