pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38988?usp=email ) Change subject: Drop internal use of osmocom/abis/ipaccess.h ...................................................................... Drop internal use of 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. Take the chance to organize a bit better the includes based on dependency chain. Change-Id: Ifc9759b17a9b966cb713f7533a13f6223161a4cd --- M src/input/ipa.c M src/input/ipaccess.c M src/ipa_proxy.c M tests/e1inp_ipa_bts_test.c 4 files changed, 16 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/88/38988/1 diff --git a/src/input/ipa.c b/src/input/ipa.c index f902b95..f49d0dc 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -13,15 +13,14 @@ #include <osmocom/core/select.h> #include <osmocom/core/timer.h> -#include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> #include <osmocom/core/talloc.h> -#include <osmocom/abis/e1_input.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/core/socket.h> #include <osmocom/core/backtrace.h> - +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/abis/e1_input.h> #include <osmocom/abis/ipa.h> #define LOGIPA(link, level, fmt, args...) LOGP(DLINP, level, "%s:%u " fmt, link->addr, link->port, ## args) diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index af6e39d..94f1b2b 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -39,21 +39,21 @@ #include <arpa/inet.h> #include <osmocom/core/select.h> -#include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/macaddr.h> #include <osmocom/core/logging.h> #include <osmocom/core/talloc.h> -#include <osmocom/abis/e1_input.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/core/socket.h> -#include <osmocom/abis/ipa.h> #include <osmocom/core/backtrace.h> -#include <osmocom/gsm/ipa.h> #include <osmocom/core/stats_tcp.h> #include <osmocom/core/fsm.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/gsm/ipa.h> #include <osmocom/netif/stream.h> #include <osmocom/netif/ipa.h> +#include <osmocom/abis/e1_input.h> +#include <osmocom/abis/ipa.h> /* global parameters of IPA input driver */ struct ipa_pars g_e1inp_ipaccess_pars; diff --git a/src/ipa_proxy.c b/src/ipa_proxy.c index 441dd3f..04d3f9c 100644 --- a/src/ipa_proxy.c +++ b/src/ipa_proxy.c @@ -14,17 +14,16 @@ #include <osmocom/core/select.h> #include <osmocom/core/bitvec.h> -#include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> #include <osmocom/core/talloc.h> -#include <osmocom/abis/e1_input.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/core/socket.h> - -#include <osmocom/abis/ipa.h> #include <osmocom/vty/vty.h> #include <osmocom/vty/command.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/abis/e1_input.h> +#include <osmocom/abis/ipa.h> static void *tall_ipa_proxy_ctx; diff --git a/tests/e1inp_ipa_bts_test.c b/tests/e1inp_ipa_bts_test.c index 68dfefb..4488fe7 100644 --- a/tests/e1inp_ipa_bts_test.c +++ b/tests/e1inp_ipa_bts_test.c @@ -1,15 +1,15 @@ #include <stdio.h> #include <signal.h> -#include <osmocom/core/talloc.h> #include <string.h> #include <unistd.h> -#include <osmocom/abis/abis.h> -#include <osmocom/abis/e1_input.h> +#include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> #include <osmocom/core/application.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/gsm/protocol/gsm_12_21.h> +#include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/gsm/ipa.h> +#include <osmocom/abis/abis.h> +#include <osmocom/abis/e1_input.h> static void *tall_test; static struct e1inp_sign_link *oml_sign_link, *rsl_sign_link; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38988?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ifc9759b17a9b966cb713f7533a13f6223161a4cd Gerrit-Change-Number: 38988 Gerrit-PatchSet: 1 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt;