logging: use central filter and ctx consts from libosmocore
The LCHAN and BTS filter contexts are actually never used, so drop them until
someone adds them properly.
For now use only LOGGING_{FILTER,CTX}_VLR_SUBSCR. Some of these will change to
_BSC_SUBSCR once struct bsc_subscriber is introduced, and later on, struct
gsm_subscriber will be replaced by vlr_subscriber so that the names will match.
Depends: libosmocore change-id I5c343630020f4b108099696fd96c2111614c8067
Change-Id: Ifa82f6a461ad4c0eeddb8a38fb3833460432d16b
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index 1a64731..10e2b31 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -1457,7 +1457,7 @@
/* FIXME: request id? close channel? */
return -EINVAL;
}
- log_set_context(BSC_CTX_SUBSCR, subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, subscr);
DEBUGP(DRR, "<- Channel was requested by %s\n",
subscr->name && strlen(subscr->name) ? subscr->name : subscr->imsi);
@@ -1982,7 +1982,7 @@
return -EIO;
/* Which subscriber do we want to track trans1 or trans2? */
- log_set_context(BSC_CTX_SUBSCR, trans1->subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, trans1->subscr);
/* through-connect channel */
return tch_map(trans1->conn->lchan, trans2->conn->lchan);
@@ -2003,7 +2003,7 @@
if (!trans->conn)
return 0;
- log_set_context(BSC_CTX_SUBSCR, trans->subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, trans->subscr);
lchan = trans->conn->lchan;
bts = lchan->ts->trx->bts;
@@ -3339,7 +3339,7 @@
mncc_recv_rtp_err(net, callref, MNCC_RTP_CREATE);
return -EIO;
}
- log_set_context(BSC_CTX_SUBSCR, trans->subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, trans->subscr);
if (!trans->conn) {
LOGP(DMNCC, LOGL_NOTICE, "RTP create for trans without conn\n");
mncc_recv_rtp_err(net, callref, MNCC_RTP_CREATE);
@@ -3395,7 +3395,7 @@
mncc_recv_rtp_err(net, rtp->callref, MNCC_RTP_CONNECT);
return -EIO;
}
- log_set_context(BSC_CTX_SUBSCR, trans->subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, trans->subscr);
if (!trans->conn) {
LOGP(DMNCC, LOGL_ERROR, "RTP connect for trans without conn\n");
mncc_recv_rtp_err(net, rtp->callref, MNCC_RTP_CONNECT);
@@ -3572,7 +3572,7 @@
LOGP(DMNCC, LOGL_ERROR, "TCH frame for non-existing trans\n");
return -EIO;
}
- log_set_context(BSC_CTX_SUBSCR, trans->subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, trans->subscr);
if (!trans->conn) {
LOGP(DMNCC, LOGL_NOTICE, "TCH frame for trans without conn\n");
return 0;
@@ -3646,7 +3646,7 @@
data->imsi);
/* update the subscriber we deal with */
- log_set_context(BSC_CTX_SUBSCR, subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, subscr);
/* If subscriber is not found */
if (!subscr) {
@@ -3724,7 +3724,7 @@
subscr_put(subscr);
} else {
/* update the subscriber we deal with */
- log_set_context(BSC_CTX_SUBSCR, trans->subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, trans->subscr);
}
if (trans->conn)
diff --git a/openbsc/src/libmsc/smpp_openbsc.c b/openbsc/src/libmsc/smpp_openbsc.c
index 657272e..fdafa16 100644
--- a/openbsc/src/libmsc/smpp_openbsc.c
+++ b/openbsc/src/libmsc/smpp_openbsc.c
@@ -67,7 +67,7 @@
}
/* tag the context in case we know it */
- log_set_context(BSC_CTX_SUBSCR, subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, subscr);
return subscr;
}