This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Neels Hofmeyr gerrit-no-reply at lists.osmocom.orgReview at https://gerrit.osmocom.org/3811 rename include/openbsc to include/osmocom/msc Change-Id: I1f96a1285bbd1b4607614856bca935d5c26e2da9 --- M configure.ac M include/Makefile.am A include/osmocom/Makefile.am R include/osmocom/msc/Makefile.am R include/osmocom/msc/a_iface.h R include/osmocom/msc/a_iface_bssap.h R include/osmocom/msc/a_reset.h R include/osmocom/msc/abis_nm.h R include/osmocom/msc/abis_om2000.h R include/osmocom/msc/abis_rsl.h R include/osmocom/msc/arfcn_range_encode.h R include/osmocom/msc/auth.h R include/osmocom/msc/bsc_api.h R include/osmocom/msc/bsc_msc.h R include/osmocom/msc/bsc_msc_data.h R include/osmocom/msc/bsc_msg_filter.h R include/osmocom/msc/bsc_rll.h R include/osmocom/msc/bss.h R include/osmocom/msc/bts_ipaccess_nanobts_omlattr.h R include/osmocom/msc/chan_alloc.h R include/osmocom/msc/common.h R include/osmocom/msc/common_bsc.h R include/osmocom/msc/common_cs.h R include/osmocom/msc/crc24.h R include/osmocom/msc/ctrl.h R include/osmocom/msc/db.h R include/osmocom/msc/debug.h R include/osmocom/msc/e1_config.h R include/osmocom/msc/gsm_04_08.h R include/osmocom/msc/gsm_04_11.h R include/osmocom/msc/gsm_04_14.h R include/osmocom/msc/gsm_04_80.h R include/osmocom/msc/gsm_data.h R include/osmocom/msc/gsm_data_shared.h R include/osmocom/msc/gsm_subscriber.h R include/osmocom/msc/gsup_client.h R include/osmocom/msc/gtphub.h R include/osmocom/msc/handover.h R include/osmocom/msc/handover_decision.h R include/osmocom/msc/ipaccess.h R include/osmocom/msc/iu_dummy.h R include/osmocom/msc/iucs.h R include/osmocom/msc/iucs_ranap.h R include/osmocom/msc/meas_feed.h R include/osmocom/msc/meas_rep.h R include/osmocom/msc/misdn.h R include/osmocom/msc/mncc.h R include/osmocom/msc/mncc_int.h R include/osmocom/msc/msc_ifaces.h R include/osmocom/msc/network_listen.h R include/osmocom/msc/oap_client.h R include/osmocom/msc/openbscdefines.h R include/osmocom/msc/osmo_bsc.h R include/osmocom/msc/osmo_bsc_grace.h R include/osmocom/msc/osmo_bsc_reset.h R include/osmocom/msc/osmo_bsc_rf.h R include/osmocom/msc/osmo_bsc_sigtran.h R include/osmocom/msc/osmo_msc.h R include/osmocom/msc/osmux.h R include/osmocom/msc/paging.h R include/osmocom/msc/rest_octets.h R include/osmocom/msc/rrlp.h R include/osmocom/msc/rs232.h R include/osmocom/msc/rtp_proxy.h R include/osmocom/msc/signal.h R include/osmocom/msc/silent_call.h R include/osmocom/msc/slhc.h R include/osmocom/msc/smpp.h R include/osmocom/msc/sms_queue.h R include/osmocom/msc/socket.h R include/osmocom/msc/system_information.h R include/osmocom/msc/transaction.h R include/osmocom/msc/trau_mux.h R include/osmocom/msc/trau_upqueue.h R include/osmocom/msc/ussd.h R include/osmocom/msc/vlr.h R include/osmocom/msc/vty.h M src/libcommon-cs/a_reset.c M src/libcommon-cs/common_cs.c M src/libcommon-cs/common_cs_vty.c M src/libcommon/common_vty.c M src/libcommon/debug.c M src/libcommon/gsm_data.c M src/libcommon/gsm_data_shared.c M src/libcommon/gsm_subscriber_base.c M src/libcommon/gsup_client.c M src/libcommon/gsup_test_client.c M src/libcommon/oap_client.c M src/libcommon/socket.c M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/auth.c M src/libmsc/ctrl_commands.c M src/libmsc/db.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_14.c M src/libmsc/gsm_04_80.c M src/libmsc/gsm_subscriber.c M src/libmsc/iu_dummy.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/meas_feed.c M src/libmsc/mncc.c M src/libmsc/mncc_builtin.c M src/libmsc/mncc_sock.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/rrlp.c M src/libmsc/silent_call.c M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.c M src/libmsc/smpp_utils.c M src/libmsc/smpp_vty.c M src/libmsc/sms_queue.c M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M src/libmsc/ussd.c M src/libmsc/vty_interface_layer3.c M src/libvlr/vlr.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M src/osmo-msc/msc_main.c M src/utils/meas_db.c M src/utils/meas_json.c M src/utils/meas_pcap2db.c M src/utils/meas_udp2db.c M src/utils/meas_vis.c M src/utils/smpp_mirror.c M tests/db/db_test.c M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h M tests/smpp/smpp_test.c M tests/sms_queue/sms_queue_test.c 137 files changed, 349 insertions(+), 345 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/3811/1 diff --git a/configure.ac b/configure.ac index 0549ed3..4e27a14 100644 --- a/configure.ac +++ b/configure.ac @@ -177,8 +177,9 @@ 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 677eec3..9d963a0 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 0000000..4d80637 --- /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 similarity index 100% rename from include/openbsc/Makefile.am rename to include/osmocom/msc/Makefile.am diff --git a/include/openbsc/a_iface.h b/include/osmocom/msc/a_iface.h similarity index 98% rename from include/openbsc/a_iface.h rename to include/osmocom/msc/a_iface.h index 149f1c7..a49ede2 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 similarity index 100% rename from include/openbsc/a_iface_bssap.h rename to include/osmocom/msc/a_iface_bssap.h diff --git a/include/openbsc/a_reset.h b/include/osmocom/msc/a_reset.h similarity index 100% rename from include/openbsc/a_reset.h rename to include/osmocom/msc/a_reset.h diff --git a/include/openbsc/abis_nm.h b/include/osmocom/msc/abis_nm.h similarity index 99% rename from include/openbsc/abis_nm.h rename to include/osmocom/msc/abis_nm.h index db2a659..2581962 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 similarity index 100% rename from include/openbsc/abis_om2000.h rename to include/osmocom/msc/abis_om2000.h diff --git a/include/openbsc/abis_rsl.h b/include/osmocom/msc/abis_rsl.h similarity index 100% rename from include/openbsc/abis_rsl.h rename to include/osmocom/msc/abis_rsl.h diff --git a/include/openbsc/arfcn_range_encode.h b/include/osmocom/msc/arfcn_range_encode.h similarity index 100% rename from include/openbsc/arfcn_range_encode.h rename to include/osmocom/msc/arfcn_range_encode.h diff --git a/include/openbsc/auth.h b/include/osmocom/msc/auth.h similarity index 100% rename from include/openbsc/auth.h rename to include/osmocom/msc/auth.h diff --git a/include/openbsc/bsc_api.h b/include/osmocom/msc/bsc_api.h similarity index 100% rename from include/openbsc/bsc_api.h rename to include/osmocom/msc/bsc_api.h diff --git a/include/openbsc/bsc_msc.h b/include/osmocom/msc/bsc_msc.h similarity index 98% rename from include/openbsc/bsc_msc.h rename to include/osmocom/msc/bsc_msc.h index 380eb17..d649f76 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 similarity index 100% rename from include/openbsc/bsc_msc_data.h rename to include/osmocom/msc/bsc_msc_data.h diff --git a/include/openbsc/bsc_msg_filter.h b/include/osmocom/msc/bsc_msg_filter.h similarity index 100% rename from include/openbsc/bsc_msg_filter.h rename to include/osmocom/msc/bsc_msg_filter.h diff --git a/include/openbsc/bsc_rll.h b/include/osmocom/msc/bsc_rll.h similarity index 92% rename from include/openbsc/bsc_rll.h rename to include/osmocom/msc/bsc_rll.h index 729ba60..93c80e7 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 similarity index 93% rename from include/openbsc/bss.h rename to include/osmocom/msc/bss.h index 9f16bf7..0904334 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 similarity index 100% rename from include/openbsc/bts_ipaccess_nanobts_omlattr.h rename to include/osmocom/msc/bts_ipaccess_nanobts_omlattr.h diff --git a/include/openbsc/chan_alloc.h b/include/osmocom/msc/chan_alloc.h similarity index 100% rename from include/openbsc/chan_alloc.h rename to include/osmocom/msc/chan_alloc.h diff --git a/include/openbsc/common.h b/include/osmocom/msc/common.h similarity index 100% rename from include/openbsc/common.h rename to include/osmocom/msc/common.h diff --git a/include/openbsc/common_bsc.h b/include/osmocom/msc/common_bsc.h similarity index 83% rename from include/openbsc/common_bsc.h rename to include/osmocom/msc/common_bsc.h index 7960383..821298c 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 similarity index 100% rename from include/openbsc/common_cs.h rename to include/osmocom/msc/common_cs.h diff --git a/include/openbsc/crc24.h b/include/osmocom/msc/crc24.h similarity index 100% rename from include/openbsc/crc24.h rename to include/osmocom/msc/crc24.h diff --git a/include/openbsc/ctrl.h b/include/osmocom/msc/ctrl.h similarity index 100% rename from include/openbsc/ctrl.h rename to include/osmocom/msc/ctrl.h diff --git a/include/openbsc/db.h b/include/osmocom/msc/db.h similarity index 100% rename from include/openbsc/db.h rename to include/osmocom/msc/db.h diff --git a/include/openbsc/debug.h b/include/osmocom/msc/debug.h similarity index 100% rename from include/openbsc/debug.h rename to include/osmocom/msc/debug.h diff --git a/include/openbsc/e1_config.h b/include/osmocom/msc/e1_config.h similarity index 83% rename from include/openbsc/e1_config.h rename to include/osmocom/msc/e1_config.h index 538c0b0..ac5fbb1 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 similarity index 98% rename from include/openbsc/gsm_04_08.h rename to include/osmocom/msc/gsm_04_08.h index ca251b0..c99fc86 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 similarity index 100% rename from include/openbsc/gsm_04_11.h rename to include/osmocom/msc/gsm_04_11.h diff --git a/include/openbsc/gsm_04_14.h b/include/osmocom/msc/gsm_04_14.h similarity index 100% rename from include/openbsc/gsm_04_14.h rename to include/osmocom/msc/gsm_04_14.h diff --git a/include/openbsc/gsm_04_80.h b/include/osmocom/msc/gsm_04_80.h similarity index 100% rename from include/openbsc/gsm_04_80.h rename to include/osmocom/msc/gsm_04_80.h diff --git a/include/openbsc/gsm_data.h b/include/osmocom/msc/gsm_data.h similarity index 99% rename from include/openbsc/gsm_data.h rename to include/osmocom/msc/gsm_data.h index 205ab6c..5d3d5ca 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/mgcp_client/mgcp_client.h> diff --git a/include/openbsc/gsm_data_shared.h b/include/osmocom/msc/gsm_data_shared.h similarity index 99% rename from include/openbsc/gsm_data_shared.h rename to include/osmocom/msc/gsm_data_shared.h index bed46d2..5028a26 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 similarity index 97% rename from include/openbsc/gsm_subscriber.h rename to include/osmocom/msc/gsm_subscriber.h index d88e32a..6b0e3da 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 similarity index 97% rename from include/openbsc/gsup_client.h rename to include/osmocom/msc/gsup_client.h index 4a25490..3d1dce0 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 similarity index 99% rename from include/openbsc/gtphub.h rename to include/osmocom/msc/gtphub.h index 9cb7605..d7b6f1b 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 similarity index 100% rename from include/openbsc/handover.h rename to include/osmocom/msc/handover.h diff --git a/include/openbsc/handover_decision.h b/include/osmocom/msc/handover_decision.h similarity index 100% rename from include/openbsc/handover_decision.h rename to include/osmocom/msc/handover_decision.h diff --git a/include/openbsc/ipaccess.h b/include/osmocom/msc/ipaccess.h similarity index 100% rename from include/openbsc/ipaccess.h rename to include/osmocom/msc/ipaccess.h diff --git a/include/openbsc/iu_dummy.h b/include/osmocom/msc/iu_dummy.h similarity index 100% rename from include/openbsc/iu_dummy.h rename to include/osmocom/msc/iu_dummy.h diff --git a/include/openbsc/iucs.h b/include/osmocom/msc/iucs.h similarity index 100% rename from include/openbsc/iucs.h rename to include/osmocom/msc/iucs.h diff --git a/include/openbsc/iucs_ranap.h b/include/osmocom/msc/iucs_ranap.h similarity index 100% rename from include/openbsc/iucs_ranap.h rename to include/osmocom/msc/iucs_ranap.h diff --git a/include/openbsc/meas_feed.h b/include/osmocom/msc/meas_feed.h similarity index 95% rename from include/openbsc/meas_feed.h rename to include/osmocom/msc/meas_feed.h index f77ee07..02b7d95 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 similarity index 100% rename from include/openbsc/meas_rep.h rename to include/osmocom/msc/meas_rep.h diff --git a/include/openbsc/misdn.h b/include/osmocom/msc/misdn.h similarity index 100% rename from include/openbsc/misdn.h rename to include/osmocom/msc/misdn.h diff --git a/include/openbsc/mncc.h b/include/osmocom/msc/mncc.h similarity index 100% rename from include/openbsc/mncc.h rename to include/osmocom/msc/mncc.h diff --git a/include/openbsc/mncc_int.h b/include/osmocom/msc/mncc_int.h similarity index 100% rename from include/openbsc/mncc_int.h rename to include/osmocom/msc/mncc_int.h diff --git a/include/openbsc/msc_ifaces.h b/include/osmocom/msc/msc_ifaces.h similarity index 97% rename from include/openbsc/msc_ifaces.h rename to include/osmocom/msc/msc_ifaces.h index a1071ae..d46dfe9 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 similarity index 92% rename from include/openbsc/network_listen.h rename to include/osmocom/msc/network_listen.h index 67d1f4e..05fbb2f 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 similarity index 100% rename from include/openbsc/oap_client.h rename to include/osmocom/msc/oap_client.h diff --git a/include/openbsc/openbscdefines.h b/include/osmocom/msc/openbscdefines.h similarity index 100% rename from include/openbsc/openbscdefines.h rename to include/osmocom/msc/openbscdefines.h diff --git a/include/openbsc/osmo_bsc.h b/include/osmocom/msc/osmo_bsc.h similarity index 100% rename from include/openbsc/osmo_bsc.h rename to include/osmocom/msc/osmo_bsc.h diff --git a/include/openbsc/osmo_bsc_grace.h b/include/osmocom/msc/osmo_bsc_grace.h similarity index 94% rename from include/openbsc/osmo_bsc_grace.h rename to include/osmocom/msc/osmo_bsc_grace.h index 5a81cd1..6232ffd 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 similarity index 100% rename from include/openbsc/osmo_bsc_reset.h rename to include/osmocom/msc/osmo_bsc_reset.h diff --git a/include/openbsc/osmo_bsc_rf.h b/include/osmocom/msc/osmo_bsc_rf.h similarity index 97% rename from include/openbsc/osmo_bsc_rf.h rename to include/osmocom/msc/osmo_bsc_rf.h index 19ccd08..a81ebd7 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 similarity index 95% rename from include/openbsc/osmo_bsc_sigtran.h rename to include/osmocom/msc/osmo_bsc_sigtran.h index fbcfcb3..7015edb 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 similarity index 98% rename from include/openbsc/osmo_msc.h rename to include/osmocom/msc/osmo_msc.h index cdfd27f..5f4713e 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 similarity index 100% rename from include/openbsc/osmux.h rename to include/osmocom/msc/osmux.h diff --git a/include/openbsc/paging.h b/include/osmocom/msc/paging.h similarity index 98% rename from include/openbsc/paging.h rename to include/osmocom/msc/paging.h index 049da14..b856dcd 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 similarity index 98% rename from include/openbsc/rest_octets.h rename to include/osmocom/msc/rest_octets.h index 49a2312..49857b7 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 similarity index 100% rename from include/openbsc/rrlp.h rename to include/osmocom/msc/rrlp.h diff --git a/include/openbsc/rs232.h b/include/osmocom/msc/rs232.h similarity index 100% rename from include/openbsc/rs232.h rename to include/osmocom/msc/rs232.h diff --git a/include/openbsc/rtp_proxy.h b/include/osmocom/msc/rtp_proxy.h similarity index 98% rename from include/openbsc/rtp_proxy.h rename to include/osmocom/msc/rtp_proxy.h index 52ffefd..3cd8cac 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 similarity index 99% rename from include/openbsc/signal.h rename to include/osmocom/msc/signal.h index 49f86d6..14c76f8 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 similarity index 100% rename from include/openbsc/silent_call.h rename to include/osmocom/msc/silent_call.h diff --git a/include/openbsc/slhc.h b/include/osmocom/msc/slhc.h similarity index 100% rename from include/openbsc/slhc.h rename to include/osmocom/msc/slhc.h diff --git a/include/openbsc/smpp.h b/include/osmocom/msc/smpp.h similarity index 100% rename from include/openbsc/smpp.h rename to include/osmocom/msc/smpp.h diff --git a/include/openbsc/sms_queue.h b/include/osmocom/msc/sms_queue.h similarity index 100% rename from include/openbsc/sms_queue.h rename to include/osmocom/msc/sms_queue.h diff --git a/include/openbsc/socket.h b/include/osmocom/msc/socket.h similarity index 100% rename from include/openbsc/socket.h rename to include/osmocom/msc/socket.h diff --git a/include/openbsc/system_information.h b/include/osmocom/msc/system_information.h similarity index 94% rename from include/openbsc/system_information.h rename to include/osmocom/msc/system_information.h index 71bea26..854b7e3 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 similarity index 94% rename from include/openbsc/transaction.h rename to include/osmocom/msc/transaction.h index 4930fbd..272fb3b 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 similarity index 97% rename from include/openbsc/trau_mux.h rename to include/osmocom/msc/trau_mux.h index 75c359b..08863bf 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 similarity index 100% rename from include/openbsc/trau_upqueue.h rename to include/osmocom/msc/trau_upqueue.h diff --git a/include/openbsc/ussd.h b/include/osmocom/msc/ussd.h similarity index 100% rename from include/openbsc/ussd.h rename to include/osmocom/msc/ussd.h diff --git a/include/openbsc/vlr.h b/include/osmocom/msc/vlr.h similarity index 99% rename from include/openbsc/vlr.h rename to include/osmocom/msc/vlr.h index 619971a..e9afde3 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 similarity index 100% rename from include/openbsc/vty.h rename to include/osmocom/msc/vty.h diff --git a/src/libcommon-cs/a_reset.c b/src/libcommon-cs/a_reset.c index c0294c7..9a226ac 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 d6dff95..8a28b72 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 1791687..cdefa09 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 7157e00..6037dda 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 7236413..612e215 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 7be2240..f4f6e5d 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 2696273..9382889 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 018ed21..58a6ff0 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 fd65e7b..b5f2e68 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 b6a8d6b..5576292 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 5128ac1..39055ab 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 2a64767..2793bcf 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 3f9f231..3d2013e 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/mgcp_client/mgcp_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 45d2040..34d03e3 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 9064ce6..7b5367b 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 9d1f0d4..7e445aa 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 ae7e287..4e4477b 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 cad9d9b..84f52c6 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 574fe28..99adbf7 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 b529f4c..5f49574 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 bec1d26..37e058c 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 09540c1..8bc060f 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 e9d335e..4191c5a 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 04b9ece..c89e412 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 45de1ca..abf1812 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 1e7b4cd..3daebee 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 8110ead..4e88bc6 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 ac6e734..84623df 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 0c696f2..05c9439 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 c461139..7a04153 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/mgcp_client/mgcp_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 @@ 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 198b1dd..5c9539d 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 4d24f22..db24757 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 cd3da06..7428893 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 7af7a80..5b19700 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 431cb4d..3ea5ddd 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 04afc49..88cecfc 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 d0850d8..7208e25 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 13467f1..c0309d6 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 fe7a608..609a0db 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 bcab8e4..336637c 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 28e0914..bac31a1 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 81a3566..e3263d2 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 b4c9450..484e9d5 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 a5ea0f6..a9aacbd 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 f9ed0b5..9d9e4c1 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 0eb86e7..1c9e191 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 0e63c7e..6ca54e8 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 94bea56..c9223f8 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 3dfc806..75ba19c 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/mgcp_client/mgcp_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 d81efca..8cf27df 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 51eb6c7..8db7791 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 b874ac4..0644521 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 5032d0c..c2b5ace 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 77194de..5efb300 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 c570505..248396a 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 a0c1e79..63099f6 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 4b10e49..d05aa29 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 c2c5a58..1cd3914 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 62fa9d2..5f5f2d6 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 af25b06..0d073db 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; -- To view, visit https://gerrit.osmocom.org/3811 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f96a1285bbd1b4607614856bca935d5c26e2da9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>