[PATCH] osmo-msc[master]: debug log: a_iface_tx_cipher_mode(): log cipher and key

[Neels Hofmeyr]

Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/5374

to look at the new patch set (#3).

debug log: a_iface_tx_cipher_mode(): log cipher and key

Introduce LOGPCONN() which would also be useful in numerous other places in
this file.

Change-Id: Ib406d6e6784342341e716206997e382c702ac9d2
---
M src/libmsc/a_iface.c
1 file changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/74/5374/3

diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c
index 83ec82f..f863517 100644
--- a/src/libmsc/a_iface.c
+++ b/src/libmsc/a_iface.c
@@ -39,8 +39,14 @@
 #include <osmocom/sccp/sccp_types.h>
 #include <osmocom/msc/a_reset.h>
 #include <osmocom/msc/osmo_msc.h>
+#include <osmocom/msc/vlr.h>
 
 #include <errno.h>
+
+#define LOGPCONN(conn, level, fmt, args...) \
+	LOGP(DMSC, level, "(subscr %s, conn_id %d) " fmt, \
+	     vlr_subscr_name(conn ? conn->vsub : NULL), conn ? conn->a.conn_id : -1, \
+	     ## args)
 
 /* A pointer to the GSM network we work with. By the current paradigm,
  * there can only be one gsm_network per MSC. The pointer is set once
@@ -172,10 +178,12 @@
 
 	OSMO_ASSERT(conn);
 
-	LOGP(DMSC, LOGL_DEBUG, "Passing Cipher mode command message from MSC to BSC (conn_id=%i)\n", conn->a.conn_id);
 	uint8_t crm = 0x01;
 	uint8_t *crm_ptr = NULL;
 
+	LOGPCONN(conn, LOGL_DEBUG, "Cipher Mode Command to BSC, cipher=%d key=%s\n",
+		 cipher, osmo_hexdump_nospc(key, len));
+
 	/* Setup encryption information */
 	if (len > ENCRY_INFO_KEY_MAXLEN || !key) {
 		LOGP(DMSC, LOGL_ERROR,

-- 
To view, visit https://gerrit.osmocom.org/5374
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ib406d6e6784342341e716206997e382c702ac9d2
Gerrit-PatchSet: 3
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>