paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-23 08:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

gbproxy: Fix TLLI state handling

Browse Source 
This patch contains fixes for the TLLI tracking and handling.
It adds and uses gbprox_map_tlli() the map the source TLLI to the
destination TLLI while respecting whether it is current or assigned.
It removes gbprox_register_tlli() from the downlink path. It fixes
TLLI validation and disables the use of the BSSGP TLLI IE.

Sponsored-by: On-Waves ehf
This commit is contained in:
Jacob Erlbeck
2014-08-18 17:01:32 +02:00
committed by Holger Hans Peter Freyther
parent 3b23d639ab
commit e37487e083
1 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
openbsc/src/gprs/gb_proxy.c
View File

@@ -687,6 +687,26 @@ void gbprox_reassign_tlli(struct gbproxy_tlli_state *tlli_state,
tlli_state->net_validated = 0; tlli_state->net_validated = 0;
} }
static uint32_t gbprox_map_tlli(uint32_t other_tlli,
struct gbproxy_tlli_info *tlli_info, int to_bss)
{
uint32_t tlli = 0;
struct gbproxy_tlli_state *src, *dst;
if (to_bss) {
src = &tlli_info->sgsn_tlli;
dst = &tlli_info->tlli;
} else {
src = &tlli_info->tlli;
dst = &tlli_info->sgsn_tlli;
}
if (src->current == other_tlli)
tlli = dst->current;
else if (src->assigned == other_tlli)
tlli = dst->assigned;
return tlli;
}
static void gbprox_validate_tlli(struct gbproxy_tlli_state *tlli_state, static void gbprox_validate_tlli(struct gbproxy_tlli_state *tlli_state,
uint32_t tlli, int to_bss) uint32_t tlli, int to_bss)
{ {
@@ -1489,6 +1509,7 @@ static uint32_t gbprox_make_bss_ptmsi(struct gbproxy_peer *peer,
} }
static uint32_t gbprox_make_sgsn_tlli(struct gbproxy_peer *peer, static uint32_t gbprox_make_sgsn_tlli(struct gbproxy_peer *peer,
struct gbproxy_tlli_info *tlli_info,
uint32_t bss_tlli) uint32_t bss_tlli)
{ {
return bss_tlli; return bss_tlli;
@@ -1525,16 +1546,14 @@ static struct gbproxy_tlli_info *gbprox_update_state_ul(
parse_ctx->imsi, parse_ctx->imsi,
parse_ctx->imsi_len, now); parse_ctx->imsi_len, now);
/* Setup TLLIs */ /* Setup TLLIs */
sgsn_tlli = gbprox_make_sgsn_tlli(peer, parse_ctx->tlli); sgsn_tlli = gbprox_make_sgsn_tlli(peer, tlli_info,
parse_ctx->tlli);
tlli_info->sgsn_tlli.current = sgsn_tlli; tlli_info->sgsn_tlli.current = sgsn_tlli;
} else { } else {
sgsn_tlli = tlli_info->sgsn_tlli.assigned; sgsn_tlli = gbprox_map_tlli(parse_ctx->tlli, tlli_info, 0);
if (!sgsn_tlli) if (!sgsn_tlli)
sgsn_tlli = tlli_info->sgsn_tlli.current; sgsn_tlli = gbprox_make_sgsn_tlli(peer, tlli_info,
if (!sgsn_tlli) {
sgsn_tlli = gbprox_make_sgsn_tlli(peer,
parse_ctx->tlli); parse_ctx->tlli);
}
gbprox_validate_tlli(&tlli_info->tlli, gbprox_validate_tlli(&tlli_info->tlli,
parse_ctx->tlli, 0); parse_ctx->tlli, 0);
@@ -1612,10 +1631,12 @@ static struct gbproxy_tlli_info *gbprox_update_state_dl(
peer, new_bss_tlli); peer, new_bss_tlli);
gbprox_touch_tlli(peer, tlli_info, now); gbprox_touch_tlli(peer, tlli_info, now);
} else { } else {
tlli_info = tlli_info = gbprox_tlli_info_alloc(peer);
gbprox_register_tlli(peer, new_bss_tlli, LOGP(DGPRS, LOGL_INFO,
parse_ctx->imsi, "Adding TLLI %08x to list (SGSN, new P-TMSI)\n",
parse_ctx->imsi_len, now); new_sgsn_tlli);
gbprox_attach_tlli_info(peer, now, tlli_info);
/* Setup TLLIs */ /* Setup TLLIs */
tlli_info->sgsn_tlli.current = new_sgsn_tlli; tlli_info->sgsn_tlli.current = new_sgsn_tlli;
} }
@@ -1624,13 +1645,13 @@ static struct gbproxy_tlli_info *gbprox_update_state_dl(
tlli_info->tlli.ptmsi = new_bss_ptmsi; tlli_info->tlli.ptmsi = new_bss_ptmsi;
} else if (parse_ctx->tlli_enc && parse_ctx->llc && !tlli_info) { } else if (parse_ctx->tlli_enc && parse_ctx->llc && !tlli_info) {
/* Unknown SGSN TLLI */ /* Unknown SGSN TLLI */
tlli_info = tlli_info = gbprox_tlli_info_alloc(peer);
gbprox_register_tlli(peer, parse_ctx->tlli, LOGP(DGPRS, LOGL_INFO, "Adding TLLI %08x to list (SGSN)\n",
parse_ctx->imsi, parse_ctx->tlli);
parse_ctx->imsi_len, now);
gbprox_attach_tlli_info(peer, now, tlli_info);
/* Setup TLLIs */ /* Setup TLLIs */
tlli_info->sgsn_tlli.current = tlli_info->tlli.current; tlli_info->sgsn_tlli.current = parse_ctx->tlli;
if (peer->cfg->patch_ptmsi) { if (peer->cfg->patch_ptmsi) {
/* TODO: We don't know the local TLLI here, perhaps add /* TODO: We don't know the local TLLI here, perhaps add
* a workaround that derives a PTMSI from the SGSN TLLI * a workaround that derives a PTMSI from the SGSN TLLI
@@ -1640,12 +1661,14 @@ static struct gbproxy_tlli_info *gbprox_update_state_dl(
* length. * length.
*/ */
tlli_info->tlli.current = 0; tlli_info->tlli.current = 0;
} else {
tlli_info->tlli.current = tlli_info->sgsn_tlli.current;
} }
} else if (parse_ctx->tlli_enc && parse_ctx->llc && tlli_info) { } else if (parse_ctx->tlli_enc && parse_ctx->llc && tlli_info) {
uint32_t bss_tlli = gbprox_map_tlli(parse_ctx->tlli,
tlli_info, 1);
gbprox_validate_tlli(&tlli_info->sgsn_tlli, parse_ctx->tlli, 1); gbprox_validate_tlli(&tlli_info->sgsn_tlli, parse_ctx->tlli, 1);
if (!peer->cfg->patch_ptmsi) gbprox_validate_tlli(&tlli_info->tlli, bss_tlli, 1);
gbprox_validate_tlli(&tlli_info->tlli,
parse_ctx->tlli, 1);
gbprox_touch_tlli(peer, tlli_info, now); gbprox_touch_tlli(peer, tlli_info, now);
} else if (tlli_info) { } else if (tlli_info) {
gbprox_touch_tlli(peer, tlli_info, now); gbprox_touch_tlli(peer, tlli_info, now);
@@ -1730,7 +1753,9 @@ static int gbprox_parse_bssgp(uint8_t *bssgp, size_t bssgp_len,
parse_ctx->imsi_len = TLVP_LEN(tp, BSSGP_IE_IMSI); parse_ctx->imsi_len = TLVP_LEN(tp, BSSGP_IE_IMSI);
} }
if (TLVP_PRESENT(tp, BSSGP_IE_TLLI)) /* TODO: This is TLLI old, don't confuse with TLLI current, add
* and use tlli_old_enc instead */
if (0 && TLVP_PRESENT(tp, BSSGP_IE_TLLI))
parse_ctx->tlli_enc = (uint8_t *)TLVP_VAL(tp, BSSGP_IE_TLLI); parse_ctx->tlli_enc = (uint8_t *)TLVP_VAL(tp, BSSGP_IE_TLLI);
if (TLVP_PRESENT(tp, BSSGP_IE_TMSI) && pdu_type == BSSGP_PDUT_PAGING_PS) if (TLVP_PRESENT(tp, BSSGP_IE_TMSI) && pdu_type == BSSGP_PDUT_PAGING_PS)