October 2022 - gerrit-log - lists.osmocom.org

Change in osmo-msc[master]: vlr_auth_fsm: add result no_auth_info_event

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/29698 ) Change subject: vlr_auth_fsm: add result no_auth_info_event ...................................................................... vlr_auth_fsm: add result no_auth_info_event Add third outcome of auth_fsm: the no_auth_info_event, which should be dispatched when auth failed because the HLR has no auth info for this subscriber, i.e. not because an actual auth challenge failed. No functional change: Handling no_auth_info_event separately follows in another patch (to allow fallback to no-auth). Feed the same _E_AUTH_FAILURE as no_auth_info_event to still behave unchanged. Related: OS#4830 Change-Id: I5103b1f2727f1729a5517ae359df813d50436ed3 --- M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_auth_fsm.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 7 files changed, 64 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/98/29698/1 diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 438e0d7..a6eb533 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -342,6 +342,7 @@ vsub->auth_fsm = auth_fsm_start(vsub, fi, PR_ARQ_E_AUTH_RES, PR_ARQ_E_AUTH_FAILURE, + PR_ARQ_E_AUTH_FAILURE, par->is_r99, par->is_utran); } else { diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index 0583d7c..bb2f38e 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -53,6 +53,7 @@ int auth_tuple_max_reuse_count; /* see vlr->cfg instead */ uint32_t parent_event_success; + uint32_t parent_event_no_auth_info; uint32_t parent_event_failure; }; @@ -233,34 +234,50 @@ } } -static const char *vlr_auth_fsm_result_name(enum gsm48_reject_value result) -{ - if (!result) - return "PASSED"; - return get_value_string(gsm48_gmm_cause_names, result); -} +enum auth_fsm_result { + /* Authentication verified the subscriber. */ + AUTH_FSM_PASSED = 0, + /* HLR does not have authentication info for this subscriber. */ + AUTH_FSM_NO_AUTH_INFO, + /* Authentication was attempted but failed. */ + AUTH_FSM_FAILURE, +}; + +const char *auth_fsm_result_str[] = { + [AUTH_FSM_PASSED] = "PASSED", + [AUTH_FSM_NO_AUTH_INFO] = "NO_AUTH_INFO", + [AUTH_FSM_FAILURE] = "FAILURE", +}; /* Terminate the Auth FSM Instance and notify parent */ -static void auth_fsm_term(struct osmo_fsm_inst *fi, enum gsm48_reject_value result) +static void auth_fsm_term(struct osmo_fsm_inst *fi, enum auth_fsm_result result, enum gsm48_reject_value cause) { struct auth_fsm_priv *afp = fi->priv; - LOGPFSM(fi, "Authentication terminating with result %s\n", - vlr_auth_fsm_result_name(result)); + LOGPFSM(fi, "Authentication terminating with result %s%s%s\n", + auth_fsm_result_str[result], + cause ? ", cause " : "", + cause ? get_value_string(gsm48_gmm_cause_names, cause) : ""); - /* Do one final state transition (mostly for logging purpose) and set the parent_term_event according to success - * or failure. */ - if (!result) { - /* No reject value means success */ + /* Do one final state transition (mostly for logging purpose) + * and set the parent_term_event according to result */ + switch (result) { + case AUTH_FSM_PASSED: osmo_fsm_inst_state_chg(fi, VLR_SUB_AS_AUTHENTICATED, 0, 0); fi->proc.parent_term_event = afp->parent_event_success; - } else { + break; + case AUTH_FSM_NO_AUTH_INFO: + osmo_fsm_inst_state_chg(fi, VLR_SUB_AS_AUTH_FAILED, 0, 0); + fi->proc.parent_term_event = afp->parent_event_no_auth_info; + break; + case AUTH_FSM_FAILURE: osmo_fsm_inst_state_chg(fi, VLR_SUB_AS_AUTH_FAILED, 0, 0); fi->proc.parent_term_event = afp->parent_event_failure; + break; } /* return the result to the parent FSM */ - osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, &result); + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, &cause); } static void auth_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) @@ -285,7 +302,7 @@ LOGPFSML(fi, LOGL_ERROR, "A previous check ensured that an" " auth tuple was available, but now there is in fact" " none.\n"); - auth_fsm_term(fi, GSM48_REJECT_NETWORK_FAILURE); + auth_fsm_term(fi, AUTH_FSM_FAILURE, GSM48_REJECT_NETWORK_FAILURE); return -1; } @@ -366,16 +383,20 @@ switch (event) { case VLR_AUTH_E_HLR_SAI_ACK: if (!gsup->num_auth_vectors) { - auth_fsm_term(fi, GSM48_REJECT_NETWORK_FAILURE); + auth_fsm_term(fi, AUTH_FSM_FAILURE, GSM48_REJECT_NETWORK_FAILURE); return; } vlr_subscr_update_tuples(vsub, gsup); goto pass; break; case VLR_AUTH_E_HLR_SAI_NACK: + /* HLR did not return Auth Info, hence cannot authenticate. (The caller may still decide to permit + * attaching without authentication) */ + auth_fsm_term(fi, AUTH_FSM_NO_AUTH_INFO, gsup->cause); + break; case VLR_AUTH_E_HLR_SAI_ABORT: vlr_gmm_cause_to_mm_cause(gsup->cause, &gsm48_rej); - auth_fsm_term(fi, gsm48_rej); + auth_fsm_term(fi, AUTH_FSM_FAILURE, gsm48_rej); break; } @@ -408,10 +429,10 @@ VLR_SUB_AS_WAIT_ID_IMSI, vlr_timer(vlr, 3270), 3270); } else { - auth_fsm_term(fi, GSM48_REJECT_ILLEGAL_MS); + auth_fsm_term(fi, AUTH_FSM_FAILURE, GSM48_REJECT_ILLEGAL_MS); } } else { - auth_fsm_term(fi, 0); + auth_fsm_term(fi, AUTH_FSM_PASSED, 0); } break; case VLR_AUTH_E_MS_AUTH_FAIL: @@ -423,7 +444,7 @@ VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC, GSM_29002_TIMER_M, 0); } else - auth_fsm_term(fi, GSM48_REJECT_ILLEGAL_MS); + auth_fsm_term(fi, AUTH_FSM_FAILURE, GSM48_REJECT_ILLEGAL_MS); break; } } @@ -443,7 +464,7 @@ gsup->cause != GMM_CAUSE_IMSI_UNKNOWN) || (event == VLR_AUTH_E_HLR_SAI_ABORT)) { /* result = procedure error */ - auth_fsm_term(fi, GSM48_REJECT_NETWORK_FAILURE); + auth_fsm_term(fi, AUTH_FSM_FAILURE, GSM48_REJECT_NETWORK_FAILURE); } switch (event) { case VLR_AUTH_E_HLR_SAI_ACK: @@ -454,6 +475,7 @@ break; case VLR_AUTH_E_HLR_SAI_NACK: auth_fsm_term(fi, + AUTH_FSM_FAILURE, gsup->cause == GMM_CAUSE_IMSI_UNKNOWN? GSM48_REJECT_IMSI_UNKNOWN_IN_HLR : GSM48_REJECT_NETWORK_FAILURE); @@ -484,16 +506,16 @@ vlr_timer(vlr, 3270), 3270); } else { /* Result = Aborted */ - auth_fsm_term(fi, GSM48_REJECT_SYNCH_FAILURE); + auth_fsm_term(fi, AUTH_FSM_FAILURE, GSM48_REJECT_SYNCH_FAILURE); } } else { /* Result = Pass */ - auth_fsm_term(fi, 0); + auth_fsm_term(fi, AUTH_FSM_PASSED, 0); } break; case VLR_AUTH_E_MS_AUTH_FAIL: /* Second failure: Result = Fail */ - auth_fsm_term(fi, GSM48_REJECT_SYNCH_FAILURE); + auth_fsm_term(fi, AUTH_FSM_FAILURE, GSM48_REJECT_SYNCH_FAILURE); break; } } @@ -604,6 +626,7 @@ struct osmo_fsm_inst *auth_fsm_start(struct vlr_subscr *vsub, struct osmo_fsm_inst *parent, uint32_t parent_event_success, + uint32_t parent_event_no_auth_info, uint32_t parent_event_failure, bool is_r99, bool is_utran) @@ -629,6 +652,7 @@ afp->is_r99 = is_r99; afp->is_utran = is_utran; afp->parent_event_success = parent_event_success; + afp->parent_event_no_auth_info = parent_event_no_auth_info; afp->parent_event_failure = parent_event_failure; fi->priv = afp; vsub->auth_fsm = fi; diff --git a/src/libvlr/vlr_auth_fsm.h b/src/libvlr/vlr_auth_fsm.h index 44a5650..8283842 100644 --- a/src/libvlr/vlr_auth_fsm.h +++ b/src/libvlr/vlr_auth_fsm.h @@ -32,6 +32,7 @@ struct osmo_fsm_inst *auth_fsm_start(struct vlr_subscr *vsub, struct osmo_fsm_inst *parent, uint32_t parent_event_success, + uint32_t parent_event_no_auth_info, uint32_t parent_event_failure, bool is_r99, bool is_utran); diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 7d8b706..886ef2d 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -910,6 +910,7 @@ fi, VLR_ULA_E_AUTH_RES, VLR_ULA_E_AUTH_FAILURE, + VLR_ULA_E_AUTH_FAILURE, lfp->is_r99, lfp->is_utran); } else { diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 33be01d..e9f8907 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -3271,7 +3271,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP DVLR SUBSCR(IMSI-901700000004620) AUTH on GERAN received SRES/RES: (0 bytes) DVLR SUBSCR(IMSI-901700000004620) AUTH SRES/RES missing -DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result Illegal MS +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result FAILURE, cause Illegal MS DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTH_FAILED GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000004026f00a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index 1d7c4b2..441bc2f 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -43,7 +43,7 @@ DREF VLR subscr IMSI-901700000004620 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_NACK DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: GSUP: rx Auth Info Error cause: 2: IMSI unknown in HLR -DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Authentication terminating with result IMSI unknown in HLR +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Authentication terminating with result NO_AUTH_INFO, cause IMSI unknown in HLR DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_AUTH_FAILED DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Removing from parent vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) @@ -142,7 +142,7 @@ DREF VLR subscr IMSI-901700000004620 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_NACK DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: GSUP: rx Auth Info Error cause: 17: Network failure -DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Authentication terminating with result Network failure +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Authentication terminating with result NO_AUTH_INFO, cause Network failure DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_AUTH_FAILED DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Removing from parent vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) @@ -738,7 +738,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + vlr_gsup_rx: now used by 3 (attached,active-conn,vlr_gsup_rx) DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_NACK DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: GSUP: rx Auth Info Error cause: 17: Network failure -DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Authentication terminating with result Network failure +DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Authentication terminating with result NO_AUTH_INFO, cause Network failure DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_AUTH_FAILED DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Removing from parent vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU) @@ -1006,7 +1006,7 @@ DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + vlr_gsup_rx: now used by 3 (attached,active-conn,vlr_gsup_rx) DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_NACK DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: GSUP: rx Auth Info Error cause: 2: IMSI unknown in HLR -DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Authentication terminating with result IMSI unknown in HLR +DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Authentication terminating with result NO_AUTH_INFO, cause IMSI unknown in HLR DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_AUTH_FAILED DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Removing from parent vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU) @@ -1104,7 +1104,7 @@ <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: 0a010809710000004026f00a0101 DREF VLR subscr IMSI-901700000004620 + vlr_gsup_rx: now used by 2 (active-conn,vlr_gsup_rx) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Received Event VLR_AUTH_E_HLR_SAI_ACK -DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Authentication terminating with result Network failure +DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Authentication terminating with result FAILURE, cause Network failure DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: state_chg to VLR_SUB_AS_AUTH_FAILED DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Removing from parent vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index a9d9702..4d7abd9 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -2647,7 +2647,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP DVLR SUBSCR(IMSI-901700000010650) AUTH on GERAN received SRES/RES: e229c19e791f2e (7 bytes) DVLR SUBSCR(IMSI-901700000010650) AUTH SRES/RES has invalid length: 7. Expected either 4 (GSM AKA) or 8 (UMTS AKA) -DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result Illegal MS +DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result FAILURE, cause Illegal MS DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTH_FAILED GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f00a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) @@ -2763,7 +2763,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP DVLR SUBSCR(IMSI-901700000010650) AUTH on UTRAN received RES: e229c19e791f2e (7 bytes) DVLR SUBSCR(IMSI-901700000010650) AUTH RES has invalid length: 7. Expected 8 (UMTS AKA) -DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result Illegal MS +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result FAILURE, cause Illegal MS DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTH_FAILED GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f00a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) @@ -2879,7 +2879,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP DVLR SUBSCR(IMSI-901700000010650) AUTH on GERAN received SRES/RES: e229c19e791f2e4123 (9 bytes) DVLR SUBSCR(IMSI-901700000010650) AUTH SRES/RES has invalid length: 9. Expected either 4 (GSM AKA) or 8 (UMTS AKA) -DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result Illegal MS +DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result FAILURE, cause Illegal MS DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTH_FAILED GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f00a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) @@ -2995,7 +2995,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP DVLR SUBSCR(IMSI-901700000010650) AUTH on UTRAN received RES: e229c19e791f2e4123 (9 bytes) DVLR SUBSCR(IMSI-901700000010650) AUTH RES has invalid length: 9. Expected 8 (UMTS AKA) -DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result Illegal MS +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result FAILURE, cause Illegal MS DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTH_FAILED GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f00a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) @@ -3111,7 +3111,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP DVLR SUBSCR(IMSI-901700000010650) AUTH on GERAN received SRES/RES: e229c19e (4 bytes) DVLR SUBSCR(IMSI-901700000010650) GSM AUTH failure: mismatching sres (expected sres=9b 36 ef df ) -DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result Illegal MS +DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result FAILURE, cause Illegal MS DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTH_FAILED GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f00a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) @@ -3227,7 +3227,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_RESP DVLR SUBSCR(IMSI-901700000010650) AUTH on UTRAN received RES: e229c19e (4 bytes) DVLR SUBSCR(IMSI-901700000010650) AUTH via UTRAN, cannot allow GSM AKA (MS is R99 capable, vec has UMTS AKA tokens, res_len=4 is INVALID on UTRAN) -DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result Illegal MS +DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Authentication terminating with result FAILURE, cause Illegal MS DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_AUTH_FAILED GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f00a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5103b1f2727f1729a5517ae359df813d50436ed3 Gerrit-Change-Number: 29698 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: msc_a,vlr: rename ciphering_required to try_ciphering

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/29694 ) Change subject: msc_a,vlr: rename ciphering_required to try_ciphering ...................................................................... msc_a,vlr: rename ciphering_required to try_ciphering Clarify the name to avoid confusion in upcoming patches. This function actually returns whether any ciphering mode besides A5/0 is enabled, and does not imply that ciphering is mandatory. A5/0 may well be allowed when this function returns true. Related: OS#4830 Change-Id: Ia55085e3b36feb275bcf92fc91a4be7d1c24a6b9 --- M include/osmocom/msc/msc_a.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_a.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_lu_fsm.c 6 files changed, 24 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/94/29694/1 diff --git a/include/osmocom/msc/msc_a.h b/include/osmocom/msc/msc_a.h index f94420a..ad41d73 100644 --- a/include/osmocom/msc/msc_a.h +++ b/include/osmocom/msc/msc_a.h @@ -180,7 +180,7 @@ void msc_a_pending_cm_service_req_add(struct msc_a *msc_a, enum osmo_cm_service_type type); unsigned int msc_a_pending_cm_service_req_count(struct msc_a *msc_a, enum osmo_cm_service_type type); void msc_a_pending_cm_service_req_del(struct msc_a *msc_a, enum osmo_cm_service_type type); -bool msc_a_require_ciphering(const struct msc_a *msc_a); +bool msc_a_try_ciphering(const struct msc_a *msc_a); #define msc_a_ran_down(A,B,C) \ _msc_a_ran_down(A,B,C, __FILE__, __LINE__) diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index d23661d..db9c72b 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -299,7 +299,7 @@ const struct osmo_location_area_id *old_lai, const struct osmo_location_area_id *new_lai, bool authentication_required, - bool ciphering_required, + bool try_ciphering, uint8_t key_seq, bool is_r99, bool is_utran, bool assign_tmsi); @@ -463,7 +463,7 @@ const struct osmo_mobile_identity *mi, const struct osmo_location_area_id *lai, bool authentication_required, - bool ciphering_required, + bool try_ciphering, uint8_t key_seq, bool is_r99, bool is_utran); diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 9d3b5a2..3c60b1f 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -417,7 +417,7 @@ net->vlr, msc_a, vlr_lu_type, tmsi, imsi, &old_lai, &msc_a->via_cell.lai, is_utran || net->authentication_required, - msc_a_require_ciphering(msc_a), + msc_a_try_ciphering(msc_a), lu->key_seq, osmo_gsm48_classmark1_is_r99(&lu->classmark1), is_utran, @@ -818,7 +818,7 @@ req->cm_service_type, &mi, &msc_a->via_cell.lai, is_utran || net->authentication_required, - msc_a_require_ciphering(msc_a), + msc_a_try_ciphering(msc_a), req->cipher_key_seq, osmo_gsm48_classmark2_is_r99(cm2, cm2_len), is_utran); @@ -944,7 +944,7 @@ VLR_PR_ARQ_T_CM_RE_ESTABLISH_REQ, 0, &mi, &msc_a->via_cell.lai, is_utran || net->authentication_required, - msc_a_require_ciphering(msc_a), + msc_a_try_ciphering(msc_a), req->cipher_key_seq, osmo_gsm48_classmark2_is_r99(cm2, cm2_len), is_utran); @@ -1306,7 +1306,7 @@ net->vlr, msc_a, VLR_PR_ARQ_T_PAGING_RESP, 0, &mi, &msc_a->via_cell.lai, is_utran || net->authentication_required, - msc_a_require_ciphering(msc_a), + msc_a_try_ciphering(msc_a), pr->key_seq, osmo_gsm48_classmark2_is_r99(cm2, classmark2_len), is_utran); diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index f00fb11..fad5b77 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -106,7 +106,7 @@ return fi->priv; } -bool msc_a_require_ciphering(const struct msc_a *msc_a) +bool msc_a_try_ciphering(const struct msc_a *msc_a) { struct gsm_network *net = msc_a_net(msc_a); bool is_utran = (msc_a->c.ran->type == OSMO_RAT_UTRAN_IU); diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 8daaaad..c210249 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -67,7 +67,7 @@ uint32_t tmsi; struct osmo_location_area_id lai; bool authentication_required; - bool ciphering_required; + bool try_ciphering; uint8_t key_seq; bool is_r99; bool is_utran; @@ -272,7 +272,7 @@ { /* UTRAN: always send SecModeCmd, even if ciphering is not required. * GERAN: avoid sending CiphModeCmd if ciphering is not required. */ - return par->is_utran || par->ciphering_required; + return par->is_utran || par->try_ciphering; } static void _proc_arq_vlr_node2(struct osmo_fsm_inst *fi) @@ -320,7 +320,7 @@ * are defined in 3GPP TS 33.102 */ /* For now we use a default value passed in to vlr_lu_fsm(). */ return par->authentication_required || - (par->ciphering_required && !auth_try_reuse_tuple(par->vsub, par->key_seq)); + (par->try_ciphering && !auth_try_reuse_tuple(par->vsub, par->key_seq)); } /* after the IMSI is known */ @@ -634,7 +634,7 @@ const struct osmo_mobile_identity *mi, const struct osmo_location_area_id *lai, bool authentication_required, - bool ciphering_required, + bool try_ciphering, uint8_t key_seq, bool is_r99, bool is_utran) { @@ -657,7 +657,7 @@ par->parent_event_failure = parent_event_failure; par->parent_event_data = parent_event_data; par->authentication_required = authentication_required; - par->ciphering_required = ciphering_required; + par->try_ciphering = try_ciphering; par->key_seq = key_seq; par->is_r99 = is_r99; par->is_utran = is_utran; @@ -665,10 +665,10 @@ LOGPFSM(fi, "rev=%s net=%s%s%s\n", is_r99 ? "R99" : "GSM", is_utran ? "UTRAN" : "GERAN", - (authentication_required || ciphering_required)? + (authentication_required || try_ciphering)? " Auth" : " (no Auth)", - (authentication_required || ciphering_required)? - (ciphering_required? "+Ciph" : " (no Ciph)") + (authentication_required || try_ciphering)? + (try_ciphering? "+Ciph" : " (no Ciph)") : ""); if (is_utran && !authentication_required) diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index f673316..85cd25e 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -676,7 +676,7 @@ struct osmo_location_area_id old_lai; struct osmo_location_area_id new_lai; bool authentication_required; - bool ciphering_required; + bool try_ciphering; uint8_t key_seq; bool is_r99; bool is_utran; @@ -699,7 +699,7 @@ * are defined in 3GPP TS 33.102 */ /* For now we use a default value passed in to vlr_lu_fsm(). */ return lfp->authentication_required || - (lfp->ciphering_required && !auth_try_reuse_tuple(lfp->vsub, lfp->key_seq)); + (lfp->try_ciphering && !auth_try_reuse_tuple(lfp->vsub, lfp->key_seq)); } /* Determine if sending of CMC/SMC is required */ @@ -707,7 +707,7 @@ { /* UTRAN: always send SecModeCmd, even if ciphering is not required. * GERAN: avoid sending CiphModeCmd if ciphering is not required. */ - return lfp->is_utran || lfp->ciphering_required; + return lfp->is_utran || lfp->try_ciphering; } /* Determine if a HLR Update is required */ @@ -1475,7 +1475,7 @@ const struct osmo_location_area_id *old_lai, const struct osmo_location_area_id *new_lai, bool authentication_required, - bool ciphering_required, + bool try_ciphering, uint8_t key_seq, bool is_r99, bool is_utran, bool assign_tmsi) @@ -1499,7 +1499,7 @@ lfp->parent_event_failure = parent_event_failure; lfp->parent_event_data = parent_event_data; lfp->authentication_required = authentication_required; - lfp->ciphering_required = ciphering_required; + lfp->try_ciphering = try_ciphering; lfp->key_seq = key_seq; lfp->is_r99 = is_r99; lfp->is_utran = is_utran; @@ -1514,10 +1514,10 @@ LOGPFSM(fi, "rev=%s net=%s%s%s\n", is_r99 ? "R99" : "GSM", is_utran ? "UTRAN" : "GERAN", - (authentication_required || ciphering_required)? + (authentication_required || try_ciphering)? " Auth" : " (no Auth)", - (authentication_required || ciphering_required)? - (ciphering_required? "+Ciph" : " (no Ciph)") + (authentication_required || try_ciphering)? + (try_ciphering? "+Ciph" : " (no Ciph)") : ""); osmo_fsm_inst_dispatch(fi, VLR_ULA_E_UPDATE_LA, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia55085e3b36feb275bcf92fc91a4be7d1c24a6b9 Gerrit-Change-Number: 29694 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: msc_a,vlr: add ciphering_required (accurately named)

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/29695 ) Change subject: msc_a,vlr: add ciphering_required (accurately named) ...................................................................... msc_a,vlr: add ciphering_required (accurately named) For establishing Layer 3, pass a flag from msc_a to VLR that indicates to fail if encryption is not possible. An earlier patch [1] renamed a previously existing flag ciphering_required to try_ciphering, because the naming was not accurate. This new flag now indicates exactly what its name suggests. This new flag is needed for upcoming patch [2] to distinguish between optional and mandatory encryption. [1] Ia55085e3b36feb275bcf92fc91a4be7d1c24a6b9 [2] I5feda196fa481dd8a46b0e4721c64b7c6600f0d1 Related: OS#4830 Change-Id: I52090c5f5db997030da7c2ed9beca9c51f55f4cf --- M include/osmocom/msc/msc_a.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_a.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_lu_fsm.c 6 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/95/29695/1 diff --git a/include/osmocom/msc/msc_a.h b/include/osmocom/msc/msc_a.h index ad41d73..0bd72cb 100644 --- a/include/osmocom/msc/msc_a.h +++ b/include/osmocom/msc/msc_a.h @@ -181,6 +181,7 @@ unsigned int msc_a_pending_cm_service_req_count(struct msc_a *msc_a, enum osmo_cm_service_type type); void msc_a_pending_cm_service_req_del(struct msc_a *msc_a, enum osmo_cm_service_type type); bool msc_a_try_ciphering(const struct msc_a *msc_a); +bool msc_a_require_ciphering(const struct msc_a *msc_a); #define msc_a_ran_down(A,B,C) \ _msc_a_ran_down(A,B,C, __FILE__, __LINE__) diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index db9c72b..8f2417a 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -300,6 +300,7 @@ const struct osmo_location_area_id *new_lai, bool authentication_required, bool try_ciphering, + bool ciphering_required, uint8_t key_seq, bool is_r99, bool is_utran, bool assign_tmsi); @@ -464,6 +465,7 @@ const struct osmo_location_area_id *lai, bool authentication_required, bool try_ciphering, + bool ciphering_required, uint8_t key_seq, bool is_r99, bool is_utran); diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 3c60b1f..af20b38 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -418,6 +418,7 @@ &old_lai, &msc_a->via_cell.lai, is_utran || net->authentication_required, msc_a_try_ciphering(msc_a), + msc_a_require_ciphering(msc_a), lu->key_seq, osmo_gsm48_classmark1_is_r99(&lu->classmark1), is_utran, @@ -819,6 +820,7 @@ &mi, &msc_a->via_cell.lai, is_utran || net->authentication_required, msc_a_try_ciphering(msc_a), + msc_a_require_ciphering(msc_a), req->cipher_key_seq, osmo_gsm48_classmark2_is_r99(cm2, cm2_len), is_utran); @@ -945,6 +947,7 @@ &mi, &msc_a->via_cell.lai, is_utran || net->authentication_required, msc_a_try_ciphering(msc_a), + msc_a_require_ciphering(msc_a), req->cipher_key_seq, osmo_gsm48_classmark2_is_r99(cm2, cm2_len), is_utran); @@ -1307,6 +1310,7 @@ VLR_PR_ARQ_T_PAGING_RESP, 0, &mi, &msc_a->via_cell.lai, is_utran || net->authentication_required, msc_a_try_ciphering(msc_a), + msc_a_require_ciphering(msc_a), pr->key_seq, osmo_gsm48_classmark2_is_r99(cm2, classmark2_len), is_utran); diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index fad5b77..7ce70c9 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -116,6 +116,18 @@ return net->a5_encryption_mask > 0x1; } +bool msc_a_require_ciphering(const struct msc_a *msc_a) +{ + struct gsm_network *net = msc_a_net(msc_a); + bool is_utran = (msc_a->c.ran->type == OSMO_RAT_UTRAN_IU); + if (is_utran) + return net->uea_encryption_mask + && ((net->uea_encryption_mask & (1 << OSMO_UTRAN_UEA0)) == 0); + else + return net->a5_encryption_mask + && ((net->a5_encryption_mask & 0x1) == 0); +} + static void update_counters(struct osmo_fsm_inst *fi, bool conn_accepted) { struct msc_a *msc_a = fi->priv; diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index c210249..eeefc90 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -68,6 +68,7 @@ struct osmo_location_area_id lai; bool authentication_required; bool try_ciphering; + bool ciphering_required; uint8_t key_seq; bool is_r99; bool is_utran; @@ -635,6 +636,7 @@ const struct osmo_location_area_id *lai, bool authentication_required, bool try_ciphering, + bool ciphering_required, uint8_t key_seq, bool is_r99, bool is_utran) { @@ -658,6 +660,7 @@ par->parent_event_data = parent_event_data; par->authentication_required = authentication_required; par->try_ciphering = try_ciphering; + par->ciphering_required = ciphering_required; par->key_seq = key_seq; par->is_r99 = is_r99; par->is_utran = is_utran; diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 85cd25e..e0c73a3 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -677,6 +677,7 @@ struct osmo_location_area_id new_lai; bool authentication_required; bool try_ciphering; + bool ciphering_required; uint8_t key_seq; bool is_r99; bool is_utran; @@ -1476,6 +1477,7 @@ const struct osmo_location_area_id *new_lai, bool authentication_required, bool try_ciphering, + bool ciphering_required, uint8_t key_seq, bool is_r99, bool is_utran, bool assign_tmsi) @@ -1500,6 +1502,7 @@ lfp->parent_event_data = parent_event_data; lfp->authentication_required = authentication_required; lfp->try_ciphering = try_ciphering; + lfp->ciphering_required = ciphering_required; lfp->key_seq = key_seq; lfp->is_r99 = is_r99; lfp->is_utran = is_utran; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I52090c5f5db997030da7c2ed9beca9c51f55f4cf Gerrit-Change-Number: 29695 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: vlr_loc_update(): drop bogus check

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/29693 ) Change subject: vlr_loc_update(): drop bogus check ...................................................................... vlr_loc_update(): drop bogus check All callers pass authentication_required = true when is_utran = true. The failure this error message would highlight is not possible. Change-Id: Ia1b5d5d308746651a41612f46a988f41acd0a269 --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/93/29693/1 diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 4f603b3..f673316 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -1520,10 +1520,6 @@ (ciphering_required? "+Ciph" : " (no Ciph)") : ""); - if (is_utran && !authentication_required) - LOGPFSML(fi, LOGL_ERROR, - "Authentication off on UTRAN network. Good luck.\n"); - osmo_fsm_inst_dispatch(fi, VLR_ULA_E_UPDATE_LA, NULL); return fi; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia1b5d5d308746651a41612f46a988f41acd0a269 Gerrit-Change-Number: 29693 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: msc: test auth options, and fall-back to no-auth

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29692 ) Change subject: msc: test auth options, and fall-back to no-auth ...................................................................... msc: test auth options, and fall-back to no-auth Test 12 permutations of (auth optional,required) x (a5 '0', '0 3', '3') x (hlr has auth info) In TC_auth_options_2(), expect behavior after implementing OS#4830: if the HLR fails to return auth info and auth + ciph are configured optional, fall back to no authentication. This test will start succeeding starting with commit I5feda196fa481dd8a46b0e4721c64b7c6600f0d1 in osmo-msc.git. All other tests yield the current behavior of osmo-msc. Related: I5feda196fa481dd8a46b0e4721c64b7c6600f0d1 (osmo-msc) Related: OS#4830 Change-Id: I8e3b02ca83e56ef5349d85f08407509e19fa353c --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 409 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/29692/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 4e736b8..fe9187c 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -78,8 +78,24 @@ } type record BSC_ConnHdlrNetworkPars { + /* Bitmask of expected A5 levels; in Ciphering, will expect use of the highest A5 remaining after masking this + * with A5 supported by the MS */ OCT1 kc_support, + /* osmo-msc VTY cfg under 'network': If a test wants to temporarily modify auth and encr config, this is the + * original config to return to for this test (is *not* sent to vty before the test, but maybe it should). + * For example: { "authentication optional", "encryption a5 0 3" } */ + rof_charstring net_config, + /* expect_attach_success == true: expect Location Updating / CM Service Request to succeed. + * expect_attach_success == false: expect the MSC to reject LU / CM Service. */ + boolean expect_attach_success, + /* expect_tmsi == true: expect MSC to allocate a new TMSI. + * expect_tmsi == false: expect no TMSI to be assigned, operate with IMSI Mobile Identity. */ boolean expect_tmsi, + /* expect_auth == true overrides expect_auth_attempt == false */ + boolean expect_auth_attempt, + /* hlr_has_auth_info has an effect only when (expect_auth_attempt or expect_auth) == true. + * hlr_has_auth_info == false means the HLR responds to Send Auth Info Request with a NACK. */ + boolean hlr_has_auth_info, boolean expect_auth, boolean expect_ciph, boolean expect_imei, @@ -404,7 +420,11 @@ } else { if (etype != EST_TYPE_PAG_RESP) { /* explicit CM SERVICE ACCEPT */ - BSSAP.receive(tr_PDU_DTAP_MT(tr_CM_SERV_ACC)); + if (g_pars.net.expect_attach_success) { + BSSAP.receive(tr_PDU_DTAP_MT(tr_CM_SERV_ACC)); + } else { + BSSAP.receive(tr_PDU_DTAP_MT(tr_CM_SERV_REJ)); + } } } } @@ -436,34 +456,43 @@ altstep as_GSUP_SAI() runs on BSC_ConnHdlr { var GSUP_IE auth_tuple; [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)) { - if (g_pars.use_umts_aka) { - if (not g_pars.vec_keep) { - g_pars.vec := f_gen_auth_vec_3g(); + if (g_pars.net.hlr_has_auth_info) { + if (g_pars.use_umts_aka) { + if (not g_pars.vec_keep) { + g_pars.vec := f_gen_auth_vec_3g(); + } + auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc, + g_pars.vec.ik, + g_pars.vec.ck, + g_pars.vec.autn, + g_pars.vec.res)); + GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); + } else { + if (not g_pars.vec_keep) { + g_pars.vec := f_gen_auth_vec_2g(); + } + auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc)); + GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); } - auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand, - g_pars.vec.sres, - g_pars.vec.kc, - g_pars.vec.ik, - g_pars.vec.ck, - g_pars.vec.autn, - g_pars.vec.res)); - GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); } else { - if (not g_pars.vec_keep) { - g_pars.vec := f_gen_auth_vec_2g(); - } - auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G(g_pars.vec.rand, - g_pars.vec.sres, - g_pars.vec.kc)); - GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); + log("XXX ts_GSUP_SAI_ERR"); + /* HLR knows the IMSI but has no authentication info; osmo-hlr responds with GMM_CAUSE_IMSI_UNKNOWN=2 in + * this case, for SAI this merely means there is no auth entry for this IMSI. */ + GSUP.send(ts_GSUP_SAI_ERR(g_pars.imsi, 2)); } } } function f_mm_auth() runs on BSC_ConnHdlr { - if (g_pars.net.expect_auth) { + if (g_pars.net.expect_auth or g_pars.net.expect_auth_attempt) { as_GSUP_SAI(); + } + if (g_pars.net.expect_auth) { if (g_pars.use_umts_aka) { BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_AUTH_REQ_3G(g_pars.vec.rand, g_pars.vec.autn))); var OCT4 res := substr(g_pars.vec.res, 0, 4); @@ -685,6 +714,9 @@ f_mm_ciph_utran(); } + if (not g_pars.net.expect_attach_success) { + return; + } f_expect_common_id(); } @@ -810,15 +842,18 @@ f_mm_common(); f_msc_lu_hlr(); f_mm_imei(); - f_accept_reject_lu(); + as_accept_reject_lu(g_pars.net.expect_attach_success); /* FIXME: there could be pending SMS or other common procedures by the MSC, let's ignore them */ - f_expect_clear(); + f_expect_clear(verify_vlr_cell_id := g_pars.net.expect_attach_success); setverdict(pass); } function f_msc_lu_hlr() runs on BSC_ConnHdlr { + if (not g_pars.net.expect_attach_success) { + return; + } /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); GSUP.send(ts_GSUP_ISD_REQ(g_pars.imsi, g_pars.msisdn)); @@ -826,11 +861,10 @@ GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); } -function f_accept_reject_lu() runs on BSC_ConnHdlr { +altstep as_accept_reject_lu(boolean expect_accept := true) runs on BSC_ConnHdlr { var PDU_DTAP_MT dtap_mt; - alt { - [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) -> value dtap_mt { + [expect_accept] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) -> value dtap_mt { var PDU_ML3_LocationUpdateAccept lu_acc := dtap_mt.dtap.msgs.mm.locationUpdateAccept; if (g_pars.net.expect_tmsi) { if (not ispresent(lu_acc.mobileIdentityTLV) or @@ -848,16 +882,23 @@ mtc.stop; } } - } - [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + + /* Wait for MM-Information (if enabled) */ + f_expect_mm_info(); + setverdict(pass); + } + [expect_accept] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { setverdict(fail, "Expected LU ACK, but received LU REJ"); mtc.stop; - } } - /* Wait for MM-Information (if enabled) */ - f_expect_mm_info(); - setverdict(pass); + [not expect_accept] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + setverdict(pass); + } + [not expect_accept] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) -> value dtap_mt { + setverdict(fail, "Expected LU REJ, but received LU ACK"); + mtc.stop; + } } function f_expect_lu_reject(template OCT1 cause := ?) runs on BSC_ConnHdlr { diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index e6d270d..13133de 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -371,7 +371,11 @@ runs on MTC_CT return BSC_ConnHdlrPars { var BSC_ConnHdlrNetworkPars net_pars := { kc_support := '0A'O, /* A5/1 and A5/3 enabled */ + net_config := { "authentication optional", "encryption a5 0" }, + expect_attach_success := true, expect_tmsi := true, + expect_auth_attempt := false, + hlr_has_auth_info := true, expect_auth := false, expect_ciph := false, expect_imei := false, @@ -4474,7 +4478,7 @@ /* TODO: Verify MSC is using the best cipher available! How? */ f_msc_lu_hlr(); - f_accept_reject_lu(); + as_accept_reject_lu(); f_expect_clear(); setverdict(pass); } @@ -6848,6 +6852,325 @@ vc_conn.done; } +/* a5 0 a5 0 a5 0 3 a5 0 3 a5 3 a5 3 + * HLR has auth info no yes no yes no yes + * + * test case index [0] [1] [2] [3] [4] [5] + * authentication optional No auth No auth attempt auth, auth reject auth + * (%) fall back to +ciph +ciph + * no-auth + * + * [6] [7] [8] [9] [10] [11] + * authentication mandatory reject auth reject auth reject auth + * only +ciph +ciph + * + * (%): Arguably, when HLR has auth info, the MSC should use it. Current behavior of osmo-msc is to not attempt auth at + * all. Related: OS#4830. + */ +type record of BSC_ConnHdlrNetworkPars rof_netpars; + +const rof_netpars auth_options_testcases := { + { + /* [0] auth optional, encr a5 0: no-auth" */ + kc_support := '01'O, + net_config := { "authentication optional", + "encryption a5 0" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := false, + hlr_has_auth_info := false, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [1] auth optional, encr a5 0, HLR HAS auth info: no-auth */ + kc_support := '01'O, + net_config := { "authentication optional", + "encryption a5 0" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := false, + hlr_has_auth_info := true, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [2] auth optional, encr a5 0 3, HLR has NO Auth Info: Fall back to no-auth" */ + kc_support := '09'O, + net_config := { "authentication optional", + "encryption a5 0 3" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := false, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [3] auth optional, encr a5 0 3, HLR HAS Auth Info: Use A5/3 */ + kc_support := '09'O, + net_config := { "authentication optional", + "encryption a5 0 3" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := true, + expect_auth := true, + expect_ciph := true, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [4] auth optional, encr a5 3, HLR has NO Auth Info: reject. + * Auth is required implicitly because ciph is required. */ + kc_support := '08'O, + net_config := { "authentication optional", + "encryption a5 3" }, + expect_attach_success := false, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := false, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [5] auth optional, encr a5 3, HLR HAS Auth Info: auth + ciph. + * Auth is required implicitly because ciph is required. */ + kc_support := '08'O, + net_config := { "authentication optional", + "encryption a5 3" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := true, + expect_auth := true, + expect_ciph := true, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + + /* Same as above, but with 'authentication required' */ + + { + /* [6] auth required, encr a5 0, HLR has NO auth info: reject */ + kc_support := '01'O, + net_config := { "authentication required", + "encryption a5 0" }, + expect_attach_success := false, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := false, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [7] auth required, encr a5 0, HLR HAS auth info: do auth, no ciph" */ + kc_support := '01'O, + net_config := { "authentication required", + "encryption a5 0" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := true, + expect_auth := true, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [8] auth required, encr a5 0 3, HLR has NO Auth Info: reject */ + kc_support := '09'O, + net_config := { "authentication required", + "encryption a5 0 3" }, + expect_attach_success := false, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := false, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [9] auth required, encr a5 0 3, HLR HAS Auth Info: Use A5/3 */ + kc_support := '09'O, + net_config := { "authentication required", + "encryption a5 0 3" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := true, + expect_auth := true, + expect_ciph := true, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [10] auth required, encr a5 3, HLR has NO Auth Info: reject. */ + kc_support := '08'O, + net_config := { "authentication required", + "encryption a5 3" }, + expect_attach_success := false, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := false, + expect_auth := false, + expect_ciph := false, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + }, + { + /* [11] auth required, encr a5 3, HLR HAS Auth Info: auth + ciph. */ + kc_support := '08'O, + net_config := { "authentication required", + "encryption a5 3" }, + expect_attach_success := true, + expect_tmsi := true, + expect_auth_attempt := true, + hlr_has_auth_info := true, + expect_auth := true, + expect_ciph := true, + expect_imei := false, + expect_imei_early := false, + check_imei_result := OSMO_GSUP_IMEI_RESULT_ACK, + check_imei_error := false + } +}; + +private function f_tc_auth_options(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + + /* Location Updating */ + f_logp(MSCVTY, "f_perform_lu() starting"); + f_perform_lu(); + f_logp(MSCVTY, "f_perform_lu() done"); + + f_sleep(1.0); + + if (not pars.net.expect_attach_success) { + /* Expected above LU to fail. In order to test CM Service Request below, a LU has to succeed first. So + * run another LU that will be successful. Careful not to load auth tokens into the VLR that may taint + * the test for CM Service Request below. */ + + f_logp(MSCVTY, "Running a successful LU so that CM Service Request can be tested"); + var BSC_ConnHdlrNetworkPars saved_net := g_pars.net; + g_pars.net.kc_support := '01'O; + g_pars.net.expect_attach_success := true; + g_pars.net.expect_auth_attempt := false; + g_pars.net.expect_auth := false; + g_pars.net.expect_ciph := false; + f_vty_config3(MSCVTY, {"network"}, {"authentication optional", "encryption a5 0"}); + f_perform_lu(); + + /* Reconfigure like it was before */ + g_pars.net := saved_net; + f_vty_config3(MSCVTY, {"network"}, g_pars.net.net_config); + f_logp(MSCVTY, "Running a successful LU done"); + } + + /* CM Service Request */ + f_logp(MSCVTY, "f_establish_fully() starting"); + f_establish_fully(); + f_logp(MSCVTY, "f_establish_fully() done"); + BSSAP.send(ts_BSSMAP_ClearRequest(0)); + f_expect_clear(); +} + +function f_TC_auth_options(integer tc_i) runs on MTC_CT { + f_init(); + + var BSC_ConnHdlrNetworkPars tc := auth_options_testcases[tc_i]; + + f_vty_config3(MSCVTY, {"network"}, tc.net_config); + + var BSC_ConnHdlrPars pars := f_init_pars(42300 + tc_i); + pars.net := tc; + + var BSC_ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_tc_auth_options), pars); + vc_conn.done; +} + +testcase TC_auth_options_0() runs on MTC_CT { + f_TC_auth_options(0); +} + +testcase TC_auth_options_1() runs on MTC_CT { + f_TC_auth_options(1); +} + +testcase TC_auth_options_2() runs on MTC_CT { + f_TC_auth_options(2); +} + +testcase TC_auth_options_3() runs on MTC_CT { + f_TC_auth_options(3); +} + +testcase TC_auth_options_4() runs on MTC_CT { + f_TC_auth_options(4); +} + +testcase TC_auth_options_5() runs on MTC_CT { + f_TC_auth_options(5); +} + +testcase TC_auth_options_6() runs on MTC_CT { + f_TC_auth_options(6); +} + +testcase TC_auth_options_7() runs on MTC_CT { + f_TC_auth_options(7); +} + +testcase TC_auth_options_8() runs on MTC_CT { + f_TC_auth_options(8); +} + +testcase TC_auth_options_9() runs on MTC_CT { + f_TC_auth_options(9); +} + +testcase TC_auth_options_10() runs on MTC_CT { + f_TC_auth_options(10); +} + +testcase TC_auth_options_11() runs on MTC_CT { + f_TC_auth_options(11); +} + control { execute( TC_cr_before_reset() ); execute( TC_lu_imsi_noauth_tmsi() ); @@ -7012,6 +7335,19 @@ execute( TC_call_re_establishment_ciph() ); execute( TC_cm_serv_wrong_mi() ); + + execute( TC_auth_options_0() ); + execute( TC_auth_options_1() ); + execute( TC_auth_options_2() ); + execute( TC_auth_options_3() ); + execute( TC_auth_options_4() ); + execute( TC_auth_options_5() ); + execute( TC_auth_options_6() ); + execute( TC_auth_options_7() ); + execute( TC_auth_options_8() ); + execute( TC_auth_options_9() ); + execute( TC_auth_options_10() ); + execute( TC_auth_options_11() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8e3b02ca83e56ef5349d85f08407509e19fa353c Gerrit-Change-Number: 29692 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activ...

by Jenkins Builder

Attention is currently required from: pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29659 ) Change subject: osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activation ...................................................................... Patch Set 2: Verified+1 4 passed: [build] https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-mgw-build/a1=default,a2… [lint] https://jenkins.osmocom.org/jenkins/job/gerrit-lint/38/consoleFull [deb] https://jenkins.osmocom.org/jenkins/job/gerrit-binpkgs-deb/22/consoleFull [rpm] https://jenkins.osmocom.org/jenkins/job/gerrit-binpkgs-rpm/24/consoleFull Build Successful -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7654ddf51d197a4107e55f4e406053b2e4a02f83 Gerrit-Change-Number: 29659 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Oct 2022 19:28:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activ...

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29659 to look at the new patch set (#2). Change subject: osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activation ...................................................................... osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activation Change-Id: I7654ddf51d197a4107e55f4e406053b2e4a02f83 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 5 files changed, 131 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/59/29659/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7654ddf51d197a4107e55f4e406053b2e4a02f83 Gerrit-Change-Number: 29659 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in docker-playground[master]: ttcn3-mgw: jenkins.sh Fix centos tests

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29665 ) Change subject: ttcn3-mgw: jenkins.sh Fix centos tests ...................................................................... ttcn3-mgw: jenkins.sh Fix centos tests The sed lines dropping the new configs must be applied to any non-master run. Fixes: e077fec68419d13c2dbe347b6799f407dd927ffd Change-Id: I369bb61f3979bd9118fad17c3d202253411ba14b --- M ttcn3-mgw-test/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 48cd1d1..2dee534 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -16,7 +16,7 @@ mkdir $VOL_BASE_DIR/mgw cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/ # Can be dropped once released osmo-mgw is >1.10.0: -if image_suffix_is_latest; then +if ! image_suffix_is_master; then sed -i "/^ osmux bind-ip-v6 fd02:db8:4::180/d" $VOL_BASE_DIR/mgw/osmo-mgw.cfg fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I369bb61f3979bd9118fad17c3d202253411ba14b Gerrit-Change-Number: 29665 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_crcx_osmux_257

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29661 to look at the new patch set (#4). Change subject: mgw: Introduce test TC_crcx_osmux_257 ...................................................................... mgw: Introduce test TC_crcx_osmux_257 Related: SYS#5987 Change-Id: I74e6c760e076fe2547b6297a54524255fb8b --- M mgw/MGCP_Test.ttcn M mgw/expected-results.xml M mgw/osmo-mgw.cfg 3 files changed, 49 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/29661/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I74e6c760e076fe2547b6297a54524255fb8bc41b Gerrit-Change-Number: 29661 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Remove hack in f_two_crcx_mdcx_and_rtp_osmux() no longer needed

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29664 ) Change subject: mgw: Remove hack in f_two_crcx_mdcx_and_rtp_osmux() no longer needed ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > should we add a code path for latest release here, so it doesn't start failing? Latest release is wrong, so it's fine having them fail. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I531631d716581f68c11d3c0b07fc6755a822a0d3 Gerrit-Change-Number: 29664 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Oct 2022 19:22:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022