diff options
-rw-r--r-- | include/osmocom/msc/Makefile.am | 4 | ||||
-rw-r--r-- | include/osmocom/msc/common.h | 6 | ||||
-rw-r--r-- | include/osmocom/msc/common_cs.h | 10 | ||||
-rw-r--r-- | include/osmocom/msc/gsm_data.h | 4 | ||||
-rw-r--r-- | include/osmocom/msc/gsm_data_shared.h | 2 | ||||
-rw-r--r-- | include/osmocom/msc/msc_common.h (renamed from include/osmocom/msc/osmo_msc.h) | 12 | ||||
-rw-r--r-- | src/libmsc/a_iface.c | 1 | ||||
-rw-r--r-- | src/libmsc/a_iface_bssap.c | 1 | ||||
-rw-r--r-- | src/libmsc/a_reset.c | 1 | ||||
-rw-r--r-- | src/libmsc/gsm_04_08.c | 1 | ||||
-rw-r--r-- | src/libmsc/gsm_04_08_cc.c | 1 | ||||
-rw-r--r-- | src/libmsc/gsm_04_11.c | 1 | ||||
-rw-r--r-- | src/libmsc/gsm_09_11.c | 1 | ||||
-rw-r--r-- | src/libmsc/gsm_subscriber.c | 1 | ||||
-rw-r--r-- | src/libmsc/iucs.c | 1 | ||||
-rw-r--r-- | src/libmsc/iucs_ranap.c | 1 | ||||
-rw-r--r-- | src/libmsc/msc_vty.c | 1 | ||||
-rw-r--r-- | src/libmsc/osmo_msc.c | 2 | ||||
-rw-r--r-- | src/libmsc/silent_call.c | 1 | ||||
-rw-r--r-- | src/libmsc/transaction.c | 1 | ||||
-rw-r--r-- | src/osmo-msc/msc_main.c | 1 | ||||
-rw-r--r-- | tests/msc_vlr/msc_vlr_tests.h | 1 |
22 files changed, 14 insertions, 41 deletions
diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index 9fa58c7a6..d98bc9cb5 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 @@ noinst_HEADERS = \ 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 d91b3d39e..000000000 --- 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 097d3b157..000000000 --- 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 35ec752cd..3ffa100a2 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 f71e92b63..732607bc1 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/osmo_msc.h b/include/osmocom/msc/msc_common.h index 151201780..ffe8902e2 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/msc_common.h @@ -1,13 +1,21 @@ #pragma once -/* Routines for the MSC handling */ - +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); diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index 82519d62d..66644eef2 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 4d03d2303..a10bd4296 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 1e35a108c..d6d4a1c5e 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 97a632b64..38376d01b 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 8ac87c115..a172b4745 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 d01244392..62f3bbafd 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 c0a0bddf0..43bf48c56 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 a5bf74523..c3b8a95cb 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 1e4ab1958..a96b4c2fc 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 a6578575b..f1221c0dd 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 589eca077..b63211734 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 45dfd73f1..52277b75d 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 c6c31a09e..b4fc15464 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 cf1206637..47124a03b 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 a13904690..afab417d3 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 f308a03b0..f7ff94002 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> |