Change in osmo-msc[master]: combine several small .h in msc_common.h

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/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Fri Nov 30 02:45:48 UTC 2018 

Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12033


Change subject: combine several small .h in msc_common.h
......................................................................

combine several small .h in msc_common.h

For hysterical raisins, there are some header files that contain few
declarations, and where the name doesn't reflect the content. Combine them to
new msc_common.h:

- common.h
- common_cs.h
- debug.h
- osmo_msc.h
=> msc_common.h

Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28
---
M include/osmocom/msc/Makefile.am
D include/osmocom/msc/common.h
D include/osmocom/msc/common_cs.h
D include/osmocom/msc/debug.h
M include/osmocom/msc/gsm_data.h
M include/osmocom/msc/gsm_data_shared.h
A include/osmocom/msc/msc_common.h
D include/osmocom/msc/osmo_msc.h
M src/libmsc/a_iface.c
M src/libmsc/a_iface_bssap.c
M src/libmsc/a_reset.c
M src/libmsc/ctrl_commands.c
M src/libmsc/db.c
M src/libmsc/gsm_04_08.c
M src/libmsc/gsm_04_08_cc.c
M src/libmsc/gsm_04_11.c
M src/libmsc/gsm_04_14.c
M src/libmsc/gsm_09_11.c
M src/libmsc/gsm_subscriber.c
M src/libmsc/iucs.c
M src/libmsc/iucs_ranap.c
M src/libmsc/mncc.c
M src/libmsc/mncc_builtin.c
M src/libmsc/mncc_sock.c
M src/libmsc/msc_ifaces.c
M src/libmsc/msc_mgcp.c
M src/libmsc/msc_vty.c
M src/libmsc/osmo_msc.c
M src/libmsc/ran_conn.c
M src/libmsc/rrlp.c
M src/libmsc/silent_call.c
M src/libmsc/smpp_openbsc.c
M src/libmsc/smpp_smsc.c
M src/libmsc/sms_queue.c
M src/libmsc/transaction.c
M src/libvlr/vlr.c
M src/libvlr/vlr_access_req_fsm.c
M src/libvlr/vlr_auth_fsm.c
M src/libvlr/vlr_lu_fsm.c
M src/osmo-msc/msc_main.c
M src/utils/smpp_mirror.c
M tests/msc_vlr/msc_vlr_tests.c
M tests/msc_vlr/msc_vlr_tests.h
M tests/smpp/smpp_test.c
M tests/sms_queue/sms_queue_test.c
45 files changed, 52 insertions(+), 113 deletions(-)



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

diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am
index 9fa58c7..ca83b2d 100644
--- a/include/osmocom/msc/Makefile.am
+++ b/include/osmocom/msc/Makefile.am
@@ -1,10 +1,7 @@
 noinst_HEADERS = \
 	a_iface.h \
 	a_iface_bssap.h \
-	common.h \
-	common_cs.h \
 	db.h \
-	debug.h \
 	gsm_04_08.h \
 	gsm_04_11.h \
 	gsm_04_14.h \
@@ -18,10 +15,10 @@
 	iu_dummy.h \
 	mncc.h \
 	mncc_int.h \
+	msc_common.h \
 	msc_ifaces.h \
 	msc_mgcp.h \
 	a_reset.h \
-	osmo_msc.h \
 	ran_conn.h \
 	rrlp.h \
 	signal.h \
diff --git a/include/osmocom/msc/common.h b/include/osmocom/msc/common.h
deleted file mode 100644
index d91b3d3..0000000
--- a/include/osmocom/msc/common.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-enum nsap_addr_enc {
-	NSAP_ADDR_ENC_X213,
-	NSAP_ADDR_ENC_V4RAW,
-};
diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h
deleted file mode 100644
index 14fe618..0000000
--- a/include/osmocom/msc/common_cs.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-struct msgb;
-struct gsm_network;
-
-typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *);
-
-struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv);
diff --git a/include/osmocom/msc/debug.h b/include/osmocom/msc/debug.h
deleted file mode 100644
index 717cf74..0000000
--- a/include/osmocom/msc/debug.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <osmocom/core/logging.h>
-
-/* Debug Areas of the code */
-enum {
-	DRLL,
-	DCC,
-	DMM,
-	DRR,
-	DMNCC,
-	DPAG,
-	DMSC,
-	DMGCP,
-	DHO,
-	DDB,
-	DREF,
-	DCTRL,
-	DSMPP,
-	DRANAP,
-	DVLR,
-	DIUCS,
-	DBSSAP,
-	Debug_LastEntry,
-};
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 35ec752..3ffa100 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -13,10 +13,10 @@
 #include <osmocom/gsm/gsm48.h>
 #include <osmocom/crypt/auth.h>
 
-#include <osmocom/msc/common.h>
-#include <osmocom/msc/common_cs.h>
 #include <osmocom/mgcp_client/mgcp_client.h>
 
+#include <osmocom/msc/msc_common.h>
+
 #include "gsm_data_shared.h"
 
 /* TS 48.008 DLCI containing DCCH/ACCH + SAPI */
diff --git a/include/osmocom/msc/gsm_data_shared.h b/include/osmocom/msc/gsm_data_shared.h
index f71e92b..732607b 100644
--- a/include/osmocom/msc/gsm_data_shared.h
+++ b/include/osmocom/msc/gsm_data_shared.h
@@ -12,8 +12,6 @@
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 
-#include <osmocom/msc/common_cs.h>
-
 struct osmo_bsc_data;
 
 struct osmo_bsc_sccp_con;
diff --git a/include/osmocom/msc/msc_common.h b/include/osmocom/msc/msc_common.h
new file mode 100644
index 0000000..d0c2c0b
--- /dev/null
+++ b/include/osmocom/msc/msc_common.h
@@ -0,0 +1,43 @@
+#pragma once
+
+struct msgb;
+struct gsm_network;
+struct vlr_subscr;
+
+#define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1"
+#define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT
+
+enum msc_debug_categories {
+	DRLL,
+	DCC,
+	DMM,
+	DRR,
+	DMNCC,
+	DPAG,
+	DMSC,
+	DMGCP,
+	DHO,
+	DDB,
+	DREF,
+	DCTRL,
+	DSMPP,
+	DRANAP,
+	DVLR,
+	DIUCS,
+	DBSSAP,
+	Debug_LastEntry
+};
+
+enum nsap_addr_enc {
+	NSAP_ADDR_ENC_X213,
+	NSAP_ADDR_ENC_V4RAW,
+};
+
+typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *);
+
+struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv);
+
+int msc_vlr_alloc(struct gsm_network *net);
+int msc_vlr_start(struct gsm_network *net);
+
+void msc_stop_paging(struct vlr_subscr *vsub);
diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h
deleted file mode 100644
index 1512017..0000000
--- a/include/osmocom/msc/osmo_msc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-/* Routines for the MSC handling */
-
-struct gsm_network;
-struct vlr_subscr;
-
-#define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1"
-#define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT
-
-int msc_vlr_alloc(struct gsm_network *net);
-int msc_vlr_start(struct gsm_network *net);
-
-void msc_stop_paging(struct vlr_subscr *vsub);
diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c
index 82519d6..14744fc 100644
--- a/src/libmsc/a_iface.c
+++ b/src/libmsc/a_iface.c
@@ -30,7 +30,6 @@
 #include <osmocom/gsm/protocol/gsm_08_08.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 #include <osmocom/gsm/gsm0808_utils.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/msc_ifaces.h>
 #include <osmocom/msc/a_iface.h>
 #include <osmocom/msc/a_iface_bssap.h>
@@ -39,7 +38,6 @@
 #include <osmocom/core/byteswap.h>
 #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>
diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c
index 4d03d23..c31be29 100644
--- a/src/libmsc/a_iface_bssap.c
+++ b/src/libmsc/a_iface_bssap.c
@@ -27,11 +27,9 @@
 #include <osmocom/gsm/gsm0808.h>
 #include <osmocom/gsm/gsm48.h>
 #include <osmocom/gsm/gsm0808_utils.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/a_iface_bssap.h>
 #include <osmocom/msc/a_iface.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/core/byteswap.h>
 #include <osmocom/msc/a_reset.h>
 #include <osmocom/msc/transaction.h>
diff --git a/src/libmsc/a_reset.c b/src/libmsc/a_reset.c
index 1e35a10..6c2b5cb 100644
--- a/src/libmsc/a_reset.c
+++ b/src/libmsc/a_reset.c
@@ -25,8 +25,8 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/a_reset.h>
+#include <osmocom/msc/msc_common.h>
 
 #define RESET_RESEND_INTERVAL 2		/* sec */
 #define RESET_RESEND_TIMER_NO 16	/* See also 3GPP TS 48.008 Chapter 3.1.4.1.3.2 */
diff --git a/src/libmsc/ctrl_commands.c b/src/libmsc/ctrl_commands.c
index e37cc94..1d877cb 100644
--- a/src/libmsc/ctrl_commands.c
+++ b/src/libmsc/ctrl_commands.c
@@ -24,7 +24,6 @@
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/db.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/vlr.h>
 
 #include <stdbool.h>
diff --git a/src/libmsc/db.c b/src/libmsc/db.c
index b5e7ad8..c11c6d2 100644
--- a/src/libmsc/db.c
+++ b/src/libmsc/db.c
@@ -34,7 +34,6 @@
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/gsm_04_11.h>
 #include <osmocom/msc/db.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/vlr.h>
 
 #include <osmocom/gsm/protocol/gsm_23_003.h>
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index c20dba2..83f8d99 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -35,7 +35,6 @@
 #include "bscconfig.h"
 
 #include <osmocom/msc/db.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/gsm_04_11.h>
@@ -46,7 +45,6 @@
 #include <osmocom/msc/signal.h>
 #include <osmocom/msc/transaction.h>
 #include <osmocom/msc/silent_call.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/mncc_int.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/core/bitvec.h>
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 8ac87c1..1d9ec57 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -33,7 +33,6 @@
 #include "bscconfig.h"
 
 #include <osmocom/msc/db.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/gsm_04_11.h>
@@ -44,7 +43,6 @@
 #include <osmocom/msc/signal.h>
 #include <osmocom/msc/transaction.h>
 #include <osmocom/msc/silent_call.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/mncc_int.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/core/bitvec.h>
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index 03027ae..191b6bb 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -43,7 +43,6 @@
 #include <osmocom/gsm/gsm0411_utils.h>
 #include <osmocom/gsm/protocol/gsm_04_11.h>
 
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/gsm_subscriber.h>
@@ -52,7 +51,6 @@
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/transaction.h>
 #include <osmocom/msc/msc_ifaces.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/vlr.h>
 
 #ifdef BUILD_SMPP
diff --git a/src/libmsc/gsm_04_14.c b/src/libmsc/gsm_04_14.c
index 8fe03a8..f7e225d 100644
--- a/src/libmsc/gsm_04_14.c
+++ b/src/libmsc/gsm_04_14.c
@@ -26,7 +26,6 @@
 
 #include "bscconfig.h"
 
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/gsm_04_08.h>
diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c
index c0a0bdd..b5f586a 100644
--- a/src/libmsc/gsm_09_11.c
+++ b/src/libmsc/gsm_09_11.c
@@ -41,8 +41,6 @@
 
 #include <osmocom/msc/gsm_04_80.h>
 #include <osmocom/msc/gsm_subscriber.h>
-#include <osmocom/msc/debug.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/vlr.h>
 #include <osmocom/msc/gsm_04_08.h>
 #include <osmocom/msc/transaction.h>
diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c
index a5bf745..a4ebf5f 100644
--- a/src/libmsc/gsm_subscriber.c
+++ b/src/libmsc/gsm_subscriber.c
@@ -42,11 +42,9 @@
 
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/gsm_04_08.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/signal.h>
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/vlr.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/msc_ifaces.h>
 #include <osmocom/msc/a_iface.h>
 
diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c
index 1e4ab19..062317b 100644
--- a/src/libmsc/iucs.c
+++ b/src/libmsc/iucs.c
@@ -26,12 +26,10 @@
 
 #include <osmocom/core/logging.h>
 #include <osmocom/ranap/iu_client.h>
-#include <osmocom/msc/debug.h>
 
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/transaction.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/vlr.h>
 #include <osmocom/core/byteswap.h>
 
diff --git a/src/libmsc/iucs_ranap.c b/src/libmsc/iucs_ranap.c
index a657857..da64333 100644
--- a/src/libmsc/iucs_ranap.c
+++ b/src/libmsc/iucs_ranap.c
@@ -31,13 +31,11 @@
 #include <osmocom/ranap/RANAP_IuTransportAssociation.h>
 #include <osmocom/ranap/iu_helpers.h>
 
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/iucs.h>
 #include <osmocom/msc/vlr.h>
 #include <osmocom/msc/iucs_ranap.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/msc_mgcp.h>
 
 #include <asn1c/asn1helpers.h>
diff --git a/src/libmsc/mncc.c b/src/libmsc/mncc.c
index d2cd170..f4c8c7e 100644
--- a/src/libmsc/mncc.c
+++ b/src/libmsc/mncc.c
@@ -30,7 +30,6 @@
 #include <osmocom/core/utils.h>
 
 #include <osmocom/msc/gsm_04_08.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/mncc.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/transaction.h>
diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c
index 135a5e4..bc37b4a 100644
--- a/src/libmsc/mncc_builtin.c
+++ b/src/libmsc/mncc_builtin.c
@@ -28,7 +28,6 @@
 #include <errno.h>
 
 #include <osmocom/msc/gsm_04_08.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/mncc.h>
 #include <osmocom/msc/mncc_int.h>
 #include <osmocom/core/talloc.h>
diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c
index 57b4bd8..47a7a6c 100644
--- a/src/libmsc/mncc_sock.c
+++ b/src/libmsc/mncc_sock.c
@@ -35,7 +35,6 @@
 #include <osmocom/core/socket.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/mncc.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_04_08.h>
diff --git a/src/libmsc/msc_ifaces.c b/src/libmsc/msc_ifaces.c
index 8ae34fc..4559e96 100644
--- a/src/libmsc/msc_ifaces.c
+++ b/src/libmsc/msc_ifaces.c
@@ -20,7 +20,6 @@
 
 #include <osmocom/core/logging.h>
 
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/msc_ifaces.h>
 #include <osmocom/msc/gsm_subscriber.h>
diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c
index 1ddec08..c2b7441 100644
--- a/src/libmsc/msc_mgcp.c
+++ b/src/libmsc/msc_mgcp.c
@@ -27,7 +27,6 @@
 #include <osmocom/core/fsm.h>
 #include <osmocom/core/byteswap.h>
 #include <osmocom/msc/msc_mgcp.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/transaction.h>
 #include <osmocom/msc/a_iface.h>
 #include <osmocom/msc/msc_ifaces.h>
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 598916a..03dbbc9 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -43,7 +43,6 @@
 #endif
 
 #include <osmocom/msc/vty.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/vlr.h>
diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c
index fc85dd1..9d93d50 100644
--- a/src/libmsc/osmo_msc.c
+++ b/src/libmsc/osmo_msc.c
@@ -21,12 +21,9 @@
  *
  */
 
-#include <osmocom/msc/osmo_msc.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/transaction.h>
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/vlr.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/a_iface.h>
 #include <osmocom/msc/gsm_04_08.h>
 #include <osmocom/msc/gsm_04_11.h>
diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c
index 9b63f16..5cb62ef 100644
--- a/src/libmsc/ran_conn.c
+++ b/src/libmsc/ran_conn.c
@@ -27,7 +27,6 @@
 
 #include <osmocom/msc/ran_conn.h>
 #include <osmocom/msc/vlr.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/transaction.h>
 #include <osmocom/msc/signal.h>
 #include <osmocom/msc/a_iface.h>
diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c
index 6ff30b7..32844f5 100644
--- a/src/libmsc/rrlp.c
+++ b/src/libmsc/rrlp.c
@@ -25,7 +25,6 @@
 
 #include <osmocom/msc/gsm_04_08.h>
 #include <osmocom/msc/signal.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/ran_conn.h>
 
diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c
index c6c31a0..da9df6c 100644
--- a/src/libmsc/silent_call.c
+++ b/src/libmsc/silent_call.c
@@ -26,10 +26,8 @@
 
 #include <osmocom/core/msgb.h>
 #include <osmocom/msc/signal.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_subscriber.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/vlr.h>
 
 /* paging of the requested subscriber has completed */
diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c
index 10f3cfa..0f0871d 100644
--- a/src/libmsc/smpp_openbsc.c
+++ b/src/libmsc/smpp_openbsc.c
@@ -37,7 +37,6 @@
 #include <osmocom/gsm/protocol/smpp34_osmocom.h>
 
 #include <osmocom/msc/gsm_subscriber.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/gsm_04_11.h>
 #include <osmocom/msc/gsm_data.h>
diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c
index ea5303c..87295cd 100644
--- a/src/libmsc/smpp_smsc.c
+++ b/src/libmsc/smpp_smsc.c
@@ -41,7 +41,6 @@
 
 #include "smpp_smsc.h"
 
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 
 /*! \brief Ugly wrapper. libsmpp34 should do this itself! */
diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c
index 9907f4f..fd38d50 100644
--- a/src/libmsc/sms_queue.c
+++ b/src/libmsc/sms_queue.c
@@ -32,7 +32,6 @@
 
 #include <osmocom/msc/sms_queue.h>
 #include <osmocom/msc/db.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_04_11.h>
 #include <osmocom/msc/gsm_subscriber.h>
diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c
index cf12066..dfb1acf 100644
--- a/src/libmsc/transaction.c
+++ b/src/libmsc/transaction.c
@@ -21,11 +21,9 @@
 #include <osmocom/msc/transaction.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/mncc.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/core/talloc.h>
 #include <osmocom/msc/gsm_04_08.h>
 #include <osmocom/msc/mncc.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/vlr.h>
 
 void *tall_trans_ctx;
diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c
index 189cb66..c777d8a 100644
--- a/src/libvlr/vlr.c
+++ b/src/libvlr/vlr.c
@@ -30,7 +30,6 @@
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/gsupclient/gsup_client.h>
 #include <osmocom/msc/vlr.h>
-#include <osmocom/msc/debug.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c
index 3a0760d..0642d1d 100644
--- a/src/libvlr/vlr_access_req_fsm.c
+++ b/src/libvlr/vlr_access_req_fsm.c
@@ -23,7 +23,6 @@
 #include <osmocom/gsm/gsup.h>
 #include <osmocom/gsm/gsm48.h>
 #include <osmocom/msc/vlr.h>
-#include <osmocom/msc/debug.h>
 
 #include "vlr_core.h"
 #include "vlr_auth_fsm.h"
diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c
index d5a8555..6384d39 100644
--- a/src/libvlr/vlr_auth_fsm.c
+++ b/src/libvlr/vlr_auth_fsm.c
@@ -24,7 +24,6 @@
 #include <osmocom/core/utils.h>
 #include <osmocom/gsm/gsup.h>
 #include <osmocom/msc/vlr.h>
-#include <osmocom/msc/debug.h>
 
 #include "vlr_core.h"
 #include "vlr_auth_fsm.h"
diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c
index 02e49e0..637eb97 100644
--- a/src/libvlr/vlr_lu_fsm.c
+++ b/src/libvlr/vlr_lu_fsm.c
@@ -22,7 +22,6 @@
 #include <osmocom/core/fsm.h>
 #include <osmocom/gsm/gsm48.h>
 #include <osmocom/msc/vlr.h>
-#include <osmocom/msc/debug.h>
 
 #include "vlr_core.h"
 #include "vlr_auth_fsm.h"
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index a139046..f300b3d 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -41,12 +41,10 @@
 #include <osmocom/core/application.h>
 #include <osmocom/core/select.h>
 #include <osmocom/core/stats.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/abis/abis.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/core/talloc.h>
 #include <osmocom/msc/signal.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/sms_queue.h>
 #include <osmocom/vty/telnet_interface.h>
 #include <osmocom/vty/ports.h>
diff --git a/src/utils/smpp_mirror.c b/src/utils/smpp_mirror.c
index 3053553..f464425 100644
--- a/src/utils/smpp_mirror.c
+++ b/src/utils/smpp_mirror.c
@@ -17,8 +17,9 @@
 #include <osmocom/core/select.h>
 #include <osmocom/core/socket.h>
 #include <osmocom/core/write_queue.h>
+#include <osmocom/core/logging.h>
 
-#include <osmocom/msc/debug.h>
+#include <osmocom/msc/msc_common.h>
 
 /* FIXME: merge with smpp_smsc.c */
 #define SMPP_SYS_ID_LEN	16
diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c
index 2443e31..861e56f 100644
--- a/tests/msc_vlr/msc_vlr_tests.c
+++ b/tests/msc_vlr/msc_vlr_tests.c
@@ -32,7 +32,6 @@
 #include <osmocom/gsm/gsup.h>
 #include <osmocom/gsupclient/gsup_client.h>
 #include <osmocom/msc/gsm_04_11.h>
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_04_08.h>
 #include <osmocom/msc/transaction.h>
 #include <osmocom/msc/a_iface_bssap.h>
diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h
index f308a03..f7ff940 100644
--- a/tests/msc_vlr/msc_vlr_tests.h
+++ b/tests/msc_vlr/msc_vlr_tests.h
@@ -27,7 +27,6 @@
 #include <stdio.h>
 
 #include <osmocom/msc/gsm_data.h>
-#include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/vlr.h>
 #include <osmocom/msc/mncc.h>
 
diff --git a/tests/smpp/smpp_test.c b/tests/smpp/smpp_test.c
index 1abb63b..1d1edca 100644
--- a/tests/smpp/smpp_test.c
+++ b/tests/smpp/smpp_test.c
@@ -20,10 +20,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <osmocom/msc/debug.h>
-
 #include <osmocom/core/application.h>
 #include <osmocom/core/backtrace.h>
+#include <osmocom/core/logging.h>
+
+#include <osmocom/msc/msc_common.h>
 
 #include "smpp_smsc.h"
 
diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c
index 6ce0b88..e9443e0 100644
--- a/tests/sms_queue/sms_queue_test.c
+++ b/tests/sms_queue/sms_queue_test.c
@@ -23,7 +23,6 @@
 
 #include <osmocom/core/application.h>
 
-#include <osmocom/msc/debug.h>
 #include <osmocom/msc/vlr.h>
 
 static void *talloc_ctx = NULL;

-- 
To view, visit https://gerrit.osmocom.org/12033
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: I9e3a587342f8d398fb27354a2f2475f8797cdb28
Gerrit-Change-Number: 12033
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181130/fbea3daa/attachment.htm>

More information about the gerrit-log mailing list