diff options
Diffstat (limited to 'src/libmsc')
31 files changed, 221 insertions, 221 deletions
diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index e473b7526..7a6000a12 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -29,16 +29,16 @@ #include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/gsm0808_utils.h> -#include <openbsc/debug.h> -#include <openbsc/msc_ifaces.h> -#include <openbsc/a_iface.h> -#include <openbsc/a_iface_bssap.h> -#include <openbsc/transaction.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> +#include <osmocom/msc/transaction.h> #include <osmocom/legacy_mgcp/mgcpgw_client.h> #include <osmocom/core/byteswap.h> #include <osmocom/sccp/sccp_types.h> -#include <openbsc/a_reset.h> -#include <openbsc/osmo_msc.h> +#include <osmocom/msc/a_reset.h> +#include <osmocom/msc/osmo_msc.h> /* 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 diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index e8a229374..1cd672337 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -25,13 +25,13 @@ #include <osmocom/sccp/sccp_types.h> #include <osmocom/gsm/gsm0808.h> #include <osmocom/gsm/gsm0808_utils.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/a_iface_bssap.h> -#include <openbsc/a_iface.h> -#include <openbsc/osmo_msc.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 <openbsc/a_reset.h> +#include <osmocom/msc/a_reset.h> #define IP_V4_ADDR_LEN 4 diff --git a/src/libmsc/auth.c b/src/libmsc/auth.c index 9064ce6c4..7b5367bf0 100644 --- a/src/libmsc/auth.c +++ b/src/libmsc/auth.c @@ -20,10 +20,10 @@ * */ -#include <openbsc/db.h> -#include <openbsc/debug.h> -#include <openbsc/auth.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/db.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/auth.h> +#include <osmocom/msc/gsm_data.h> #include <osmocom/gsm/comp128.h> #include <osmocom/core/utils.h> diff --git a/src/libmsc/ctrl_commands.c b/src/libmsc/ctrl_commands.c index 9d1f0d4fa..7e445aa19 100644 --- a/src/libmsc/ctrl_commands.c +++ b/src/libmsc/ctrl_commands.c @@ -21,11 +21,11 @@ #include <osmocom/ctrl/control_cmd.h> #include <osmocom/core/utils.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/db.h> -#include <openbsc/debug.h> -#include <openbsc/vlr.h> +#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 ae7e2876b..4e4477b6e 100644 --- a/src/libmsc/db.c +++ b/src/libmsc/db.c @@ -29,12 +29,12 @@ #include <errno.h> #include <dbi/dbi.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/gsm_04_11.h> -#include <openbsc/db.h> -#include <openbsc/debug.h> -#include <openbsc/vlr.h> +#include <osmocom/msc/gsm_data.h> +#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> #include <osmocom/core/talloc.h> diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 90a04312e..2ef0b306f 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -35,33 +35,33 @@ #include "bscconfig.h" -#include <openbsc/auth.h> -#include <openbsc/db.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/gsm_04_11.h> -#include <openbsc/gsm_04_08.h> -#include <openbsc/gsm_04_80.h> -#include <openbsc/gsm_04_14.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/paging.h> -#include <openbsc/signal.h> +#include <osmocom/msc/auth.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> +#include <osmocom/msc/gsm_04_08.h> +#include <osmocom/msc/gsm_04_80.h> +#include <osmocom/msc/gsm_04_14.h> +#include <osmocom/msc/abis_rsl.h> +#include <osmocom/msc/chan_alloc.h> +#include <osmocom/msc/paging.h> +#include <osmocom/msc/signal.h> #include <osmocom/abis/trau_frame.h> -#include <openbsc/trau_mux.h> -#include <openbsc/rtp_proxy.h> -#include <openbsc/transaction.h> -#include <openbsc/ussd.h> -#include <openbsc/silent_call.h> -#include <openbsc/bsc_api.h> -#include <openbsc/osmo_msc.h> -#include <openbsc/handover.h> -#include <openbsc/mncc_int.h> +#include <osmocom/msc/trau_mux.h> +#include <osmocom/msc/rtp_proxy.h> +#include <osmocom/msc/transaction.h> +#include <osmocom/msc/ussd.h> +#include <osmocom/msc/silent_call.h> +#include <osmocom/msc/bsc_api.h> +#include <osmocom/msc/osmo_msc.h> +#include <osmocom/msc/handover.h> +#include <osmocom/msc/mncc_int.h> #include <osmocom/abis/e1_input.h> #include <osmocom/core/bitvec.h> -#include <openbsc/vlr.h> -#include <openbsc/msc_ifaces.h> +#include <osmocom/msc/vlr.h> +#include <osmocom/msc/msc_ifaces.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/gsm0480.h> @@ -76,8 +76,8 @@ #include <osmocom/ranap/iu_client.h> #endif -#include <openbsc/msc_ifaces.h> -#include <openbsc/a_iface.h> +#include <osmocom/msc/msc_ifaces.h> +#include <osmocom/msc/a_iface.h> #include <assert.h> diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 574fe281d..99adbf7ca 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -43,21 +43,21 @@ #include <osmocom/gsm/gsm0411_utils.h> #include <osmocom/gsm/protocol/gsm_04_11.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/db.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/gsm_04_08.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/signal.h> -#include <openbsc/db.h> -#include <openbsc/transaction.h> -#include <openbsc/paging.h> -#include <openbsc/bsc_rll.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/msc_ifaces.h> -#include <openbsc/osmo_msc.h> -#include <openbsc/vlr.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/db.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/gsm_04_08.h> +#include <osmocom/msc/abis_rsl.h> +#include <osmocom/msc/signal.h> +#include <osmocom/msc/db.h> +#include <osmocom/msc/transaction.h> +#include <osmocom/msc/paging.h> +#include <osmocom/msc/bsc_rll.h> +#include <osmocom/msc/chan_alloc.h> +#include <osmocom/msc/msc_ifaces.h> +#include <osmocom/msc/osmo_msc.h> +#include <osmocom/msc/vlr.h> #ifdef BUILD_SMPP #include "smpp_smsc.h" diff --git a/src/libmsc/gsm_04_14.c b/src/libmsc/gsm_04_14.c index b529f4c72..5f495740e 100644 --- a/src/libmsc/gsm_04_14.c +++ b/src/libmsc/gsm_04_14.c @@ -26,12 +26,12 @@ #include "bscconfig.h" -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/gsm_04_08.h> -#include <openbsc/bsc_api.h> -#include <openbsc/msc_ifaces.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> +#include <osmocom/msc/bsc_api.h> +#include <osmocom/msc/msc_ifaces.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/gsm_utils.h> diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c index bec1d26f4..37e058cb6 100644 --- a/src/libmsc/gsm_04_80.c +++ b/src/libmsc/gsm_04_80.c @@ -28,11 +28,11 @@ #include <string.h> #include <errno.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_04_08.h> -#include <openbsc/gsm_04_80.h> -#include <openbsc/msc_ifaces.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/gsm_04_08.h> +#include <osmocom/msc/gsm_04_80.h> +#include <osmocom/msc/msc_ifaces.h> #include <osmocom/gsm/gsm0480.h> #include <osmocom/gsm/gsm_utils.h> diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c index 09540c16c..8bc060f85 100644 --- a/src/libmsc/gsm_subscriber.c +++ b/src/libmsc/gsm_subscriber.c @@ -37,20 +37,20 @@ #ifdef BUILD_IU #include <osmocom/ranap/iu_client.h> #else -#include <openbsc/iu_dummy.h> +#include <osmocom/msc/iu_dummy.h> #endif -#include <openbsc/gsm_subscriber.h> -#include <openbsc/gsm_04_08.h> -#include <openbsc/debug.h> -#include <openbsc/paging.h> -#include <openbsc/signal.h> -#include <openbsc/db.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/vlr.h> -#include <openbsc/osmo_msc.h> -#include <openbsc/msc_ifaces.h> -#include <openbsc/a_iface.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/gsm_04_08.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/paging.h> +#include <osmocom/msc/signal.h> +#include <osmocom/msc/db.h> +#include <osmocom/msc/chan_alloc.h> +#include <osmocom/msc/vlr.h> +#include <osmocom/msc/osmo_msc.h> +#include <osmocom/msc/msc_ifaces.h> +#include <osmocom/msc/a_iface.h> int subscr_paging_dispatch(unsigned int hooknum, unsigned int event, struct msgb *msg, void *data, void *param) diff --git a/src/libmsc/iu_dummy.c b/src/libmsc/iu_dummy.c index e9d335e2e..4191c5ab1 100644 --- a/src/libmsc/iu_dummy.c +++ b/src/libmsc/iu_dummy.c @@ -26,7 +26,7 @@ #include "../../bscconfig.h" #ifndef BUILD_IU -#include <openbsc/iu_dummy.h> +#include <osmocom/msc/iu_dummy.h> #include <osmocom/core/logging.h> #include <osmocom/vty/logging.h> diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index 04b9ece7d..c89e41266 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -26,12 +26,12 @@ #include <osmocom/core/logging.h> #include <osmocom/ranap/iu_client.h> -#include <openbsc/debug.h> +#include <osmocom/msc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/osmo_msc.h> -#include <openbsc/vlr.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/osmo_msc.h> +#include <osmocom/msc/vlr.h> /* For A-interface see libbsc/bsc_api.c subscr_con_allocate() */ static struct gsm_subscriber_connection *subscr_conn_allocate_iu(struct gsm_network *network, diff --git a/src/libmsc/iucs_ranap.c b/src/libmsc/iucs_ranap.c index 45de1caca..abf18123b 100644 --- a/src/libmsc/iucs_ranap.c +++ b/src/libmsc/iucs_ranap.c @@ -29,13 +29,13 @@ #include <osmocom/ranap/ranap_ies_defs.h> #include <osmocom/ranap/iu_client.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/iucs.h> -#include <openbsc/vlr.h> -#include <openbsc/iucs_ranap.h> -#include <openbsc/osmo_msc.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> /* To continue authorization after a Security Mode Complete */ int gsm0408_authorize(struct gsm_subscriber_connection *conn); diff --git a/src/libmsc/meas_feed.c b/src/libmsc/meas_feed.c index 1e7b4cd51..3daebee68 100644 --- a/src/libmsc/meas_feed.c +++ b/src/libmsc/meas_feed.c @@ -13,12 +13,12 @@ #include <osmocom/vty/command.h> #include <osmocom/vty/vty.h> -#include <openbsc/meas_rep.h> -#include <openbsc/signal.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/meas_feed.h> -#include <openbsc/vty.h> -#include <openbsc/vlr.h> +#include <osmocom/msc/meas_rep.h> +#include <osmocom/msc/signal.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/meas_feed.h> +#include <osmocom/msc/vty.h> +#include <osmocom/msc/vlr.h> #include "meas_feed.h" diff --git a/src/libmsc/mncc.c b/src/libmsc/mncc.c index 8110eadca..4e88bc6e9 100644 --- a/src/libmsc/mncc.c +++ b/src/libmsc/mncc.c @@ -29,12 +29,12 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> -#include <openbsc/gsm_04_08.h> -#include <openbsc/debug.h> -#include <openbsc/mncc.h> -#include <openbsc/gsm_data.h> -#include <openbsc/transaction.h> -#include <openbsc/rtp_proxy.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> +#include <osmocom/msc/rtp_proxy.h> static const struct value_string mncc_names[] = { diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c index ac6e7345d..84623dffb 100644 --- a/src/libmsc/mncc_builtin.c +++ b/src/libmsc/mncc_builtin.c @@ -27,14 +27,14 @@ #include <string.h> #include <errno.h> -#include <openbsc/gsm_04_08.h> -#include <openbsc/debug.h> -#include <openbsc/mncc.h> -#include <openbsc/mncc_int.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> -#include <openbsc/gsm_data.h> -#include <openbsc/transaction.h> -#include <openbsc/rtp_proxy.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/transaction.h> +#include <osmocom/msc/rtp_proxy.h> void *tall_call_ctx; diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c index 0c696f2d9..05c943985 100644 --- a/src/libmsc/mncc_sock.c +++ b/src/libmsc/mncc_sock.c @@ -35,9 +35,9 @@ #include <osmocom/core/socket.h> #include <osmocom/gsm/protocol/gsm_04_08.h> -#include <openbsc/debug.h> -#include <openbsc/mncc.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/mncc.h> +#include <osmocom/msc/gsm_data.h> struct mncc_sock_state { struct gsm_network *net; diff --git a/src/libmsc/msc_ifaces.c b/src/libmsc/msc_ifaces.c index 161a10019..b191e0def 100644 --- a/src/libmsc/msc_ifaces.c +++ b/src/libmsc/msc_ifaces.c @@ -20,15 +20,15 @@ #include <osmocom/core/logging.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/msc_ifaces.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/transaction.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/msc_ifaces.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/transaction.h> #include <osmocom/legacy_mgcp/mgcp.h> #include <osmocom/legacy_mgcp/mgcpgw_client.h> -#include <openbsc/vlr.h> -#include <openbsc/a_iface.h> +#include <osmocom/msc/vlr.h> +#include <osmocom/msc/a_iface.h> #include "../../bscconfig.h" @@ -39,7 +39,7 @@ extern struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint16_t rtp_port, bool use_x213_nsap); #else -#include <openbsc/iu_dummy.h> +#include <osmocom/msc/iu_dummy.h> #endif /* BUILD_IU */ static int msc_tx(struct gsm_subscriber_connection *conn, struct msgb *msg) diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 50679aa01..2f0f056b3 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -32,10 +32,10 @@ #include <osmocom/ranap/iu_client.h> #endif -#include <openbsc/vty.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/vlr.h> +#include <osmocom/msc/vty.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/vlr.h> static struct cmd_node msc_node = { MSC_NODE, diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 4d24f22a6..db247579f 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -21,22 +21,22 @@ * */ -#include <openbsc/osmo_msc.h> -#include <openbsc/bsc_api.h> -#include <openbsc/debug.h> -#include <openbsc/transaction.h> -#include <openbsc/db.h> -#include <openbsc/vlr.h> -#include <openbsc/osmo_msc.h> -#include <openbsc/a_iface.h> +#include <osmocom/msc/osmo_msc.h> +#include <osmocom/msc/bsc_api.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 <openbsc/gsm_04_11.h> +#include <osmocom/msc/gsm_04_11.h> #include "../../bscconfig.h" #ifdef BUILD_IU #include <osmocom/ranap/iu_client.h> #else -#include <openbsc/iu_dummy.h> +#include <osmocom/msc/iu_dummy.h> #endif /* Receive a SAPI-N-REJECT from BSC */ diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index cd3da066b..742889341 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -21,10 +21,10 @@ -#include <openbsc/gsm_04_08.h> -#include <openbsc/signal.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/chan_alloc.h> +#include <osmocom/msc/gsm_04_08.h> +#include <osmocom/msc/signal.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/chan_alloc.h> /* RRLP msPositionReq, nsBased, * Accuracy=60, Method=gps, ResponseTime=2, oneSet */ diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c index 7af7a8055..5b197008b 100644 --- a/src/libmsc/silent_call.c +++ b/src/libmsc/silent_call.c @@ -25,14 +25,14 @@ #include <errno.h> #include <osmocom/core/msgb.h> -#include <openbsc/signal.h> -#include <openbsc/debug.h> -#include <openbsc/paging.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/osmo_msc.h> +#include <osmocom/msc/signal.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/paging.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/abis_rsl.h> +#include <osmocom/msc/chan_alloc.h> +#include <osmocom/msc/osmo_msc.h> /* paging of the requested subscriber has completed */ static int paging_cb_silent(unsigned int hooknum, unsigned int event, diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 431cb4dfd..3ea5ddd88 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -36,16 +36,16 @@ #include <osmocom/gsm/protocol/gsm_04_11.h> #include <osmocom/gsm/protocol/smpp34_osmocom.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/debug.h> -#include <openbsc/db.h> -#include <openbsc/gsm_04_11.h> -#include <openbsc/gsm_data.h> -#include <openbsc/signal.h> -#include <openbsc/transaction.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/vlr.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> +#include <osmocom/msc/signal.h> +#include <osmocom/msc/transaction.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/chan_alloc.h> +#include <osmocom/msc/vlr.h> #include "smpp_smsc.h" diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index 04afc49bb..88cecfc4e 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -41,8 +41,8 @@ #include "smpp_smsc.h" -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/gsm_data.h> /*! \brief Ugly wrapper. libsmpp34 should do this itself! */ #define SMPP34_UNPACK(rc, type, str, data, len) \ diff --git a/src/libmsc/smpp_utils.c b/src/libmsc/smpp_utils.c index d0850d8c1..7208e25ce 100644 --- a/src/libmsc/smpp_utils.c +++ b/src/libmsc/smpp_utils.c @@ -19,7 +19,7 @@ #include "smpp_smsc.h" -#include <openbsc/debug.h> +#include <osmocom/msc/debug.h> int smpp_determine_scheme(uint8_t dcs, uint8_t *data_coding, int *mode) diff --git a/src/libmsc/smpp_vty.c b/src/libmsc/smpp_vty.c index 13467f182..c0309d6f0 100644 --- a/src/libmsc/smpp_vty.c +++ b/src/libmsc/smpp_vty.c @@ -32,7 +32,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/talloc.h> -#include <openbsc/vty.h> +#include <osmocom/msc/vty.h> #include "smpp_smsc.h" diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index fe7a608be..609a0db1d 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -30,15 +30,15 @@ #include <limits.h> -#include <openbsc/sms_queue.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/db.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_04_11.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/signal.h> -#include <openbsc/vlr.h> +#include <osmocom/msc/sms_queue.h> +#include <osmocom/msc/chan_alloc.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> +#include <osmocom/msc/signal.h> +#include <osmocom/msc/vlr.h> #include <osmocom/core/talloc.h> diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index bcab8e48c..336637cee 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -25,12 +25,12 @@ #include <osmocom/core/fsm.h> #include <osmocom/core/signal.h> -#include <openbsc/osmo_msc.h> -#include <openbsc/vlr.h> -#include <openbsc/debug.h> -#include <openbsc/transaction.h> -#include <openbsc/signal.h> -#include <openbsc/a_iface.h> +#include <osmocom/msc/osmo_msc.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> #define SUBSCR_CONN_TIMEOUT 5 /* seconds */ diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 28e0914a8..bac31a16c 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -18,16 +18,16 @@ * */ -#include <openbsc/transaction.h> -#include <openbsc/gsm_data.h> -#include <openbsc/mncc.h> -#include <openbsc/debug.h> +#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 <openbsc/gsm_04_08.h> -#include <openbsc/mncc.h> -#include <openbsc/paging.h> -#include <openbsc/osmo_msc.h> -#include <openbsc/vlr.h> +#include <osmocom/msc/gsm_04_08.h> +#include <osmocom/msc/mncc.h> +#include <osmocom/msc/paging.h> +#include <osmocom/msc/osmo_msc.h> +#include <osmocom/msc/vlr.h> void *tall_trans_ctx; diff --git a/src/libmsc/ussd.c b/src/libmsc/ussd.c index 81a356690..e3263d2c8 100644 --- a/src/libmsc/ussd.c +++ b/src/libmsc/ussd.c @@ -29,11 +29,11 @@ #include <string.h> #include <errno.h> -#include <openbsc/gsm_04_80.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/debug.h> -#include <openbsc/osmo_msc.h> -#include <openbsc/vlr.h> +#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> /* Declarations of USSD strings to be recognised */ const char USSD_TEXT_OWN_NUMBER[] = "*#100#"; diff --git a/src/libmsc/vty_interface_layer3.c b/src/libmsc/vty_interface_layer3.c index b4c945097..484e9d567 100644 --- a/src/libmsc/vty_interface_layer3.c +++ b/src/libmsc/vty_interface_layer3.c @@ -31,30 +31,30 @@ #include <arpa/inet.h> #include <osmocom/core/linuxlist.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/silent_call.h> -#include <openbsc/gsm_04_11.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/silent_call.h> +#include <osmocom/msc/gsm_04_11.h> #include <osmocom/abis/e1_input.h> -#include <openbsc/abis_nm.h> +#include <osmocom/msc/abis_nm.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/core/utils.h> -#include <openbsc/db.h> +#include <osmocom/msc/db.h> #include <osmocom/core/talloc.h> -#include <openbsc/signal.h> -#include <openbsc/debug.h> -#include <openbsc/vty.h> -#include <openbsc/gsm_04_80.h> -#include <openbsc/gsm_04_14.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/sms_queue.h> -#include <openbsc/mncc_int.h> -#include <openbsc/handover.h> -#include <openbsc/vlr.h> +#include <osmocom/msc/signal.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/vty.h> +#include <osmocom/msc/gsm_04_80.h> +#include <osmocom/msc/gsm_04_14.h> +#include <osmocom/msc/chan_alloc.h> +#include <osmocom/msc/sms_queue.h> +#include <osmocom/msc/mncc_int.h> +#include <osmocom/msc/handover.h> +#include <osmocom/msc/vlr.h> #include <osmocom/vty/logging.h> -#include <openbsc/osmo_msc.h> +#include <osmocom/msc/osmo_msc.h> #include "meas_feed.h" |