aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2019-06-17 22:12:54 +0700
committerVadim Yanitskiy <axilirator@gmail.com>2019-06-17 22:13:03 +0700
commit66322515724b244d3ef46551b2ba5241fbf55794 (patch)
treec07ad04597eebdfbb4fd41f5e37ca10335237798
parente0da446e76f0000fcccb13810e90d34468ab2df4 (diff)
libmsc/gsm_09_11.c: do not abuse LOG_TRANS() in gsm0911_rcv_nc_ss()
If we 100% sure that trans == NULL, it makes more sense to use generic LOGP(DSS, LOGL_*, ...) call, so the logs can reflect more information than such dummy prefix: trans(NULL NULL callref-0x0 tid-0) ... Change-Id: I6b68a0f0b32eb126e0f7e914a314130254d28467
-rw-r--r--src/libmsc/gsm_09_11.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c
index c7b21552e..df0a9b42a 100644
--- a/src/libmsc/gsm_09_11.c
+++ b/src/libmsc/gsm_09_11.c
@@ -135,8 +135,9 @@ int gsm0911_rcv_nc_ss(struct msc_a *msc_a, struct msgb *msg)
* a supplementary service.
*/
if (msg_type != GSM0480_MTYPE_REGISTER) {
- LOG_TRANS(trans, LOGL_ERROR, "Rx wrong SS/USSD message type for new transaction: %s\n",
- gsm48_pdisc_msgtype_name(GSM48_PDISC_NC_SS, msg_type));
+ LOGP(DSS, LOGL_ERROR, "Rx %s message for non-existing transaction (tid-%u)\n",
+ gsm48_pdisc_msgtype_name(GSM48_PDISC_NC_SS, msg_type),
+ gsm48_hdr_trans_id(gh));
gsm48_tx_simple(msc_a,
GSM48_PDISC_NC_SS | (tid << 4),
GSM0480_MTYPE_RELEASE_COMPLETE);
@@ -145,7 +146,7 @@ int gsm0911_rcv_nc_ss(struct msc_a *msc_a, struct msgb *msg)
trans = trans_alloc(net, vsub, TRANS_USSD, tid, new_callref++);
if (!trans) {
- LOG_TRANS(trans, LOGL_ERROR, " -> No memory for trans\n");
+ LOGP(DSS, LOGL_ERROR, " -> No memory for trans\n");
gsm48_tx_simple(msc_a,
GSM48_PDISC_NC_SS | (tid << 4),
GSM0480_MTYPE_RELEASE_COMPLETE);