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 21:49:10 UTC 2018


Neels Hofmeyr has submitted this change and it was merged. ( 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
- osmo_msc.h

Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28
---
M include/osmocom/msc/Makefile.am
D include/osmocom/msc/common.h
D include/osmocom/msc/common_cs.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/gsm_04_08.c
M src/libmsc/gsm_04_08_cc.c
M src/libmsc/gsm_04_11.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/msc_vty.c
M src/libmsc/osmo_msc.c
M src/libmsc/silent_call.c
M src/libmsc/transaction.c
M src/osmo-msc/msc_main.c
M tests/msc_vlr/msc_vlr_tests.h
23 files changed, 26 insertions(+), 53 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, approved



diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am
index 9fa58c7..d98bc9c 100644
--- a/include/osmocom/msc/Makefile.am
+++ b/include/osmocom/msc/Makefile.am
@@ -1,8 +1,6 @@
 noinst_HEADERS = \
 	a_iface.h \
 	a_iface_bssap.h \
-	common.h \
-	common_cs.h \
 	db.h \
 	debug.h \
 	gsm_04_08.h \
@@ -18,10 +16,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 097d3b1..0000000
--- a/include/osmocom/msc/common_cs.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-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/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..ffe8902
--- /dev/null
+++ b/include/osmocom/msc/msc_common.h
@@ -0,0 +1,22 @@
+#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 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..66644ee 100644
--- a/src/libmsc/a_iface.c
+++ b/src/libmsc/a_iface.c
@@ -39,7 +39,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..a10bd42 100644
--- a/src/libmsc/a_iface_bssap.c
+++ b/src/libmsc/a_iface_bssap.c
@@ -31,7 +31,6 @@
 #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..d6d4a1c 100644
--- a/src/libmsc/a_reset.c
+++ b/src/libmsc/a_reset.c
@@ -27,6 +27,7 @@
 #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/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 97a632b..38376d0 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -46,7 +46,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..a172b47 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -44,7 +44,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 d012443..62f3bba 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -52,7 +52,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_09_11.c b/src/libmsc/gsm_09_11.c
index c0a0bdd..43bf48c 100644
--- a/src/libmsc/gsm_09_11.c
+++ b/src/libmsc/gsm_09_11.c
@@ -42,7 +42,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..c3b8a95 100644
--- a/src/libmsc/gsm_subscriber.c
+++ b/src/libmsc/gsm_subscriber.c
@@ -46,7 +46,6 @@
 #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..a96b4c2 100644
--- a/src/libmsc/iucs.c
+++ b/src/libmsc/iucs.c
@@ -31,7 +31,6 @@
 #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..f1221c0 100644
--- a/src/libmsc/iucs_ranap.c
+++ b/src/libmsc/iucs_ranap.c
@@ -37,7 +37,6 @@
 #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/msc_vty.c b/src/libmsc/msc_vty.c
index 589eca0..b632117 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 45dfd73..52277b7 100644
--- a/src/libmsc/osmo_msc.c
+++ b/src/libmsc/osmo_msc.c
@@ -21,12 +21,10 @@
  *
  */
 
-#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/silent_call.c b/src/libmsc/silent_call.c
index c6c31a0..b4fc154 100644
--- a/src/libmsc/silent_call.c
+++ b/src/libmsc/silent_call.c
@@ -29,7 +29,6 @@
 #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/transaction.c b/src/libmsc/transaction.c
index cf12066..47124a0 100644
--- a/src/libmsc/transaction.c
+++ b/src/libmsc/transaction.c
@@ -25,7 +25,6 @@
 #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/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index a139046..afab417 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -46,7 +46,6 @@
 #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/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>
 

-- 
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: merged
Gerrit-Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28
Gerrit-Change-Number: 12033
Gerrit-PatchSet: 7
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-CC: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181130/9d496568/attachment.htm>


More information about the gerrit-log mailing list