diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2014-09-19 13:17:55 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-10-09 17:43:12 +0200 |
| commit | 8992f30866224af3d4e6e57bd75af44c81b38d21 (patch) | |
| tree | a3ecd12f1c31f61e4b6c105db7dc328ff398676b /openbsc/src | |
| parent | 08fbeb8fa4c1097c2714e7b4b85079119aebee5b (diff) | |
gbproxy: Rename identifiers related to IMSI matching
This patch renames gbproxy_check_tlli() to
gbproxy_imsi_matches() and struct tlli_info's
enable_patching to imsi_matches.
It's meant to be more obvious and consistent this way.
Sponsored-by: On-Waves ehf
Diffstat (limited to 'openbsc/src')
| -rw-r--r-- | openbsc/src/gprs/gb_proxy.c | 2 | ||||
| -rw-r--r-- | openbsc/src/gprs/gb_proxy_patch.c | 2 | ||||
| -rw-r--r-- | openbsc/src/gprs/gb_proxy_tlli.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c index 8b5a67269..886d3c342 100644 --- a/openbsc/src/gprs/gb_proxy.c +++ b/openbsc/src/gprs/gb_proxy.c @@ -574,7 +574,7 @@ static int gbprox_process_bssgp_ul(struct gbproxy_config *cfg, if (tlli_info && cfg->route_to_sgsn2) { if (cfg->acquire_imsi && tlli_info->imsi_len == 0) sgsn_nsei = 0xffff; - else if (gbproxy_check_tlli(peer, tlli_info)) + else if (gbproxy_imsi_matches(peer, tlli_info)) sgsn_nsei = cfg->nsip_sgsn2_nsei; } diff --git a/openbsc/src/gprs/gb_proxy_patch.c b/openbsc/src/gprs/gb_proxy_patch.c index bf0f22e08..93b85880c 100644 --- a/openbsc/src/gprs/gb_proxy_patch.c +++ b/openbsc/src/gprs/gb_proxy_patch.c @@ -245,7 +245,7 @@ int gbproxy_patch_llc(struct msgb *msg, uint8_t *llc, size_t llc_len, if (parse_ctx->apn_ie && peer->cfg->core_apn && !parse_ctx->to_bss && - gbproxy_check_tlli(peer, tlli_info) && peer->cfg->core_apn) { + gbproxy_imsi_matches(peer, tlli_info) && peer->cfg->core_apn) { size_t new_len; gbproxy_patch_apn_ie(msg, parse_ctx->apn_ie, parse_ctx->apn_ie_len, diff --git a/openbsc/src/gprs/gb_proxy_tlli.c b/openbsc/src/gprs/gb_proxy_tlli.c index 8aadd2f44..969bee76c 100644 --- a/openbsc/src/gprs/gb_proxy_tlli.c +++ b/openbsc/src/gprs/gb_proxy_tlli.c @@ -357,20 +357,20 @@ static void gbproxy_unregister_tlli(struct gbproxy_peer *peer, return; } -int gbproxy_check_tlli(struct gbproxy_peer *peer, +int gbproxy_imsi_matches(struct gbproxy_peer *peer, struct gbproxy_tlli_info *tlli_info) { if (!peer->cfg->check_imsi) return 1; - return tlli_info != NULL && tlli_info->enable_patching; + return tlli_info != NULL && tlli_info->imsi_matches; } void gbproxy_assign_imsi(struct gbproxy_peer *peer, struct gbproxy_tlli_info *tlli_info, struct gprs_gb_parse_context *parse_ctx) { - int enable_patching; + int imsi_matches; struct gbproxy_tlli_info *other_tlli_info; /* Make sure that there is a second entry with the same IMSI */ @@ -393,10 +393,10 @@ void gbproxy_assign_imsi(struct gbproxy_peer *peer, parse_ctx->imsi, parse_ctx->imsi_len); /* Check, whether the IMSI matches */ - enable_patching = gbproxy_check_imsi(peer, parse_ctx->imsi, + imsi_matches = gbproxy_check_imsi(peer, parse_ctx->imsi, parse_ctx->imsi_len); - if (enable_patching >= 0) - tlli_info->enable_patching = enable_patching; + if (imsi_matches >= 0) + tlli_info->imsi_matches = imsi_matches; } static int gbproxy_tlli_match(const struct gbproxy_tlli_state *a, |