Commit abaf6ba7 authored by Navid Nikaein's avatar Navid Nikaein

fix the conflict of the primitives between S1ap and X2ap

parent 45df334d
...@@ -419,7 +419,7 @@ void *eNB_app_task(void *args_p) ...@@ -419,7 +419,7 @@ void *eNB_app_task(void *args_p)
# if defined(ENABLE_USE_MME) # if defined(ENABLE_USE_MME)
/* Try to register each eNB */ /* Try to register each eNB */
registered_enb = 0; registered_enb = 0;
register_enb_pending = eNB_app_register (enb_id_start, enb_id_end, enb_properties_p); register_enb_pending = eNB_app_register_s1 (enb_id_start, enb_id_end, enb_properties_p);
# else # else
/* Start L2L1 task */ /* Start L2L1 task */
msg_p = itti_alloc_new_message(TASK_ENB_APP, INITIALIZE_MESSAGE); msg_p = itti_alloc_new_message(TASK_ENB_APP, INITIALIZE_MESSAGE);
......
...@@ -39,13 +39,13 @@ ...@@ -39,13 +39,13 @@
#include "x2ap_common.h" #include "x2ap_common.h"
#include "X2AP-PDU.h" #include "X2AP-PDU.h"
int asn_debug = 0; int asn_debug_x2 = 0;
int asn1_xer_print = 0; int asn1_xer_print_x2 = 0;
#if defined(EMIT_ASN_DEBUG_EXTERN) #if defined(EMIT_ASN_DEBUG_EXTERN)
inline void ASN_DEBUG(const char *fmt, ...) inline void ASN_DEBUG_X2(const char *fmt, ...)
{ {
if (asn_debug) { if (asn_debug_x2) {
int adi = asn_debug_indent; int adi = asn_debug_indent;
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
...@@ -78,7 +78,7 @@ ssize_t x2ap_generate_initiating_message( ...@@ -78,7 +78,7 @@ ssize_t x2ap_generate_initiating_message(
pdu.choice.initiatingMessage.criticality = criticality; pdu.choice.initiatingMessage.criticality = criticality;
ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr); ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr);
if (asn1_xer_print) { if (asn1_xer_print_x2) {
xer_fprint(stdout, &asn_DEF_X2AP_PDU, (void *)&pdu); xer_fprint(stdout, &asn_DEF_X2AP_PDU, (void *)&pdu);
} }
...@@ -112,7 +112,7 @@ ssize_t x2ap_generate_successfull_outcome( ...@@ -112,7 +112,7 @@ ssize_t x2ap_generate_successfull_outcome(
pdu.choice.successfulOutcome.criticality = criticality; pdu.choice.successfulOutcome.criticality = criticality;
ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr); ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr);
if (asn1_xer_print) { if (asn1_xer_print_x2) {
xer_fprint(stdout, &asn_DEF_X2AP_PDU, (void *)&pdu); xer_fprint(stdout, &asn_DEF_X2AP_PDU, (void *)&pdu);
} }
...@@ -147,7 +147,7 @@ ssize_t x2ap_generate_unsuccessfull_outcome( ...@@ -147,7 +147,7 @@ ssize_t x2ap_generate_unsuccessfull_outcome(
pdu.choice.successfulOutcome.criticality = criticality; pdu.choice.successfulOutcome.criticality = criticality;
ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr); ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr);
if (asn1_xer_print) { if (asn1_xer_print_x2) {
xer_fprint(stdout, &asn_DEF_X2AP_PDU, (void *)&pdu); xer_fprint(stdout, &asn_DEF_X2AP_PDU, (void *)&pdu);
} }
...@@ -188,7 +188,7 @@ X2ap_IE_t *x2ap_new_ie( ...@@ -188,7 +188,7 @@ X2ap_IE_t *x2ap_new_ie(
return NULL; return NULL;
} }
if (asn1_xer_print) if (asn1_xer_print_x2)
if (xer_fprint(stdout, &asn_DEF_X2ap_IE, buff) < 0) { if (xer_fprint(stdout, &asn_DEF_X2ap_IE, buff) < 0) {
free(buff); free(buff);
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment