diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2019-08-22 17:20:14 +0200 |
|---|---|---|
| committer | laforge <laforge@gnumonks.org> | 2019-08-29 05:42:02 +0000 |
| commit | 364f927ac48d68e2e0d73826df20a728ed95c2d7 (patch) | |
| tree | 5a56a1cb4a7cac5d3a61fbd0d6ce776107d0a22d | |
| parent | 2e8f881f7290fb4fcff9e42b4b80ffaeb227bb34 (diff) | |
vlr_lu_fsm: ignore ID_IMEISV during VLR_ULA_S_WAIT_HLR_UPD
Change-Id: I2ea4f46efa013671d93892cb07bf830393289150
| -rw-r--r-- | src/libvlr/vlr_lu_fsm.c | 8 | ||||
| -rw-r--r-- | tests/msc_vlr/msc_vlr_test_gsm_ciph.err | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 454709f44..2db571134 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -1234,6 +1234,10 @@ static void lu_fsm_wait_hlr_ul_res(struct osmo_fsm_inst *fi, uint32_t event, } } break; + case VLR_ULA_E_ID_IMEI: + case VLR_ULA_E_ID_IMEISV: + /* Got the IMEI from ME, nothing to do right now though. */ + break; default: OSMO_ASSERT(0); break; @@ -1400,7 +1404,9 @@ static const struct osmo_fsm_state vlr_lu_fsm_states[] = { }, [VLR_ULA_S_WAIT_HLR_UPD] = { .in_event_mask = S(VLR_ULA_E_HLR_LU_RES) | - S(VLR_ULA_E_UPD_HLR_COMPL), + S(VLR_ULA_E_UPD_HLR_COMPL) | + S(VLR_ULA_E_ID_IMEI) | + S(VLR_ULA_E_ID_IMEISV), .out_state_mask = S(VLR_ULA_S_WAIT_LU_COMPL) | S(VLR_ULA_S_WAIT_LU_COMPL_STANDALONE) | S(VLR_ULA_S_DONE), diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 893203e63..7b9970de3 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -1789,7 +1789,6 @@ DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Ciphering Mod DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275 DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=42342342342342 DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_ID_IMEISV -DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_HLR_UPD}: Event VLR_ULA_E_ID_IMEISV not permitted DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - ms_sends_ciphering_mode_complete: now used by 1 (lu) lu_result_sent == 0 - Subscriber has the IMEISV |