aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2016-11-07 21:43:50 +0100
committerHarald Welte <laforge@gnumonks.org>2016-11-07 21:43:50 +0100
commit7c9052398e95a84ea905cbfde4763aa039dde47b (patch)
treeb3d25d0d04698988a06530f6292a45c6a1412d27
parent450710501b092986024c1348697477fdcfbf80ce (diff)
gb_proxy: Don't use bssgp_nsi variable, but cfg->{bss,sgsn}_nsilaforge/gbproxy-multi-ns
The global variable bssgp_nsi should disappear soon to make the gb_proxy work with different NS instances on the SGSN and the BSS side. Let's remove any code that explicitly references bssgp_nsi during message processing. Change-Id: Iac6c5d318fde41fb6edab3cb11b4773c62bb4ef6
-rw-r--r--openbsc/src/gprs/gb_proxy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c
index a363bb956..83219edcf 100644
--- a/openbsc/src/gprs/gb_proxy.c
+++ b/openbsc/src/gprs/gb_proxy.c
@@ -761,7 +761,7 @@ static int gbprox_relay2sgsn(struct gbproxy_config *cfg, struct msgb *old_msg,
strip_ns_hdr(msg);
- rc = gprs_ns_sendmsg(bssgp_nsi, msg);
+ rc = gprs_ns_sendmsg(cfg->sgsn_nsi, msg);
if (rc < 0)
rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_TX_ERR_SGSN]);
@@ -786,7 +786,7 @@ static int gbprox_relay2peer(struct msgb *old_msg, struct gbproxy_peer *peer,
/* Strip the old NS header, it will be replaced with a new one */
strip_ns_hdr(msg);
- rc = gprs_ns_sendmsg(bssgp_nsi, msg);
+ rc = gprs_ns_sendmsg(peer->cfg->bss_nsi, msg);
if (rc < 0)
rate_ctr_inc(&peer->ctrg->ctr[GBPROX_PEER_CTR_TX_ERR]);