Change X2AP_ID_1 to X2AP_ID used in handover.

openair2/X2AP/x2ap_eNB_generate_messages.c

@@ -833,8 +833,8 @@ int x2ap_eNB_generate_x2_handover_request_ack (x2ap_eNB_instance_t *instance_p,
   ie = (X2AP_HandoverRequestAcknowledge_IEs_t *)calloc(1, sizeof(X2AP_HandoverRequestAcknowledge_IEs_t));
   ie->id = X2AP_ProtocolIE_ID_id_New_eNB_UE_X2AP_ID;
   ie->criticality = X2AP_Criticality_ignore;
-  ie->value.present = X2AP_HandoverRequestAcknowledge_IEs__value_PR_UE_X2AP_ID_1;
-  ie->value.choice.UE_X2AP_ID_1 = id_target;
+  ie->value.present = X2AP_HandoverRequestAcknowledge_IEs__value_PR_UE_X2AP_ID;
+  ie->value.choice.UE_X2AP_ID = id_target;
   ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
 
   /* mandatory */
@@ -956,8 +956,8 @@ int x2ap_eNB_generate_x2_ue_context_release (x2ap_eNB_instance_t *instance_p, x2
   ie = (X2AP_UEContextRelease_IEs_t *)calloc(1, sizeof(X2AP_UEContextRelease_IEs_t));
   ie->id = X2AP_ProtocolIE_ID_id_New_eNB_UE_X2AP_ID;
   ie->criticality = X2AP_Criticality_reject;
-  ie->value.present = X2AP_UEContextRelease_IEs__value_PR_UE_X2AP_ID_1;
-  ie->value.choice.UE_X2AP_ID_1 = id_target;
+  ie->value.present = X2AP_UEContextRelease_IEs__value_PR_UE_X2AP_ID;
+  ie->value.choice.UE_X2AP_ID = id_target;
   ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
 
   if (x2ap_eNB_encode_pdu(&pdu, &buffer, &len) < 0) {
@@ -1023,8 +1023,8 @@ int x2ap_eNB_generate_x2_handover_cancel (x2ap_eNB_instance_t *instance_p, x2ap_
     ie = (X2AP_HandoverCancel_IEs_t *)calloc(1, sizeof(X2AP_HandoverCancel_IEs_t));
     ie->id = X2AP_ProtocolIE_ID_id_New_eNB_UE_X2AP_ID;
     ie->criticality = X2AP_Criticality_ignore;
-    ie->value.present = X2AP_HandoverCancel_IEs__value_PR_UE_X2AP_ID_1;
-    ie->value.choice.UE_X2AP_ID_1 = id_target;
+    ie->value.present = X2AP_HandoverCancel_IEs__value_PR_UE_X2AP_ID;
+    ie->value.choice.UE_X2AP_ID = id_target;
     ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
   }
 

openair2/X2AP/x2ap_eNB_handler.c

@@ -863,7 +863,7 @@ int x2ap_eNB_handle_handover_response (instance_t instance,
     return -1;
   }
 
-  id_target = ie->value.choice.UE_X2AP_ID_1;
+  id_target = ie->value.choice.UE_X2AP_ID;
 
   ue_id = id_source;
 
@@ -1018,7 +1018,7 @@ int x2ap_eNB_handle_ue_context_release (instance_t instance,
     return -1;
   }
 
-  id_target = ie->value.choice.UE_X2AP_ID_1;
+  id_target = ie->value.choice.UE_X2AP_ID;
 
   ue_id = id_source;
   if (ue_id != x2ap_find_id_from_id_source(&instance_p->id_manager, id_source)) {
@@ -1106,7 +1106,7 @@ int x2ap_eNB_handle_handover_cancel (instance_t instance,
     X2AP_INFO("%s %d: ie is a NULL pointer \n",__FILE__,__LINE__);
     id_target = -1;
   } else
-    id_target = ie->value.choice.UE_X2AP_ID_1;
+    id_target = ie->value.choice.UE_X2AP_ID;
 
   X2AP_FIND_PROTOCOLIE_BY_ID(X2AP_HandoverCancel_IEs_t, ie, x2HandoverCancel,
                              X2AP_ProtocolIE_ID_id_Cause, true);

openair3/S1AP/s1ap_eNB_handlers.c

@@ -273,6 +273,7 @@ int s1ap_eNB_handle_s1_setup_failure(uint32_t               assoc_id,
     S1AP_ERROR("pdu == NULL\n");
     return -1;
   }
+
   container = &pdu->choice.unsuccessfulOutcome.value.choice.S1SetupFailure;
 
   /* S1 Setup Failure == Non UE-related procedure -> stream 0 */
@@ -282,8 +283,6 @@ int s1ap_eNB_handle_s1_setup_failure(uint32_t               assoc_id,
   }
 
   if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) {
-//    S1AP_ERROR("[SCTP %d] Received S1 setup response for non existing "
-//               "MME context\n", assoc_id);
     S1AP_ERROR("[SCTP %d] Received S1 setup failure for non existing "
                "MME context\n", assoc_id);
     return -1;