gbproxy: Use pointer to PTMSI value instead of MI
Currently, ptmsi_enc and new_ptmsi_enc point to the beginning of the
mobile identity. Since all P-TMSI in 04.08 (MM) are encoded this way (1
byte header + 4 byte P-TMSI value). This is different to the P-TMSI
encoding in 08.18 (BSSGP), where the P-TMSI is encoded into 4 byte
without MI header.
This patch changes the code to use pointers to the P-TMSI value,
which is encoded in the same way in both specifications.
Sponsored-by: On-Waves ehf
diff --git a/openbsc/src/gprs/gprs_gb_parse.c b/openbsc/src/gprs/gprs_gb_parse.c
index 87cea1b..1978bd4 100644
--- a/openbsc/src/gprs/gprs_gb_parse.c
+++ b/openbsc/src/gprs/gprs_gb_parse.c
@@ -171,7 +171,7 @@
return 0;
if (gprs_is_mi_tmsi(value, value_len)) {
- parse_ctx->ptmsi_enc = value;
+ parse_ctx->ptmsi_enc = value + 1;
} else if (gprs_is_mi_imsi(value, value_len)) {
parse_ctx->imsi = value;
parse_ctx->imsi_len = value_len;
@@ -215,7 +215,7 @@
if (tlv_match(&data, &data_len, GSM48_IE_GMM_ALLOC_PTMSI,
&value, &value_len) > 0 &&
gprs_is_mi_tmsi(value, value_len))
- parse_ctx->new_ptmsi_enc = value;
+ parse_ctx->new_ptmsi_enc = value + 1;
return 1;
}
@@ -270,7 +270,7 @@
GSM48_IE_GMM_ALLOC_PTMSI, &value, &value_len) > 0)
{
if (gprs_is_mi_tmsi(value, value_len))
- parse_ctx->ptmsi_enc = value;
+ parse_ctx->ptmsi_enc = value + 1;
}
}
@@ -351,7 +351,7 @@
if (tlv_match(&data, &data_len, GSM48_IE_GMM_ALLOC_PTMSI,
&value, &value_len) > 0 &&
gprs_is_mi_tmsi(value, value_len))
- parse_ctx->new_ptmsi_enc = value;
+ parse_ctx->new_ptmsi_enc = value + 1;
return 1;
}
@@ -370,7 +370,7 @@
/* Allocated P-TMSI */
if (lv_shift(&data, &data_len, &value, &value_len) > 0 &&
gprs_is_mi_tmsi(value, value_len))
- parse_ctx->new_ptmsi_enc = value;
+ parse_ctx->new_ptmsi_enc = value + 1;
if (v_fixed_shift(&data, &data_len, 6, &value) <= 0)
return 0;
@@ -395,7 +395,7 @@
return 0;
if (gprs_is_mi_tmsi(value, value_len)) {
- parse_ctx->ptmsi_enc = value;
+ parse_ctx->ptmsi_enc = value + 1;
} else if (gprs_is_mi_imsi(value, value_len)) {
parse_ctx->imsi = value;
parse_ctx->imsi_len = value_len;
@@ -680,20 +680,15 @@
if (parse_ctx->ptmsi_enc) {
uint32_t ptmsi = GSM_RESERVED_TMSI;
- int ok;
- ok = gprs_parse_mi_tmsi(parse_ctx->ptmsi_enc, GSM48_TMSI_LEN, &ptmsi);
- LOGPC(DGPRS, LOGL_DEBUG, "%s PTMSI %08x%s",
- sep, ptmsi, ok ? "" : " (parse error)");
+ gprs_parse_tmsi(parse_ctx->ptmsi_enc, &ptmsi);
+ LOGPC(DGPRS, LOGL_DEBUG, "%s PTMSI %08x", sep, ptmsi);
sep = ",";
}
if (parse_ctx->new_ptmsi_enc) {
uint32_t new_ptmsi = GSM_RESERVED_TMSI;
- int ok;
- ok = gprs_parse_mi_tmsi(parse_ctx->new_ptmsi_enc, GSM48_TMSI_LEN,
- &new_ptmsi);
- LOGPC(DGPRS, LOGL_DEBUG, "%s new PTMSI %08x%s",
- sep, new_ptmsi, ok ? "" : " (parse error)");
+ gprs_parse_tmsi(parse_ctx->new_ptmsi_enc, &new_ptmsi);
+ LOGPC(DGPRS, LOGL_DEBUG, "%s new PTMSI %08x", sep, new_ptmsi);
sep = ",";
}