cellular-infrastructure
/
osmo-iuh
mirror of https://gerrit.osmocom.org/osmo-iuh
9
0
Fork 0
Code Issues Releases Wiki Activity

Introduce DRANAP/DRUA log categories to separate logging

This commit is contained in:
Harald Welte 2015-12-23 15:36:31 +01:00
parent f6d0138d76
commit f42317ba9c
7 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hnbap_common.c
View File

@ -126,7 +126,7 @@ static struct msgb *_hnbap_gen_msg(HNBAP_PDU_t *pdu)
rval = aper_encode_to_buffer(&asn_DEF_HNBAP_PDU, pdu,
msg->data, msgb_tailroom(msg));
if (rval.encoded < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error encoding type: %s\n",
LOGP(DHNBAP, LOGL_ERROR, "Error encoding type: %s\n",
rval.failed_type->name);
}
@ -152,7 +152,7 @@ struct msgb *hnbap_generate_initiating_message(
pdu.choice.initiatingMessage.criticality = criticality;
rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DHNBAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");
return NULL;
}
@ -179,7 +179,7 @@ struct msgb *hnbap_generate_successful_outcome(
pdu.choice.successfulOutcome.criticality = criticality;
rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DHNBAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");
return NULL;
}
@ -206,7 +206,7 @@ struct msgb *hnbap_generate_unsuccessful_outcome(
pdu.choice.unsuccessfulOutcome.criticality = criticality;
rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DHNBAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");
return NULL;
}
@ -234,7 +234,7 @@ IE_t *hnbap_new_ie(ProtocolIE_ID_t id,
rc = ANY_fromType_aper(&buff->value, type, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DHNBAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");
FREEMEM(buff);
return NULL;
}

10
src/hnbgw.c
View File

@ -274,6 +274,16 @@ static const struct log_info_cat log_cat[] = {
.color = "",
.description = "SCCP User Adaptation",
},
[DRUA] = {
.name = "DRUA", .loglevel = LOGL_DEBUG, .enabled = 1,
.color = "",
.description = "RANAP User Adaptation",
},
[DRANAP] = {
.name = "DRANAP", .loglevel = LOGL_DEBUG, .enabled = 1,
.color = "",
.description = "RAN Application Part",
},
};
static const struct log_info hnbgw_log_info = {

2
src/hnbgw.h
View File

@ -11,6 +11,8 @@ enum {
DMAIN,
DHNBAP,
DSUA,
DRUA,
DRANAP,
};

8
src/hnbgw_ranap.c
View File

@ -49,7 +49,7 @@ static int ranap_tx_reset_ack(struct hnb_context *hnb,
memset(&out, 0, sizeof(out));
rc = ranap_encode_resetacknowledgeies(&out, &ies);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "error encoding reset ack IEs: %d\n", rc);
LOGP(DRANAP, LOGL_ERROR, "error encoding reset ack IEs: %d\n", rc);
return rc;
}
@ -76,7 +76,7 @@ static int ranap_rx_init_reset(struct hnb_context *hnb, ANY_t *in)
if (rc < 0)
return rc;
DEBUGP(DMAIN, "RESET.req\n");
DEBUGP(DRANAP, "RESET.req\n");
/* FIXME: Actually we have to wait for some guard time? */
/* FIXME: Reset all resources related to this HNB/RNC */
@ -151,7 +151,7 @@ static int ranap_rx_dt(struct hnb_context *hnb, ANY_t *in)
/* FIXME: Update RAC associated with UE */
}
DEBUGP(DMAIN, "DirectTransfer: %s\n",
DEBUGP(DRANAP, "DirectTransfer: %s\n",
osmo_hexdump(ies.nas_pdu.buf, ies.nas_pdu.size));
/* FIXME: hand NAS PDU into MSC */
}
@ -201,7 +201,7 @@ int hnbgw_ranap_rx(struct msgb *msg, uint8_t *data, size_t len)
dec_ret = aper_decode(NULL,&asn_DEF_RANAP_RANAP_PDU, (void **) &pdu,
data, len, 0, 0);
if (dec_ret.code != RC_OK) {
LOGP(DMAIN, LOGL_ERROR, "Error in RANAP ASN.1 decode\n");
LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n");
return rc;
}

2
src/hnbgw_rua.c
View File

@ -266,7 +266,7 @@ int hnbgw_rua_rx(struct hnb_context *hnb, struct msgb *msg)
dec_ret = aper_decode(NULL, &asn_DEF_RUA_RUA_PDU, (void **) &pdu,
msg->data, msgb_length(msg), 0, 0);
if (dec_ret.code != RC_OK) {
LOGP(DMAIN, LOGL_ERROR, "Error in ASN.1 decode\n");
LOGP(DRUA, LOGL_ERROR, "Error in ASN.1 decode\n");
return rc;
}

16
src/ranap_common.c
View File

@ -43,7 +43,7 @@ static struct msgb *_ranap_gen_msg(RANAP_RANAP_PDU_t *pdu)
rval = aper_encode_to_buffer(&asn_DEF_RANAP_RANAP_PDU, pdu,
msg->data, msgb_tailroom(msg));
if (rval.encoded < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error encoding type: %s\n",
LOGP(DRANAP, LOGL_ERROR, "Error encoding type: %s\n",
rval.failed_type->name);
}
@ -68,7 +68,7 @@ struct msgb *ranap_generate_initiating_message(e_RANAP_ProcedureCode procedureCo
pdu.choice.initiatingMessage.criticality = criticality;
rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");
return NULL;
}
@ -95,7 +95,7 @@ struct msgb *ranap_generate_successful_outcome(
pdu.choice.successfulOutcome.criticality = criticality;
rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");
return NULL;
}
@ -122,7 +122,7 @@ struct msgb *ranap_generate_unsuccessful_outcome(
pdu.choice.unsuccessfulOutcome.criticality = criticality;
rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");
return NULL;
}
@ -149,7 +149,7 @@ struct msgb *ranap_generate_outcome(
pdu.choice.outcome.criticality = criticality;
rc = ANY_fromType_aper(&pdu.choice.outcome.value, td, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");
return NULL;
}
@ -177,7 +177,7 @@ RANAP_IE_t *ranap_new_ie(RANAP_ProtocolIE_ID_t id,
rc = ANY_fromType_aper(&buff->value, type, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");
FREEMEM(buff);
return NULL;
}
@ -211,14 +211,14 @@ RANAP_ProtocolIE_FieldPair_t *ranap_new_ie_pair(RANAP_ProtocolIE_ID_t id,
rc = ANY_fromType_aper(&buff->firstValue, type1, sptr1);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");
FREEMEM(buff);
return NULL;
}
rc = ANY_fromType_aper(&buff->secondValue, type2, sptr2);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n");
ASN_STRUCT_FREE(asn_DEF_RANAP_ProtocolIE_FieldPair, buff);
return NULL;
}

10
src/rua_common.c
View File

@ -111,7 +111,7 @@ static struct msgb *_rua_gen_msg(RUA_RUA_PDU_t *pdu)
rval = aper_encode_to_buffer(&asn_DEF_RUA_RUA_PDU, pdu,
msg->data, msgb_tailroom(msg));
if (rval.encoded < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error encoding type: %s\n",
LOGP(DRUA, LOGL_ERROR, "Error encoding type: %s\n",
rval.failed_type->name);
}
@ -137,7 +137,7 @@ struct msgb *rua_generate_initiating_message(
pdu.choice.initiatingMessage.criticality = criticality;
rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n");
return NULL;
}
@ -160,7 +160,7 @@ struct msgb *rua_generate_successful_outcome(
pdu.choice.successfulOutcome.criticality = criticality;
rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n");
return NULL;
}
@ -183,7 +183,7 @@ struct msgb *rua_generate_unsuccessful_outcome(
pdu.choice.unsuccessfulOutcome.criticality = criticality;
rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n");
return NULL;
}
@ -208,7 +208,7 @@ RUA_IE_t *rua_new_ie(RUA_ProtocolIE_ID_t id,
rc = ANY_fromType_aper(&buff->value, type, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n");
FREEMEM(buff);
return NULL;
}