aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/src/libbsc
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-02-17 17:05:40 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-02-22 17:24:54 +0100
commitf13b3c968ff6266cc19188fe25cb3f7d8d780b6d (patch)
treee13fa955dddafa0ec6b75a784dff4b54a91559a2 /openbsc/src/libbsc
parenta66d8cfcb530240b5eebdb8f3ad10aaa027bcbde (diff)
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
Diffstat (limited to 'openbsc/src/libbsc')
-rw-r--r--openbsc/src/libbsc/abis_rsl.c3
-rw-r--r--openbsc/src/libbsc/e1_config.c1
-rw-r--r--openbsc/src/libbsc/paging.c8
3 files changed, 5 insertions, 7 deletions
diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index 541a86d6..58fdaa33 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -158,9 +158,8 @@ static struct gsm_lchan *lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr,
LOGP(DRSL, LOGL_ERROR, "%s %smismatching chan_nr=0x%02x\n",
gsm_ts_and_pchan_name(lchan->ts), log_name, chan_nr);
- log_set_context(BSC_CTX_LCHAN, lchan);
if (lchan->conn)
- log_set_context(BSC_CTX_SUBSCR, lchan->conn->subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, lchan->conn->subscr);
return lchan;
}
diff --git a/openbsc/src/libbsc/e1_config.c b/openbsc/src/libbsc/e1_config.c
index f1962c73..8910d217 100644
--- a/openbsc/src/libbsc/e1_config.c
+++ b/openbsc/src/libbsc/e1_config.c
@@ -134,7 +134,6 @@ static int bts_isdn_sign_link(struct msgb *msg)
struct e1inp_sign_link *link = msg->dst;
struct gsm_bts *bts;
- log_set_context(BSC_CTX_BTS, link->trx->bts);
switch (link->type) {
case E1INP_SIGN_OML:
bts = link->trx->bts;
diff --git a/openbsc/src/libbsc/paging.c b/openbsc/src/libbsc/paging.c
index 8c306371..816d7a64 100644
--- a/openbsc/src/libbsc/paging.c
+++ b/openbsc/src/libbsc/paging.c
@@ -77,7 +77,7 @@ static void page_ms(struct gsm_paging_request *request)
if (!bts->oml_link)
return;
- log_set_context(BSC_CTX_SUBSCR, request->subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, request->subscr);
LOGP(DPAG, LOGL_INFO, "Going to send paging commands: imsi: %s tmsi: "
"0x%x for ch. type %d (attempt %d)\n", request->subscr->imsi,
@@ -91,7 +91,7 @@ static void page_ms(struct gsm_paging_request *request)
page_group = gsm0502_calc_paging_group(&bts->si_common.chan_desc,
str_to_imsi(request->subscr->imsi));
gsm0808_page(bts, page_group, mi_len, mi, request->chan_type);
- log_set_context(BSC_CTX_SUBSCR, NULL);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, NULL);
}
static void paging_schedule_if_needed(struct gsm_bts_paging_state *paging_bts)
@@ -255,7 +255,7 @@ static void paging_T3113_expired(void *data)
gsm_cbfn *cbfn;
int msg;
- log_set_context(BSC_CTX_SUBSCR, req->subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, req->subscr);
LOGP(DPAG, LOGL_INFO, "T3113 expired for request %p (%s)\n",
req, req->subscr->imsi);
@@ -394,7 +394,7 @@ void paging_request_stop(struct gsm_bts *_bts, struct gsm_subscriber *subscr,
{
struct gsm_bts *bts;
- log_set_context(BSC_CTX_SUBSCR, subscr);
+ log_set_context(LOGGING_CTX_VLR_SUBSCR, subscr);
/* Stop this first and dispatch the request */
if (_bts)