Max has uploaded this change for review. ( https://gerrit.osmocom.org/12570
Change subject: Log: don't print CallRef prefix
..
Log: don't print CallRef prefix
In a preparation for upcoming CallRef fixes, let's update test output by
ignoring first byte of callref (which acts as per-protocol namespace
indicator anyway) and print protocol name instead.
Change-Id: Icae21a44c7d4010145bcb570187ce9b58092e5a9
Related: OS#3294
---
M src/libmsc/transaction.c
M tests/msc_vlr/msc_vlr_test_call.err
M tests/msc_vlr/msc_vlr_test_gsm_authen.err
M tests/msc_vlr/msc_vlr_test_gsm_ciph.err
M tests/msc_vlr/msc_vlr_test_ms_timeout.err
M tests/msc_vlr/msc_vlr_test_no_authen.err
M tests/msc_vlr/msc_vlr_test_reject_concurrency.err
M tests/msc_vlr/msc_vlr_test_ss.err
M tests/msc_vlr/msc_vlr_test_umts_authen.err
9 files changed, 27 insertions(+), 27 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/70/12570/1
diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c
index df770ed..01cb2ba 100644
--- a/src/libmsc/transaction.c
+++ b/src/libmsc/transaction.c
@@ -114,8 +114,8 @@
return NULL;
}
- DEBUGP(DCC, "(ti %02x sub %s callref %x) New transaction\n",
- trans_id, vlr_subscr_name(vsub), callref);
+ DEBUGP(DCC, "(ti %02x sub %s callref %x) New transaction for %s\n",
+ trans_id, vlr_subscr_name(vsub), (callref << 8) >> 8,
gsm48_pdisc_name(protocol));
trans = talloc_zero(tall_trans_ctx, struct gsm_trans);
if (!trans)
diff --git a/tests/msc_vlr/msc_vlr_test_call.err
b/tests/msc_vlr/msc_vlr_test_call.err
index f190c31..b6cd460 100644
--- a/tests/msc_vlr/msc_vlr_test_call.err
+++ b/tests/msc_vlr/msc_vlr_test_call.err
@@ -271,7 +271,7 @@
DREF IMSI-90170010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap ==
2 (0xa: dtap,cm_service)
DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5)
DCC Unknown transaction ID 8, creating new trans.
-DCC (ti 08 sub IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 callref
8001) New transaction
+DCC (ti 08 sub IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 callref 1)
New transaction for CC
DREF VLR subscr IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 usage
increases to: 3
DREF IMSI-90170010650:MSISDN-42342:TMSI-0x03020100: MSC conn use +
trans_cc == 3 (0x1a: dtap,cm_service,trans_cc)
DMM IMSI-90170010650:MSISDN-42342:TMSI-0x03020100: rx msg
GSM48_MT_CC_SETUP: received_cm_service_request changes to false
@@ -574,7 +574,7 @@
- after a while, MNCC asks us to setup a call, causing Paging
DMNCC receive message MNCC_SETUP_REQ
DREF VLR subscr IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 usage
increases to: 2
-DCC (ti ff sub IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 callref 423)
New transaction
+DCC (ti ff sub IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 callref 423)
New transaction for CC
DREF VLR subscr IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 usage
increases to: 3
DMM Subscriber IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 not paged
yet, start paging.
UTRAN-Iu sends out paging request to IMSI 90170010650, TMSI 0x03020100,
LAC 23
@@ -960,7 +960,7 @@
- after a while, MNCC asks us to setup a call, causing Paging
DMNCC receive message MNCC_SETUP_REQ
DREF VLR subscr IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 usage
increases to: 2
-DCC (ti ff sub IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 callref 423)
New transaction
+DCC (ti ff sub IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 callref 423)
New transaction for CC
DREF VLR subscr IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 usage
increases to: 3
DMM Subscriber IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 not paged
yet, start paging.
UTRAN-Iu sends out paging request to IMSI 90170010650, TMSI 0x03020100,
LAC 23
@@ -1396,7 +1396,7 @@
DREF IMSI-90170010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap ==
2 (0xa: dtap,cm_service)
DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5)
DCC Unknown transaction ID 8, creating new trans.
-DCC (ti 08 sub IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 callref
8002) New transaction
+DCC (ti 08 sub IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 callref 2)
New transaction for CC
DREF VLR subscr IMSI-90170010650:MSISDN-42342:TMSI-0x03020100 usage
increases to: 3
DREF IMSI-90170010650:MSISDN-42342:TMSI-0x03020100: MSC conn use +
trans_cc == 3 (0x1a: dtap,cm_service,trans_cc)
DMM IMSI-90170010650:MSISDN-42342:TMSI-0x03020100: rx msg
GSM48_MT_CC_SETUP: received_cm_service_request changes to false
@@ -1745,7 +1745,7 @@
DREF IMSI-90170010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + dtap ==
2 (0xa: dtap,cm_service)
DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5)
DCC Unknown transaction ID 8, creating new trans.
-DCC (ti 08 sub IMSI-90170010