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
diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c
index 8b5a672..886d3c3 100644
--- a/openbsc/src/gprs/gb_proxy.c
+++ b/openbsc/src/gprs/gb_proxy.c
@@ -574,7 +574,7 @@
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 bf0f22e..93b8588 100644
--- a/openbsc/src/gprs/gb_proxy_patch.c
+++ b/openbsc/src/gprs/gb_proxy_patch.c
@@ -245,7 +245,7 @@
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 8aadd2f..969bee7 100644
--- a/openbsc/src/gprs/gb_proxy_tlli.c
+++ b/openbsc/src/gprs/gb_proxy_tlli.c
@@ -357,20 +357,20 @@
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 @@
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,