diff options
| -rw-r--r-- | include/osmocom/bsc/gsm_data.h | 2 | ||||
| -rw-r--r-- | src/libbsc/abis_nm_vty.c | 4 | ||||
| -rw-r--r-- | src/libbsc/abis_om2000_vty.c | 4 | ||||
| -rw-r--r-- | src/libbsc/bsc_init.c | 5 | ||||
| -rw-r--r-- | src/libbsc/bts_ipaccess_nanobts.c | 4 | ||||
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_ctrl.c | 2 | ||||
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_sigtran.c | 5 | ||||
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_vty.c | 2 |
8 files changed, 8 insertions, 20 deletions
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 5ba4362c0..1cf79a53d 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1350,6 +1350,8 @@ static inline int is_e1_bts(struct gsm_bts *bts) return 0; } +extern struct gsm_network *bsc_gsmnet; + enum bts_gprs_mode bts_gprs_mode_parse(const char *arg, int *valid); const char *bts_gprs_mode_name(enum bts_gprs_mode mode); int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode); diff --git a/src/libbsc/abis_nm_vty.c b/src/libbsc/abis_nm_vty.c index 956d28b7a..3019eb828 100644 --- a/src/libbsc/abis_nm_vty.c +++ b/src/libbsc/abis_nm_vty.c @@ -1,6 +1,6 @@ /* VTY interface for A-bis OML (Netowrk Management) */ -/* (C) 2009-2010 by Harald Welte <laforge@gnumonks.org> +/* (C) 2009-2018 by Harald Welte <laforge@gnumonks.org> * * All Rights Reserved * @@ -42,8 +42,6 @@ #include <osmocom/vty/logging.h> #include <osmocom/vty/telnet_interface.h> -extern struct gsm_network *bsc_gsmnet; - static struct cmd_node oml_node = { OML_NODE, "%s(oml)# ", diff --git a/src/libbsc/abis_om2000_vty.c b/src/libbsc/abis_om2000_vty.c index b55a6c485..faf39c106 100644 --- a/src/libbsc/abis_om2000_vty.c +++ b/src/libbsc/abis_om2000_vty.c @@ -1,6 +1,6 @@ /* VTY interface for A-bis OM2000 */ -/* (C) 2010-2011 by Harald Welte <laforge@gnumonks.org> +/* (C) 2010-2018 by Harald Welte <laforge@gnumonks.org> * * All Rights Reserved * @@ -40,8 +40,6 @@ #include <osmocom/vty/logging.h> #include <osmocom/vty/telnet_interface.h> -extern struct gsm_network *bsc_gsmnet; - static struct cmd_node om2k_node = { OM2K_NODE, "%s(om2k)# ", diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index 5b157c57f..508a7f410 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -1,6 +1,6 @@ /* A hackish minimal BSC (+MSC +HLR) implementation */ -/* (C) 2008-2010 by Harald Welte <laforge@gnumonks.org> +/* (C) 2008-2018 by Harald Welte <laforge@gnumonks.org> * (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org> * All Rights Reserved * @@ -42,9 +42,6 @@ #include <limits.h> #include <stdbool.h> -/* global pointer to the gsm network data structure */ -extern struct gsm_network *bsc_gsmnet; - /* Callback function for NACK on the OML NM */ static int oml_msg_nack(struct nm_nack_signal_data *nack) { diff --git a/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c index 823fd664c..843f264ae 100644 --- a/src/libbsc/bts_ipaccess_nanobts.c +++ b/src/libbsc/bts_ipaccess_nanobts.c @@ -1,6 +1,6 @@ /* ip.access nanoBTS specific code */ -/* (C) 2009-2010 by Harald Welte <laforge@gnumonks.org> +/* (C) 2009-2018 by Harald Welte <laforge@gnumonks.org> * * All Rights Reserved * @@ -43,8 +43,6 @@ #include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h> #include <osmocom/bsc/paging.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); diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c index 7891cf427..13cf98dce 100644 --- a/src/osmo-bsc/osmo_bsc_ctrl.c +++ b/src/osmo-bsc/osmo_bsc_ctrl.c @@ -41,8 +41,6 @@ #include <time.h> #include <unistd.h> -extern struct gsm_network *bsc_gsmnet; - /* Obtain SS7 application server currently handling given MSC (DPC) */ static struct osmo_ss7_as *msc_get_ss7_as(struct bsc_msc_data *msc) { diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index c33124f70..608c3fbca 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -1,5 +1,5 @@ /* (C) 2017 by sysmocom s.f.m.c. GmbH, Author: Philipp Maier - * (C) 2017 by Harald Welte <laforge@gnumonks.org> + * (C) 2017-2018 by Harald Welte <laforge@gnumonks.org> * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -34,13 +34,12 @@ #include <osmocom/bsc/a_reset.h> #include <osmocom/bsc/gsm_04_80.h> #include <osmocom/bsc/bsc_subscr_conn_fsm.h> +#include <osmocom/bsc/gsm_data.h> /* A pointer to a list with all involved MSCs * (a copy of the pointer location submitted with osmo_bsc_sigtran_init() */ static struct llist_head *msc_list; -extern struct gsm_network *bsc_gsmnet; - #define RESET_INTERVAL 1 /* sek */ #define SCCP_MSG_MAXSIZE 1024 #define CS7_POINTCODE_DEFAULT_OFFSET 2 diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index d1a82ba92..34080c0d1 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -38,8 +38,6 @@ #define IPA_STR "IP.ACCESS specific\n" -extern struct gsm_network *bsc_gsmnet; - static struct osmo_bsc_data *osmo_bsc_data(struct vty *vty) { return bsc_gsmnet->bsc_data; |