ipaccess: Remove the ipaccess_gsmnet and assume there is a bsc_gsmnet
Assume that there is a bsc_gsmnet and modify the ipaccess-config to
provide this symbol. If a bsc_gsmmnet is not available when linked
the linker will complain and fail.
E.g. give an error like this:
../../src/libbsc/libbsc.a(bts_ipaccess_nanobts.o): In function `ipaccess_sign_link_up':
src/libbsc/bts_ipaccess_nanobts.c:550: undefined reference to `bsc_gsmnet'
diff --git a/openbsc/src/libbsc/bts_ipaccess_nanobts.c b/openbsc/src/libbsc/bts_ipaccess_nanobts.c
index b6616c0..4bf937b 100644
--- a/openbsc/src/libbsc/bts_ipaccess_nanobts.c
+++ b/openbsc/src/libbsc/bts_ipaccess_nanobts.c
@@ -38,6 +38,8 @@
#include <osmocom/abis/ipaccess.h>
#include <osmocom/core/logging.h>
+extern struct gsm_network *bsc_gsmnet;
+
static int bts_model_nanobts_start(struct gsm_network *net);
static void bts_model_nanobts_e1line_bind_ops(struct e1inp_line *line);
@@ -457,13 +459,10 @@
return 0;
}
-struct gsm_network *ipaccess_gsmnet;
-
static int bts_model_nanobts_start(struct gsm_network *net)
{
osmo_signal_unregister_handler(SS_NM, bts_ipa_nm_sig_cb, NULL);
osmo_signal_register_handler(SS_NM, bts_ipa_nm_sig_cb, NULL);
- ipaccess_gsmnet = net;
return 0;
}
@@ -534,7 +533,7 @@
struct ipaccess_unit *dev = unit_data;
struct e1inp_sign_link *sign_link = NULL;
- bts = find_bts_by_unitid(ipaccess_gsmnet, dev->site_id, dev->bts_id);
+ bts = find_bts_by_unitid(bsc_gsmnet, dev->site_id, dev->bts_id);
if (!bts) {
LOGP(DLINP, LOGL_ERROR, "Unable to find BTS configuration for "
" %u/%u/%u, disconnecting\n", dev->site_id,