Move global var bsc_gsmnet into libbsc [2/4]

This is used inside group of files forming libbsc (shared files used by
several apps). Let's instantie only once inside a file from libbsc
instead of doing so on each binary.

This is one further step towards fixing interdependency mess of symbols
and stubs.

Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25
This commit is contained in:
Pau Espin 2021-10-05 18:49:43 +02:00
parent 7974008436
commit 12adbeaba3
6 changed files with 2 additions and 9 deletions

View File

@ -58,8 +58,6 @@
#include <osmocom/bsc/bss.h>
#include <osmocom/bsc/bts.h>
struct gsm_network *bsc_gsmnet;
static int net_listen_testnr;
static int restart;
static bool get_attr;

View File

@ -47,6 +47,8 @@
#include <limits.h>
#include <stdbool.h>
struct gsm_network *bsc_gsmnet;
int bsc_shutdown_net(struct gsm_network *net)
{
struct gsm_bts *bts;

View File

@ -87,7 +87,6 @@
#include "../../bscconfig.h"
struct gsm_network *bsc_gsmnet = 0;
static const char *config_file = "osmo-bsc.cfg";
static const char *rf_ctrl = NULL;
static int daemonize = 0;

View File

@ -39,7 +39,6 @@
#include <search.h>
void *ctx = NULL;
struct gsm_network *bsc_gsmnet = NULL;
enum test {
TEST_SCAN_TO_BTS,

View File

@ -57,9 +57,6 @@
__FILE__, __LINE__, (int) res, # cmp, (int) wanted); \
}
struct gsm_network *bsc_gsmnet = NULL;
static inline void gen(struct gsm_bts *bts, const char *s)
{
int r;

View File

@ -58,8 +58,6 @@
void *ctx;
struct gsm_network *bsc_gsmnet;
/* override, requires '-Wl,--wrap=osmo_mgcpc_ep_ci_request'.
* Catch modification of an MGCP connection. */
void __real_osmo_mgcpc_ep_ci_request(struct osmo_mgcpc_ep_ci *ci,