From 26d0326157ca88abb3e7888b541c304b1d012648 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 4 May 2016 12:34:12 +0200 Subject: debug log tweaks for paging --- openbsc/src/libiu/iu.c | 21 ++++++++++++++------- openbsc/src/libmsc/db.c | 2 +- openbsc/src/libmsc/gsm_subscriber.c | 5 +++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/openbsc/src/libiu/iu.c b/openbsc/src/libiu/iu.c index 43acf256..d619b974 100644 --- a/openbsc/src/libiu/iu.c +++ b/openbsc/src/libiu/iu.c @@ -593,13 +593,20 @@ static int iu_page(const char *imsi, const uint32_t *tmsi_or_ptimsi, struct iu_rnc *rnc; int pagings_sent = 0; - LOGP(DRANAP, LOGL_DEBUG, "%s: Looking for RNCs to page for IMSI %s" - " (paging will use %s)\n", - is_ps? "IuPS" : "IuCS", - imsi, - tmsi_or_ptimsi ? (is_ps? "PTMSI" : "TMSI") - : "IMSI" - ); + if (tmsi_or_ptimsi) { + LOGP(DRANAP, LOGL_DEBUG, "%s: Looking for RNCs to page for IMSI %s" + " (paging will use %s %x)\n", + is_ps? "IuPS" : "IuCS", + imsi, + is_ps? "PTMSI" : "TMSI", + *tmsi_or_ptimsi); + } else { + LOGP(DRANAP, LOGL_DEBUG, "%s: Looking for RNCs to page for IMSI %s" + " (paging will use IMSI)\n", + is_ps? "IuPS" : "IuCS", + imsi + ); + } llist_for_each_entry(rnc, &rnc_list, entry) { if (!rnc->link) { diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index 0935fc54..8d7d7dc1 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -893,7 +893,7 @@ struct gsm_subscriber *db_get_subscriber(enum gsm_subscriber_field field, subscr->id = dbi_result_get_ulonglong(result, "id"); db_set_from_query(subscr, result); - DEBUGP(DDB, "Found Subscriber: ID %llu, IMSI %s, NAME '%s', TMSI %u, EXTEN '%s', LAC %hu, AUTH %u\n", + DEBUGP(DDB, "Found Subscriber: ID %llu, IMSI %s, NAME '%s', TMSI %x, EXTEN '%s', LAC %hu, AUTH %u\n", subscr->id, subscr->imsi, subscr->name, subscr->tmsi, subscr->extension, subscr->lac, subscr->authorized); dbi_result_free(result); diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c index f62b9df6..24416f8d 100644 --- a/openbsc/src/libmsc/gsm_subscriber.c +++ b/openbsc/src/libmsc/gsm_subscriber.c @@ -66,8 +66,9 @@ static int subscr_paging_dispatch(unsigned int hooknum, unsigned int event, struct gsm_subscriber *subscr = param; struct paging_signal_data sig_data; - LOGP(DPAG, LOGL_DEBUG, "Running paging response action for %s\n", - subscr_name(conn->subscr)); + LOGP(DPAG, LOGL_DEBUG, "Paging %s for %s (event=%d)\n", + event == GSM_PAGING_SUCCEEDED ? "success" : "failure", + subscr_name(subscr), event); if (!subscr->is_paging) { LOGP(DPAG, LOGL_NOTICE, -- cgit v1.2.3