Change in osmo-bsc[master]: move 'extern struct gsm_network *bsc_gsmnet" to header file

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Mon May 28 09:19:38 UTC 2018 

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9341 )

Change subject: move 'extern struct gsm_network *bsc_gsmnet" to header file
......................................................................

move 'extern struct gsm_network *bsc_gsmnet" to header file

It's not a good idea to keep extern declarations copied over
half a dozen C files.  Let's move it to a header.

Change-Id: I6f643f1393ba0955d9c0cf1cf78d5c604e7b9451
---
M include/osmocom/bsc/gsm_data.h
M src/libbsc/abis_nm_vty.c
M src/libbsc/abis_om2000_vty.c
M src/libbsc/bsc_init.c
M src/libbsc/bts_ipaccess_nanobts.c
M src/osmo-bsc/osmo_bsc_ctrl.c
M src/osmo-bsc/osmo_bsc_sigtran.c
M src/osmo-bsc/osmo_bsc_vty.c
8 files changed, 8 insertions(+), 20 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 5ba4362..1cf79a5 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1350,6 +1350,8 @@
 	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 956d28b..3019eb8 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 at gnumonks.org>
+/* (C) 2009-2018 by Harald Welte <laforge at 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 b55a6c4..faf39c1 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 at gnumonks.org>
+/* (C) 2010-2018 by Harald Welte <laforge at 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 5b157c5..508a7f4 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 at gnumonks.org>
+/* (C) 2008-2018 by Harald Welte <laforge at gnumonks.org>
  * (C) 2009 by Holger Hans Peter Freyther <zecke at 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 823fd66..843f264 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 at gnumonks.org>
+/* (C) 2009-2018 by Harald Welte <laforge at 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 7891cf4..13cf98d 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 c33124f..608c3fb 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 at gnumonks.org>
+ * (C) 2017-2018 by Harald Welte <laforge at 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 d1a82ba..34080c0 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;

-- 
To view, visit https://gerrit.osmocom.org/9341
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f643f1393ba0955d9c0cf1cf78d5c604e7b9451
Gerrit-Change-Number: 9341
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180528/8f2f19a6/attachment.htm>

More information about the gerrit-log mailing list