pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/38990?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.

Take the chance to organize a bit better the includes based on dependency chain.

Change-Id: Ie4540eb6f535375a1e4ddf3849602aecb6260914 --- M src/common/abis.c M src/common/oml.c 2 files changed, 3 insertions(+), 3 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/90/38990/1

diff --git a/src/common/abis.c b/src/common/abis.c index e619ec8..d9c56e9 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -39,10 +39,10 @@ #include <osmocom/core/signal.h> #include <osmocom/core/macaddr.h> #include <osmocom/core/fsm.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/gsm/ipa.h> #include <osmocom/abis/abis.h> #include <osmocom/abis/e1_input.h> -#include <osmocom/abis/ipaccess.h> -#include <osmocom/gsm/ipa.h>

#include <osmo-bts/abis.h> #include <osmo-bts/logging.h> diff --git a/src/common/oml.c b/src/common/oml.c index a9e13b5..35b8664 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -36,10 +36,10 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/protocol/gsm_12_21.h> +#include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/gsm/abis_nm.h> #include <osmocom/gsm/tlv.h> #include <osmocom/abis/e1_input.h> -#include <osmocom/abis/ipaccess.h>

#include <osmo-bts/logging.h> #include <osmo-bts/gsm_data.h>