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

[XS] Change in osmo-msc[master]: vlr: add bool is_ps to vlr_alloc()
by pespin 21 Oct '24

21 Oct '24

Attention is currently required from: lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38485?usp=email ) Change subject: vlr: add bool is_ps to vlr_alloc() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib77aad8492a198131c966d4ac4cf8f5f727edcfa Gerrit-Change-Number: 38485 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 21 Oct 2024 19:51:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XL] Change in osmo-msc[master]: vlr: drop msc/debug.h header
by pespin 21 Oct '24

21 Oct '24

Attention is currently required from: laforge, lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38411?usp=email ) Change subject: vlr: drop msc/debug.h header ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38411?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8fa2f16c07ef54be3a125c19e0990a68c4d5d2cf Gerrit-Change-Number: 38411 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 21 Oct 2024 19:50:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XL] Change in osmo-msc[master]: vlr: drop msc/debug.h header
by lynxis lazus 21 Oct '24

21 Oct '24

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/38411?usp=email to look at the new patch set (#8). The following approvals got outdated and were removed: Code-Review+1 by pespin Change subject: vlr: drop msc/debug.h header ...................................................................... vlr: drop msc/debug.h header Since logging is done different, remove the MSC specific header. Change-Id: I8fa2f16c07ef54be3a125c19e0990a68c4d5d2cf --- M src/libvlr/vlr.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_lu_fsm.c M src/libvlr/vlr_sgs.c M src/libvlr/vlr_sgs_fsm.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 18 files changed, 2,493 insertions(+), 2,499 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/38411/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38411?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8fa2f16c07ef54be3a125c19e0990a68c4d5d2cf Gerrit-Change-Number: 38411 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-msc[master]: vlr: add a logging layer
by lynxis lazus 21 Oct '24

21 Oct '24

Attention is currently required from: laforge. lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38410?usp=email ) Change subject: vlr: add a logging layer ...................................................................... Patch Set 6: (2 comments) Patchset: PS5: > whoy doesn't LOGVLR take a vlr as first pointer and then print the context? Like we usually do in o […] I only converted the code, even there is also LOGVSUBP File src/libvlr/vlr.c: https://gerrit.osmocom.org/c/osmo-msc/+/38410/comment/b46b52dd_15f6ea22?usp… : PS5, Line 457: LOGVLR(LOGL_DEBUG, "freeing VLR subscr %s (max total use count was %d)\n", vlr_subscr_name(vsub), > So I'd suggest something like `LOGVSUB(vsub, LOGL_DEBUG, "freeing VLR subscr (max total use count wa […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38410?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6d87b38d6d7d704c7c7b2c90ad12187e4b953b8b Gerrit-Change-Number: 38410 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 21 Oct 2024 18:14:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[M] Change in osmo-msc[master]: vlr: add PS support
by Jenkins Builder 21 Oct '24

21 Oct '24

Jenkins Builder has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38490?usp=email ) Change subject: vlr: add PS support ...................................................................... Patch Set 1: (3 comments) File src/libvlr/vlr_lu_fsm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19334): https://gerrit.osmocom.org/c/osmo-msc/+/38490/comment/65a3a0e5_eede9c6e?usp… : PS1, Line 575: static int lu_compl_vlr_timeout(struct osmo_fsm_inst *fi) { open brace '{' following function definitions go on the next line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19334): https://gerrit.osmocom.org/c/osmo-msc/+/38490/comment/00981ee8_5a6e83cc?usp… : PS1, Line 588: LOGPFSML(fi, LOGL_ERROR, "LU Compl timeout %i / %i \n", fi->T, lcvp->N); unnecessary whitespace before a quoted newline Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19334): https://gerrit.osmocom.org/c/osmo-msc/+/38490/comment/ec7fd840_c7dc1334?usp… : PS1, Line 588: LOGPFSML(fi, LOGL_ERROR, "LU Compl timeout %i / %i \n", fi->T, lcvp->N); Use %d instead of %i -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38490?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie9ffeb140c9d354b3a0f4822e2619f623235add0 Gerrit-Change-Number: 38490 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 21 Oct 2024 18:10:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in osmo-msc[master]: WIP: vlr: extend the subscriber invalidate callback with reasons
by lynxis lazus 21 Oct '24

21 Oct '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38488?usp=email ) Change subject: WIP: vlr: extend the subscriber invalidate callback with reasons ...................................................................... WIP: vlr: extend the subscriber invalidate callback with reasons The VLR must be allowed to notify the MSC if an subscriber becomes invalid. There are multiple cases when this happens: a) if the subscriber didn't do a Location Update Procedure within the given periodic timer. b) if the HLR do a Cancel Location Procedure with reason withdraw c) if the HLR do a Cancel Location Procedure with reason update location. Only in case b) must the user informed with the cause code by the HLR. For c) the MSC must inform the MS about the reason. FIXME: check case a) what must be done. Do we really need to inform the user? Change-Id: Ie5b687318b106a230fcee52deba86649641004b3 --- M include/osmocom/vlr/vlr.h M src/libmsc/gsm_04_08.c M src/libvlr/vlr.c 3 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/88/38488/1 diff --git a/include/osmocom/vlr/vlr.h b/include/osmocom/vlr/vlr.h index ed6438b..e99a1e2 100644 --- a/include/osmocom/vlr/vlr.h +++ b/include/osmocom/vlr/vlr.h @@ -251,7 +251,8 @@ * with this msc_conn_ref */ int (*subscr_assoc)(void *msc_conn_ref, struct vlr_subscr *vsub); /* notify MSC that the given subscriber is no longer valid */ - void (*subscr_inval)(void *msc_conn_ref, struct vlr_subscr *vsub); + void (*subscr_inval)(void *msc_conn_ref, struct vlr_subscr *vsub, + enum gsm48_reject_value cause, bool cancel_by_update); }; /* An instance of the VLR codebase */ diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index d9e0b5f..7249fc7 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1572,7 +1572,8 @@ return 0; } -static void msc_vlr_subscr_inval(void *msc_conn_ref, struct vlr_subscr *vsub) +static void msc_vlr_subscr_inval(void *msc_conn_ref, struct vlr_subscr *vsub, + enum gsm48_reject_value cause, bool cancel_by_update) { /* Search vsub backwards to make sure msc_conn_ref is a valid msc_a instance. */ struct msub *msub; diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index b924f81..a4b0887 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -628,7 +628,7 @@ exists->imsi); if (vlr->ops.subscr_inval) - vlr->ops.subscr_inval(exists->msc_conn_ref, exists); + vlr->ops.subscr_inval(exists->msc_conn_ref, exists, 0, true); vlr_subscr_free(exists); } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38488?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie5b687318b106a230fcee52deba86649641004b3 Gerrit-Change-Number: 38488 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-msc[master]: WIP: vlr: when receiving imsi detach, purge the subscriber towards HLR
by lynxis lazus 21 Oct '24

21 Oct '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38489?usp=email ) Change subject: WIP: vlr: when receiving imsi detach, purge the subscriber towards HLR ...................................................................... WIP: vlr: when receiving imsi detach, purge the subscriber towards HLR The HLR must know when a subscriber has been disconnected. FIXME: the unit tests doesn't expect a GSUP, which is wrong IMHO. Change-Id: I9c2569c45e69b422ce26050b682e6eb26c1c2625 --- M src/libvlr/vlr.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/89/38489/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index a4b0887..c7d17f8 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -1512,8 +1512,15 @@ /* See TS 23.012 version 9.10.0 4.3.2.1 "Process Detach_IMSI_VLR" */ int vlr_subscr_rx_imsi_detach(struct vlr_subscr *vsub) { + int rc = 0; + vlr_rate_ctr_inc(vsub->vlr, VLR_CTR_DETACH_BY_REQ); - return vlr_subscr_detach(vsub); + + if (!vsub->imsi_detached_flag) + rc = vlr_subscr_purge(vsub); + + rc |= vlr_subscr_detach(vsub); + return rc; } /* Tear down any running FSMs due to MSC connection timeout. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38489?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9c2569c45e69b422ce26050b682e6eb26c1c2625 Gerrit-Change-Number: 38489 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-msc[master]: vlr: add PS support
by lynxis lazus 21 Oct '24

21 Oct '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38490?usp=email ) Change subject: vlr: add PS support ...................................................................... vlr: add PS support Add vlr_ra_update() similar to vlr_lu_update(). Implement resending of GMM PDUs. While CS has a reliable connection between the MS and MSC, the MS and SGSN doesn't have such connection. The PDU is resend N times before the LU fsm is failing. Change-Id: Ie9ffeb140c9d354b3a0f4822e2619f623235add0 --- M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c 2 files changed, 214 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/90/38490/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index c7d17f8..b8650c7 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -1480,6 +1480,16 @@ } } +/* SGSN->VLR: Subscriber has provided ATTACH/RAU Complete */ +int vlr_subscr_rx_rau_complete(struct vlr_subscr *vsub) +{ + if (!vsub->lu_fsm) + return -EINVAL; + + return osmo_fsm_inst_dispatch(vsub->lu_fsm, + VLR_ULA_E_NEW_TMSI_ACK, NULL); +} + bool vlr_subscr_expire(struct vlr_subscr *vsub) { if (vsub->lu_complete) { diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index fca8347..fa0b83b 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -354,6 +354,7 @@ uint8_t cause; bool assign_tmsi; enum vlr_lu_type lu_type; + int N; /*! counter of timeouts */ }; static inline struct lu_compl_vlr_priv *lu_compl_vlr_fi_priv(struct osmo_fsm_inst *fi); @@ -407,6 +408,7 @@ OSMO_ASSERT(vlr); OSMO_ASSERT(event == LU_COMPL_VLR_E_START); + lcvp->N = 0; /* TODO: National Roaming restrictions? */ /* TODO: Roaming restriction due to unsupported feature in subscriber @@ -564,6 +566,42 @@ vlr_lu_compl_fsm_success(fi); } +static void vlr_lu_compl_fsm_reset_n(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct lu_compl_vlr_priv *lcvp = lu_compl_vlr_fi_priv(fi); + lcvp->N = 0; +} + +static int lu_compl_vlr_timeout(struct osmo_fsm_inst *fi) { + struct lu_compl_vlr_priv *lcvp = lu_compl_vlr_fi_priv(fi); + struct vlr_instance *vlr = lcvp->vsub->vlr; + struct vlr_subscr *vsub = lcvp->vsub; + + /* on cs: terminate the FSM */ + if (vlr_is_cs(lcvp->vsub->vlr)) + return 1; + + /* PS: we have to resend the complete message 5x times, before failing */ + if (++lcvp->N >= 5) + return 1; + + LOGPFSML(fi, LOGL_ERROR, "LU Compl timeout %i / %i \n", fi->T, lcvp->N); + + switch (fi->state) { + case LU_COMPL_VLR_S_WAIT_IMEI: + case LU_COMPL_VLR_S_WAIT_IMEI_TMSI: + vlr->ops.tx_id_req(lcvp->msc_conn_ref, GSM_MI_TYPE_IMEI); + break; + case LU_COMPL_VLR_S_WAIT_TMSI_CNF: + vlr->ops.tx_lu_acc(lcvp->msc_conn_ref, vsub->tmsi_new, lcvp->lu_type); + break; + } + + osmo_timer_schedule(&fi->timer, vlr_timer_secs(vlr, fi->T, fi->T), 0); + + return 0; +} + static const struct osmo_fsm_state lu_compl_vlr_states[] = { [LU_COMPL_VLR_S_INIT] = { .in_event_mask = S(LU_COMPL_VLR_E_START), @@ -579,6 +617,7 @@ S(LU_COMPL_VLR_S_WAIT_TMSI_CNF) | S(LU_COMPL_VLR_S_DONE), .name = OSMO_STRINGIFY(LU_COMPL_VLR_S_WAIT_SUB_PRES), + .onenter = vlr_lu_compl_fsm_reset_n, .action = lu_compl_vlr_wait_subscr_pres, }, [LU_COMPL_VLR_S_WAIT_IMEI] = { @@ -586,6 +625,7 @@ S(LU_COMPL_VLR_E_IMEI_CHECK_NACK), .out_state_mask = S(LU_COMPL_VLR_S_DONE), .name = OSMO_STRINGIFY(LU_COMPL_VLR_S_WAIT_IMEI), + .onenter = vlr_lu_compl_fsm_reset_n, .action = lu_compl_vlr_wait_imei, }, [LU_COMPL_VLR_S_WAIT_IMEI_TMSI] = { @@ -594,12 +634,14 @@ .out_state_mask = S(LU_COMPL_VLR_S_DONE) | S(LU_COMPL_VLR_S_WAIT_TMSI_CNF), .name = OSMO_STRINGIFY(LU_COMPL_VLR_S_WAIT_IMEI_TMSI), + .onenter = vlr_lu_compl_fsm_reset_n, .action = lu_compl_vlr_wait_imei, }, [LU_COMPL_VLR_S_WAIT_TMSI_CNF] = { .in_event_mask = S(LU_COMPL_VLR_E_NEW_TMSI_ACK), .out_state_mask = S(LU_COMPL_VLR_S_DONE), .name = OSMO_STRINGIFY(LU_COMPL_VLR_S_WAIT_TMSI_CNF), + .onenter = vlr_lu_compl_fsm_reset_n, .action = lu_compl_vlr_wait_tmsi, }, [LU_COMPL_VLR_S_DONE] = { @@ -616,6 +658,7 @@ .allstate_action = NULL, .log_subsys = DLGLOBAL, .event_names = lu_compl_vlr_event_names, + .timer_cb = lu_compl_vlr_timeout, }; static inline struct lu_compl_vlr_priv *lu_compl_vlr_fi_priv(struct osmo_fsm_inst *fi) @@ -711,6 +754,8 @@ uint32_t tmsi; struct osmo_location_area_id old_lai; struct osmo_location_area_id new_lai; + struct osmo_routing_area_id old_rai; + struct osmo_routing_area_id new_rai; bool authentication_required; /* is_ciphering_to_be_attempted: true when any A5/n > 0 are enabled. Ciphering is allowed, always attempt to get Auth Info from * the HLR. */ @@ -722,6 +767,9 @@ bool is_r99; bool is_utran; bool assign_tmsi; + + /*! count times timer T timed out */ + int N; }; @@ -1386,6 +1434,12 @@ } } +static void lu_fsm_reset_n(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct lu_fsm_priv *lfp = lu_fsm_fi_priv(fi); + lfp->N = 0; +} + static const struct osmo_fsm_state vlr_lu_fsm_states[] = { [VLR_ULA_S_IDLE] = { .in_event_mask = S(VLR_ULA_E_UPDATE_LA), @@ -1450,6 +1504,7 @@ S(VLR_ULA_S_WAIT_HLR_UPD) | S(VLR_ULA_S_DONE), .name = OSMO_STRINGIFY(VLR_ULA_S_WAIT_IMSI), + .onenter = lu_fsm_reset_n, .action = lu_fsm_wait_imsi, }, [VLR_ULA_S_WAIT_HLR_CHECK_IMEI_EARLY] = { @@ -1511,6 +1566,54 @@ vsub->lu_fsm = NULL; } +static void fsm_lu_preterm(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +{ + struct lu_fsm_priv *lfp = lu_fsm_fi_priv(fi); + uint8_t gsm48_cause; + + if (vlr_is_cs(lfp->vlr)) + return; + + if (cause != OSMO_FSM_TERM_TIMEOUT) + return; + + switch (fi->state) { + case VLR_ULA_S_WAIT_IMSI: + gsm48_cause = GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE; + break; + case VLR_ULA_S_WAIT_AUTH: + default: + gsm48_cause = GSM48_REJECT_NETWORK_FAILURE; + } + + lfp->vlr->ops.tx_lu_rej(lfp->msc_conn_ref, gsm48_cause, lfp->lu_type); +} + +int fsm_lu_timer_cb(struct osmo_fsm_inst *fi) +{ + struct lu_fsm_priv *lfp = lu_fsm_fi_priv(fi); + struct vlr_instance *vlr = lfp->vlr; + + /* only PS requires resending, CS termiante FSM */ + if (vlr_is_cs(vlr)) + return 1; + + /* PS: we have to resend the complete message 5x times, before failing */ + if (++lfp->N >= 5) + return 1; + + switch (fi->state) { + case VLR_ULA_S_WAIT_IMSI: + vlr->ops.tx_id_req(lfp->msc_conn_ref, GSM_MI_TYPE_IMSI); + break; + } + + osmo_timer_schedule(&fi->timer, vlr_timer_secs(vlr, fi->T, fi->T), 0); + + return 0; +} + + static struct osmo_fsm vlr_lu_fsm = { .name = "vlr_lu_fsm", .states = vlr_lu_fsm_states, @@ -1520,6 +1623,8 @@ .log_subsys = DLGLOBAL, .event_names = fsm_lu_event_names, .cleanup = fsm_lu_cleanup, + .pre_term = fsm_lu_preterm, + .timer_cb = fsm_lu_timer_cb, }; static inline struct lu_fsm_priv *lu_fsm_fi_priv(struct osmo_fsm_inst *fi) @@ -1528,8 +1633,8 @@ return (struct lu_fsm_priv*)fi->priv; } -struct osmo_fsm_inst * -vlr_loc_update(struct osmo_fsm_inst *parent, +static struct osmo_fsm_inst * +_vlr_loc_update(struct osmo_fsm_inst *parent, uint32_t parent_event_success, uint32_t parent_event_failure, void *parent_event_data, @@ -1579,6 +1684,103 @@ } fi->priv = lfp; + return fi; +} + +struct osmo_fsm_inst * +vlr_loc_update(struct osmo_fsm_inst *parent, + uint32_t parent_event_success, + uint32_t parent_event_failure, + void *parent_event_data, + struct vlr_instance *vlr, void *msc_conn_ref, + enum vlr_lu_type type, uint32_t tmsi, const char *imsi, + const struct osmo_location_area_id *old_lai, + const struct osmo_location_area_id *new_lai, + bool authentication_required, + bool is_ciphering_to_be_attempted, + bool is_ciphering_required, + uint8_t key_seq, + bool is_r99, bool is_utran, + bool assign_tmsi) +{ + struct osmo_fsm_inst *fi = _vlr_loc_update( + parent, + parent_event_success, + parent_event_failure, + parent_event_data, + vlr, msc_conn_ref, + type, tmsi, imsi, + old_lai, + new_lai, + authentication_required, + is_ciphering_to_be_attempted, + is_ciphering_required, + key_seq, + is_r99, is_utran, + assign_tmsi); + + if (!fi) + return NULL; + + LOGPFSM(fi, "rev=%s net=%s%s%s\n", + is_r99 ? "R99" : "GSM", + is_utran ? "UTRAN" : "GERAN", + (authentication_required || is_ciphering_to_be_attempted) ? + " Auth" : " (no Auth)", + (authentication_required || is_ciphering_to_be_attempted) ? + (is_ciphering_to_be_attempted ? "+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; +} + + +struct osmo_fsm_inst * +vlr_ra_update(struct osmo_fsm_inst *parent, + uint32_t parent_event_success, + uint32_t parent_event_failure, + void *parent_event_data, + struct vlr_instance *vlr, void *msc_conn_ref, + enum vlr_lu_type type, uint32_t tmsi, const char *imsi, + const struct osmo_routing_area_id *old_rai, + const struct osmo_routing_area_id *new_rai, + bool authentication_required, + bool is_ciphering_to_be_attempted, + bool is_ciphering_required, + uint8_t key_seq, + bool is_r99, bool is_utran, + bool assign_tmsi) +{ + struct lu_fsm_priv *lfp; + struct osmo_fsm_inst *fi = _vlr_loc_update( + parent, + parent_event_success, + parent_event_failure, + parent_event_data, + vlr, msc_conn_ref, + type, tmsi, imsi, + &old_rai->lac, + &new_rai->lac, + authentication_required, + is_ciphering_to_be_attempted, + is_ciphering_required, + key_seq, + is_r99, is_utran, + assign_tmsi); + + if (!fi) + return NULL; + + lfp = fi->priv; + lfp->old_rai = *old_rai; + lfp->new_rai = *new_rai; + LOGPFSM(fi, "rev=%s net=%s%s%s\n", is_r99 ? "R99" : "GSM", is_utran ? "UTRAN" : "GERAN", -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38490?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie9ffeb140c9d354b3a0f4822e2619f623235add0 Gerrit-Change-Number: 38490 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-msc[master]: vlr: vlr_lu_fsm: update the HLR only on initial IMSI attach
by lynxis lazus 21 Oct '24

21 Oct '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38492?usp=email ) Change subject: vlr: vlr_lu_fsm: update the HLR only on initial IMSI attach ...................................................................... vlr: vlr_lu_fsm: update the HLR only on initial IMSI attach As long the VLR isn't supporting multiple MSCs, skip updating the HLR on PERIODIC and REGULAR Location Updates (same for PS Attach Request/Routing Area Update). Change-Id: I7adc2092557f8cc6bb358234df2d1a16d1036eee --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/38492/1 diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index f315e6c..ed7c169 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -879,12 +879,20 @@ /* FIXME: Delete subscriber record */ /* LU REJ: Roaming not allowed */ lu_fsm_failure(fi, GSM48_REJECT_ROAMING_NOT_ALLOWED); - } else { + return; + } + + if (lfp->lu_type == VLR_LU_TYPE_IMSI_ATTACH) { /* Update_HLR_VLR */ osmo_fsm_inst_state_chg(fi, VLR_ULA_S_WAIT_HLR_UPD, LU_TIMEOUT_LONG, 0); lfp->upd_hlr_vlr_fsm = upd_hlr_vlr_proc_start(fi, vsub, VLR_ULA_E_UPD_HLR_COMPL); + } else { + /* PERIODIC and REGULAR, as long we don't support multiple MSC with different Location Areas */ + osmo_fsm_inst_state_chg(fi, VLR_ULA_S_WAIT_LU_COMPL, + LU_TIMEOUT_LONG, 0); + vlr_loc_upd_start_lu_compl_fsm(fi); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38492?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7adc2092557f8cc6bb358234df2d1a16d1036eee Gerrit-Change-Number: 38492 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-msc[master]: WIP: vlr_lu_fsm: terminate the FSM instead of dispatching a signal to...
by lynxis lazus 21 Oct '24

21 Oct '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38491?usp=email ) Change subject: WIP: vlr_lu_fsm: terminate the FSM instead of dispatching a signal to the parent ...................................................................... WIP: vlr_lu_fsm: terminate the FSM instead of dispatching a signal to the parent Change-Id: I27fd1048f85363797b43808d2061ce28be6da81b --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/91/38491/1 diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index fa0b83b..f315e6c 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -817,11 +817,12 @@ LOGPFSML(fi, LOGL_ERROR, "No parent FSM\n"); return; } - osmo_fsm_inst_dispatch(fi->proc.parent, - (lfp->result == VLR_FSM_RESULT_SUCCESS) - ? lfp->parent_event_success - : lfp->parent_event_failure, - lfp->parent_event_data); + if (lfp->result == VLR_FSM_RESULT_SUCCESS) + fi->proc.parent_term_event = lfp->parent_event_success; + else + fi->proc.parent_term_event = lfp->parent_event_failure; + + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, lfp->parent_event_data); } static void _lu_fsm_done(struct osmo_fsm_inst *fi, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38491?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I27fd1048f85363797b43808d2061ce28be6da81b Gerrit-Change-Number: 38491 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0