Change in osmo-msc[master]: Use transaction-specific debug macro

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Max gerrit-no-reply at lists.osmocom.org
Wed Jan 16 12:10:04 UTC 2019


Max has uploaded this change for review. ( https://gerrit.osmocom.org/12579


Change subject: Use transaction-specific debug macro
......................................................................

Use transaction-specific debug macro

Move logging outside of trans_alloc() so the caller can use appropriate
log subsystem. Log transaction allocation errors as such.

Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e
---
M include/osmocom/msc/transaction.h
M src/libmsc/gsm_04_08_cc.c
M src/libmsc/gsm_04_11.c
M src/libmsc/gsm_09_11.c
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
13 files changed, 60 insertions(+), 35 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/79/12579/1

diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h
index 6e67f39..9d34ac1 100644
--- a/include/osmocom/msc/transaction.h
+++ b/include/osmocom/msc/transaction.h
@@ -9,6 +9,10 @@
 #include <osmocom/gsm/gsm0411_smc.h>
 #include <osmocom/gsm/gsm0411_smr.h>
 
+#define DEBUGTRAN(t, subsys, fmt, args ...) \
+	DEBUGP(subsys, "(Ti %u, CRef 0x%X %s %s) " fmt, \
+	       t->transaction_id, t->callref, gsm48_pdisc_name(t->protocol), vlr_subscr_name(t->vsub), ## args)
+
 enum bridge_state {
 	BRIDGE_STATE_NONE,
 	BRIDGE_STATE_LOOPBACK_PENDING,
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 7172184..3e7b3a9 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -1931,7 +1931,7 @@
 		/* Create transaction */
 		trans = trans_alloc(net, vsub, GSM48_PDISC_CC, 0xff, data->callref);
 		if (!trans) {
-			DEBUGP(DCC, "No memory for trans.\n");
+			LOGP(DCC, LOGL_ERROR, "No memory for trans.\n");
 			vlr_subscr_put(vsub);
 			/* Ressource unavailable */
 			mncc_release_ind(net, NULL, data->callref,
@@ -1939,6 +1939,7 @@
 					 GSM48_CC_CAUSE_RESOURCE_UNAVAIL);
 			return -ENOMEM;
 		}
+		DEBUGTRAN(trans, DCC, "transaction allocated\n");
 
 		/* Find conn */
 		conn = connection_for_subscr(vsub);
@@ -2129,12 +2130,14 @@
 				    GSM48_PDISC_CC,
 				    transaction_id, new_callref++);
 		if (!trans) {
-			DEBUGP(DCC, "No memory for trans.\n");
+			LOGP(DCC, LOGL_ERROR, "No memory for trans.\n");
 			rc = gsm48_tx_simple(conn,
 					     GSM48_PDISC_CC | (transaction_id << 4),
 					     GSM48_MT_CC_RELEASE_COMPL);
 			return -ENOMEM;
 		}
+		DEBUGTRAN(trans, DCC, "transaction allocated\n");
+
 		/* Assign transaction */
 		trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_CC);
 		trans->dlci = OMSC_LINKID_CB(msg); /* DLCI as received from BSC */
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index 4dc07bd..913678c 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -136,6 +136,7 @@
 	int rc = 0;
 
 	DEBUGP(DLSMS, "paging_cb_mmsms_est_req(hooknum=%u, event=%u)\n", hooknum, event);
+	DEBUGTRAN(trans, DLSMS, "paging callback for MT SMS is triggered\n");
 
 	if (hooknum != GSM_HOOK_RR_PAGING)
 		return -EINVAL;
@@ -1017,6 +1018,8 @@
 		return NULL;
 	}
 
+	DEBUGTRAN(trans, DLSMS, "transaction allocated\n");
+
 	/* Init both SMC and SMR state machines */
 	gsm411_smc_init(&trans->sms.smc_inst, 0, 1, gsm411_mn_recv, gsm411_mm_send);
 	gsm411_smr_init(&trans->sms.smr_inst, 0, 1, gsm411_rl_recv, gsm411_mn_send);
diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c
index 12bec9d..1d3cfd4 100644
--- a/src/libmsc/gsm_09_11.c
+++ b/src/libmsc/gsm_09_11.c
@@ -97,16 +97,16 @@
 			return -EINVAL;
 		}
 
-		DEBUGP(DMM, " -> (new transaction)\n");
 		trans = trans_alloc(conn->network, conn->vsub,
 				    GSM48_PDISC_NC_SS, tid, new_callref++);
 		if (!trans) {
-			DEBUGP(DMM, " -> No memory for trans\n");
+			LOGP(DMM, LOGL_ERROR, " -> No memory for trans\n");
 			gsm48_tx_simple(conn,
 				GSM48_PDISC_NC_SS | (tid << 4),
 				GSM0480_MTYPE_RELEASE_COMPLETE);
 			return -ENOMEM;
 		}
+		DEBUGTRAN(trans, DMM, "transaction allocated\n");
 
 		/* Count active NC SS/USSD sessions */
 		osmo_counter_inc(conn->network->active_nc_ss);
@@ -298,9 +298,10 @@
 	trans = trans_alloc(net, vsub, GSM48_PDISC_NC_SS,
 		0xff, gsup_msg->session_id);
 	if (!trans) {
-		DEBUGP(DMM, " -> No memory for trans\n");
+		LOGP(DMM, LOGL_ERROR, " -> No memory for trans\n");
 		return NULL;
 	}
+	DEBUGTRAN(trans, DMM, "transaction allocated\n");
 
 	/* Count active NC SS/USSD sessions */
 	osmo_counter_inc(net->active_nc_ss);
diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c
index df770ed..1ba01b7 100644
--- a/src/libmsc/transaction.c
+++ b/src/libmsc/transaction.c
@@ -109,14 +109,11 @@
 
 	/* a valid subscriber is indispensable */
 	if (vsub == NULL) {
-		LOGP(DCC, LOGL_NOTICE,
+		LOGP(DVLR, LOGL_ERROR,
 		     "unable to alloc transaction, invalid subscriber (NULL)\n");
 		return NULL;
 	}
 
-	DEBUGP(DCC, "(ti %02x sub %s callref %x) New transaction\n",
-	       trans_id, vlr_subscr_name(vsub), callref);
-
 	trans = talloc_zero(tall_trans_ctx, struct gsm_trans);
 	if (!trans)
 		return NULL;
diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err
index f190c31..9733e09 100644
--- a/tests/msc_vlr/msc_vlr_test_call.err
+++ b/tests/msc_vlr/msc_vlr_test_call.err
@@ -271,8 +271,8 @@
 DREF IMSI-901700000010650: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-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 80000001) New transaction
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3
+DCC (Ti 8, CRef 0x80000001 CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated
 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_cc == 3 (0x1a: dtap,cm_service,trans_cc)
 DMM IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: rx msg GSM48_MT_CC_SETUP: received_cm_service_request changes to false
 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - cm_service == 2 (0x12: dtap,trans_cc)
@@ -574,8 +574,8 @@
 - after a while, MNCC asks us to setup a call, causing Paging
 DMNCC receive message MNCC_SETUP_REQ
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 2
-DCC (ti ff sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 423) New transaction
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3
+DCC (Ti 255, CRef 0x423 CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated
 DMM Subscriber IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 not paged yet, start paging.
   UTRAN-Iu sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
@@ -960,8 +960,8 @@
 - after a while, MNCC asks us to setup a call, causing Paging
 DMNCC receive message MNCC_SETUP_REQ
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 2
-DCC (ti ff sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 423) New transaction
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3
+DCC (Ti 255, CRef 0x423 CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated
 DMM Subscriber IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 not paged yet, start paging.
   UTRAN-Iu sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
@@ -1396,8 +1396,8 @@
 DREF IMSI-901700000010650: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-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 80000002) New transaction
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3
+DCC (Ti 8, CRef 0x80000002 CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated
 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_cc == 3 (0x1a: dtap,cm_service,trans_cc)
 DMM IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: rx msg GSM48_MT_CC_SETUP: received_cm_service_request changes to false
 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - cm_service == 2 (0x12: dtap,trans_cc)
@@ -1745,8 +1745,8 @@
 DREF IMSI-901700000010650: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-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 80000003) New transaction
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3
+DCC (Ti 8, CRef 0x80000003 CC IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated
 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_cc == 3 (0x1a: dtap,cm_service,trans_cc)
 DMM IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: rx msg GSM48_MT_CC_SETUP: received_cm_service_request changes to false
 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use - cm_service == 2 (0x12: dtap,trans_cc)
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
index 2bf19e0..b422f20 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
@@ -271,8 +271,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -364,6 +364,7 @@
 DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
@@ -793,8 +794,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -886,6 +887,7 @@
 DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100) paging callback for MT SMS is triggered
 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
@@ -1925,8 +1927,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 40000003) New transaction
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000010650:MSISDN-42342) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -2018,6 +2020,7 @@
 DPAG Paging success for IMSI-901700000010650:MSISDN-42342 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000010650:MSISDN-42342) paging callback for MT SMS is triggered
 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
index 8ed0d45..4bb185e 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
@@ -299,8 +299,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -417,6 +417,7 @@
 DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 1 (0x20: trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
@@ -874,8 +875,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -992,6 +993,7 @@
 DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100) paging callback for MT SMS is triggered
 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 1 (0x20: trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
@@ -2117,8 +2119,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 40000003) New transaction
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000010650:MSISDN-42342) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -2225,6 +2227,7 @@
 DPAG Paging success for IMSI-901700000010650:MSISDN-42342 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000010650:MSISDN-42342) paging callback for MT SMS is triggered
 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
@@ -2642,8 +2645,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 40000004) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000004 SMS IMSI-901700000004620:MSISDN-42342) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -2760,6 +2763,7 @@
 DPAG Paging success for IMSI-901700000004620:MSISDN-42342 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000004 SMS IMSI-901700000004620:MSISDN-42342) paging callback for MT SMS is triggered
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
@@ -3177,8 +3181,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 40000005) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000005 SMS IMSI-901700000004620:MSISDN-42342) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -3290,6 +3294,7 @@
 DPAG Paging success for IMSI-901700000004620:MSISDN-42342 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000005 SMS IMSI-901700000004620:MSISDN-42342) paging callback for MT SMS is triggered
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
index e09389c..19d7984 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
@@ -462,8 +462,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -489,8 +489,8 @@
 - another request is added to the list but does not cause another paging
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 6
 DLSMS Going to send a MT SMS
-DCC (ti 01 sub IMSI-901700000004620:MSISDN-46071 callref 40000002) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 7
+DLSMS (Ti 1, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -508,6 +508,7 @@
 DPAG Paging failure for IMSI-901700000004620:MSISDN-46071 (event=1)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=1)
+DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered
 DLSMS SMC(0) message MMSMS-REL-IND received in state MM_CONN_PENDING
 DLSMS SMC(0) MM layer is released
 DLSMS SMC(0) new CP state MM_CONN_PENDING -> IDLE
@@ -523,6 +524,7 @@
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 4
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=1)
+DLSMS (Ti 1, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered
 DLSMS SMC(0) message MMSMS-REL-IND received in state MM_CONN_PENDING
 DLSMS SMC(0) MM layer is released
 DLSMS SMC(0) new CP state MM_CONN_PENDING -> IDLE
@@ -545,8 +547,8 @@
 - Now that the timeout has expired, another Paging is sent on request
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000003) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -576,6 +578,7 @@
 DPAG Paging failure for IMSI-901700000004620:MSISDN-46071 (event=1)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=1)
+DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered
 DLSMS SMC(0) message MMSMS-REL-IND received in state MM_CONN_PENDING
 DLSMS SMC(0) MM layer is released
 DLSMS SMC(0) new CP state MM_CONN_PENDING -> IDLE
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err
index 61ac09f..5163b6c 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.err
@@ -183,8 +183,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -234,6 +234,7 @@
 DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
@@ -577,8 +578,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -628,6 +629,7 @@
 DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100) paging callback for MT SMS is triggered
 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
index 2147e84..2d4d4f7 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
@@ -1216,8 +1216,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -1263,6 +1263,7 @@
 DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
@@ -1473,8 +1474,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000002) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -1520,6 +1521,7 @@
 DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
@@ -1751,8 +1753,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000003) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000004620:MSISDN-46071) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -1798,6 +1800,7 @@
 DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000003 SMS IMSI-901700000004620:MSISDN-46071) paging callback for MT SMS is triggered
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err
index a801f9e..05805b9 100644
--- a/tests/msc_vlr/msc_vlr_test_ss.err
+++ b/tests/msc_vlr/msc_vlr_test_ss.err
@@ -150,9 +150,8 @@
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service)
 DRLL Dispatching 04.08 message GSM0480_MTYPE_REGISTER (0xb:0x3b)
 DMM Received SS/USSD data (trans_id=8, msg_type=GSM0480_MTYPE_REGISTER)
-DMM  -> (new transaction)
-DCC (ti 08 sub IMSI-901700000004620:MSISDN-46071 callref 20000001) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3
+DMM (Ti 8, CRef 0x20000001 NCSS IMSI-901700000004620:MSISDN-46071) transaction allocated
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_nc_ss == 3 (0x4a: dtap,cm_service,trans_nc_ss)
 DMM IMSI-901700000004620:MSISDN-46071: rx msg GSM0480_MTYPE_REGISTER: received_cm_service_request changes to false
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - cm_service == 2 (0x42: dtap,trans_nc_ss)
@@ -318,8 +317,8 @@
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3
 DMSC Routed to GSM 09.11 SS/USSD handler
 DMM Establishing network-originated session
-DCC (ti ff sub IMSI-901700000004620:MSISDN-46071 callref 20000101) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4
+DMM (Ti 255, CRef 0x20000101 NCSS IMSI-901700000004620:MSISDN-46071) transaction allocated
 DMM Triggering Paging Request
 DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging.
   GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err
index ee9eeba..703b83f 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err
@@ -288,8 +288,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -382,6 +382,7 @@
 DPAG Paging success for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000001 SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) paging callback for MT SMS is triggered
 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data
@@ -813,8 +814,8 @@
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 3
 DLSMS Going to send a MT SMS
-DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 callref 40000002) New transaction
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 usage increases to: 4
+DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) transaction allocated
 DLSMS SMC(0) instance created for network
 DLSMS SMR(0) instance created for network.
 DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
@@ -922,6 +923,7 @@
 DPAG Paging success for IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (event=0)
 DPAG Calling paging cbfn.
 DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
+DLSMS (Ti 0, CRef 0x40000002 SMS IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100) paging callback for MT SMS is triggered
 DREF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100: MSC conn use + trans_sms == 1 (0x20: trans_sms)
 DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
 DLSMS SMC(0) send CP data

-- 
To view, visit https://gerrit.osmocom.org/12579
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82ad7d2f53c123ad656e8f23432f770ab1d5937e
Gerrit-Change-Number: 12579
Gerrit-PatchSet: 1
Gerrit-Owner: Max <msuraev at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190116/251e6587/attachment.htm>


More information about the gerrit-log mailing list