From d1028eebcbc2a268e2afd342a80af21a4ffb3adf Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Fri, 10 Mar 2017 02:15:20 +0100 Subject: 04.08: log protocol discriminators and message types by name On incoming 04.08 messages, we log only the protocol discriminator in decimal. Enhance: log pdisc and message type in hex, and also log the protocol and message type as human readable string. Also adjust the msc_vlr tests' log statements for wrapped rx/tx functions of dtap from/to the MS. Adjust the expected output of msc_vlr_tests. Change-Id: Ida205d217e304337d816b14fd15e2ee435e7397d Depends: libosmocore change-id I0fca8e95ed5c2148b1a7440eff3fc9c7583898df --- src/libmsc/gsm_04_08.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/libmsc/gsm_04_08.c') diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 3f3f90581..d97bde235 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -3003,10 +3003,10 @@ void cm_service_request_concludes(struct gsm_subscriber_connection *conn, uint8_t pdisc = gsm48_hdr_pdisc(gh); uint8_t msg_type = gsm48_hdr_msg_type(gh); - DEBUGP(DMM, "%s pdisc=%d msg_type=0x%02x:" + DEBUGP(DMM, "%s: rx msg %s:" " received_cm_service_request changes to false\n", vlr_subscr_name(conn->vsub), - pdisc, msg_type); + gsm48_pdisc_msgtype_name(pdisc, msg_type)); } conn->received_cm_service_request = false; } @@ -3022,14 +3022,16 @@ int gsm0408_dispatch(struct gsm_subscriber_connection *conn, struct msgb *msg) OSMO_ASSERT(conn); OSMO_ASSERT(msg); - LOGP(DRLL, LOGL_DEBUG, "Dispatching 04.08 message, pdisc=%d\n", pdisc); + LOGP(DRLL, LOGL_DEBUG, "Dispatching 04.08 message %s (0x%x:0x%x)\n", + gsm48_pdisc_msgtype_name(pdisc, gsm48_hdr_msg_type(gh)), + pdisc, gsm48_hdr_msg_type(gh)); if (!msc_subscr_conn_is_accepted(conn) && !msg_is_initially_permitted(gh)) { LOGP(DRLL, LOGL_ERROR, - "subscr %s: Message not permitted for initial conn:" - " pdisc=0x%02x msg_type=0x%02x\n", - vlr_subscr_name(conn->vsub), gh->proto_discr, gh->msg_type); + "subscr %s: Message not permitted for initial conn: %s\n", + vlr_subscr_name(conn->vsub), + gsm48_pdisc_msgtype_name(pdisc, gsm48_hdr_msg_type(gh))); return -EACCES; } -- cgit v1.2.3