From cf04231a361e6257d019a538b03fd07cb7922896 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Sat, 22 Jul 2017 17:39:59 +0200 Subject: cosmetic: tweak IMSI Detach log output Match the log message for known subscriber to the one for unknown subscriber. Change-Id: I73871089036c9fd301e818eaaf48142aaf295d09 --- openbsc/src/libmsc/gsm_04_08.c | 3 +-- openbsc/tests/msc_vlr/msc_vlr_test_gsm_authen.err | 10 +++++----- openbsc/tests/msc_vlr/msc_vlr_test_gsm_ciph.err | 10 +++++----- openbsc/tests/msc_vlr/msc_vlr_test_no_authen.err | 8 ++++---- openbsc/tests/msc_vlr/msc_vlr_test_reject_concurrency.err | 6 +++--- openbsc/tests/msc_vlr/msc_vlr_test_rest.err | 2 +- openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.err | 4 ++-- 7 files changed, 21 insertions(+), 22 deletions(-) (limited to 'openbsc') diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 5968c86b2..d883881f7 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -782,8 +782,7 @@ static int gsm48_rx_mm_imsi_detach_ind(struct gsm_subscriber_connection *conn, s LOGP(DMM, LOGL_ERROR, "IMSI DETACH for unknown subscriber MI(%s)=%s\n", gsm48_mi_type_name(mi_type), mi_string); } else { - LOGP(DMM, LOGL_INFO, "Subscriber %s DETACHED\n", - vlr_subscr_name(vsub)); + LOGP(DMM, LOGL_INFO, "IMSI DETACH for %s\n", vlr_subscr_name(vsub)); vlr_subscr_rx_imsi_detach(vsub); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_DETACHED, vsub); vlr_subscr_put(vsub); diff --git a/openbsc/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/openbsc/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 3222cf419..6ad931637 100644 --- a/openbsc/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/openbsc/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -427,7 +427,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 @@ -1070,7 +1070,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(TMSI)=117835012 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 @@ -1285,7 +1285,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 @@ -1531,7 +1531,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(TMSI)=50462976 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 @@ -1953,7 +1953,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000010650 DREF VLR subscr MSISDN:42342 usage increases to: 2 -DMM Subscriber MSISDN:42342 DETACHED +DMM IMSI DETACH for MSISDN:42342 DREF VLR subscr MSISDN:42342 usage decreases to: 1 DREF VLR subscr MSISDN:42342 usage decreases to: 0 DREF freeing VLR subscr MSISDN:42342 diff --git a/openbsc/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/openbsc/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 584bb60ef..faf97a158 100644 --- a/openbsc/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/openbsc/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -461,7 +461,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 @@ -973,7 +973,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(TMSI)=50462976 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 @@ -1188,7 +1188,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 @@ -1402,7 +1402,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 @@ -1648,7 +1648,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(TMSI)=50462976 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 diff --git a/openbsc/tests/msc_vlr/msc_vlr_test_no_authen.err b/openbsc/tests/msc_vlr/msc_vlr_test_no_authen.err index 71348ac1e..9eda3fc9d 100644 --- a/openbsc/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/openbsc/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -303,7 +303,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 @@ -805,7 +805,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(TMSI)=117835012 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 @@ -973,7 +973,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 @@ -1166,7 +1166,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 diff --git a/openbsc/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/openbsc/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index a327b99a3..0f08ce8ed 100644 --- a/openbsc/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/openbsc/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -691,7 +691,7 @@ DREF MSISDN:46071: MSC conn use + 1 == 2 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 DREF VLR subscr MSISDN:46071 usage increases to: 3 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DVLR Process_Access_Request_VLR(901700000004620){PR_ARQ_S_DONE}: Terminating (cause = OSMO_FSM_TERM_ERROR) DVLR Process_Access_Request_VLR(901700000004620){PR_ARQ_S_DONE}: Removing from parent Subscr_Conn(901700000004620) DVLR Process_Access_Request_VLR(901700000004620){PR_ARQ_S_DONE}: Freeing instance @@ -882,7 +882,7 @@ DREF MSISDN:46071: MSC conn use + 1 == 2 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 DREF VLR subscr MSISDN:46071 usage increases to: 3 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DVLR Process_Access_Request_VLR(901700000004620){PR_ARQ_S_DONE}: Terminating (cause = OSMO_FSM_TERM_ERROR) DVLR Process_Access_Request_VLR(901700000004620){PR_ARQ_S_DONE}: Removing from parent Subscr_Conn(901700000004620) DVLR Process_Access_Request_VLR(901700000004620){PR_ARQ_S_DONE}: Freeing instance @@ -1544,7 +1544,7 @@ DREF MSISDN:46071: MSC conn use + 1 == 2 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 DREF VLR subscr MSISDN:46071 usage increases to: 3 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DVLR Process_Access_Request_VLR(901700000004620){PR_ARQ_S_DONE}: Terminating (cause = OSMO_FSM_TERM_ERROR) DVLR Process_Access_Request_VLR(901700000004620){PR_ARQ_S_DONE}: Removing from parent Subscr_Conn(901700000004620) DVLR Process_Access_Request_VLR(901700000004620){PR_ARQ_S_DONE}: Freeing instance diff --git a/openbsc/tests/msc_vlr/msc_vlr_test_rest.err b/openbsc/tests/msc_vlr/msc_vlr_test_rest.err index f080e809a..1424361a4 100644 --- a/openbsc/tests/msc_vlr/msc_vlr_test_rest.err +++ b/openbsc/tests/msc_vlr/msc_vlr_test_rest.err @@ -319,7 +319,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 DREF VLR subscr MSISDN:46071 usage increases to: 2 -DMM Subscriber MSISDN:46071 DETACHED +DMM IMSI DETACH for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage decreases to: 1 DREF VLR subscr MSISDN:46071 usage decreases to: 0 DREF freeing VLR subscr MSISDN:46071 diff --git a/openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.err b/openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.err index ced79ff18..de0c430e9 100644 --- a/openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/openbsc/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -441,7 +441,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000010650 DREF VLR subscr MSISDN:42342 usage increases to: 2 -DMM Subscriber MSISDN:42342 DETACHED +DMM IMSI DETACH for MSISDN:42342 DREF VLR subscr MSISDN:42342 usage decreases to: 1 DREF VLR subscr MSISDN:42342 usage decreases to: 0 DREF freeing VLR subscr MSISDN:42342 @@ -928,7 +928,7 @@ DREF unknown: MSC conn use + 1 == 1 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000010650 DREF VLR subscr MSISDN:42342 usage increases to: 2 -DMM Subscriber MSISDN:42342 DETACHED +DMM IMSI DETACH for MSISDN:42342 DREF VLR subscr MSISDN:42342 usage decreases to: 1 DREF VLR subscr MSISDN:42342 usage decreases to: 0 DREF freeing VLR subscr MSISDN:42342 -- cgit v1.2.3