remove dead code and replace unmanaged asn1_xer_print global variable by the appropriate existing debug flag

openair2/E1AP/e1ap_common.h

@@ -41,8 +41,6 @@ typedef struct e1ap_upcp_inst_s {
   e1ap_net_config_t net_config;
 } e1ap_upcp_inst_t;
 
-extern int asn1_xer_print;
-
 // forward declaration so we don't require E1AP ASN.1 when including this
 // header
 struct E1AP_E1AP_PDU;

openair2/GNB_APP/gnb_paramdef.h

@@ -49,9 +49,6 @@
 #define GNB_CONF_STRING_OTG_APP_TYPE              "app_type"
 #define GNB_CONF_STRING_OTG_BG_TRAFFIC            "bg_traffic"
 
-extern int asn_debug;
-extern int asn1_xer_print;
-
 #ifdef LIBCONFIG_LONG
 #define libconfig_int long
 #else

openair2/M2AP/m2ap_common.c

@@ -47,7 +47,7 @@ ssize_t m2ap_generate_initiating_message(
   pdu.choice.initiatingMessage.criticality   = criticality;
   ANY_fromType_aper((ANY_t *)&pdu.choice.initiatingMessage.value, td, sptr);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_M2AP_M2AP_PDU, (void *)&pdu);
   }
 
@@ -80,7 +80,7 @@ ssize_t m2ap_generate_unsuccessfull_outcome(
   pdu.choice.successfulOutcome.criticality   = criticality;
   ANY_fromType_aper((ANY_t *)&pdu.choice.successfulOutcome.value, td, sptr);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_M2AP_M2AP_PDU, (void *)&pdu);
   }
 

openair2/M2AP/m2ap_common.h

@@ -50,8 +50,6 @@
 # define M2AP_PORT 36423
 #endif
 
-extern int asn1_xer_print;
-
 #include "common/utils/LOG/log.h"
 #include "m2ap_default_values.h"
 #define M2AP_INFO(x, args...) LOG_I(M2AP, x, ##args)

openair2/M2AP/m2ap_decoder.c

@@ -165,7 +165,7 @@ int m2ap_decode_pdu(M2AP_M2AP_PDU_t *pdu, const uint8_t *const buffer, uint32_t
                         length,
                         0,
                         0);
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_M2AP_M2AP_PDU, pdu);
   }
 

openair2/M2AP/m2ap_encoder.c

@@ -44,7 +44,7 @@ int m2ap_encode_pdu(M2AP_M2AP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
   DevAssert(buffer != NULL);
   DevAssert(len != NULL);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_M2AP_M2AP_PDU, (void *)pdu);
   }
 

openair2/X2AP/x2ap_common.c

@@ -47,7 +47,7 @@ ssize_t x2ap_generate_initiating_message(
   pdu.choice.initiatingMessage.criticality   = criticality;
   ANY_fromType_aper((ANY_t *)&pdu.choice.initiatingMessage.value, td, sptr);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_X2AP_X2AP_PDU, (void *)&pdu);
   }
 
@@ -79,7 +79,7 @@ ssize_t x2ap_generate_successfull_outcome(
   pdu.choice.successfulOutcome.criticality   = criticality;
   ANY_fromType_aper((ANY_t *)&pdu.choice.successfulOutcome.value, td, sptr);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_X2AP_X2AP_PDU, (void *)&pdu);
   }
 
@@ -111,7 +111,7 @@ ssize_t x2ap_generate_unsuccessfull_outcome(
   pdu.choice.successfulOutcome.criticality   = criticality;
   ANY_fromType_aper((ANY_t *)&pdu.choice.successfulOutcome.value, td, sptr);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_X2AP_X2AP_PDU, (void *)&pdu);
   }
 

openair2/X2AP/x2ap_common.h

@@ -49,8 +49,6 @@
 # define X2AP_PORT 36422
 #endif
 
-extern int asn1_xer_print;
-
 #include "common/utils/LOG/log.h"
 #define X2AP_INFO(x, args...) LOG_I(X2AP, x, ##args)
 #define X2AP_ERROR(x, args...) LOG_E(X2AP, x, ##args)

openair2/X2AP/x2ap_eNB_decoder.c

@@ -156,7 +156,7 @@ int x2ap_eNB_decode_pdu(X2AP_X2AP_PDU_t *pdu, const uint8_t *const buffer, uint3
                         length,
                         0,
                         0);
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_X2AP_X2AP_PDU, pdu);
   }
 

openair2/X2AP/x2ap_eNB_encoder.c

@@ -44,7 +44,7 @@ int x2ap_eNB_encode_pdu(X2AP_X2AP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
   DevAssert(buffer != NULL);
   DevAssert(len != NULL);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_X2AP_X2AP_PDU, (void *)pdu);
   }