add LOG_RAN_CONN() to use the conn->fi->id for context

For each conn, set a default logging category, to distinguish categories for
BSSMAP and RANAP based conns.

LOG_RAN_CONN(): log with the conn's default category,

LOG_RAN_CONN_CAT(): log with a manually set category (mostly for keeping
previous DMM logging on the same category).

In some places, replace LOGP() using manual context with LOG_RAN_CONN(), and
remove the manual context info, now provided by the conn->fi->id.

This is loosely related to inter-BSC and inter-MSC handover: to speed up
refactoring, I want to avoid the need for manual logging context and just use
this LOG_RAN_CONN().

Change-Id: I0a7809840428b1e028df6eb683bc5ffcc8df474a

1 files changed, 8 insertions, 0 deletions

diff --git a/include/osmocom/msc/ran_conn.h b/include/osmocom/msc/ran_conn.h
index 4aa771e3f..d134c30c5 100644
--- a/include/osmocom/msc/ran_conn.h
+++ b/include/osmocom/msc/ran_conn.h
@@ -8,6 +8,12 @@
 #include <osmocom/mgcp_client/mgcp_client.h>
 #include <osmocom/gsm/gsm_utils.h>
 
+#define LOG_RAN_CONN(conn, level, fmt, args ...) \
+	LOG_RAN_CONN_CAT(conn, (conn) ? (conn)->log_subsys : DMSC, level, fmt, ## args)
+
+#define LOG_RAN_CONN_CAT(conn, subsys, level, fmt, args ...) \
+	LOGPFSMSL((conn)? (conn)->fi : NULL, subsys, level, fmt, ## args)
+
 enum ran_conn_fsm_event {
 	/* Accepted the initial Complete Layer 3 (starting to evaluate Authentication and Ciphering) */
 	RAN_CONN_E_COMPLETE_LAYER_3,
@@ -107,6 +113,8 @@ struct ran_conn {
 
 	/* connected via 2G or 3G? */
 	enum osmo_rat_type via_ran;
+	/* whether to log on DBSSAP, DIUCS, ... */
+	int log_subsys;
 
 	uint16_t lac;
 	struct geran_encr geran_encr;