summaryrefslogtreecommitdiffstats
path: root/openbsc/src/gprs/gb_proxy.c
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2014-09-19 13:23:21 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-10-09 17:43:34 +0200
commit9a6b7635071d7956a65c86ba9566eabd82865c55 (patch)
tree6d8a7d6c0a9023ed94d9a76b04668a2130bdeb29 /openbsc/src/gprs/gb_proxy.c
parent8992f30866224af3d4e6e57bd75af44c81b38d21 (diff)
gbproxy: Remove sgsn_nsei parameter
The function gbproxy_imsi_acquisition() has a parameter sgsn_nsei that is alyways equal to tlli_info->sgsn_nsei (if tlli_info is not NULL). This patch removes this parameter from gbproxy_imsi_acquisition() and gbproxy_flush_stored_messages() and accesses tlli_info->sgsn_nsei instead within these functions. Sponsored-by: On-Waves ehf
Diffstat (limited to 'openbsc/src/gprs/gb_proxy.c')
-rw-r--r--openbsc/src/gprs/gb_proxy.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c
index 886d3c3..89617ce 100644
--- a/openbsc/src/gprs/gb_proxy.c
+++ b/openbsc/src/gprs/gb_proxy.c
@@ -299,7 +299,6 @@ static void gbproxy_reset_imsi_acquisition(struct gbproxy_tlli_info* tlli_info)
static void gbproxy_flush_stored_messages(struct gbproxy_peer *peer,
struct msgb *msg,
- uint16_t sgsn_nsei,
time_t now,
struct gbproxy_tlli_info* tlli_info,
struct gprs_gb_parse_context *parse_ctx)
@@ -333,7 +332,7 @@ static void gbproxy_flush_stored_messages(struct gbproxy_peer *peer,
&tmp_parse_ctx);
rc = gbprox_relay2sgsn(peer->cfg, stored_msg,
- msgb_bvci(msg), sgsn_nsei);
+ msgb_bvci(msg), tlli_info->sgsn_nsei);
if (rc < 0)
LOGP(DLLC, LOGL_ERROR,
@@ -388,7 +387,6 @@ static void gbproxy_tx_detach_acc(struct gbproxy_peer *peer,
/* Return != 0 iff msg still needs to be processed */
static int gbproxy_imsi_acquisition(struct gbproxy_peer *peer,
struct msgb *msg,
- uint16_t sgsn_nsei,
time_t now,
struct gbproxy_tlli_info* tlli_info,
struct gprs_gb_parse_context *parse_ctx)
@@ -442,8 +440,8 @@ static int gbproxy_imsi_acquisition(struct gbproxy_peer *peer,
parse_ctx->g48_hdr->msg_type == GSM48_MT_GMM_ID_RESP;
/* The IMSI is now available */
- gbproxy_flush_stored_messages(peer, msg, sgsn_nsei, now,
- tlli_info, parse_ctx);
+ gbproxy_flush_stored_messages(peer, msg, now, tlli_info,
+ parse_ctx);
gbproxy_reset_imsi_acquisition(tlli_info);
@@ -583,8 +581,8 @@ static int gbprox_process_bssgp_ul(struct gbproxy_config *cfg,
/* Handle IMSI acquisition */
if (cfg->acquire_imsi) {
- rc = gbproxy_imsi_acquisition(peer, msg, sgsn_nsei, now,
- tlli_info, &parse_ctx);
+ rc = gbproxy_imsi_acquisition(peer, msg, now, tlli_info,
+ &parse_ctx);
if (rc <= 0)
return rc;
}