diff options
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | include/Makefile.am | 2 | ||||
-rw-r--r-- | include/osmocom/Makefile.am | 3 | ||||
-rw-r--r-- | include/osmocom/msc/Makefile.am (renamed from include/openbsc/Makefile.am) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/a_iface.h (renamed from include/openbsc/a_iface.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/a_iface_bssap.h (renamed from include/openbsc/a_iface_bssap.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/a_reset.h (renamed from include/openbsc/a_reset.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/abis_nm.h (renamed from include/openbsc/abis_nm.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/abis_om2000.h (renamed from include/openbsc/abis_om2000.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/abis_rsl.h (renamed from include/openbsc/abis_rsl.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/arfcn_range_encode.h (renamed from include/openbsc/arfcn_range_encode.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/auth.h (renamed from include/openbsc/auth.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/bsc_api.h (renamed from include/openbsc/bsc_api.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/bsc_msc.h (renamed from include/openbsc/bsc_msc.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/bsc_msc_data.h (renamed from include/openbsc/bsc_msc_data.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/bsc_msg_filter.h (renamed from include/openbsc/bsc_msg_filter.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/bsc_rll.h (renamed from include/openbsc/bsc_rll.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/bss.h (renamed from include/openbsc/bss.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/bts_ipaccess_nanobts_omlattr.h (renamed from include/openbsc/bts_ipaccess_nanobts_omlattr.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/chan_alloc.h (renamed from include/openbsc/chan_alloc.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/common.h (renamed from include/openbsc/common.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/common_bsc.h (renamed from include/openbsc/common_bsc.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/common_cs.h (renamed from include/openbsc/common_cs.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/crc24.h (renamed from include/openbsc/crc24.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/ctrl.h (renamed from include/openbsc/ctrl.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/db.h (renamed from include/openbsc/db.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/debug.h (renamed from include/openbsc/debug.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/e1_config.h (renamed from include/openbsc/e1_config.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/gsm_04_08.h (renamed from include/openbsc/gsm_04_08.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/gsm_04_11.h (renamed from include/openbsc/gsm_04_11.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/gsm_04_14.h (renamed from include/openbsc/gsm_04_14.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/gsm_04_80.h (renamed from include/openbsc/gsm_04_80.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/gsm_data.h (renamed from include/openbsc/gsm_data.h) | 6 | ||||
-rw-r--r-- | include/osmocom/msc/gsm_data_shared.h (renamed from include/openbsc/gsm_data_shared.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/gsm_subscriber.h (renamed from include/openbsc/gsm_subscriber.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/gsup_client.h (renamed from include/openbsc/gsup_client.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/gtphub.h (renamed from include/openbsc/gtphub.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/handover.h (renamed from include/openbsc/handover.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/handover_decision.h (renamed from include/openbsc/handover_decision.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/ipaccess.h (renamed from include/openbsc/ipaccess.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/iu_dummy.h (renamed from include/openbsc/iu_dummy.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/iucs.h (renamed from include/openbsc/iucs.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/iucs_ranap.h (renamed from include/openbsc/iucs_ranap.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/meas_feed.h (renamed from include/openbsc/meas_feed.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/meas_rep.h (renamed from include/openbsc/meas_rep.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/misdn.h (renamed from include/openbsc/misdn.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/mncc.h (renamed from include/openbsc/mncc.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/mncc_int.h (renamed from include/openbsc/mncc_int.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/msc_ifaces.h (renamed from include/openbsc/msc_ifaces.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/network_listen.h (renamed from include/openbsc/network_listen.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/oap_client.h (renamed from include/openbsc/oap_client.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/openbscdefines.h (renamed from include/openbsc/openbscdefines.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/osmo_bsc.h (renamed from include/openbsc/osmo_bsc.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/osmo_bsc_grace.h (renamed from include/openbsc/osmo_bsc_grace.h) | 4 | ||||
-rw-r--r-- | include/osmocom/msc/osmo_bsc_reset.h (renamed from include/openbsc/osmo_bsc_reset.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/osmo_bsc_rf.h (renamed from include/openbsc/osmo_bsc_rf.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/osmo_bsc_sigtran.h (renamed from include/openbsc/osmo_bsc_sigtran.h) | 4 | ||||
-rw-r--r-- | include/osmocom/msc/osmo_msc.h (renamed from include/openbsc/osmo_msc.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/osmux.h (renamed from include/openbsc/osmux.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/paging.h (renamed from include/openbsc/paging.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/rest_octets.h (renamed from include/openbsc/rest_octets.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/rrlp.h (renamed from include/openbsc/rrlp.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/rs232.h (renamed from include/openbsc/rs232.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/rtp_proxy.h (renamed from include/openbsc/rtp_proxy.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/signal.h (renamed from include/openbsc/signal.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/silent_call.h (renamed from include/openbsc/silent_call.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/slhc.h (renamed from include/openbsc/slhc.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/smpp.h (renamed from include/openbsc/smpp.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/sms_queue.h (renamed from include/openbsc/sms_queue.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/socket.h (renamed from include/openbsc/socket.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/system_information.h (renamed from include/openbsc/system_information.h) | 2 | ||||
-rw-r--r-- | include/osmocom/msc/transaction.h (renamed from include/openbsc/transaction.h) | 8 | ||||
-rw-r--r-- | include/osmocom/msc/trau_mux.h (renamed from include/openbsc/trau_mux.h) | 4 | ||||
-rw-r--r-- | include/osmocom/msc/trau_upqueue.h (renamed from include/openbsc/trau_upqueue.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/ussd.h (renamed from include/openbsc/ussd.h) | 0 | ||||
-rw-r--r-- | include/osmocom/msc/vlr.h (renamed from include/openbsc/vlr.h) | 4 | ||||
-rw-r--r-- | include/osmocom/msc/vty.h (renamed from include/openbsc/vty.h) | 0 | ||||
-rw-r--r-- | src/libcommon-cs/a_reset.c | 6 | ||||
-rw-r--r-- | src/libcommon-cs/common_cs.c | 10 | ||||
-rw-r--r-- | src/libcommon-cs/common_cs_vty.c | 6 | ||||
-rw-r--r-- | src/libcommon/common_vty.c | 8 | ||||
-rw-r--r-- | src/libcommon/debug.c | 4 | ||||
-rw-r--r-- | src/libcommon/gsm_data.c | 6 | ||||
-rw-r--r-- | src/libcommon/gsm_data_shared.c | 2 | ||||
-rw-r--r-- | src/libcommon/gsm_subscriber_base.c | 6 | ||||
-rw-r--r-- | src/libcommon/gsup_client.c | 4 | ||||
-rw-r--r-- | src/libcommon/gsup_test_client.c | 4 | ||||
-rw-r--r-- | src/libcommon/oap_client.c | 4 | ||||
-rw-r--r-- | src/libcommon/socket.c | 4 | ||||
-rw-r--r-- | src/libmsc/a_iface.c | 14 | ||||
-rw-r--r-- | src/libmsc/a_iface_bssap.c | 12 | ||||
-rw-r--r-- | src/libmsc/auth.c | 8 | ||||
-rw-r--r-- | src/libmsc/ctrl_commands.c | 10 | ||||
-rw-r--r-- | src/libmsc/db.c | 12 | ||||
-rw-r--r-- | src/libmsc/gsm_04_08.c | 52 | ||||
-rw-r--r-- | src/libmsc/gsm_04_11.c | 30 | ||||
-rw-r--r-- | src/libmsc/gsm_04_14.c | 12 | ||||
-rw-r--r-- | src/libmsc/gsm_04_80.c | 10 | ||||
-rw-r--r-- | src/libmsc/gsm_subscriber.c | 24 | ||||
-rw-r--r-- | src/libmsc/iu_dummy.c | 2 | ||||
-rw-r--r-- | src/libmsc/iucs.c | 10 | ||||
-rw-r--r-- | src/libmsc/iucs_ranap.c | 14 | ||||
-rw-r--r-- | src/libmsc/meas_feed.c | 12 | ||||
-rw-r--r-- | src/libmsc/mncc.c | 12 | ||||
-rw-r--r-- | src/libmsc/mncc_builtin.c | 14 | ||||
-rw-r--r-- | src/libmsc/mncc_sock.c | 6 | ||||
-rw-r--r-- | src/libmsc/msc_ifaces.c | 16 | ||||
-rw-r--r-- | src/libmsc/msc_vty.c | 8 | ||||
-rw-r--r-- | src/libmsc/osmo_msc.c | 20 | ||||
-rw-r--r-- | src/libmsc/rrlp.c | 8 | ||||
-rw-r--r-- | src/libmsc/silent_call.c | 16 | ||||
-rw-r--r-- | src/libmsc/smpp_openbsc.c | 20 | ||||
-rw-r--r-- | src/libmsc/smpp_smsc.c | 4 | ||||
-rw-r--r-- | src/libmsc/smpp_utils.c | 2 | ||||
-rw-r--r-- | src/libmsc/smpp_vty.c | 2 | ||||
-rw-r--r-- | src/libmsc/sms_queue.c | 18 | ||||
-rw-r--r-- | src/libmsc/subscr_conn.c | 12 | ||||
-rw-r--r-- | src/libmsc/transaction.c | 18 | ||||
-rw-r--r-- | src/libmsc/ussd.c | 10 | ||||
-rw-r--r-- | src/libmsc/vty_interface_layer3.c | 34 | ||||
-rw-r--r-- | src/libvlr/vlr.c | 8 | ||||
-rw-r--r-- | src/libvlr/vlr_access_req_fsm.c | 4 | ||||
-rw-r--r-- | src/libvlr/vlr_auth_fsm.c | 4 | ||||
-rw-r--r-- | src/libvlr/vlr_core.h | 2 | ||||
-rw-r--r-- | src/libvlr/vlr_lu_fsm.c | 4 | ||||
-rw-r--r-- | src/osmo-msc/msc_main.c | 36 | ||||
-rw-r--r-- | src/utils/meas_db.c | 2 | ||||
-rw-r--r-- | src/utils/meas_json.c | 6 | ||||
-rw-r--r-- | src/utils/meas_pcap2db.c | 2 | ||||
-rw-r--r-- | src/utils/meas_udp2db.c | 2 | ||||
-rw-r--r-- | src/utils/meas_vis.c | 2 | ||||
-rw-r--r-- | src/utils/smpp_mirror.c | 2 | ||||
-rw-r--r-- | tests/db/db_test.c | 10 | ||||
-rw-r--r-- | tests/msc_vlr/msc_vlr_tests.c | 10 | ||||
-rw-r--r-- | tests/msc_vlr/msc_vlr_tests.h | 6 | ||||
-rw-r--r-- | tests/smpp/smpp_test.c | 2 | ||||
-rw-r--r-- | tests/sms_queue/sms_queue_test.c | 4 |
137 files changed, 349 insertions, 345 deletions
diff --git a/configure.ac b/configure.ac index 8d646d303..dd61e52da 100644 --- a/configure.ac +++ b/configure.ac @@ -204,8 +204,9 @@ AM_CONFIG_HEADER(bscconfig.h) AC_OUTPUT( osmo-msc.pc - include/openbsc/Makefile include/Makefile + include/osmocom/Makefile + include/osmocom/msc/Makefile src/Makefile src/libmsc/Makefile src/libvlr/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 677eec3aa..9d963a024 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = \ - openbsc \ + osmocom \ $(NULL) diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am new file mode 100644 index 000000000..4d8063711 --- /dev/null +++ b/include/osmocom/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + msc \ + $(NULL) diff --git a/include/openbsc/Makefile.am b/include/osmocom/msc/Makefile.am index 6e7aa384b..6e7aa384b 100644 --- a/include/openbsc/Makefile.am +++ b/include/osmocom/msc/Makefile.am diff --git a/include/openbsc/a_iface.h b/include/osmocom/msc/a_iface.h index 149f1c71e..a49ede25e 100644 --- a/include/openbsc/a_iface.h +++ b/include/osmocom/msc/a_iface.h @@ -20,7 +20,7 @@ #pragma once -#include <openbsc/a_reset.h> +#include <osmocom/msc/a_reset.h> /* A struct to keep a context information about the BSCs we are associated with */ struct bsc_context { diff --git a/include/openbsc/a_iface_bssap.h b/include/osmocom/msc/a_iface_bssap.h index 237c618fd..237c618fd 100644 --- a/include/openbsc/a_iface_bssap.h +++ b/include/osmocom/msc/a_iface_bssap.h diff --git a/include/openbsc/a_reset.h b/include/osmocom/msc/a_reset.h index 7aaab0620..7aaab0620 100644 --- a/include/openbsc/a_reset.h +++ b/include/osmocom/msc/a_reset.h diff --git a/include/openbsc/abis_nm.h b/include/osmocom/msc/abis_nm.h index db2a659e4..25819626e 100644 --- a/include/openbsc/abis_nm.h +++ b/include/osmocom/msc/abis_nm.h @@ -26,7 +26,7 @@ #include <osmocom/gsm/abis_nm.h> #include <osmocom/gsm/protocol/gsm_12_21.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/gsm_data.h> /* max number of attributes represented as 3GPP TS 52.021 §9.4.62 SW Description array */ #define MAX_BTS_ATTR 5 diff --git a/include/openbsc/abis_om2000.h b/include/osmocom/msc/abis_om2000.h index b093a0350..b093a0350 100644 --- a/include/openbsc/abis_om2000.h +++ b/include/osmocom/msc/abis_om2000.h diff --git a/include/openbsc/abis_rsl.h b/include/osmocom/msc/abis_rsl.h index f983fceec..f983fceec 100644 --- a/include/openbsc/abis_rsl.h +++ b/include/osmocom/msc/abis_rsl.h diff --git a/include/openbsc/arfcn_range_encode.h b/include/osmocom/msc/arfcn_range_encode.h index 7ec710c33..7ec710c33 100644 --- a/include/openbsc/arfcn_range_encode.h +++ b/include/osmocom/msc/arfcn_range_encode.h diff --git a/include/openbsc/auth.h b/include/osmocom/msc/auth.h index b314bbf19..b314bbf19 100644 --- a/include/openbsc/auth.h +++ b/include/osmocom/msc/auth.h diff --git a/include/openbsc/bsc_api.h b/include/osmocom/msc/bsc_api.h index 40068d6ef..40068d6ef 100644 --- a/include/openbsc/bsc_api.h +++ b/include/osmocom/msc/bsc_api.h diff --git a/include/openbsc/bsc_msc.h b/include/osmocom/msc/bsc_msc.h index 380eb17c1..d649f76cd 100644 --- a/include/openbsc/bsc_msc.h +++ b/include/osmocom/msc/bsc_msc.h @@ -25,7 +25,7 @@ #include <osmocom/core/write_queue.h> #include <osmocom/core/timer.h> #include <osmocom/sigtran/sccp_sap.h> -#include <openbsc/a_reset.h> +#include <osmocom/msc/a_reset.h> #include <netinet/in.h> diff --git a/include/openbsc/bsc_msc_data.h b/include/osmocom/msc/bsc_msc_data.h index 4a283d165..4a283d165 100644 --- a/include/openbsc/bsc_msc_data.h +++ b/include/osmocom/msc/bsc_msc_data.h diff --git a/include/openbsc/bsc_msg_filter.h b/include/osmocom/msc/bsc_msg_filter.h index a9dedf43c..a9dedf43c 100644 --- a/include/openbsc/bsc_msg_filter.h +++ b/include/osmocom/msc/bsc_msg_filter.h diff --git a/include/openbsc/bsc_rll.h b/include/osmocom/msc/bsc_rll.h index 729ba6037..93c80e7a9 100644 --- a/include/openbsc/bsc_rll.h +++ b/include/osmocom/msc/bsc_rll.h @@ -1,7 +1,7 @@ #ifndef _BSC_RLL_H #define _BSC_RLL_H -#include <openbsc/gsm_data.h> +#include <osmocom/msc/gsm_data.h> enum bsc_rllr_ind { BSC_RLLR_IND_EST_CONF, diff --git a/include/openbsc/bss.h b/include/osmocom/msc/bss.h index 9f16bf7d7..090433420 100644 --- a/include/openbsc/bss.h +++ b/include/osmocom/msc/bss.h @@ -1,7 +1,7 @@ #ifndef _BSS_H_ #define _BSS_H_ -#include <openbsc/gsm_data.h> +#include <osmocom/msc/gsm_data.h> struct msgb; diff --git a/include/openbsc/bts_ipaccess_nanobts_omlattr.h b/include/osmocom/msc/bts_ipaccess_nanobts_omlattr.h index bc7860b2d..bc7860b2d 100644 --- a/include/openbsc/bts_ipaccess_nanobts_omlattr.h +++ b/include/osmocom/msc/bts_ipaccess_nanobts_omlattr.h diff --git a/include/openbsc/chan_alloc.h b/include/osmocom/msc/chan_alloc.h index 7388e14c5..7388e14c5 100644 --- a/include/openbsc/chan_alloc.h +++ b/include/osmocom/msc/chan_alloc.h diff --git a/include/openbsc/common.h b/include/osmocom/msc/common.h index d91b3d39e..d91b3d39e 100644 --- a/include/openbsc/common.h +++ b/include/osmocom/msc/common.h diff --git a/include/openbsc/common_bsc.h b/include/osmocom/msc/common_bsc.h index 796038323..821298cbf 100644 --- a/include/openbsc/common_bsc.h +++ b/include/osmocom/msc/common_bsc.h @@ -1,7 +1,7 @@ #pragma once #include <stdint.h> -#include <openbsc/common_cs.h> +#include <osmocom/msc/common_cs.h> struct gsm_network *bsc_network_init(void *ctx, uint16_t country_code, diff --git a/include/openbsc/common_cs.h b/include/osmocom/msc/common_cs.h index 6dc956f80..6dc956f80 100644 --- a/include/openbsc/common_cs.h +++ b/include/osmocom/msc/common_cs.h diff --git a/include/openbsc/crc24.h b/include/osmocom/msc/crc24.h index 756638c03..756638c03 100644 --- a/include/openbsc/crc24.h +++ b/include/osmocom/msc/crc24.h diff --git a/include/openbsc/ctrl.h b/include/osmocom/msc/ctrl.h index c5ac21092..c5ac21092 100644 --- a/include/openbsc/ctrl.h +++ b/include/osmocom/msc/ctrl.h diff --git a/include/openbsc/db.h b/include/osmocom/msc/db.h index 988c9bd6e..988c9bd6e 100644 --- a/include/openbsc/db.h +++ b/include/osmocom/msc/db.h diff --git a/include/openbsc/debug.h b/include/osmocom/msc/debug.h index 65e197d52..65e197d52 100644 --- a/include/openbsc/debug.h +++ b/include/osmocom/msc/debug.h diff --git a/include/openbsc/e1_config.h b/include/osmocom/msc/e1_config.h index 538c0b09d..ac5fbb1e4 100644 --- a/include/openbsc/e1_config.h +++ b/include/osmocom/msc/e1_config.h @@ -1,7 +1,7 @@ #ifndef _E1_CONFIG_H #define _E1_CONFIG_H -#include <openbsc/gsm_data_shared.h> +#include <osmocom/msc/gsm_data_shared.h> int e1_reconfig_ts(struct gsm_bts_trx_ts *ts); int e1_reconfig_trx(struct gsm_bts_trx *trx); diff --git a/include/openbsc/gsm_04_08.h b/include/osmocom/msc/gsm_04_08.h index ca251b00b..c99fc86aa 100644 --- a/include/openbsc/gsm_04_08.h +++ b/include/osmocom/msc/gsm_04_08.h @@ -5,7 +5,7 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_04_08.h> -#include <openbsc/meas_rep.h> +#include <osmocom/msc/meas_rep.h> struct msgb; struct gsm_bts; diff --git a/include/openbsc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index 3305e3e61..3305e3e61 100644 --- a/include/openbsc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h diff --git a/include/openbsc/gsm_04_14.h b/include/osmocom/msc/gsm_04_14.h index 3cdbe0469..3cdbe0469 100644 --- a/include/openbsc/gsm_04_14.h +++ b/include/osmocom/msc/gsm_04_14.h diff --git a/include/openbsc/gsm_04_80.h b/include/osmocom/msc/gsm_04_80.h index d65f640bc..d65f640bc 100644 --- a/include/openbsc/gsm_04_80.h +++ b/include/osmocom/msc/gsm_04_80.h diff --git a/include/openbsc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 88a4f1067..9343c3195 100644 --- a/include/openbsc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -14,9 +14,9 @@ #include <osmocom/crypt/auth.h> #include <osmocom/sigtran/sccp_sap.h> -#include <openbsc/common.h> -#include <openbsc/rest_octets.h> -#include <openbsc/common_cs.h> +#include <osmocom/msc/common.h> +#include <osmocom/msc/rest_octets.h> +#include <osmocom/msc/common_cs.h> #include <osmocom/legacy_mgcp/mgcpgw_client.h> diff --git a/include/openbsc/gsm_data_shared.h b/include/osmocom/msc/gsm_data_shared.h index bed46d254..5028a269d 100644 --- a/include/openbsc/gsm_data_shared.h +++ b/include/osmocom/msc/gsm_data_shared.h @@ -24,7 +24,7 @@ #include <osmocom/gsm/lapdm.h> #endif -#include <openbsc/common_cs.h> +#include <osmocom/msc/common_cs.h> /* 16 is the max. number of SI2quater messages according to 3GPP TS 44.018 Table 10.5.2.33b.1: 4-bit index is used (2#1111 = 10#15) */ diff --git a/include/openbsc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index d88e32aa7..6b0e3da42 100644 --- a/include/openbsc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -6,7 +6,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/gsm/protocol/gsm_23_003.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/gsm_data.h> #define GSM_NAME_LENGTH 160 diff --git a/include/openbsc/gsup_client.h b/include/osmocom/msc/gsup_client.h index 4a25490f6..3d1dce078 100644 --- a/include/openbsc/gsup_client.h +++ b/include/osmocom/msc/gsup_client.h @@ -23,7 +23,7 @@ #include <osmocom/core/timer.h> -#include <openbsc/oap_client.h> +#include <osmocom/msc/oap_client.h> #define GSUP_CLIENT_RECONNECT_INTERVAL 10 #define GSUP_CLIENT_PING_INTERVAL 20 diff --git a/include/openbsc/gtphub.h b/include/osmocom/msc/gtphub.h index 9cb7605f8..d7b6f1b9e 100644 --- a/include/openbsc/gtphub.h +++ b/include/osmocom/msc/gtphub.h @@ -28,7 +28,7 @@ #include <osmocom/core/timer.h> #include <osmocom/core/rate_ctr.h> -#include <openbsc/gprs_sgsn.h> +#include <osmocom/msc/gprs_sgsn.h> /* support */ diff --git a/include/openbsc/handover.h b/include/osmocom/msc/handover.h index 3fe71a28b..3fe71a28b 100644 --- a/include/openbsc/handover.h +++ b/include/osmocom/msc/handover.h diff --git a/include/openbsc/handover_decision.h b/include/osmocom/msc/handover_decision.h index 81078b05d..81078b05d 100644 --- a/include/openbsc/handover_decision.h +++ b/include/osmocom/msc/handover_decision.h diff --git a/include/openbsc/ipaccess.h b/include/osmocom/msc/ipaccess.h index 82e89c27d..82e89c27d 100644 --- a/include/openbsc/ipaccess.h +++ b/include/osmocom/msc/ipaccess.h diff --git a/include/openbsc/iu_dummy.h b/include/osmocom/msc/iu_dummy.h index d5e142801..d5e142801 100644 --- a/include/openbsc/iu_dummy.h +++ b/include/osmocom/msc/iu_dummy.h diff --git a/include/openbsc/iucs.h b/include/osmocom/msc/iucs.h index b7d60645d..b7d60645d 100644 --- a/include/openbsc/iucs.h +++ b/include/osmocom/msc/iucs.h diff --git a/include/openbsc/iucs_ranap.h b/include/osmocom/msc/iucs_ranap.h index c2ff5f90e..c2ff5f90e 100644 --- a/include/openbsc/iucs_ranap.h +++ b/include/osmocom/msc/iucs_ranap.h diff --git a/include/openbsc/meas_feed.h b/include/osmocom/msc/meas_feed.h index f77ee075f..02b7d95b4 100644 --- a/include/openbsc/meas_feed.h +++ b/include/osmocom/msc/meas_feed.h @@ -3,7 +3,7 @@ #include <stdint.h> -#include <openbsc/meas_rep.h> +#include <osmocom/msc/meas_rep.h> struct meas_feed_hdr { uint8_t msg_type; diff --git a/include/openbsc/meas_rep.h b/include/osmocom/msc/meas_rep.h index b0c03f0bb..b0c03f0bb 100644 --- a/include/openbsc/meas_rep.h +++ b/include/osmocom/msc/meas_rep.h diff --git a/include/openbsc/misdn.h b/include/osmocom/msc/misdn.h index 9851ad32c..9851ad32c 100644 --- a/include/openbsc/misdn.h +++ b/include/osmocom/msc/misdn.h diff --git a/include/openbsc/mncc.h b/include/osmocom/msc/mncc.h index 881e0418e..881e0418e 100644 --- a/include/openbsc/mncc.h +++ b/include/osmocom/msc/mncc.h diff --git a/include/openbsc/mncc_int.h b/include/osmocom/msc/mncc_int.h index 213ce1414..213ce1414 100644 --- a/include/openbsc/mncc_int.h +++ b/include/osmocom/msc/mncc_int.h diff --git a/include/openbsc/msc_ifaces.h b/include/osmocom/msc/msc_ifaces.h index a1071ae9b..d46dfe9b3 100644 --- a/include/openbsc/msc_ifaces.h +++ b/include/osmocom/msc/msc_ifaces.h @@ -1,7 +1,7 @@ #pragma once #include <osmocom/core/msgb.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/gsm_data.h> /* These are the interfaces of the MSC layer towards (from?) the BSC and RNC, * i.e. in the direction towards the mobile device (MS aka UE). diff --git a/include/openbsc/network_listen.h b/include/osmocom/msc/network_listen.h index 67d1f4ef7..05fbb2fec 100644 --- a/include/openbsc/network_listen.h +++ b/include/osmocom/msc/network_listen.h @@ -2,7 +2,7 @@ #define _OPENBSC_NWL_H #include <stdint.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/gsm_data.h> void ipac_nwl_init(void); diff --git a/include/openbsc/oap_client.h b/include/osmocom/msc/oap_client.h index 80c86d5d6..80c86d5d6 100644 --- a/include/openbsc/oap_client.h +++ b/include/osmocom/msc/oap_client.h diff --git a/include/openbsc/openbscdefines.h b/include/osmocom/msc/openbscdefines.h index c6ac153b8..c6ac153b8 100644 --- a/include/openbsc/openbscdefines.h +++ b/include/osmocom/msc/openbscdefines.h diff --git a/include/openbsc/osmo_bsc.h b/include/osmocom/msc/osmo_bsc.h index 5ebea5079..5ebea5079 100644 --- a/include/openbsc/osmo_bsc.h +++ b/include/osmocom/msc/osmo_bsc.h diff --git a/include/openbsc/osmo_bsc_grace.h b/include/osmocom/msc/osmo_bsc_grace.h index 5a81cd137..6232ffda1 100644 --- a/include/openbsc/osmo_bsc_grace.h +++ b/include/osmocom/msc/osmo_bsc_grace.h @@ -21,8 +21,8 @@ #ifndef OSMO_BSC_GRACE_H #define OSMO_BSC_GRACE_H -#include <openbsc/gsm_data.h> -#include <openbsc/signal.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/signal.h> struct bsc_msc_data; diff --git a/include/openbsc/osmo_bsc_reset.h b/include/osmocom/msc/osmo_bsc_reset.h index 578f763e6..578f763e6 100644 --- a/include/openbsc/osmo_bsc_reset.h +++ b/include/osmocom/msc/osmo_bsc_reset.h diff --git a/include/openbsc/osmo_bsc_rf.h b/include/osmocom/msc/osmo_bsc_rf.h index 19ccd080d..a81ebd710 100644 --- a/include/openbsc/osmo_bsc_rf.h +++ b/include/osmocom/msc/osmo_bsc_rf.h @@ -1,7 +1,7 @@ #ifndef OSMO_BSC_RF #define OSMO_BSC_RF -#include <openbsc/gsm_data.h> +#include <osmocom/msc/gsm_data.h> #include <osmocom/core/write_queue.h> #include <osmocom/core/timer.h> diff --git a/include/openbsc/osmo_bsc_sigtran.h b/include/osmocom/msc/osmo_bsc_sigtran.h index fbcfcb3fc..7015edbc4 100644 --- a/include/openbsc/osmo_bsc_sigtran.h +++ b/include/osmocom/msc/osmo_bsc_sigtran.h @@ -20,8 +20,8 @@ #pragma once -#include <openbsc/gsm_data.h> -#include <openbsc/bsc_msc_data.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/bsc_msc_data.h> /* Allocate resources to make a new connection oriented sigtran connection * (not the connection ittself!) */ diff --git a/include/openbsc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index cdfd27f11..5f4713ee8 100644 --- a/include/openbsc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -6,7 +6,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/gsm/gsup.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/gsm_data.h> #include "bsc_api.h" diff --git a/include/openbsc/osmux.h b/include/osmocom/msc/osmux.h index f3ea72a85..f3ea72a85 100644 --- a/include/openbsc/osmux.h +++ b/include/osmocom/msc/osmux.h diff --git a/include/openbsc/paging.h b/include/osmocom/msc/paging.h index 049da1402..b856dcd2e 100644 --- a/include/openbsc/paging.h +++ b/include/osmocom/msc/paging.h @@ -26,7 +26,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/timer.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/gsm_data.h> /** * A pending paging request diff --git a/include/openbsc/rest_octets.h b/include/osmocom/msc/rest_octets.h index 49a231296..49857b7c5 100644 --- a/include/openbsc/rest_octets.h +++ b/include/osmocom/msc/rest_octets.h @@ -2,7 +2,7 @@ #define _REST_OCTETS_H #include <stdbool.h> -#include <openbsc/gsm_04_08.h> +#include <osmocom/msc/gsm_04_08.h> #include <osmocom/gsm/sysinfo.h> /* generate SI1 rest octets */ diff --git a/include/openbsc/rrlp.h b/include/osmocom/msc/rrlp.h index c89402a2d..c89402a2d 100644 --- a/include/openbsc/rrlp.h +++ b/include/osmocom/msc/rrlp.h diff --git a/include/openbsc/rs232.h b/include/osmocom/msc/rs232.h index 61187ca62..61187ca62 100644 --- a/include/openbsc/rs232.h +++ b/include/osmocom/msc/rs232.h diff --git a/include/openbsc/rtp_proxy.h b/include/osmocom/msc/rtp_proxy.h index 52ffefd27..3cd8cac24 100644 --- a/include/openbsc/rtp_proxy.h +++ b/include/osmocom/msc/rtp_proxy.h @@ -27,7 +27,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/select.h> -#include <openbsc/mncc.h> +#include <osmocom/msc/mncc.h> #define RTP_PT_GSM_FULL 3 #define RTP_PT_GSM_HALF 96 diff --git a/include/openbsc/signal.h b/include/osmocom/msc/signal.h index 49f86d612..14c76f828 100644 --- a/include/openbsc/signal.h +++ b/include/osmocom/msc/signal.h @@ -25,7 +25,7 @@ #include <stdlib.h> #include <errno.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/gsm_data.h> #include <osmocom/core/signal.h> diff --git a/include/openbsc/silent_call.h b/include/osmocom/msc/silent_call.h index 5fec77b73..5fec77b73 100644 --- a/include/openbsc/silent_call.h +++ b/include/osmocom/msc/silent_call.h diff --git a/include/openbsc/slhc.h b/include/osmocom/msc/slhc.h index cd5a47cf4..cd5a47cf4 100644 --- a/include/openbsc/slhc.h +++ b/include/osmocom/msc/slhc.h diff --git a/include/openbsc/smpp.h b/include/osmocom/msc/smpp.h index bcdac8f0b..bcdac8f0b 100644 --- a/include/openbsc/smpp.h +++ b/include/osmocom/msc/smpp.h diff --git a/include/openbsc/sms_queue.h b/include/osmocom/msc/sms_queue.h index 2a8bd5850..2a8bd5850 100644 --- a/include/openbsc/sms_queue.h +++ b/include/osmocom/msc/sms_queue.h diff --git a/include/openbsc/socket.h b/include/osmocom/msc/socket.h index 0fd85f104..0fd85f104 100644 --- a/include/openbsc/socket.h +++ b/include/osmocom/msc/socket.h diff --git a/include/openbsc/system_information.h b/include/osmocom/msc/system_information.h index 71bea2660..854b7e3ce 100644 --- a/include/openbsc/system_information.h +++ b/include/osmocom/msc/system_information.h @@ -3,7 +3,7 @@ #include <osmocom/gsm/sysinfo.h> -#include <openbsc/arfcn_range_encode.h> +#include <osmocom/msc/arfcn_range_encode.h> struct gsm_bts; diff --git a/include/openbsc/transaction.h b/include/osmocom/msc/transaction.h index 4930fbd32..272fb3b2e 100644 --- a/include/openbsc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -1,11 +1,11 @@ #ifndef _TRANSACT_H #define _TRANSACT_H -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/gsm_subscriber.h> #include <osmocom/core/linuxlist.h> -#include <openbsc/gsm_04_11.h> -#include <openbsc/mncc.h> +#include <osmocom/msc/gsm_04_11.h> +#include <osmocom/msc/mncc.h> #include <osmocom/gsm/gsm0411_smc.h> #include <osmocom/gsm/gsm0411_smr.h> diff --git a/include/openbsc/trau_mux.h b/include/osmocom/msc/trau_mux.h index 75c359b56..08863bfea 100644 --- a/include/openbsc/trau_mux.h +++ b/include/osmocom/msc/trau_mux.h @@ -29,8 +29,8 @@ */ #include <stdint.h> -#include <openbsc/gsm_data.h> -#include <openbsc/mncc.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/mncc.h> struct decoded_trau_frame; diff --git a/include/openbsc/trau_upqueue.h b/include/osmocom/msc/trau_upqueue.h index ecc765843..ecc765843 100644 --- a/include/openbsc/trau_upqueue.h +++ b/include/osmocom/msc/trau_upqueue.h diff --git a/include/openbsc/ussd.h b/include/osmocom/msc/ussd.h index 266546811..266546811 100644 --- a/include/openbsc/ussd.h +++ b/include/osmocom/msc/ussd.h diff --git a/include/openbsc/vlr.h b/include/osmocom/msc/vlr.h index 619971a52..e9afde33d 100644 --- a/include/openbsc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -7,9 +7,9 @@ #include <osmocom/gsm/protocol/gsm_23_003.h> #include <osmocom/gsm/protocol/gsm_04_08_gprs.h> #include <osmocom/gsm/gsm23003.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/gsm_data.h> // for GSM_NAME_LENGTH -#include <openbsc/gsm_subscriber.h> +#include <osmocom/msc/gsm_subscriber.h> struct log_target; diff --git a/include/openbsc/vty.h b/include/osmocom/msc/vty.h index f7056016c..f7056016c 100644 --- a/include/openbsc/vty.h +++ b/include/osmocom/msc/vty.h diff --git a/src/libcommon-cs/a_reset.c b/src/libcommon-cs/a_reset.c index c0294c797..9a226aca7 100644 --- a/src/libcommon-cs/a_reset.c +++ b/src/libcommon-cs/a_reset.c @@ -25,9 +25,9 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#include <openbsc/debug.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/osmo_bsc_sigtran.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/bsc_msc_data.h> +#include <osmocom/msc/osmo_bsc_sigtran.h> #define RESET_RESEND_INTERVAL 2 /* sec */ #define RESET_RESEND_TIMER_NO 1234 /* FIXME: dig out the real timer number */ diff --git a/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c index d6dff95df..8a28b7235 100644 --- a/src/libcommon-cs/common_cs.c +++ b/src/libcommon-cs/common_cs.c @@ -24,11 +24,11 @@ #include <osmocom/gsm/gsm0480.h> -#include <openbsc/common_cs.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_04_11.h> +#include <osmocom/msc/common_cs.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/gsm_04_11.h> /* Warning: if bsc_network_init() is not called, some of the members of * gsm_network are not initialized properly and must not be used! (In diff --git a/src/libcommon-cs/common_cs_vty.c b/src/libcommon-cs/common_cs_vty.c index 17916878b..cdefa09b4 100644 --- a/src/libcommon-cs/common_cs_vty.c +++ b/src/libcommon-cs/common_cs_vty.c @@ -25,10 +25,10 @@ #include <osmocom/vty/logging.h> #include <osmocom/vty/stats.h> -#include <openbsc/vty.h> +#include <osmocom/msc/vty.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/gsm_subscriber.h> struct cmd_node net_node = { GSMNET_NODE, diff --git a/src/libcommon/common_vty.c b/src/libcommon/common_vty.c index 7157e0070..6037dda6f 100644 --- a/src/libcommon/common_vty.c +++ b/src/libcommon/common_vty.c @@ -23,10 +23,10 @@ #include <osmocom/core/talloc.h> -#include <openbsc/vty.h> -#include <openbsc/gsm_data.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_subscriber.h> +#include <osmocom/msc/vty.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/gsm_subscriber.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/command.h> diff --git a/src/libcommon/debug.c b/src/libcommon/debug.c index 723641335..612e215bc 100644 --- a/src/libcommon/debug.c +++ b/src/libcommon/debug.c @@ -31,8 +31,8 @@ #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> #include <osmocom/gprs/gprs_msgb.h> -#include <openbsc/gsm_data.h> -#include <openbsc/debug.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/debug.h> /* default categories */ static const struct log_info_cat default_categories[] = { diff --git a/src/libcommon/gsm_data.c b/src/libcommon/gsm_data.c index 7be224082..f4f6e5d42 100644 --- a/src/libcommon/gsm_data.c +++ b/src/libcommon/gsm_data.c @@ -33,9 +33,9 @@ #include <osmocom/core/statistics.h> #include <osmocom/gsm/protocol/gsm_04_08.h> -#include <openbsc/gsm_data.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/abis_nm.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/bsc_msc_data.h> +#include <osmocom/msc/abis_nm.h> void *tall_bsc_ctx; diff --git a/src/libcommon/gsm_data_shared.c b/src/libcommon/gsm_data_shared.c index 26962730a..9382889ca 100644 --- a/src/libcommon/gsm_data_shared.c +++ b/src/libcommon/gsm_data_shared.c @@ -32,7 +32,7 @@ #include <osmocom/gsm/abis_nm.h> #include <osmocom/core/statistics.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/gsm_data.h> void gsm_abis_mo_reset(struct gsm_abis_mo *mo) { diff --git a/src/libcommon/gsm_subscriber_base.c b/src/libcommon/gsm_subscriber_base.c index 018ed210c..58a6ff089 100644 --- a/src/libcommon/gsm_subscriber_base.c +++ b/src/libcommon/gsm_subscriber_base.c @@ -29,9 +29,9 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/debug.h> -#include <openbsc/vlr.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/vlr.h> LLIST_HEAD(active_subscribers); void *tall_subscr_ctx; diff --git a/src/libcommon/gsup_client.c b/src/libcommon/gsup_client.c index fd65e7b0b..b5f2e6854 100644 --- a/src/libcommon/gsup_client.c +++ b/src/libcommon/gsup_client.c @@ -21,14 +21,14 @@ * */ -#include <openbsc/gsup_client.h> +#include <osmocom/msc/gsup_client.h> #include <osmocom/abis/ipa.h> #include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> -#include <openbsc/debug.h> +#include <osmocom/msc/debug.h> #include <errno.h> #include <string.h> diff --git a/src/libcommon/gsup_test_client.c b/src/libcommon/gsup_test_client.c index b6a8d6b7d..557629268 100644 --- a/src/libcommon/gsup_test_client.c +++ b/src/libcommon/gsup_test_client.c @@ -10,8 +10,8 @@ #include <osmocom/core/utils.h> #include <osmocom/gsm/gsup.h> -#include <openbsc/gsup_client.h> -#include <openbsc/debug.h> +#include <osmocom/msc/gsup_client.h> +#include <osmocom/msc/debug.h> static struct gsup_client *g_gc; diff --git a/src/libcommon/oap_client.c b/src/libcommon/oap_client.c index 5128ac119..39055ab0f 100644 --- a/src/libcommon/oap_client.c +++ b/src/libcommon/oap_client.c @@ -27,8 +27,8 @@ #include <osmocom/crypt/auth.h> #include <osmocom/gsm/oap.h> -#include <openbsc/oap_client.h> -#include <openbsc/debug.h> +#include <osmocom/msc/oap_client.h> +#include <osmocom/msc/debug.h> int oap_client_init(struct oap_client_config *config, struct oap_client_state *state) diff --git a/src/libcommon/socket.c b/src/libcommon/socket.c index 2a64767f8..2793bcfd9 100644 --- a/src/libcommon/socket.c +++ b/src/libcommon/socket.c @@ -35,8 +35,8 @@ #include <osmocom/core/select.h> #include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/gsm_data.h> #include <osmocom/core/talloc.h> int make_sock(struct osmo_fd *bfd, int proto, 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" diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index a5ea0f6d1..a9aacbd6f 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -25,10 +25,10 @@ #include <osmocom/gsm/protocol/gsm_04_08_gprs.h> #include <osmocom/gsm/gsup.h> #include <osmocom/gsm/apn.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/gsup_client.h> -#include <openbsc/vlr.h> -#include <openbsc/debug.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/gsup_client.h> +#include <osmocom/msc/vlr.h> +#include <osmocom/msc/debug.h> #include <openssl/rand.h> diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index f9ed0b57d..9d9e4c1c3 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -21,8 +21,8 @@ #include <osmocom/core/fsm.h> #include <osmocom/gsm/gsup.h> -#include <openbsc/vlr.h> -#include <openbsc/debug.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 0eb86e749..1c9e19137 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -23,8 +23,8 @@ #include <osmocom/core/fsm.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/gsup.h> -#include <openbsc/vlr.h> -#include <openbsc/debug.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_core.h b/src/libvlr/vlr_core.h index 0e63c7e69..6ca54e864 100644 --- a/src/libvlr/vlr_core.h +++ b/src/libvlr/vlr_core.h @@ -1,6 +1,6 @@ #pragma once -#include <openbsc/vlr.h> +#include <osmocom/msc/vlr.h> #define LOGGSUPP(level, gsup, fmt, args...) \ LOGP(DVLR, level, "GSUP(%s) " fmt, \ diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 94bea560f..c9223f854 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -21,8 +21,8 @@ #include <osmocom/core/fsm.h> #include <osmocom/gsm/gsup.h> -#include <openbsc/vlr.h> -#include <openbsc/debug.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 30b11d983..41dfedb9d 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -37,32 +37,32 @@ /* build switches from the configure script */ #include "../../bscconfig.h" -#include <openbsc/db.h> +#include <osmocom/msc/db.h> #include <osmocom/core/application.h> #include <osmocom/core/select.h> #include <osmocom/core/stats.h> -#include <openbsc/debug.h> +#include <osmocom/msc/debug.h> #include <osmocom/abis/abis.h> #include <osmocom/abis/e1_input.h> #include <osmocom/core/talloc.h> -#include <openbsc/signal.h> -#include <openbsc/osmo_msc.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/sms_queue.h> +#include <osmocom/msc/signal.h> +#include <osmocom/msc/osmo_msc.h> +#include <osmocom/msc/bsc_msc_data.h> +#include <osmocom/msc/sms_queue.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/ports.h> #include <osmocom/vty/logging.h> -#include <openbsc/vty.h> -#include <openbsc/bss.h> -#include <openbsc/mncc.h> -#include <openbsc/handover_decision.h> -#include <openbsc/rrlp.h> +#include <osmocom/msc/vty.h> +#include <osmocom/msc/bss.h> +#include <osmocom/msc/mncc.h> +#include <osmocom/msc/handover_decision.h> +#include <osmocom/msc/rrlp.h> #include <osmocom/ctrl/control_if.h> #include <osmocom/ctrl/control_vty.h> #include <osmocom/ctrl/ports.h> -#include <openbsc/ctrl.h> -#include <openbsc/osmo_bsc_rf.h> -#include <openbsc/smpp.h> +#include <osmocom/msc/ctrl.h> +#include <osmocom/msc/osmo_bsc_rf.h> +#include <osmocom/msc/smpp.h> #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/legacy_mgcp/mgcpgw_client.h> @@ -70,10 +70,10 @@ #include <osmocom/ranap/iu_client.h> #endif -#include <openbsc/msc_ifaces.h> -#include <openbsc/iucs.h> -#include <openbsc/iucs_ranap.h> -#include <openbsc/a_iface.h> +#include <osmocom/msc/msc_ifaces.h> +#include <osmocom/msc/iucs.h> +#include <osmocom/msc/iucs_ranap.h> +#include <osmocom/msc/a_iface.h> static const char * const osmomsc_copyright = "OsmoMSC - Osmocom Circuit-Switched Core Network implementation\r\n" diff --git a/src/utils/meas_db.c b/src/utils/meas_db.c index d81efcade..8cf27df95 100644 --- a/src/utils/meas_db.c +++ b/src/utils/meas_db.c @@ -28,7 +28,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/gsm_utils.h> -#include <openbsc/meas_rep.h> +#include <osmocom/msc/meas_rep.h> #include "meas_db.h" diff --git a/src/utils/meas_json.c b/src/utils/meas_json.c index 51eb6c74e..8db7791f9 100644 --- a/src/utils/meas_json.c +++ b/src/utils/meas_json.c @@ -37,9 +37,9 @@ #include <osmocom/gsm/gsm_utils.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_data_shared.h> -#include <openbsc/meas_feed.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/gsm_data_shared.h> +#include <osmocom/msc/meas_feed.h> static void print_meas_rep_uni_json(struct gsm_meas_rep_unidir *mru) { diff --git a/src/utils/meas_pcap2db.c b/src/utils/meas_pcap2db.c index b874ac403..064452164 100644 --- a/src/utils/meas_pcap2db.c +++ b/src/utils/meas_pcap2db.c @@ -36,7 +36,7 @@ #include <osmocom/gsm/gsm_utils.h> -#include <openbsc/meas_feed.h> +#include <osmocom/msc/meas_feed.h> #include <pcap/pcap.h> diff --git a/src/utils/meas_udp2db.c b/src/utils/meas_udp2db.c index 5032d0c3e..c2b5aceae 100644 --- a/src/utils/meas_udp2db.c +++ b/src/utils/meas_udp2db.c @@ -36,7 +36,7 @@ #include <osmocom/gsm/gsm_utils.h> -#include <openbsc/meas_feed.h> +#include <osmocom/msc/meas_feed.h> #include "meas_db.h" diff --git a/src/utils/meas_vis.c b/src/utils/meas_vis.c index 77194ded4..5efb30013 100644 --- a/src/utils/meas_vis.c +++ b/src/utils/meas_vis.c @@ -16,7 +16,7 @@ #include <osmocom/gsm/gsm_utils.h> -#include <openbsc/meas_feed.h> +#include <osmocom/msc/meas_feed.h> struct ms_state_uni { CDKSLIDER *cdk; diff --git a/src/utils/smpp_mirror.c b/src/utils/smpp_mirror.c index c5705059b..248396a13 100644 --- a/src/utils/smpp_mirror.c +++ b/src/utils/smpp_mirror.c @@ -18,7 +18,7 @@ #include <osmocom/core/socket.h> #include <osmocom/core/write_queue.h> -#include <openbsc/debug.h> +#include <osmocom/msc/debug.h> /* FIXME: merge with smpp_smsc.c */ #define SMPP_SYS_ID_LEN 16 diff --git a/tests/db/db_test.c b/tests/db/db_test.c index a0c1e79c3..63099f685 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -18,11 +18,11 @@ * */ -#include <openbsc/debug.h> -#include <openbsc/db.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/gsm_04_11.h> -#include <openbsc/mgcp.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/db.h> +#include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/msc/gsm_04_11.h> +#include <osmocom/msc/mgcp.h> #include <osmocom/core/application.h> diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 4b10e49d5..d05aa29f4 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -30,15 +30,15 @@ #include <osmocom/core/application.h> #include <osmocom/gsm/protocol/gsm_04_11.h> #include <osmocom/gsm/gsup.h> -#include <openbsc/gsup_client.h> -#include <openbsc/gsm_04_11.h> -#include <openbsc/debug.h> +#include <osmocom/msc/gsup_client.h> +#include <osmocom/msc/gsm_04_11.h> +#include <osmocom/msc/debug.h> #if BUILD_IU -#include <openbsc/iucs_ranap.h> +#include <osmocom/msc/iucs_ranap.h> #include <osmocom/ranap/iu_client.h> #else -#include <openbsc/iu_dummy.h> +#include <osmocom/msc/iu_dummy.h> #endif #include "msc_vlr_tests.h" diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index c2c5a58a7..1cd391481 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -26,9 +26,9 @@ #include <stdbool.h> #include <stdio.h> -#include <openbsc/gsm_data.h> -#include <openbsc/osmo_msc.h> -#include <openbsc/vlr.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/osmo_msc.h> +#include <osmocom/msc/vlr.h> extern bool _log_lines; #define _log(fmt, args...) do { \ diff --git a/tests/smpp/smpp_test.c b/tests/smpp/smpp_test.c index 62fa9d2e9..5f5f2d642 100644 --- a/tests/smpp/smpp_test.c +++ b/tests/smpp/smpp_test.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <stdio.h> -#include <openbsc/debug.h> +#include <osmocom/msc/debug.h> #include <osmocom/core/application.h> #include <osmocom/core/backtrace.h> diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c index af25b0645..0d073db01 100644 --- a/tests/sms_queue/sms_queue_test.c +++ b/tests/sms_queue/sms_queue_test.c @@ -23,8 +23,8 @@ #include <osmocom/core/application.h> -#include <openbsc/debug.h> -#include <openbsc/vlr.h> +#include <osmocom/msc/debug.h> +#include <osmocom/msc/vlr.h> static void *talloc_ctx = NULL; |