path: root/src/ipaccess
diff options
authorNeels Hofmeyr <neels@hofmeyr.de>2018-02-14 01:44:06 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2018-02-14 12:15:40 +0100
commit87592b8967c6af0aa3f90bd1acac81ef1863c6e8 (patch)
treeab6c6e694e833ac45a81e4b5a452afb68f23d425 /src/ipaccess
parentcc6240aeb2e895a8df8c4bdca7fcae082b4f00bb (diff)
ipaccess-proxy: don't redefine tall_bsc_ctx
Curiously, ipaccess-proxy.c is able to define its own tall_bsc_ctx even though the same should already be linked from gsm_data.c. Declare it extern instead and hence use the one from gsm_data.c. A linking error actually occured as soon as I joined gsm_data_shared.c into gsm_data.c, which is how my attention was drawn to this. I assume that linking didn't necessarily pull in gsm_data.c before and a separate tall_bsc_ctx was permitted. As soon as the next commit merges those files (Ie247bc492efb331871d970c56700595ad3f7e201), it becomes impossible to define a second tall_bsc_ctx in ipaccess-proxy.c. Change-Id: I9c9c8540419876696e65a690717144d497d60fb2
Diffstat (limited to 'src/ipaccess')
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c
index d44cdf289..6a3af287c 100644
--- a/src/ipaccess/ipaccess-proxy.c
+++ b/src/ipaccess/ipaccess-proxy.c
@@ -120,8 +120,7 @@ enum ipp_fd_type {
-/* some of the code against we link from OpenBSC needs this */
-void *tall_bsc_ctx = NULL;
+extern void *tall_bsc_ctx;
static char *listen_ipaddr;
static char *bsc_ipaddr;