[MERGED] osmo-bsc[master]: ipaccess-proxy: don't redefine tall_bsc_ctx
Harald Welte has submitted this change and it was merged. Change subject: ipaccess-proxy: don't redefine tall_bsc_ctx .. 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 --- M src/ipaccess/ipaccess-proxy.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index d44cdf2..6a3af28 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -120,8 +120,7 @@ UDP_TO_BSC = 6, }; -/* 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; -- To view, visit https://gerrit.osmocom.org/6433 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c9c8540419876696e65a690717144d497d60fb2 Gerrit-PatchSet: 3 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy
osmo-bsc[master]: ipaccess-proxy: don't redefine tall_bsc_ctx
Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/6433 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9c9c8540419876696e65a690717144d497d60fb2 Gerrit-PatchSet: 3 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No
osmo-bsc[master]: ipaccess-proxy: don't redefine tall_bsc_ctx
Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/6433 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9c9c8540419876696e65a690717144d497d60fb2 Gerrit-PatchSet: 3 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No
[PATCH] osmo-bsc[master]: ipaccess-proxy: don't redefine tall_bsc_ctx
Review at https://gerrit.osmocom.org/6433 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 --- M src/ipaccess/ipaccess-proxy.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/6433/1 diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index d44cdf2..6a3af28 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -120,8 +120,7 @@ UDP_TO_BSC = 6, }; -/* 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; -- To view, visit https://gerrit.osmocom.org/6433 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c9c8540419876696e65a690717144d497d60fb2 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr