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.orgHello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3813 to look at the new patch set (#2). move include/openbsc to include/osmocom/bsc Change-Id: I39e7b882caa98334636d19ccd104fd83d07d5055 --- M configure.ac M include/Makefile.am A include/osmocom/Makefile.am R include/osmocom/bsc/Makefile.am R include/osmocom/bsc/a_reset.h R include/osmocom/bsc/abis_nm.h R include/osmocom/bsc/abis_om2000.h R include/osmocom/bsc/abis_rsl.h R include/osmocom/bsc/arfcn_range_encode.h R include/osmocom/bsc/auth.h R include/osmocom/bsc/bsc_api.h R include/osmocom/bsc/bsc_msc.h R include/osmocom/bsc/bsc_msc_data.h R include/osmocom/bsc/bsc_msg_filter.h R include/osmocom/bsc/bsc_nat.h R include/osmocom/bsc/bsc_nat_callstats.h R include/osmocom/bsc/bsc_nat_sccp.h R include/osmocom/bsc/bsc_rll.h R include/osmocom/bsc/bsc_subscriber.h R include/osmocom/bsc/bss.h R include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h R include/osmocom/bsc/chan_alloc.h R include/osmocom/bsc/common.h R include/osmocom/bsc/common_bsc.h R include/osmocom/bsc/common_cs.h R include/osmocom/bsc/crc24.h R include/osmocom/bsc/ctrl.h R include/osmocom/bsc/debug.h R include/osmocom/bsc/e1_config.h R include/osmocom/bsc/gsm_04_08_utils.h R include/osmocom/bsc/gsm_04_80.h R include/osmocom/bsc/gsm_data.h R include/osmocom/bsc/gsm_data_shared.h R include/osmocom/bsc/gsm_subscriber.h R include/osmocom/bsc/handover.h R include/osmocom/bsc/handover_decision.h R include/osmocom/bsc/ipaccess.h R include/osmocom/bsc/iu_dummy.h R include/osmocom/bsc/meas_feed.h R include/osmocom/bsc/meas_rep.h R include/osmocom/bsc/misdn.h R include/osmocom/bsc/mncc.h R include/osmocom/bsc/mncc_int.h R include/osmocom/bsc/msc_ifaces.h R include/osmocom/bsc/nat_rewrite_trie.h R include/osmocom/bsc/network_listen.h R include/osmocom/bsc/openbscdefines.h R include/osmocom/bsc/osmo_bsc.h R include/osmocom/bsc/osmo_bsc_grace.h R include/osmocom/bsc/osmo_bsc_reset.h R include/osmocom/bsc/osmo_bsc_rf.h R include/osmocom/bsc/osmo_bsc_sigtran.h R include/osmocom/bsc/osmo_msc.h R include/osmocom/bsc/osmux.h R include/osmocom/bsc/paging.h R include/osmocom/bsc/pcu_if.h R include/osmocom/bsc/pcuif_proto.h R include/osmocom/bsc/rest_octets.h R include/osmocom/bsc/rrlp.h R include/osmocom/bsc/rs232.h R include/osmocom/bsc/rtp_proxy.h R include/osmocom/bsc/sgsn.h R include/osmocom/bsc/signal.h R include/osmocom/bsc/silent_call.h R include/osmocom/bsc/smpp.h R include/osmocom/bsc/sms_queue.h R include/osmocom/bsc/socket.h R include/osmocom/bsc/system_information.h R include/osmocom/bsc/transaction.h R include/osmocom/bsc/trau_mux.h R include/osmocom/bsc/trau_upqueue.h R include/osmocom/bsc/ussd.h R include/osmocom/bsc/vty.h M src/ipaccess/abisip-find.c M src/ipaccess/ipaccess-config.c M src/ipaccess/ipaccess-firmware.c M src/ipaccess/ipaccess-proxy.c M src/ipaccess/network_listen.c M src/libbsc/abis_nm.c M src/libbsc/abis_nm_vty.c M src/libbsc/abis_om2000.c M src/libbsc/abis_om2000_vty.c M src/libbsc/abis_rsl.c M src/libbsc/arfcn_range_encode.c M src/libbsc/bsc_api.c M src/libbsc/bsc_ctrl_commands.c M src/libbsc/bsc_ctrl_lookup.c M src/libbsc/bsc_dyn_ts.c M src/libbsc/bsc_init.c M src/libbsc/bsc_msc.c M src/libbsc/bsc_rf_ctrl.c M src/libbsc/bsc_rll.c M src/libbsc/bsc_subscriber.c M src/libbsc/bsc_vty.c M src/libbsc/bts_ericsson_rbs2000.c M src/libbsc/bts_init.c M src/libbsc/bts_ipaccess_nanobts.c M src/libbsc/bts_ipaccess_nanobts_omlattr.c M src/libbsc/bts_nokia_site.c M src/libbsc/bts_siemens_bs11.c M src/libbsc/bts_sysmobts.c M src/libbsc/bts_unknown.c M src/libbsc/chan_alloc.c M src/libbsc/e1_config.c M src/libbsc/gsm_04_08_utils.c M src/libbsc/gsm_04_80_utils.c M src/libbsc/handover_decision.c M src/libbsc/handover_logic.c M src/libbsc/meas_proc.c M src/libbsc/meas_rep.c M src/libbsc/net_init.c M src/libbsc/paging.c M src/libbsc/pcu_sock.c M src/libbsc/rest_octets.c M src/libbsc/system_information.c 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/socket.c M src/libfilter/bsc_msg_acc.c M src/libfilter/bsc_msg_filter.c M src/libfilter/bsc_msg_vty.c M src/libtrau/rtp_proxy.c M src/libtrau/trau_mux.c M src/libtrau/trau_upqueue.c M src/osmo-bsc/osmo_bsc_api.c M src/osmo-bsc/osmo_bsc_audio.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_ctrl.c M src/osmo-bsc/osmo_bsc_filter.c M src/osmo-bsc/osmo_bsc_grace.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/osmo_bsc_reset.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/osmo_bsc_vty.c M src/osmo-bsc_nat/bsc_filter.c M src/osmo-bsc_nat/bsc_mgcp_utils.c M src/osmo-bsc_nat/bsc_nat.c M src/osmo-bsc_nat/bsc_nat_ctrl.c M src/osmo-bsc_nat/bsc_nat_filter.c M src/osmo-bsc_nat/bsc_nat_rewrite.c M src/osmo-bsc_nat/bsc_nat_rewrite_trie.c M src/osmo-bsc_nat/bsc_nat_utils.c M src/osmo-bsc_nat/bsc_nat_vty.c M src/osmo-bsc_nat/bsc_sccp.c M src/osmo-bsc_nat/bsc_ussd.c M src/utils/bs11_config.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 tests/abis/abis_test.c M tests/bsc-nat-trie/bsc_nat_trie_test.c M tests/bsc-nat/bsc_nat_test.c M tests/bsc/bsc_test.c M tests/channel/channel_test.c M tests/gsm0408/gsm0408_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.c M tests/subscr/bsc_subscr_test.c M tests/trau/trau_test.c 167 files changed, 515 insertions(+), 511 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/13/3813/2 diff --git a/configure.ac b/configure.ac index 8107047..930d1d3 100644 --- a/configure.ac +++ b/configure.ac @@ -126,8 +126,9 @@ AC_OUTPUT( osmo-bsc.pc - include/openbsc/Makefile include/Makefile + include/osmocom/Makefile + include/osmocom/bsc/Makefile src/Makefile src/libtrau/Makefile src/libbsc/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 3234e62..740e088 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = \ - openbsc \ + osmocom \ $(NULL) noinst_HEADERS = \ diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am new file mode 100644 index 0000000..cf24c62 --- /dev/null +++ b/include/osmocom/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + bsc \ + $(NULL) diff --git a/include/openbsc/Makefile.am b/include/osmocom/bsc/Makefile.am similarity index 100% rename from include/openbsc/Makefile.am rename to include/osmocom/bsc/Makefile.am diff --git a/include/openbsc/a_reset.h b/include/osmocom/bsc/a_reset.h similarity index 100% rename from include/openbsc/a_reset.h rename to include/osmocom/bsc/a_reset.h diff --git a/include/openbsc/abis_nm.h b/include/osmocom/bsc/abis_nm.h similarity index 99% rename from include/openbsc/abis_nm.h rename to include/osmocom/bsc/abis_nm.h index db2a659..34f16a9 100644 --- a/include/openbsc/abis_nm.h +++ b/include/osmocom/bsc/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/bsc/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/bsc/abis_om2000.h similarity index 100% rename from include/openbsc/abis_om2000.h rename to include/osmocom/bsc/abis_om2000.h diff --git a/include/openbsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h similarity index 100% rename from include/openbsc/abis_rsl.h rename to include/osmocom/bsc/abis_rsl.h diff --git a/include/openbsc/arfcn_range_encode.h b/include/osmocom/bsc/arfcn_range_encode.h similarity index 100% rename from include/openbsc/arfcn_range_encode.h rename to include/osmocom/bsc/arfcn_range_encode.h diff --git a/include/openbsc/auth.h b/include/osmocom/bsc/auth.h similarity index 100% rename from include/openbsc/auth.h rename to include/osmocom/bsc/auth.h diff --git a/include/openbsc/bsc_api.h b/include/osmocom/bsc/bsc_api.h similarity index 100% rename from include/openbsc/bsc_api.h rename to include/osmocom/bsc/bsc_api.h diff --git a/include/openbsc/bsc_msc.h b/include/osmocom/bsc/bsc_msc.h similarity index 98% rename from include/openbsc/bsc_msc.h rename to include/osmocom/bsc/bsc_msc.h index 380eb17..ceaea53 100644 --- a/include/openbsc/bsc_msc.h +++ b/include/osmocom/bsc/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/bsc/a_reset.h> #include <netinet/in.h> diff --git a/include/openbsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h similarity index 100% rename from include/openbsc/bsc_msc_data.h rename to include/osmocom/bsc/bsc_msc_data.h diff --git a/include/openbsc/bsc_msg_filter.h b/include/osmocom/bsc/bsc_msg_filter.h similarity index 100% rename from include/openbsc/bsc_msg_filter.h rename to include/osmocom/bsc/bsc_msg_filter.h diff --git a/include/openbsc/bsc_nat.h b/include/osmocom/bsc/bsc_nat.h similarity index 100% rename from include/openbsc/bsc_nat.h rename to include/osmocom/bsc/bsc_nat.h diff --git a/include/openbsc/bsc_nat_callstats.h b/include/osmocom/bsc/bsc_nat_callstats.h similarity index 100% rename from include/openbsc/bsc_nat_callstats.h rename to include/osmocom/bsc/bsc_nat_callstats.h diff --git a/include/openbsc/bsc_nat_sccp.h b/include/osmocom/bsc/bsc_nat_sccp.h similarity index 100% rename from include/openbsc/bsc_nat_sccp.h rename to include/osmocom/bsc/bsc_nat_sccp.h diff --git a/include/openbsc/bsc_rll.h b/include/osmocom/bsc/bsc_rll.h similarity index 92% rename from include/openbsc/bsc_rll.h rename to include/osmocom/bsc/bsc_rll.h index 729ba60..3afe4a8 100644 --- a/include/openbsc/bsc_rll.h +++ b/include/osmocom/bsc/bsc_rll.h @@ -1,7 +1,7 @@ #ifndef _BSC_RLL_H #define _BSC_RLL_H -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> enum bsc_rllr_ind { BSC_RLLR_IND_EST_CONF, diff --git a/include/openbsc/bsc_subscriber.h b/include/osmocom/bsc/bsc_subscriber.h similarity index 100% rename from include/openbsc/bsc_subscriber.h rename to include/osmocom/bsc/bsc_subscriber.h diff --git a/include/openbsc/bss.h b/include/osmocom/bsc/bss.h similarity index 93% rename from include/openbsc/bss.h rename to include/osmocom/bsc/bss.h index 9f16bf7..b12487d 100644 --- a/include/openbsc/bss.h +++ b/include/osmocom/bsc/bss.h @@ -1,7 +1,7 @@ #ifndef _BSS_H_ #define _BSS_H_ -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> struct msgb; diff --git a/include/openbsc/bts_ipaccess_nanobts_omlattr.h b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h similarity index 100% rename from include/openbsc/bts_ipaccess_nanobts_omlattr.h rename to include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h diff --git a/include/openbsc/chan_alloc.h b/include/osmocom/bsc/chan_alloc.h similarity index 100% rename from include/openbsc/chan_alloc.h rename to include/osmocom/bsc/chan_alloc.h diff --git a/include/openbsc/common.h b/include/osmocom/bsc/common.h similarity index 100% rename from include/openbsc/common.h rename to include/osmocom/bsc/common.h diff --git a/include/openbsc/common_bsc.h b/include/osmocom/bsc/common_bsc.h similarity index 83% rename from include/openbsc/common_bsc.h rename to include/osmocom/bsc/common_bsc.h index 7960383..08394e9 100644 --- a/include/openbsc/common_bsc.h +++ b/include/osmocom/bsc/common_bsc.h @@ -1,7 +1,7 @@ #pragma once #include <stdint.h> -#include <openbsc/common_cs.h> +#include <osmocom/bsc/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/bsc/common_cs.h similarity index 100% rename from include/openbsc/common_cs.h rename to include/osmocom/bsc/common_cs.h diff --git a/include/openbsc/crc24.h b/include/osmocom/bsc/crc24.h similarity index 100% rename from include/openbsc/crc24.h rename to include/osmocom/bsc/crc24.h diff --git a/include/openbsc/ctrl.h b/include/osmocom/bsc/ctrl.h similarity index 100% rename from include/openbsc/ctrl.h rename to include/osmocom/bsc/ctrl.h diff --git a/include/openbsc/debug.h b/include/osmocom/bsc/debug.h similarity index 100% rename from include/openbsc/debug.h rename to include/osmocom/bsc/debug.h diff --git a/include/openbsc/e1_config.h b/include/osmocom/bsc/e1_config.h similarity index 83% rename from include/openbsc/e1_config.h rename to include/osmocom/bsc/e1_config.h index 538c0b0..909e3cc 100644 --- a/include/openbsc/e1_config.h +++ b/include/osmocom/bsc/e1_config.h @@ -1,7 +1,7 @@ #ifndef _E1_CONFIG_H #define _E1_CONFIG_H -#include <openbsc/gsm_data_shared.h> +#include <osmocom/bsc/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_utils.h b/include/osmocom/bsc/gsm_04_08_utils.h similarity index 100% rename from include/openbsc/gsm_04_08_utils.h rename to include/osmocom/bsc/gsm_04_08_utils.h diff --git a/include/openbsc/gsm_04_80.h b/include/osmocom/bsc/gsm_04_80.h similarity index 100% rename from include/openbsc/gsm_04_80.h rename to include/osmocom/bsc/gsm_04_80.h diff --git a/include/openbsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h similarity index 99% rename from include/openbsc/gsm_data.h rename to include/osmocom/bsc/gsm_data.h index 74970b9..ef041d6 100644 --- a/include/openbsc/gsm_data.h +++ b/include/osmocom/bsc/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/bsc/common.h> +#include <osmocom/bsc/rest_octets.h> +#include <osmocom/bsc/common_cs.h> #include <osmocom/legacy_mgcp/mgcpgw_client.h> diff --git a/include/openbsc/gsm_data_shared.h b/include/osmocom/bsc/gsm_data_shared.h similarity index 99% rename from include/openbsc/gsm_data_shared.h rename to include/osmocom/bsc/gsm_data_shared.h index bef4504..6ce571e 100644 --- a/include/openbsc/gsm_data_shared.h +++ b/include/osmocom/bsc/gsm_data_shared.h @@ -24,8 +24,8 @@ #include <osmocom/gsm/lapdm.h> #endif -#include <openbsc/common_cs.h> -#include <openbsc/meas_rep.h> +#include <osmocom/bsc/common_cs.h> +#include <osmocom/bsc/meas_rep.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/bsc/gsm_subscriber.h similarity index 97% rename from include/openbsc/gsm_subscriber.h rename to include/osmocom/bsc/gsm_subscriber.h index d88e32a..ca66d47 100644 --- a/include/openbsc/gsm_subscriber.h +++ b/include/osmocom/bsc/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/bsc/gsm_data.h> #define GSM_NAME_LENGTH 160 diff --git a/include/openbsc/handover.h b/include/osmocom/bsc/handover.h similarity index 100% rename from include/openbsc/handover.h rename to include/osmocom/bsc/handover.h diff --git a/include/openbsc/handover_decision.h b/include/osmocom/bsc/handover_decision.h similarity index 100% rename from include/openbsc/handover_decision.h rename to include/osmocom/bsc/handover_decision.h diff --git a/include/openbsc/ipaccess.h b/include/osmocom/bsc/ipaccess.h similarity index 100% rename from include/openbsc/ipaccess.h rename to include/osmocom/bsc/ipaccess.h diff --git a/include/openbsc/iu_dummy.h b/include/osmocom/bsc/iu_dummy.h similarity index 100% rename from include/openbsc/iu_dummy.h rename to include/osmocom/bsc/iu_dummy.h diff --git a/include/openbsc/meas_feed.h b/include/osmocom/bsc/meas_feed.h similarity index 95% rename from include/openbsc/meas_feed.h rename to include/osmocom/bsc/meas_feed.h index f77ee07..55bce09 100644 --- a/include/openbsc/meas_feed.h +++ b/include/osmocom/bsc/meas_feed.h @@ -3,7 +3,7 @@ #include <stdint.h> -#include <openbsc/meas_rep.h> +#include <osmocom/bsc/meas_rep.h> struct meas_feed_hdr { uint8_t msg_type; diff --git a/include/openbsc/meas_rep.h b/include/osmocom/bsc/meas_rep.h similarity index 100% rename from include/openbsc/meas_rep.h rename to include/osmocom/bsc/meas_rep.h diff --git a/include/openbsc/misdn.h b/include/osmocom/bsc/misdn.h similarity index 100% rename from include/openbsc/misdn.h rename to include/osmocom/bsc/misdn.h diff --git a/include/openbsc/mncc.h b/include/osmocom/bsc/mncc.h similarity index 100% rename from include/openbsc/mncc.h rename to include/osmocom/bsc/mncc.h diff --git a/include/openbsc/mncc_int.h b/include/osmocom/bsc/mncc_int.h similarity index 100% rename from include/openbsc/mncc_int.h rename to include/osmocom/bsc/mncc_int.h diff --git a/include/openbsc/msc_ifaces.h b/include/osmocom/bsc/msc_ifaces.h similarity index 97% rename from include/openbsc/msc_ifaces.h rename to include/osmocom/bsc/msc_ifaces.h index a1071ae..dadb828 100644 --- a/include/openbsc/msc_ifaces.h +++ b/include/osmocom/bsc/msc_ifaces.h @@ -1,7 +1,7 @@ #pragma once #include <osmocom/core/msgb.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/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/nat_rewrite_trie.h b/include/osmocom/bsc/nat_rewrite_trie.h similarity index 100% rename from include/openbsc/nat_rewrite_trie.h rename to include/osmocom/bsc/nat_rewrite_trie.h diff --git a/include/openbsc/network_listen.h b/include/osmocom/bsc/network_listen.h similarity index 92% rename from include/openbsc/network_listen.h rename to include/osmocom/bsc/network_listen.h index 67d1f4e..68d0709 100644 --- a/include/openbsc/network_listen.h +++ b/include/osmocom/bsc/network_listen.h @@ -2,7 +2,7 @@ #define _OPENBSC_NWL_H #include <stdint.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> void ipac_nwl_init(void); diff --git a/include/openbsc/openbscdefines.h b/include/osmocom/bsc/openbscdefines.h similarity index 100% rename from include/openbsc/openbscdefines.h rename to include/osmocom/bsc/openbscdefines.h diff --git a/include/openbsc/osmo_bsc.h b/include/osmocom/bsc/osmo_bsc.h similarity index 100% rename from include/openbsc/osmo_bsc.h rename to include/osmocom/bsc/osmo_bsc.h diff --git a/include/openbsc/osmo_bsc_grace.h b/include/osmocom/bsc/osmo_bsc_grace.h similarity index 94% rename from include/openbsc/osmo_bsc_grace.h rename to include/osmocom/bsc/osmo_bsc_grace.h index 5a81cd1..b7950ce 100644 --- a/include/openbsc/osmo_bsc_grace.h +++ b/include/osmocom/bsc/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/bsc/gsm_data.h> +#include <osmocom/bsc/signal.h> struct bsc_msc_data; diff --git a/include/openbsc/osmo_bsc_reset.h b/include/osmocom/bsc/osmo_bsc_reset.h similarity index 100% rename from include/openbsc/osmo_bsc_reset.h rename to include/osmocom/bsc/osmo_bsc_reset.h diff --git a/include/openbsc/osmo_bsc_rf.h b/include/osmocom/bsc/osmo_bsc_rf.h similarity index 97% rename from include/openbsc/osmo_bsc_rf.h rename to include/osmocom/bsc/osmo_bsc_rf.h index 19ccd08..56ac980 100644 --- a/include/openbsc/osmo_bsc_rf.h +++ b/include/osmocom/bsc/osmo_bsc_rf.h @@ -1,7 +1,7 @@ #ifndef OSMO_BSC_RF #define OSMO_BSC_RF -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/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/bsc/osmo_bsc_sigtran.h similarity index 95% rename from include/openbsc/osmo_bsc_sigtran.h rename to include/osmocom/bsc/osmo_bsc_sigtran.h index fbcfcb3..8964903 100644 --- a/include/openbsc/osmo_bsc_sigtran.h +++ b/include/osmocom/bsc/osmo_bsc_sigtran.h @@ -20,8 +20,8 @@ #pragma once -#include <openbsc/gsm_data.h> -#include <openbsc/bsc_msc_data.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/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/bsc/osmo_msc.h similarity index 98% rename from include/openbsc/osmo_msc.h rename to include/osmocom/bsc/osmo_msc.h index cdfd27f..c08cb26 100644 --- a/include/openbsc/osmo_msc.h +++ b/include/osmocom/bsc/osmo_msc.h @@ -6,7 +6,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/gsm/gsup.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include "bsc_api.h" diff --git a/include/openbsc/osmux.h b/include/osmocom/bsc/osmux.h similarity index 100% rename from include/openbsc/osmux.h rename to include/osmocom/bsc/osmux.h diff --git a/include/openbsc/paging.h b/include/osmocom/bsc/paging.h similarity index 96% rename from include/openbsc/paging.h rename to include/osmocom/bsc/paging.h index 7dd8500..e917772 100644 --- a/include/openbsc/paging.h +++ b/include/osmocom/bsc/paging.h @@ -26,8 +26,8 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/timer.h> -#include <openbsc/gsm_data.h> -#include <openbsc/bsc_subscriber.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/bsc_subscriber.h> /** * A pending paging request diff --git a/include/openbsc/pcu_if.h b/include/osmocom/bsc/pcu_if.h similarity index 100% rename from include/openbsc/pcu_if.h rename to include/osmocom/bsc/pcu_if.h diff --git a/include/openbsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h similarity index 100% rename from include/openbsc/pcuif_proto.h rename to include/osmocom/bsc/pcuif_proto.h diff --git a/include/openbsc/rest_octets.h b/include/osmocom/bsc/rest_octets.h similarity index 100% rename from include/openbsc/rest_octets.h rename to include/osmocom/bsc/rest_octets.h diff --git a/include/openbsc/rrlp.h b/include/osmocom/bsc/rrlp.h similarity index 100% rename from include/openbsc/rrlp.h rename to include/osmocom/bsc/rrlp.h diff --git a/include/openbsc/rs232.h b/include/osmocom/bsc/rs232.h similarity index 100% rename from include/openbsc/rs232.h rename to include/osmocom/bsc/rs232.h diff --git a/include/openbsc/rtp_proxy.h b/include/osmocom/bsc/rtp_proxy.h similarity index 98% rename from include/openbsc/rtp_proxy.h rename to include/osmocom/bsc/rtp_proxy.h index 52ffefd..918420c 100644 --- a/include/openbsc/rtp_proxy.h +++ b/include/osmocom/bsc/rtp_proxy.h @@ -27,7 +27,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/select.h> -#include <openbsc/mncc.h> +#include <osmocom/bsc/mncc.h> #define RTP_PT_GSM_FULL 3 #define RTP_PT_GSM_HALF 96 diff --git a/include/openbsc/sgsn.h b/include/osmocom/bsc/sgsn.h similarity index 97% rename from include/openbsc/sgsn.h rename to include/osmocom/bsc/sgsn.h index f371dc6..f71b649 100644 --- a/include/openbsc/sgsn.h +++ b/include/osmocom/bsc/sgsn.h @@ -5,9 +5,9 @@ #include <osmocom/core/msgb.h> #include <osmocom/crypt/gprs_cipher.h> #include <osmocom/gprs/gprs_ns.h> -#include <openbsc/gprs_sgsn.h> -#include <openbsc/oap_client.h> -#include <openbsc/common.h> +#include <osmocom/bsc/gprs_sgsn.h> +#include <osmocom/bsc/oap_client.h> +#include <osmocom/bsc/common.h> #include <ares.h> diff --git a/include/openbsc/signal.h b/include/osmocom/bsc/signal.h similarity index 99% rename from include/openbsc/signal.h rename to include/osmocom/bsc/signal.h index 49f86d6..feab246 100644 --- a/include/openbsc/signal.h +++ b/include/osmocom/bsc/signal.h @@ -25,7 +25,7 @@ #include <stdlib.h> #include <errno.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/core/signal.h> diff --git a/include/openbsc/silent_call.h b/include/osmocom/bsc/silent_call.h similarity index 100% rename from include/openbsc/silent_call.h rename to include/osmocom/bsc/silent_call.h diff --git a/include/openbsc/smpp.h b/include/osmocom/bsc/smpp.h similarity index 100% rename from include/openbsc/smpp.h rename to include/osmocom/bsc/smpp.h diff --git a/include/openbsc/sms_queue.h b/include/osmocom/bsc/sms_queue.h similarity index 100% rename from include/openbsc/sms_queue.h rename to include/osmocom/bsc/sms_queue.h diff --git a/include/openbsc/socket.h b/include/osmocom/bsc/socket.h similarity index 100% rename from include/openbsc/socket.h rename to include/osmocom/bsc/socket.h diff --git a/include/openbsc/system_information.h b/include/osmocom/bsc/system_information.h similarity index 94% rename from include/openbsc/system_information.h rename to include/osmocom/bsc/system_information.h index 71bea26..29f639d 100644 --- a/include/openbsc/system_information.h +++ b/include/osmocom/bsc/system_information.h @@ -3,7 +3,7 @@ #include <osmocom/gsm/sysinfo.h> -#include <openbsc/arfcn_range_encode.h> +#include <osmocom/bsc/arfcn_range_encode.h> struct gsm_bts; diff --git a/include/openbsc/transaction.h b/include/osmocom/bsc/transaction.h similarity index 95% rename from include/openbsc/transaction.h rename to include/osmocom/bsc/transaction.h index 1e93fff..5465548 100644 --- a/include/openbsc/transaction.h +++ b/include/osmocom/bsc/transaction.h @@ -1,10 +1,10 @@ #ifndef _TRANSACT_H #define _TRANSACT_H -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/gsm_subscriber.h> #include <osmocom/core/linuxlist.h> -#include <openbsc/mncc.h> +#include <osmocom/bsc/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/bsc/trau_mux.h similarity index 97% rename from include/openbsc/trau_mux.h rename to include/osmocom/bsc/trau_mux.h index 75c359b..eeceff5 100644 --- a/include/openbsc/trau_mux.h +++ b/include/osmocom/bsc/trau_mux.h @@ -29,8 +29,8 @@ */ #include <stdint.h> -#include <openbsc/gsm_data.h> -#include <openbsc/mncc.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/mncc.h> struct decoded_trau_frame; diff --git a/include/openbsc/trau_upqueue.h b/include/osmocom/bsc/trau_upqueue.h similarity index 100% rename from include/openbsc/trau_upqueue.h rename to include/osmocom/bsc/trau_upqueue.h diff --git a/include/openbsc/ussd.h b/include/osmocom/bsc/ussd.h similarity index 100% rename from include/openbsc/ussd.h rename to include/osmocom/bsc/ussd.h diff --git a/include/openbsc/vty.h b/include/osmocom/bsc/vty.h similarity index 100% rename from include/openbsc/vty.h rename to include/osmocom/bsc/vty.h diff --git a/src/ipaccess/abisip-find.c b/src/ipaccess/abisip-find.c index 21d9f22..c459161 100644 --- a/src/ipaccess/abisip-find.c +++ b/src/ipaccess/abisip-find.c @@ -30,7 +30,7 @@ #include <osmocom/core/timer.h> #include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/gsm/ipa.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> static int udp_sock(const char *ifname) { diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 6822c06..c68e3ea 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -37,19 +37,19 @@ #include <osmocom/core/application.h> #include <osmocom/core/select.h> #include <osmocom/core/timer.h> -#include <openbsc/ipaccess.h> -#include <openbsc/common_bsc.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/common_bsc.h> #include <osmocom/abis/e1_input.h> -#include <openbsc/abis_nm.h> -#include <openbsc/signal.h> -#include <openbsc/debug.h> -#include <openbsc/network_listen.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/network_listen.h> #include <osmocom/abis/ipaccess.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_nm.h> -#include <openbsc/signal.h> -#include <openbsc/debug.h> -#include <openbsc/network_listen.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/network_listen.h> #include <osmocom/core/talloc.h> #include <osmocom/abis/abis.h> #include <osmocom/gsm/protocol/gsm_12_21.h> diff --git a/src/ipaccess/ipaccess-firmware.c b/src/ipaccess/ipaccess-firmware.c index 5f55bb5..515cc75 100644 --- a/src/ipaccess/ipaccess-firmware.c +++ b/src/ipaccess/ipaccess-firmware.c @@ -18,8 +18,8 @@ * */ -#include <openbsc/debug.h> -#include <openbsc/ipaccess.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/ipaccess.h> #include <osmocom/core/talloc.h> #include <stdio.h> diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index d367442..b45b543 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -37,7 +37,7 @@ #define _GNU_SOURCE #include <getopt.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/core/application.h> #include <osmocom/core/select.h> #include <osmocom/gsm/tlv.h> @@ -45,9 +45,9 @@ #include <osmocom/gsm/ipa.h> #include <osmocom/abis/ipa.h> #include <osmocom/abis/ipaccess.h> -#include <openbsc/debug.h> -#include <openbsc/ipaccess.h> -#include <openbsc/socket.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/socket.h> #include <osmocom/core/talloc.h> /* one instance of an ip.access protocol proxy */ diff --git a/src/ipaccess/network_listen.c b/src/ipaccess/network_listen.c index 3b44ceb..dd6cb4b 100644 --- a/src/ipaccess/network_listen.c +++ b/src/ipaccess/network_listen.c @@ -33,10 +33,10 @@ #include <osmocom/gsm/rxlev_stat.h> #include <osmocom/gsm/gsm48_ie.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_nm.h> -#include <openbsc/signal.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/debug.h> #include <osmocom/abis/e1_input.h> #define WHITELIST_MAX_SIZE ((NUM_ARFCNS*2)+2+1) diff --git a/src/libbsc/abis_nm.c b/src/libbsc/abis_nm.c index cf20d7c..3a48dee 100644 --- a/src/libbsc/abis_nm.c +++ b/src/libbsc/abis_nm.c @@ -34,17 +34,17 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <openbsc/gsm_data.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/debug.h> #include <osmocom/core/msgb.h> #include <osmocom/gsm/protocol/gsm_12_21.h> #include <osmocom/gsm/tlv.h> #include <osmocom/gsm/abis_nm.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> -#include <openbsc/abis_nm.h> -#include <openbsc/misdn.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/misdn.h> +#include <osmocom/bsc/signal.h> #include <osmocom/abis/e1_input.h> #define OM_ALLOC_SIZE 1024 diff --git a/src/libbsc/abis_nm_vty.c b/src/libbsc/abis_nm_vty.c index 6ec0a4a..a0d72c2 100644 --- a/src/libbsc/abis_nm_vty.c +++ b/src/libbsc/abis_nm_vty.c @@ -28,14 +28,14 @@ #include <osmocom/gsm/abis_nm.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> #include <osmocom/core/talloc.h> -#include <openbsc/debug.h> -#include <openbsc/signal.h> -#include <openbsc/abis_nm.h> -#include <openbsc/vty.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/vty.h> #include <osmocom/vty/vty.h> #include <osmocom/vty/command.h> diff --git a/src/libbsc/abis_om2000.c b/src/libbsc/abis_om2000.c index 82a14b2..756cc89 100644 --- a/src/libbsc/abis_om2000.c +++ b/src/libbsc/abis_om2000.c @@ -36,12 +36,12 @@ #include <osmocom/core/utils.h> #include <osmocom/core/fsm.h> -#include <openbsc/gsm_data.h> -#include <openbsc/debug.h> -#include <openbsc/abis_nm.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/abis_om2000.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/abis_om2000.h> +#include <osmocom/bsc/signal.h> #include <osmocom/abis/e1_input.h> /* FIXME: move to libosmocore */ diff --git a/src/libbsc/abis_om2000_vty.c b/src/libbsc/abis_om2000_vty.c index a6bc4c7..b75d420 100644 --- a/src/libbsc/abis_om2000_vty.c +++ b/src/libbsc/abis_om2000_vty.c @@ -26,14 +26,14 @@ #include <arpa/inet.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> #include <osmocom/core/talloc.h> -#include <openbsc/debug.h> -#include <openbsc/signal.h> -#include <openbsc/abis_om2000.h> -#include <openbsc/vty.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/abis_om2000.h> +#include <osmocom/bsc/vty.h> #include <osmocom/vty/vty.h> #include <osmocom/vty/command.h> diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index 75229a5..09fb14b 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -27,26 +27,26 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/gsm_04_08_utils.h> #include <osmocom/gsm/gsm_utils.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/bsc_rll.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/chan_alloc.h> +#include <osmocom/bsc/bsc_rll.h> +#include <osmocom/bsc/debug.h> #include <osmocom/gsm/tlv.h> #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/protocol/gsm_08_58.h> -#include <openbsc/paging.h> -#include <openbsc/signal.h> -#include <openbsc/meas_rep.h> -#include <openbsc/rtp_proxy.h> -#include <openbsc/gsm_subscriber.h> +#include <osmocom/bsc/paging.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/meas_rep.h> +#include <osmocom/bsc/rtp_proxy.h> +#include <osmocom/bsc/gsm_subscriber.h> #include <osmocom/abis/e1_input.h> #include <osmocom/gsm/rsl.h> #include <osmocom/core/talloc.h> -#include <openbsc/pcu_if.h> -#include <openbsc/bsc_api.h> +#include <osmocom/bsc/pcu_if.h> +#include <osmocom/bsc/bsc_api.h> #define RSL_ALLOC_SIZE 1024 #define RSL_ALLOC_HEADROOM 128 diff --git a/src/libbsc/arfcn_range_encode.c b/src/libbsc/arfcn_range_encode.c index 9ca4840..ae99fd9 100644 --- a/src/libbsc/arfcn_range_encode.c +++ b/src/libbsc/arfcn_range_encode.c @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <openbsc/arfcn_range_encode.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/arfcn_range_encode.h> +#include <osmocom/bsc/debug.h> #include <osmocom/gsm/protocol/gsm_04_08.h> diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index a0ba69a..b42c382 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -21,17 +21,17 @@ * */ -#include <openbsc/bsc_api.h> -#include <openbsc/bsc_rll.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/signal.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/handover.h> -#include <openbsc/debug.h> -#include <openbsc/trau_mux.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/bsc_api.h> +#include <osmocom/bsc/bsc_rll.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/gsm_subscriber.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/chan_alloc.h> +#include <osmocom/bsc/handover.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/trau_mux.h> +#include <osmocom/bsc/gsm_04_08_utils.h> #include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/gsm/gsm48.h> diff --git a/src/libbsc/bsc_ctrl_commands.c b/src/libbsc/bsc_ctrl_commands.c index 641fe2b..7c2bfb5 100644 --- a/src/libbsc/bsc_ctrl_commands.c +++ b/src/libbsc/bsc_ctrl_commands.c @@ -22,13 +22,13 @@ #include <time.h> #include <osmocom/ctrl/control_cmd.h> -#include <openbsc/ipaccess.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_nm.h> -#include <openbsc/debug.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/osmo_bsc_rf.h> -#include <openbsc/bsc_msc_data.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/chan_alloc.h> +#include <osmocom/bsc/osmo_bsc_rf.h> +#include <osmocom/bsc/bsc_msc_data.h> #define CTRL_CMD_VTY_STRING(cmdname, cmdstr, dtype, element) \ CTRL_HELPER_GET_STRING(cmdname, dtype, element) \ diff --git a/src/libbsc/bsc_ctrl_lookup.c b/src/libbsc/bsc_ctrl_lookup.c index a8a8cf5..d1d9b0a 100644 --- a/src/libbsc/bsc_ctrl_lookup.c +++ b/src/libbsc/bsc_ctrl_lookup.c @@ -25,8 +25,8 @@ #include <osmocom/vty/command.h> #include <osmocom/ctrl/control_if.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> extern vector ctrl_node_vec; diff --git a/src/libbsc/bsc_dyn_ts.c b/src/libbsc/bsc_dyn_ts.c index e5422fc..aa3c252 100644 --- a/src/libbsc/bsc_dyn_ts.c +++ b/src/libbsc/bsc_dyn_ts.c @@ -19,9 +19,9 @@ */ #include <osmocom/core/logging.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_rsl.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_rsl.h> void tchf_pdch_ts_init(struct gsm_bts_trx_ts *ts) { diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index a99eea2..5b6530d 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -19,25 +19,25 @@ * */ -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/gsm/gsm_utils.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/abis_nm.h> -#include <openbsc/debug.h> -#include <openbsc/misdn.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/misdn.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/ports.h> -#include <openbsc/system_information.h> -#include <openbsc/paging.h> -#include <openbsc/signal.h> -#include <openbsc/chan_alloc.h> +#include <osmocom/bsc/system_information.h> +#include <osmocom/bsc/paging.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/chan_alloc.h> #include <osmocom/core/talloc.h> -#include <openbsc/ipaccess.h> +#include <osmocom/bsc/ipaccess.h> #include <osmocom/gsm/sysinfo.h> -#include <openbsc/e1_config.h> -#include <openbsc/common_bsc.h> -#include <openbsc/pcu_if.h> -#include <openbsc/osmo_msc.h> +#include <osmocom/bsc/e1_config.h> +#include <osmocom/bsc/common_bsc.h> +#include <osmocom/bsc/pcu_if.h> +#include <osmocom/bsc/osmo_msc.h> #include <limits.h> /* global pointer to the gsm network data structure */ diff --git a/src/libbsc/bsc_msc.c b/src/libbsc/bsc_msc.c index 82a572d..648b3e6 100644 --- a/src/libbsc/bsc_msc.c +++ b/src/libbsc/bsc_msc.c @@ -19,8 +19,8 @@ * */ -#include <openbsc/bsc_msc.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/bsc_msc.h> +#include <osmocom/bsc/debug.h> #include <osmocom/abis/ipaccess.h> #include <osmocom/core/write_queue.h> diff --git a/src/libbsc/bsc_rf_ctrl.c b/src/libbsc/bsc_rf_ctrl.c index b7b6fc8..20115e1 100644 --- a/src/libbsc/bsc_rf_ctrl.c +++ b/src/libbsc/bsc_rf_ctrl.c @@ -20,12 +20,12 @@ * */ -#include <openbsc/osmo_bsc_rf.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/signal.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/ipaccess.h> +#include <osmocom/bsc/osmo_bsc_rf.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/ipaccess.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> diff --git a/src/libbsc/bsc_rll.c b/src/libbsc/bsc_rll.c index bb488da..ebf9b88 100644 --- a/src/libbsc/bsc_rll.c +++ b/src/libbsc/bsc_rll.c @@ -22,15 +22,15 @@ #include <errno.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/debug.h> #include <osmocom/core/talloc.h> #include <osmocom/core/timer.h> #include <osmocom/core/linuxlist.h> -#include <openbsc/bsc_rll.h> -#include <openbsc/gsm_data.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/bsc_rll.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/chan_alloc.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/signal.h> struct bsc_rll_req { struct llist_head list; diff --git a/src/libbsc/bsc_subscriber.c b/src/libbsc/bsc_subscriber.c index 73e61e8..d9d90ba 100644 --- a/src/libbsc/bsc_subscriber.c +++ b/src/libbsc/bsc_subscriber.c @@ -29,8 +29,8 @@ #include <osmocom/gsm/gsm48.h> #include <osmocom/core/logging.h> -#include <openbsc/bsc_subscriber.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/bsc_subscriber.h> +#include <osmocom/bsc/debug.h> static struct bsc_subscr *bsc_subscr_alloc(struct llist_head *list) { diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index abfff0c..42c16e8 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -36,28 +36,28 @@ #include <arpa/inet.h> #include <osmocom/core/linuxlist.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/abis/e1_input.h> -#include <openbsc/abis_nm.h> -#include <openbsc/abis_om2000.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/abis_om2000.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/abis_nm.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/meas_rep.h> -#include <openbsc/vty.h> +#include <osmocom/bsc/chan_alloc.h> +#include <osmocom/bsc/meas_rep.h> +#include <osmocom/bsc/vty.h> #include <osmocom/gprs/gprs_ns.h> -#include <openbsc/system_information.h> -#include <openbsc/debug.h> -#include <openbsc/paging.h> -#include <openbsc/ipaccess.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/osmo_bsc_rf.h> -#include <openbsc/pcu_if.h> -#include <openbsc/common_cs.h> -#include <openbsc/handover.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/system_information.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/paging.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/osmo_bsc_rf.h> +#include <osmocom/bsc/pcu_if.h> +#include <osmocom/bsc/common_cs.h> +#include <osmocom/bsc/handover.h> +#include <osmocom/bsc/gsm_04_08_utils.h> #include <inttypes.h> diff --git a/src/libbsc/bts_ericsson_rbs2000.c b/src/libbsc/bts_ericsson_rbs2000.c index 99da4e7..5ee2760 100644 --- a/src/libbsc/bts_ericsson_rbs2000.c +++ b/src/libbsc/bts_ericsson_rbs2000.c @@ -22,12 +22,12 @@ #include <osmocom/gsm/tlv.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_om2000.h> -#include <openbsc/abis_nm.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_om2000.h> +#include <osmocom/bsc/abis_nm.h> #include <osmocom/abis/e1_input.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/signal.h> #include <osmocom/abis/lapd.h> diff --git a/src/libbsc/bts_init.c b/src/libbsc/bts_init.c index d6b152a..18f1ed4 100644 --- a/src/libbsc/bts_init.c +++ b/src/libbsc/bts_init.c @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -#include <openbsc/bss.h> +#include <osmocom/bsc/bss.h> int bts_init(void) { diff --git a/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c index a1bde77..1f203f5 100644 --- a/src/libbsc/bts_ipaccess_nanobts.c +++ b/src/libbsc/bts_ipaccess_nanobts.c @@ -23,23 +23,23 @@ #include <osmocom/gsm/tlv.h> -#include <openbsc/gsm_data.h> -#include <openbsc/signal.h> -#include <openbsc/abis_nm.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/abis_nm.h> #include <osmocom/abis/e1_input.h> #include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_nm.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/debug.h> #include <osmocom/abis/subchan_demux.h> #include <osmocom/gsm/ipa.h> #include <osmocom/abis/ipaccess.h> #include <osmocom/core/logging.h> -#include <openbsc/ipaccess.h> -#include <openbsc/bts_ipaccess_nanobts_omlattr.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h> extern struct gsm_network *bsc_gsmnet; diff --git a/src/libbsc/bts_ipaccess_nanobts_omlattr.c b/src/libbsc/bts_ipaccess_nanobts_omlattr.c index 473e1ca..22ae484 100644 --- a/src/libbsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/libbsc/bts_ipaccess_nanobts_omlattr.c @@ -21,8 +21,8 @@ #include <arpa/inet.h> #include <osmocom/core/msgb.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_nm.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_nm.h> static void patch_16(uint8_t *data, const uint16_t val) { diff --git a/src/libbsc/bts_nokia_site.c b/src/libbsc/bts_nokia_site.c index 3ca76c0..392cd17 100644 --- a/src/libbsc/bts_nokia_site.c +++ b/src/libbsc/bts_nokia_site.c @@ -30,11 +30,11 @@ #include <osmocom/gsm/tlv.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_nm.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_nm.h> #include <osmocom/abis/e1_input.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/signal.h> #include <osmocom/core/timer.h> diff --git a/src/libbsc/bts_siemens_bs11.c b/src/libbsc/bts_siemens_bs11.c index c083b1e..e01c258 100644 --- a/src/libbsc/bts_siemens_bs11.c +++ b/src/libbsc/bts_siemens_bs11.c @@ -22,11 +22,11 @@ #include <osmocom/gsm/tlv.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_nm.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_nm.h> #include <osmocom/abis/e1_input.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/signal.h> static int bts_model_bs11_start(struct gsm_network *net); diff --git a/src/libbsc/bts_sysmobts.c b/src/libbsc/bts_sysmobts.c index e4b6cdc..2982074 100644 --- a/src/libbsc/bts_sysmobts.c +++ b/src/libbsc/bts_sysmobts.c @@ -23,17 +23,17 @@ #include <osmocom/gsm/tlv.h> -#include <openbsc/gsm_data.h> -#include <openbsc/signal.h> -#include <openbsc/abis_nm.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/abis_nm.h> #include <osmocom/abis/e1_input.h> #include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_nm.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/debug.h> #include <osmocom/abis/subchan_demux.h> #include <osmocom/abis/ipaccess.h> #include <osmocom/core/logging.h> diff --git a/src/libbsc/bts_unknown.c b/src/libbsc/bts_unknown.c index f113529..5ecf875 100644 --- a/src/libbsc/bts_unknown.c +++ b/src/libbsc/bts_unknown.c @@ -20,9 +20,9 @@ */ -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/gsm/tlv.h> -#include <openbsc/abis_nm.h> +#include <osmocom/bsc/abis_nm.h> static struct gsm_bts_model model_unknown = { .type = GSM_BTS_TYPE_UNKNOWN, diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index 4192d65..679ad42 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -25,14 +25,14 @@ #include <string.h> #include <errno.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/abis_nm.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/debug.h> -#include <openbsc/rtp_proxy.h> -#include <openbsc/signal.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/gsm_subscriber.h> +#include <osmocom/bsc/chan_alloc.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/rtp_proxy.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/gsm_04_08_utils.h> #include <osmocom/core/talloc.h> diff --git a/src/libbsc/e1_config.c b/src/libbsc/e1_config.c index d57dec5..1923efd 100644 --- a/src/libbsc/e1_config.c +++ b/src/libbsc/e1_config.c @@ -23,15 +23,15 @@ #include <netinet/in.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/abis/e1_input.h> #include <osmocom/abis/trau_frame.h> -#include <openbsc/trau_mux.h> -#include <openbsc/misdn.h> +#include <osmocom/bsc/trau_mux.h> +#include <osmocom/bsc/misdn.h> #include <osmocom/abis/ipaccess.h> #include <osmocom/core/talloc.h> -#include <openbsc/debug.h> -#include <openbsc/abis_rsl.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/abis_rsl.h> #define SAPI_L2ML 0 #define SAPI_OML 62 diff --git a/src/libbsc/gsm_04_08_utils.c b/src/libbsc/gsm_04_08_utils.c index 109beda..7fc696f 100644 --- a/src/libbsc/gsm_04_08_utils.c +++ b/src/libbsc/gsm_04_08_utils.c @@ -30,13 +30,13 @@ #include <osmocom/core/msgb.h> #include <osmocom/gsm/gsm48.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/debug.h> -#include <openbsc/transaction.h> -#include <openbsc/paging.h> -#include <openbsc/signal.h> -#include <openbsc/bsc_api.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/transaction.h> +#include <osmocom/bsc/paging.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/bsc_api.h> +#include <osmocom/bsc/gsm_04_08_utils.h> /* should ip.access BTS use direct RTP streams between each other (1), * or should OpenBSC always act as RTP relay/proxy in between (0) ? */ diff --git a/src/libbsc/gsm_04_80_utils.c b/src/libbsc/gsm_04_80_utils.c index e0db81e..d67f3c5 100644 --- a/src/libbsc/gsm_04_80_utils.c +++ b/src/libbsc/gsm_04_80_utils.c @@ -20,7 +20,7 @@ */ #include <osmocom/gsm/gsm0480.h> -#include <openbsc/bsc_api.h> +#include <osmocom/bsc/bsc_api.h> int bsc_send_ussd_notify(struct gsm_subscriber_connection *conn, int level, const char *text) diff --git a/src/libbsc/handover_decision.c b/src/libbsc/handover_decision.c index 8d7e047..09c7eaa 100644 --- a/src/libbsc/handover_decision.c +++ b/src/libbsc/handover_decision.c @@ -25,12 +25,12 @@ #include <errno.h> #include <osmocom/core/msgb.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/meas_rep.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/meas_rep.h> +#include <osmocom/bsc/signal.h> #include <osmocom/core/talloc.h> -#include <openbsc/handover.h> +#include <osmocom/bsc/handover.h> #include <osmocom/gsm/gsm_utils.h> /* Get reference to a neighbor cell on a given BCCH ARFCN */ diff --git a/src/libbsc/handover_logic.c b/src/libbsc/handover_logic.c index 8ced74f..ace8ac3 100644 --- a/src/libbsc/handover_logic.c +++ b/src/libbsc/handover_logic.c @@ -29,18 +29,18 @@ #include <netinet/in.h> #include <osmocom/core/msgb.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/gsm/gsm_utils.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/gsm_subscriber.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/chan_alloc.h> +#include <osmocom/bsc/signal.h> #include <osmocom/core/talloc.h> -#include <openbsc/transaction.h> -#include <openbsc/trau_mux.h> -#include <openbsc/bsc_subscriber.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/transaction.h> +#include <osmocom/bsc/trau_mux.h> +#include <osmocom/bsc/bsc_subscriber.h> +#include <osmocom/bsc/gsm_04_08_utils.h> struct bsc_handover { struct llist_head list; diff --git a/src/libbsc/meas_proc.c b/src/libbsc/meas_proc.c index 5b97e74..efc3fd0 100644 --- a/src/libbsc/meas_proc.c +++ b/src/libbsc/meas_proc.c @@ -24,10 +24,10 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/msgb.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/meas_rep.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/meas_rep.h> +#include <osmocom/bsc/signal.h> /* process an already parsed measurement report */ static int process_meas_rep(struct gsm_meas_rep *mr) diff --git a/src/libbsc/meas_rep.c b/src/libbsc/meas_rep.c index 808103d..cb8379e 100644 --- a/src/libbsc/meas_rep.c +++ b/src/libbsc/meas_rep.c @@ -20,8 +20,8 @@ */ -#include <openbsc/gsm_data.h> -#include <openbsc/meas_rep.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/meas_rep.h> static int get_field(const struct gsm_meas_rep *rep, enum meas_rep_field field) diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c index 0dd3753..a71662c 100644 --- a/src/libbsc/net_init.c +++ b/src/libbsc/net_init.c @@ -17,10 +17,10 @@ * */ -#include <openbsc/common_cs.h> -#include <openbsc/osmo_bsc.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/common_cs.h> +#include <osmocom/bsc/osmo_bsc.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/gsm_04_08_utils.h> struct gsm_network *bsc_network_init(void *ctx, uint16_t country_code, diff --git a/src/libbsc/paging.c b/src/libbsc/paging.c index 02212a3..b8f9043 100644 --- a/src/libbsc/paging.c +++ b/src/libbsc/paging.c @@ -42,14 +42,14 @@ #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/gsm0502.h> -#include <openbsc/bsc_subscriber.h> -#include <openbsc/paging.h> -#include <openbsc/debug.h> -#include <openbsc/signal.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/gsm_data.h> -#include <openbsc/chan_alloc.h> -#include <openbsc/bsc_api.h> +#include <osmocom/bsc/bsc_subscriber.h> +#include <osmocom/bsc/paging.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/chan_alloc.h> +#include <osmocom/bsc/bsc_api.h> void *tall_paging_ctx; diff --git a/src/libbsc/pcu_sock.c b/src/libbsc/pcu_sock.c index 98e12fa..40dd68d 100644 --- a/src/libbsc/pcu_sock.c +++ b/src/libbsc/pcu_sock.c @@ -37,12 +37,12 @@ #include <osmocom/gsm/l1sap.h> #include <osmocom/gsm/gsm0502.h> -#include <openbsc/gsm_data.h> -#include <openbsc/pcu_if.h> -#include <openbsc/pcuif_proto.h> -#include <openbsc/signal.h> -#include <openbsc/debug.h> -#include <openbsc/abis_rsl.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/pcu_if.h> +#include <osmocom/bsc/pcuif_proto.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/abis_rsl.h> static int pcu_sock_send(struct gsm_bts *bts, struct msgb *msg); uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx); diff --git a/src/libbsc/rest_octets.c b/src/libbsc/rest_octets.c index fdab70a..ae04225 100644 --- a/src/libbsc/rest_octets.c +++ b/src/libbsc/rest_octets.c @@ -26,13 +26,13 @@ #include <errno.h> #include <stdbool.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/core/bitvec.h> #include <osmocom/gsm/bitvec_gsm.h> -#include <openbsc/rest_octets.h> -#include <openbsc/arfcn_range_encode.h> -#include <openbsc/system_information.h> +#include <osmocom/bsc/rest_octets.h> +#include <osmocom/bsc/arfcn_range_encode.h> +#include <osmocom/bsc/system_information.h> /* generate SI1 rest octets */ int rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net) diff --git a/src/libbsc/system_information.c b/src/libbsc/system_information.c index fe0b23d..c0df8bb 100644 --- a/src/libbsc/system_information.c +++ b/src/libbsc/system_information.c @@ -33,12 +33,12 @@ #include <osmocom/gsm/gsm48_ie.h> #include <osmocom/gsm/gsm48.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/rest_octets.h> -#include <openbsc/arfcn_range_encode.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/rest_octets.h> +#include <osmocom/bsc/arfcn_range_encode.h> +#include <osmocom/bsc/gsm_04_08_utils.h> /* * DCS1800 and PCS1900 have overlapping ARFCNs. We would need to set the diff --git a/src/libcommon-cs/a_reset.c b/src/libcommon-cs/a_reset.c index c0294c7..c40bc41 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/bsc/debug.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/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 fbcfa1d..16d51a1 100644 --- a/src/libcommon-cs/common_cs.c +++ b/src/libcommon-cs/common_cs.c @@ -25,11 +25,11 @@ #include <osmocom/gsm/gsm0480.h> #include <osmocom/gsm/gsm48.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_08_utils.h> +#include <osmocom/bsc/common_cs.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/gsm_subscriber.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/gsm_04_08_utils.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..fd10836 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/bsc/vty.h> -#include <openbsc/gsm_data.h> -#include <openbsc/gsm_subscriber.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/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 1443791..d4d5fb5 100644 --- a/src/libcommon/common_vty.c +++ b/src/libcommon/common_vty.c @@ -23,12 +23,12 @@ #include <osmocom/core/talloc.h> -#include <openbsc/vty.h> -#include <openbsc/gsm_data.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/bsc_nat.h> -#include <openbsc/abis_om2000.h> +#include <osmocom/bsc/vty.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_subscriber.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/abis_om2000.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..68fc597 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/bsc/gsm_data.h> +#include <osmocom/bsc/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 077029a..e085aa6 100644 --- a/src/libcommon/gsm_data.c +++ b/src/libcommon/gsm_data.c @@ -34,9 +34,9 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/gsm48.h> -#include <openbsc/gsm_data.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/abis_nm.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/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..84a71cb 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/bsc/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 a2f6b2d..a746c24 100644 --- a/src/libcommon/gsm_subscriber_base.c +++ b/src/libcommon/gsm_subscriber_base.c @@ -29,8 +29,8 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/gsm_subscriber.h> +#include <osmocom/bsc/debug.h> LLIST_HEAD(active_subscribers); void *tall_subscr_ctx; diff --git a/src/libcommon/socket.c b/src/libcommon/socket.c index 2a64767..78aacdb 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/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/core/talloc.h> int make_sock(struct osmo_fd *bfd, int proto, diff --git a/src/libfilter/bsc_msg_acc.c b/src/libfilter/bsc_msg_acc.c index a42206d..d7b737b 100644 --- a/src/libfilter/bsc_msg_acc.c +++ b/src/libfilter/bsc_msg_acc.c @@ -18,9 +18,9 @@ * */ -#include <openbsc/bsc_msg_filter.h> -#include <openbsc/bsc_nat.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/bsc_msg_filter.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/debug.h> #include <osmocom/core/rate_ctr.h> #include <osmocom/core/stats.h> diff --git a/src/libfilter/bsc_msg_filter.c b/src/libfilter/bsc_msg_filter.c index 338db72..fc87e88 100644 --- a/src/libfilter/bsc_msg_filter.c +++ b/src/libfilter/bsc_msg_filter.c @@ -21,14 +21,14 @@ * */ -#include <openbsc/bsc_msg_filter.h> +#include <osmocom/bsc/bsc_msg_filter.h> -#include <openbsc/bsc_nat.h> -#include <openbsc/bsc_msc.h> -#include <openbsc/gsm_data.h> -#include <openbsc/debug.h> -#include <openbsc/ipaccess.h> -#include <openbsc/common_cs.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/bsc_msc.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/common_cs.h> #include <osmocom/core/talloc.h> #include <osmocom/gsm/gsm0808.h> diff --git a/src/libfilter/bsc_msg_vty.c b/src/libfilter/bsc_msg_vty.c index c342fdc..52e0da5 100644 --- a/src/libfilter/bsc_msg_vty.c +++ b/src/libfilter/bsc_msg_vty.c @@ -17,9 +17,9 @@ * */ -#include <openbsc/bsc_msg_filter.h> -#include <openbsc/gsm_data.h> -#include <openbsc/vty.h> +#include <osmocom/bsc/bsc_msg_filter.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/vty.h> #include <osmocom/vty/misc.h> diff --git a/src/libtrau/rtp_proxy.c b/src/libtrau/rtp_proxy.c index 6b38ee5..5b1ca79 100644 --- a/src/libtrau/rtp_proxy.c +++ b/src/libtrau/rtp_proxy.c @@ -30,13 +30,13 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/core/msgb.h> #include <osmocom/core/select.h> -#include <openbsc/debug.h> -#include <openbsc/rtp_proxy.h> -#include <openbsc/mncc.h> -#include <openbsc/trau_upqueue.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/rtp_proxy.h> +#include <osmocom/bsc/mncc.h> +#include <osmocom/bsc/trau_upqueue.h> #include <osmocom/netif/rtp.h> diff --git a/src/libtrau/trau_mux.c b/src/libtrau/trau_mux.c index b37c765..e570b93 100644 --- a/src/libtrau/trau_mux.c +++ b/src/libtrau/trau_mux.c @@ -22,16 +22,16 @@ #include <stdlib.h> #include <string.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/gsm_data.h> #include <osmocom/abis/trau_frame.h> -#include <openbsc/trau_mux.h> +#include <osmocom/bsc/trau_mux.h> #include <osmocom/abis/subchan_demux.h> #include <osmocom/abis/e1_input.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/debug.h> #include <osmocom/core/talloc.h> -#include <openbsc/trau_upqueue.h> +#include <osmocom/bsc/trau_upqueue.h> #include <osmocom/core/crcgen.h> -#include <openbsc/transaction.h> +#include <osmocom/bsc/transaction.h> /* this corresponds to the bit-lengths of the individual codec * parameters as indicated in Table 1.1 of TS 06.10 */ diff --git a/src/libtrau/trau_upqueue.c b/src/libtrau/trau_upqueue.c index f8edaf0..c1c0003 100644 --- a/src/libtrau/trau_upqueue.c +++ b/src/libtrau/trau_upqueue.c @@ -18,8 +18,8 @@ * */ -#include <openbsc/mncc.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/mncc.h> +#include <osmocom/bsc/gsm_data.h> void trau_tx_to_mncc(struct gsm_network *net, struct msgb *msg) { diff --git a/src/osmo-bsc/osmo_bsc_api.c b/src/osmo-bsc/osmo_bsc_api.c index 8e47069..c388f5b 100644 --- a/src/osmo-bsc/osmo_bsc_api.c +++ b/src/osmo-bsc/osmo_bsc_api.c @@ -17,12 +17,12 @@ * */ -#include <openbsc/osmo_bsc.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/osmo_bsc.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/debug.h> -#include <openbsc/gsm_04_80.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/gsm_04_80.h> +#include <osmocom/bsc/gsm_04_08_utils.h> #include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/gsm/gsm0808.h> @@ -30,7 +30,7 @@ #include <osmocom/gsm/gsm48.h> #include <osmocom/sccp/sccp.h> -#include <openbsc/osmo_bsc_sigtran.h> +#include <osmocom/bsc/osmo_bsc_sigtran.h> #define return_when_not_connected(conn) \ if (!conn->sccp_con) {\ diff --git a/src/osmo-bsc/osmo_bsc_audio.c b/src/osmo-bsc/osmo_bsc_audio.c index b4ffa88..94aa350 100644 --- a/src/osmo-bsc/osmo_bsc_audio.c +++ b/src/osmo-bsc/osmo_bsc_audio.c @@ -20,15 +20,15 @@ * */ -#include <openbsc/bsc_msc_data.h> -#include <openbsc/osmo_bsc.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/gsm_data.h> -#include <openbsc/debug.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/osmo_bsc.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/signal.h> #include <osmocom/gsm/gsm0808.h> #include <osmocom/gsm/gsm0808_utils.h> -#include <openbsc/osmo_bsc_sigtran.h> +#include <osmocom/bsc/osmo_bsc_sigtran.h> #include <arpa/inet.h> diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 3417783..4311250 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -18,22 +18,22 @@ * */ -#include <openbsc/osmo_bsc.h> -#include <openbsc/osmo_bsc_grace.h> -#include <openbsc/osmo_bsc_rf.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/debug.h> -#include <openbsc/bsc_subscriber.h> +#include <osmocom/bsc/osmo_bsc.h> +#include <osmocom/bsc/osmo_bsc_grace.h> +#include <osmocom/bsc/osmo_bsc_rf.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/bsc_subscriber.h> #include <osmocom/legacy_mgcp/mgcp.h> -#include <openbsc/paging.h> -#include <openbsc/gsm_04_08_utils.h> +#include <osmocom/bsc/paging.h> +#include <osmocom/bsc/gsm_04_08_utils.h> #include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/gsm/gsm0808.h> #include <osmocom/gsm/gsm0808_utils.h> #include <osmocom/gsm/gsm48.h> -#include <openbsc/osmo_bsc_sigtran.h> -#include <openbsc/a_reset.h> +#include <osmocom/bsc/osmo_bsc_sigtran.h> +#include <osmocom/bsc/a_reset.h> #include <osmocom/core/byteswap.h> #define IP_V4_ADDR_LEN 4 diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c index c23ed21..2446312 100644 --- a/src/osmo-bsc/osmo_bsc_ctrl.c +++ b/src/osmo-bsc/osmo_bsc_ctrl.c @@ -19,13 +19,13 @@ */ #include <osmocom/ctrl/control_cmd.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/osmo_bsc.h> -#include <openbsc/osmo_bsc_rf.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/signal.h> -#include <openbsc/gsm_04_80.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/osmo_bsc.h> +#include <osmocom/bsc/osmo_bsc_rf.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/gsm_04_80.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/signal.h> diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c index 2a9820d..7f9671a 100644 --- a/src/osmo-bsc/osmo_bsc_filter.c +++ b/src/osmo-bsc/osmo_bsc_filter.c @@ -19,13 +19,13 @@ #include <osmocom/gsm/gsm48.h> -#include <openbsc/osmo_bsc.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/gsm_04_80.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/bsc_subscriber.h> -#include <openbsc/debug.h> -#include <openbsc/paging.h> +#include <osmocom/bsc/osmo_bsc.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/gsm_04_80.h> +#include <osmocom/bsc/gsm_subscriber.h> +#include <osmocom/bsc/bsc_subscriber.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/paging.h> #include <stdlib.h> diff --git a/src/osmo-bsc/osmo_bsc_grace.c b/src/osmo-bsc/osmo_bsc_grace.c index 63afa20..a310079 100644 --- a/src/osmo-bsc/osmo_bsc_grace.c +++ b/src/osmo-bsc/osmo_bsc_grace.c @@ -18,13 +18,13 @@ * */ -#include <openbsc/osmo_bsc_grace.h> -#include <openbsc/osmo_bsc_rf.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/gsm_04_80.h> -#include <openbsc/bsc_subscriber.h> -#include <openbsc/paging.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/osmo_bsc_grace.h> +#include <osmocom/bsc/osmo_bsc_rf.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/gsm_04_80.h> +#include <osmocom/bsc/bsc_subscriber.h> +#include <osmocom/bsc/paging.h> +#include <osmocom/bsc/signal.h> int bsc_grace_allow_new_connection(struct gsm_network *network, struct gsm_bts *bts) { diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 61ef33c..5e8f45e 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -18,17 +18,17 @@ * */ -#include <openbsc/bss.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/osmo_bsc.h> -#include <openbsc/osmo_bsc_rf.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/signal.h> -#include <openbsc/vty.h> -#include <openbsc/ipaccess.h> -#include <openbsc/ctrl.h> -#include <openbsc/osmo_bsc_sigtran.h> +#include <osmocom/bsc/bss.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/osmo_bsc.h> +#include <osmocom/bsc/osmo_bsc_rf.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/vty.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/ctrl.h> +#include <osmocom/bsc/osmo_bsc_sigtran.h> #include <osmocom/ctrl/control_cmd.h> #include <osmocom/ctrl/control_if.h> diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index 351fd2c..0e5777e 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -20,15 +20,15 @@ * */ -#include <openbsc/bsc_nat.h> +#include <osmocom/bsc/bsc_nat.h> #include <osmocom/ctrl/control_cmd.h> #include <osmocom/ctrl/control_if.h> #include <osmocom/crypt/auth.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/ipaccess.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/signal.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/signal.h> #include <osmocom/core/talloc.h> diff --git a/src/osmo-bsc/osmo_bsc_reset.c b/src/osmo-bsc/osmo_bsc_reset.c index 0baf080..d28f548 100644 --- a/src/osmo-bsc/osmo_bsc_reset.c +++ b/src/osmo-bsc/osmo_bsc_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/bsc/debug.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/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/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 0f6ca33..48796c1 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -26,13 +26,13 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/gsm/gsm0808.h> #include <osmocom/core/msgb.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/debug.h> -#include <openbsc/osmo_bsc.h> -#include <openbsc/osmo_bsc_grace.h> -#include <openbsc/osmo_bsc_sigtran.h> -#include <openbsc/a_reset.h> -#include <openbsc/gsm_04_80.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/osmo_bsc.h> +#include <osmocom/bsc/osmo_bsc_grace.h> +#include <osmocom/bsc/osmo_bsc_sigtran.h> +#include <osmocom/bsc/a_reset.h> +#include <osmocom/bsc/gsm_04_80.h> /* A pointer to a list with all involved MSCs * (a copy of the pointer location submitted with osmo_bsc_sigtran_init() */ diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index 8edcbf3..0e7003f 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -18,13 +18,13 @@ * */ -#include <openbsc/gsm_data.h> -#include <openbsc/osmo_bsc.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/vty.h> -#include <openbsc/bsc_subscriber.h> -#include <openbsc/debug.h> -#include <openbsc/bsc_msg_filter.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/osmo_bsc.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/vty.h> +#include <osmocom/bsc/bsc_subscriber.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/bsc_msg_filter.h> #include <osmocom/core/talloc.h> #include <osmocom/vty/logging.h> diff --git a/src/osmo-bsc_nat/bsc_filter.c b/src/osmo-bsc_nat/bsc_filter.c index 6a9e99f..8d4a680 100644 --- a/src/osmo-bsc_nat/bsc_filter.c +++ b/src/osmo-bsc_nat/bsc_filter.c @@ -20,10 +20,10 @@ * */ -#include <openbsc/bsc_nat.h> -#include <openbsc/bsc_nat_sccp.h> -#include <openbsc/ipaccess.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/bsc_nat_sccp.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/debug.h> #include <osmocom/core/talloc.h> #include <osmocom/gsm/protocol/gsm_08_08.h> diff --git a/src/osmo-bsc_nat/bsc_mgcp_utils.c b/src/osmo-bsc_nat/bsc_mgcp_utils.c index 49050fc..bf6d0ad 100644 --- a/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -42,15 +42,15 @@ * */ -#include <openbsc/bsc_nat.h> -#include <openbsc/bsc_nat_callstats.h> -#include <openbsc/bsc_nat_sccp.h> -#include <openbsc/gsm_data.h> -#include <openbsc/debug.h> -#include <openbsc/ipaccess.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/bsc_nat_callstats.h> +#include <osmocom/bsc/bsc_nat_sccp.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/ipaccess.h> #include <osmocom/legacy_mgcp/mgcp.h> #include <osmocom/legacy_mgcp/mgcp_internal.h> -#include <openbsc/osmux.h> +#include <osmocom/bsc/osmux.h> #include <osmocom/ctrl/control_cmd.h> diff --git a/src/osmo-bsc_nat/bsc_nat.c b/src/osmo-bsc_nat/bsc_nat.c index 401288d..1548ea3 100644 --- a/src/osmo-bsc_nat/bsc_nat.c +++ b/src/osmo-bsc_nat/bsc_nat.c @@ -39,15 +39,15 @@ #define _GNU_SOURCE #include <getopt.h> -#include <openbsc/debug.h> -#include <openbsc/bsc_msc.h> -#include <openbsc/bsc_nat.h> -#include <openbsc/bsc_nat_sccp.h> -#include <openbsc/bsc_msg_filter.h> -#include <openbsc/ipaccess.h> -#include <openbsc/abis_nm.h> -#include <openbsc/socket.h> -#include <openbsc/vty.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/bsc_msc.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/bsc_nat_sccp.h> +#include <osmocom/bsc/bsc_msg_filter.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/socket.h> +#include <osmocom/bsc/vty.h> #include <osmocom/ctrl/control_cmd.h> #include <osmocom/ctrl/control_if.h> diff --git a/src/osmo-bsc_nat/bsc_nat_ctrl.c b/src/osmo-bsc_nat/bsc_nat_ctrl.c index ff6a739..93cdff3 100644 --- a/src/osmo-bsc_nat/bsc_nat_ctrl.c +++ b/src/osmo-bsc_nat/bsc_nat_ctrl.c @@ -27,12 +27,12 @@ #include <osmocom/vty/misc.h> -#include <openbsc/ctrl.h> -#include <openbsc/bsc_nat.h> -#include <openbsc/bsc_msg_filter.h> -#include <openbsc/vty.h> -#include <openbsc/gsm_data.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/ctrl.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/bsc_msg_filter.h> +#include <osmocom/bsc/vty.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/debug.h> #include <unistd.h> #include <string.h> diff --git a/src/osmo-bsc_nat/bsc_nat_filter.c b/src/osmo-bsc_nat/bsc_nat_filter.c index e735290..cd7ca25 100644 --- a/src/osmo-bsc_nat/bsc_nat_filter.c +++ b/src/osmo-bsc_nat/bsc_nat_filter.c @@ -18,10 +18,10 @@ * */ -#include <openbsc/bsc_nat.h> -#include <openbsc/bsc_nat_sccp.h> -#include <openbsc/bsc_msg_filter.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/bsc_nat_sccp.h> +#include <osmocom/bsc/bsc_msg_filter.h> +#include <osmocom/bsc/debug.h> #include <osmocom/gsm/gsm0808.h> diff --git a/src/osmo-bsc_nat/bsc_nat_rewrite.c b/src/osmo-bsc_nat/bsc_nat_rewrite.c index 943e1fa..75ed4ec 100644 --- a/src/osmo-bsc_nat/bsc_nat_rewrite.c +++ b/src/osmo-bsc_nat/bsc_nat_rewrite.c @@ -21,13 +21,13 @@ * */ -#include <openbsc/bsc_nat.h> -#include <openbsc/bsc_nat_sccp.h> -#include <openbsc/bsc_msc.h> -#include <openbsc/gsm_data.h> -#include <openbsc/debug.h> -#include <openbsc/ipaccess.h> -#include <openbsc/nat_rewrite_trie.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/bsc_nat_sccp.h> +#include <osmocom/bsc/bsc_msc.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/nat_rewrite_trie.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/talloc.h> diff --git a/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c b/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c index 633fa87..af346ef 100644 --- a/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c +++ b/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c @@ -19,9 +19,9 @@ * */ -#include <openbsc/nat_rewrite_trie.h> -#include <openbsc/debug.h> -#include <openbsc/vty.h> +#include <osmocom/bsc/nat_rewrite_trie.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/vty.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> diff --git a/src/osmo-bsc_nat/bsc_nat_utils.c b/src/osmo-bsc_nat/bsc_nat_utils.c index c12b29f..a9906b9 100644 --- a/src/osmo-bsc_nat/bsc_nat_utils.c +++ b/src/osmo-bsc_nat/bsc_nat_utils.c @@ -21,14 +21,14 @@ * */ -#include <openbsc/bsc_nat.h> -#include <openbsc/bsc_nat_sccp.h> -#include <openbsc/bsc_msg_filter.h> -#include <openbsc/bsc_msc.h> -#include <openbsc/gsm_data.h> -#include <openbsc/debug.h> -#include <openbsc/ipaccess.h> -#include <openbsc/vty.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/bsc_nat_sccp.h> +#include <osmocom/bsc/bsc_msg_filter.h> +#include <osmocom/bsc/bsc_msc.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/vty.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/talloc.h> diff --git a/src/osmo-bsc_nat/bsc_nat_vty.c b/src/osmo-bsc_nat/bsc_nat_vty.c index 875cefb..5f7cbc8 100644 --- a/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/src/osmo-bsc_nat/bsc_nat_vty.c @@ -18,23 +18,23 @@ * */ -#include <openbsc/vty.h> -#include <openbsc/gsm_data.h> -#include <openbsc/bsc_nat.h> -#include <openbsc/bsc_nat_sccp.h> -#include <openbsc/bsc_msg_filter.h> -#include <openbsc/bsc_msc.h> +#include <osmocom/bsc/vty.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/bsc_nat_sccp.h> +#include <osmocom/bsc/bsc_msg_filter.h> +#include <osmocom/bsc/bsc_msc.h> #include <osmocom/legacy_mgcp/mgcp.h> -#include <openbsc/vty.h> -#include <openbsc/nat_rewrite_trie.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/vty.h> +#include <osmocom/bsc/nat_rewrite_trie.h> +#include <osmocom/bsc/debug.h> #include <osmocom/core/talloc.h> #include <osmocom/core/rate_ctr.h> #include <osmocom/core/utils.h> #include <osmocom/vty/logging.h> #include <osmocom/vty/misc.h> -#include <openbsc/osmux.h> +#include <osmocom/bsc/osmux.h> #include <osmocom/sccp/sccp.h> diff --git a/src/osmo-bsc_nat/bsc_sccp.c b/src/osmo-bsc_nat/bsc_sccp.c index c6c265f..bb882a6 100644 --- a/src/osmo-bsc_nat/bsc_sccp.c +++ b/src/osmo-bsc_nat/bsc_sccp.c @@ -19,9 +19,9 @@ * */ -#include <openbsc/debug.h> -#include <openbsc/bsc_nat.h> -#include <openbsc/bsc_nat_sccp.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/bsc_nat_sccp.h> #include <osmocom/sccp/sccp.h> diff --git a/src/osmo-bsc_nat/bsc_ussd.c b/src/osmo-bsc_nat/bsc_ussd.c index 29b4fee..20df8d1 100644 --- a/src/osmo-bsc_nat/bsc_ussd.c +++ b/src/osmo-bsc_nat/bsc_ussd.c @@ -20,12 +20,12 @@ * */ -#include <openbsc/bsc_nat.h> -#include <openbsc/bsc_nat_sccp.h> -#include <openbsc/bsc_msg_filter.h> -#include <openbsc/ipaccess.h> -#include <openbsc/socket.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/bsc_nat_sccp.h> +#include <osmocom/bsc/bsc_msg_filter.h> +#include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/socket.h> +#include <osmocom/bsc/debug.h> #include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/gsm/gsm0480.h> diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c index a0f3cb7..6487df2 100644 --- a/src/utils/bs11_config.c +++ b/src/utils/bs11_config.c @@ -32,14 +32,14 @@ #include <sys/stat.h> -#include <openbsc/common_bsc.h> -#include <openbsc/abis_nm.h> +#include <osmocom/bsc/common_bsc.h> +#include <osmocom/bsc/abis_nm.h> #include <osmocom/core/msgb.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/tlv.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/debug.h> #include <osmocom/core/select.h> -#include <openbsc/rs232.h> +#include <osmocom/bsc/rs232.h> #include <osmocom/core/application.h> #include <osmocom/core/talloc.h> #include <osmocom/abis/abis.h> diff --git a/src/utils/meas_db.c b/src/utils/meas_db.c index d81efca..7233dcd 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/bsc/meas_rep.h> #include "meas_db.h" diff --git a/src/utils/meas_json.c b/src/utils/meas_json.c index 51eb6c7..4623ee0 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/bsc/gsm_data.h> +#include <osmocom/bsc/gsm_data_shared.h> +#include <osmocom/bsc/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..db00fae 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/bsc/meas_feed.h> #include <pcap/pcap.h> diff --git a/src/utils/meas_udp2db.c b/src/utils/meas_udp2db.c index 5032d0c..34f8385 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/bsc/meas_feed.h> #include "meas_db.h" diff --git a/src/utils/meas_vis.c b/src/utils/meas_vis.c index 77194de..851aa03 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/bsc/meas_feed.h> struct ms_state_uni { CDKSLIDER *cdk; diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c index 591f835..461f24e 100644 --- a/tests/abis/abis_test.c +++ b/tests/abis/abis_test.c @@ -24,9 +24,9 @@ #include <osmocom/core/utils.h> #include <osmocom/gsm/protocol/gsm_12_21.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_nm.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/debug.h> static const uint8_t load_config[] = { 0x42, 0x12, 0x00, 0x08, 0x31, 0x36, 0x38, 0x64, diff --git a/tests/bsc-nat-trie/bsc_nat_trie_test.c b/tests/bsc-nat-trie/bsc_nat_trie_test.c index 4b4df2f..3c04a9f 100644 --- a/tests/bsc-nat-trie/bsc_nat_trie_test.c +++ b/tests/bsc-nat-trie/bsc_nat_trie_test.c @@ -18,8 +18,8 @@ * */ -#include <openbsc/nat_rewrite_trie.h> -#include <openbsc/debug.h> +#include <osmocom/bsc/nat_rewrite_trie.h> +#include <osmocom/bsc/debug.h> #include <osmocom/core/application.h> #include <osmocom/core/backtrace.h> diff --git a/tests/bsc-nat/bsc_nat_test.c b/tests/bsc-nat/bsc_nat_test.c index 2914a01..a61da00 100644 --- a/tests/bsc-nat/bsc_nat_test.c +++ b/tests/bsc-nat/bsc_nat_test.c @@ -22,12 +22,12 @@ */ -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/bsc_nat.h> -#include <openbsc/bsc_nat_sccp.h> -#include <openbsc/bsc_msg_filter.h> -#include <openbsc/nat_rewrite_trie.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/bsc_nat.h> +#include <osmocom/bsc/bsc_nat_sccp.h> +#include <osmocom/bsc/bsc_msg_filter.h> +#include <osmocom/bsc/nat_rewrite_trie.h> #include <osmocom/core/application.h> #include <osmocom/core/backtrace.h> diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c index 20ed5b4..aedc018 100644 --- a/tests/bsc/bsc_test.c +++ b/tests/bsc/bsc_test.c @@ -24,13 +24,13 @@ */ -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> -#include <openbsc/osmo_bsc.h> -#include <openbsc/bsc_msc_data.h> -#include <openbsc/gsm_04_80.h> -#include <openbsc/gsm_subscriber.h> +#include <osmocom/bsc/osmo_bsc.h> +#include <osmocom/bsc/bsc_msc_data.h> +#include <osmocom/bsc/gsm_04_80.h> +#include <osmocom/bsc/gsm_subscriber.h> #include <osmocom/core/application.h> #include <osmocom/core/backtrace.h> diff --git a/tests/channel/channel_test.c b/tests/channel/channel_test.c index e66bed3..ec2927e 100644 --- a/tests/channel/channel_test.c +++ b/tests/channel/channel_test.c @@ -25,10 +25,10 @@ #include <osmocom/core/application.h> #include <osmocom/core/select.h> -#include <openbsc/common_bsc.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/debug.h> -#include <openbsc/gsm_subscriber.h> +#include <osmocom/bsc/common_bsc.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_subscriber.h> void test_bts_debug_print(void) { diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index d9ff305..974ebe5 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -24,13 +24,13 @@ #include <stdbool.h> #include <arpa/inet.h> -#include <openbsc/common_bsc.h> -#include <openbsc/gsm_subscriber.h> -#include <openbsc/gsm_data_shared.h> -#include <openbsc/debug.h> -#include <openbsc/arfcn_range_encode.h> -#include <openbsc/system_information.h> -#include <openbsc/abis_rsl.h> +#include <osmocom/bsc/common_bsc.h> +#include <osmocom/bsc/gsm_subscriber.h> +#include <osmocom/bsc/gsm_data_shared.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/arfcn_range_encode.h> +#include <osmocom/bsc/system_information.h> +#include <osmocom/bsc/abis_rsl.h> #include <osmocom/core/application.h> #include <osmocom/gsm/sysinfo.h> diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index 96d56ef..3b5429c 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -19,9 +19,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/bts_ipaccess_nanobts_omlattr.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> diff --git a/tests/subscr/bsc_subscr_test.c b/tests/subscr/bsc_subscr_test.c index 60d687d..934684f 100644 --- a/tests/subscr/bsc_subscr_test.c +++ b/tests/subscr/bsc_subscr_test.c @@ -18,8 +18,8 @@ * */ -#include <openbsc/debug.h> -#include <openbsc/bsc_subscriber.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/bsc_subscriber.h> #include <osmocom/core/application.h> #include <osmocom/core/utils.h> diff --git a/tests/trau/trau_test.c b/tests/trau/trau_test.c index c74e6db..c8c9a5e 100644 --- a/tests/trau/trau_test.c +++ b/tests/trau/trau_test.c @@ -17,7 +17,7 @@ */ #include <osmocom/abis/trau_frame.h> -#include <openbsc/trau_mux.h> +#include <osmocom/bsc/trau_mux.h> #include <osmocom/core/msgb.h> #include <stdio.h> -- To view, visit https://gerrit.osmocom.org/3813 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I39e7b882caa98334636d19ccd104fd83d07d5055 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder