[M] Change in osmo-bsc[osmith/1.12.3]: Drop use of libosmo-abis osmocom/abis/ipaccess.h

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39049?usp=email ) Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h ...................................................................... Drop use of libosmo-abis osmocom/abis/ipaccess.h That header is only really used to provide an old hack for ipaccess-proxy tool in openbsc.h/osmo-bsc.h, and will be deprecated soon. src/ipaccess/ipaccess-config.c already has an explicit extern declaration for ipacces_fd_cb() anyway, so drop the header in advance. Take the chance to organize a bit better the includes based on dependency chain. Change-Id: I5f9daaf7789a56a08d2ec24b5e25e2e3b65b8b5b (cherry picked from commit 1ca1a295ec91def8c09b3f62183be1d3982dd6f3) --- M src/ipaccess/ipaccess-config.c M src/ipaccess/ipaccess-proxy.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_osmobts.c M src/osmo-bsc/e1_config.c 5 files changed, 30 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/49/39049/1 diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 720837e..15dcc54 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -40,21 +40,21 @@ #include <osmocom/core/application.h> #include <osmocom/core/select.h> #include <osmocom/core/timer.h> -#include <osmocom/bsc/ipaccess.h> +#include <osmocom/core/talloc.h> +#include <osmocom/gsm/protocol/gsm_12_21.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/abis/abis.h> #include <osmocom/abis/e1_input.h> +#include <osmocom/bsc/ipaccess.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 <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> #include <osmocom/bsc/bss.h> #include <osmocom/bsc/bts.h> diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index 62e79cd..e659708 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -37,18 +37,18 @@ #define _GNU_SOURCE #include <getopt.h> -#include <osmocom/bsc/gsm_data.h> #include <osmocom/core/application.h> #include <osmocom/core/select.h> -#include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> -#include <osmocom/gsm/ipa.h> -#include <osmocom/abis/ipa.h> -#include <osmocom/abis/ipaccess.h> -#include <osmocom/bsc/debug.h> -#include <osmocom/bsc/ipaccess.h> #include <osmocom/core/socket.h> #include <osmocom/core/talloc.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/gsm/ipa.h> +#include <osmocom/abis/ipa.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/ipaccess.h> /* one instance of an ip.access protocol proxy */ struct ipa_proxy { diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index b0532e5..9ce7a45 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -25,25 +25,23 @@ #include <osmocom/gsm/tlv.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/socket.h> #include <osmocom/core/stat_item.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/gsm/ipa.h> +#include <osmocom/abis/e1_input.h> +#include <osmocom/abis/subchan_demux.h> #include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/signal.h> #include <osmocom/bsc/abis_nm.h> #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/abis_osmo.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 <osmocom/bsc/ipaccess.h> #include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h> #include <osmocom/bsc/paging.h> diff --git a/src/osmo-bsc/bts_osmobts.c b/src/osmo-bsc/bts_osmobts.c index 9312a2a..1df9497 100644 --- a/src/osmo-bsc/bts_osmobts.c +++ b/src/osmo-bsc/bts_osmobts.c @@ -24,21 +24,19 @@ #include <osmocom/gsm/tlv.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/logging.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/abis/e1_input.h> +#include <osmocom/abis/subchan_demux.h> #include <osmocom/bsc/gsm_data.h> #include <osmocom/bsc/signal.h> #include <osmocom/bsc/abis_nm.h> #include <osmocom/bsc/bts.h> -#include <osmocom/abis/e1_input.h> -#include <osmocom/gsm/tlv.h> -#include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.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> extern struct gsm_bts_model bts_model_nanobts; diff --git a/src/osmo-bsc/e1_config.c b/src/osmo-bsc/e1_config.c index dbea3e9..aaf8b70 100644 --- a/src/osmo-bsc/e1_config.c +++ b/src/osmo-bsc/e1_config.c @@ -23,11 +23,11 @@ #include <time.h> #include <netinet/in.h> -#include <osmocom/bsc/gsm_data.h> -#include <osmocom/abis/e1_input.h> -#include <osmocom/bsc/misdn.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/core/talloc.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/abis/e1_input.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/misdn.h> #include <osmocom/bsc/debug.h> #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/bts.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39049?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.12.3 Gerrit-Change-Id: I5f9daaf7789a56a08d2ec24b5e25e2e3b65b8b5b Gerrit-Change-Number: 39049 Gerrit-PatchSet: 1 Gerrit-Owner: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-CC: pespin &lt;pespin(a)sysmocom.de&gt;