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

[M] Change in osmo-ttcn3-hacks[master]: sgsn: Validate TLI received in RAB Ass Req
by pespin 16 Oct '24

16 Oct '24

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38433?usp=email ) Change subject: sgsn: Validate TLI received in RAB Ass Req ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > osmo-sgsn most certainly has configurable transport layer address, as we had to talk to different hN […] Ok, I'll do all this you mention in a followup patch since it involves adding new tests, adding new parameters, etc. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38433?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a3699cea981caa89b30742c031d5f232418b0ee Gerrit-Change-Number: 38433 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-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 16 Oct 2024 15:18:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-sgsn[master]: ranap: Fix decoding of padded ITU X.213 IPv4 TLA in Rab Ass Resp
by pespin 16 Oct '24

16 Oct '24

Attention is currently required from: fixeria, lynxis lazus, pespin. Hello Jenkins Builder, fixeria, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38435?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by lynxis lazus, Verified+1 by Jenkins Builder Change subject: ranap: Fix decoding of padded ITU X.213 IPv4 TLA in Rab Ass Resp ...................................................................... ranap: Fix decoding of padded ITU X.213 IPv4 TLA in Rab Ass Resp Simply use the existing omos-iuh library helper to decode the IP address, which is more robust than existing adhoc code in osmo-sgsn. The library version already supports decoding ITU X.213 IANA binary IPv4 addresses padded to 20 bytes. Related: OS#6508 Related: SYS#7119 Change-Id: I9c48b676068574338f60b6ed7ad8b61ba748b52e --- M src/sgsn/gprs_ranap.c 1 file changed, 23 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/35/38435/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9c48b676068574338f60b6ed7ad8b61ba748b52e Gerrit-Change-Number: 38435 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-sgsn[master]: ranap: Reject ActivatePDPCtx from UE if RABAssResp parsing fails
by pespin 16 Oct '24

16 Oct '24

Attention is currently required from: fixeria, lynxis lazus, pespin. Hello Jenkins Builder, fixeria, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38436?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+2 by lynxis lazus, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: ranap: Reject ActivatePDPCtx from UE if RABAssResp parsing fails ...................................................................... ranap: Reject ActivatePDPCtx from UE if RABAssResp parsing fails Before this patch, if Rx path at RAB Ass Req failed, the PDP ctx in the middle of being activated was left untouched. Explicitly communicate the failure to both sides (UE and GGSN). Related: OS#6508 Related: SYS#7119 Change-Id: I111cc4b17100d2e1ef756b654dc9e98415b3a8bb --- M src/sgsn/gprs_ranap.c 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/36/38436/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I111cc4b17100d2e1ef756b654dc9e98415b3a8bb Gerrit-Change-Number: 38436 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-msc[master]: vlr: refactor and rename vlr_timer into vlr_timer_val
by lynxis lazus 16 Oct '24

16 Oct '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38356?usp=email ) Change subject: vlr: refactor and rename vlr_timer into vlr_timer_val ...................................................................... vlr: refactor and rename vlr_timer into vlr_timer_val Use correct types for vlr_timer. A timer T is always a signed integer. Also osmo_tdef_get returns an unsigned long. Match the types from osmo_tdef. Rename the vlr_timer() into vlr_timer_val() to make it more understandable. Change-Id: Ic46ddb578962619fc08bd63645c76852e676fcc9 --- M include/osmocom/vlr/vlr.h M src/libmsc/msc_vty.c 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 tests/msc_vlr/msc_vlr_test_no_authen.c 7 files changed, 18 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/vlr/vlr.h b/include/osmocom/vlr/vlr.h index 27b40c2..5d01397 100644 --- a/include/osmocom/vlr/vlr.h +++ b/include/osmocom/vlr/vlr.h @@ -424,7 +424,7 @@ bool vlr_subscr_matches_msisdn(struct vlr_subscr *vsub, const char *msisdn); bool vlr_subscr_matches_imei(struct vlr_subscr *vsub, const char *imei); -uint32_t vlr_timer(struct vlr_instance *vlr, uint32_t timer); +unsigned long vlr_timer_secs(struct vlr_instance *vlr, int timer); int vlr_subscr_changed(struct vlr_subscr *vsub); int vlr_subscr_purge(struct vlr_subscr *vsub) __attribute__((warn_unused_result)); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 92b166f..d9eec51 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -1048,7 +1048,7 @@ VTY_NEWLINE); } - if (!vlr_timer(vsub->vlr, 3212)) { + if (!vlr_timer_secs(vsub->vlr, 3212)) { MSC_VTY_DUMP(vty, offset, "Expires: never (T3212 is disabled)%s", VTY_NEWLINE); } else if (vsub->expire_lu == VLR_SUBSCRIBER_NO_EXPIRATION) { diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index f160578..97f2484 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -203,7 +203,7 @@ /* This is just a wrapper around the osmo_tdef API. * TODO: we should start using osmo_tdef_fsm_inst_state_chg() */ -uint32_t vlr_timer(struct vlr_instance *vlr, uint32_t timer) +unsigned long vlr_timer_secs(struct vlr_instance *vlr, int timer) { /* NOTE: since we usually do not need more than one instance of the VLR, * and since libosmocore's osmo_tdef API does not (yet) support dynamic @@ -731,7 +731,7 @@ /* Mark the subscriber as inactive if it stopped to do periodical location updates. */ if (osmo_clock_gettime(CLOCK_MONOTONIC, &now) == 0) { - vsub->expire_lu = now.tv_sec + vlr_timer(vsub->vlr, 3212); + vsub->expire_lu = now.tv_sec + vlr_timer_secs(vsub->vlr, 3212); } else { LOGP(DVLR, LOGL_ERROR, "%s: Could not enable Location Update expiry: unable to read current time\n", vlr_subscr_name(vsub)); @@ -748,7 +748,7 @@ /* Periodic location update might be disabled from the VTY, * so we shall not expire subscribers until explicit IMSI Detach. */ - if (!vlr_timer(vlr, 3212)) + if (!vlr_timer_secs(vlr, 3212)) goto done; if (llist_empty(&vlr->subscribers)) diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index c2e185b..08adfbb 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -203,7 +203,7 @@ /* Chck_IMEI_VLR */ vlr->ops.tx_id_req(par->msc_conn_ref, GSM_MI_TYPE_IMEI); osmo_fsm_inst_state_chg(fi, PR_ARQ_S_WAIT_CHECK_IMEI, - vlr_timer(vlr, 3270), 3270); + vlr_timer_secs(vlr, 3270), 3270); } else _proc_arq_vlr_post_imei(fi); } @@ -406,7 +406,7 @@ if (vlr->cfg.parq_retrieve_imsi) { /* Obtain_IMSI_VLR */ osmo_fsm_inst_state_chg(fi, PR_ARQ_S_WAIT_OBTAIN_IMSI, - vlr_timer(vlr, 3270), 3270); + vlr_timer_secs(vlr, 3270), 3270); return; } else { /* Set User Error: Unidentified Subscriber */ diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index 5c16946..964c4d7 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -346,7 +346,7 @@ } else { /* go straight ahead with sending auth request */ osmo_fsm_inst_state_chg(fi, VLR_SUB_AS_WAIT_RESP, - vlr_timer(vsub->vlr, 3260), 3260); + vlr_timer_secs(vsub->vlr, 3260), 3260); _vlr_subscr_authenticate(fi); } } @@ -400,7 +400,7 @@ return; pass: osmo_fsm_inst_state_chg(fi, VLR_SUB_AS_WAIT_RESP, - vlr_timer(vsub->vlr, 3260), 3260); + vlr_timer_secs(vsub->vlr, 3260), 3260); _vlr_subscr_authenticate(fi); } @@ -424,7 +424,7 @@ GSM_MI_TYPE_IMSI); osmo_fsm_inst_state_chg(fi, VLR_SUB_AS_WAIT_ID_IMSI, - vlr_timer(vlr, 3270), 3270); + vlr_timer_secs(vlr, 3270), 3270); } else { auth_fsm_term(fi, AUTH_FSM_FAILURE, GSM48_REJECT_ILLEGAL_MS); } @@ -467,7 +467,7 @@ case VLR_AUTH_E_HLR_SAI_ACK: vlr_subscr_update_tuples(vsub, gsup); osmo_fsm_inst_state_chg(fi, VLR_SUB_AS_WAIT_RESP_RESYNC, - vlr_timer(vsub->vlr, 3260), 3260); + vlr_timer_secs(vsub->vlr, 3260), 3260); _vlr_subscr_authenticate(fi); break; case VLR_AUTH_E_HLR_SAI_NACK: @@ -500,7 +500,7 @@ GSM_MI_TYPE_IMSI); osmo_fsm_inst_state_chg(fi, VLR_SUB_AS_WAIT_ID_IMSI, - vlr_timer(vlr, 3270), 3270); + vlr_timer_secs(vlr, 3270), 3270); } else { /* Result = Aborted */ auth_fsm_term(fi, AUTH_FSM_FAILURE, GSM48_REJECT_SYNCH_FAILURE); diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index d622baa..7101240 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -432,7 +432,7 @@ } osmo_fsm_inst_state_chg(fi, LU_COMPL_VLR_S_WAIT_TMSI_CNF, - vlr_timer(vlr, 3250), 3250); + vlr_timer_secs(vlr, 3250), 3250); vlr->ops.tx_lu_acc(lcvp->msc_conn_ref, vsub->tmsi_new); } @@ -459,7 +459,7 @@ lcvp->assign_tmsi ? LU_COMPL_VLR_S_WAIT_IMEI_TMSI : LU_COMPL_VLR_S_WAIT_IMEI, - vlr_timer(vlr, 3270), 3270); + vlr_timer_secs(vlr, 3270), 3270); vlr->ops.tx_id_req(lcvp->msc_conn_ref, GSM_MI_TYPE_IMEI); return; } @@ -939,7 +939,7 @@ LOGPFSM(fi, "%s()\n", __func__); if (vlr->cfg.check_imei_rqd && vlr->cfg.retrieve_imeisv_early) { - osmo_fsm_inst_state_chg(fi, VLR_ULA_S_WAIT_HLR_CHECK_IMEI_EARLY, vlr_timer(lfp->vlr, 3270), 3270); + osmo_fsm_inst_state_chg(fi, VLR_ULA_S_WAIT_HLR_CHECK_IMEI_EARLY, vlr_timer_secs(lfp->vlr, 3270), 3270); vlr_subscr_tx_req_check_imei(lfp->vsub); } else { vlr_loc_upd_node1(fi); @@ -975,7 +975,7 @@ /* Obtain_IMSI_VLR */ osmo_fsm_inst_state_chg(fi, VLR_ULA_S_WAIT_IMSI, - vlr_timer(vlr, 3270), 3270); + vlr_timer_secs(vlr, 3270), 3270); vlr->ops.tx_id_req(lfp->msc_conn_ref, GSM_MI_TYPE_IMSI); /* will continue at vlr_loc_upd_node1_pre() once IMSI arrives */ } @@ -1112,7 +1112,7 @@ } else { vlr->ops.tx_id_req(lfp->msc_conn_ref, GSM_MI_TYPE_IMEISV); osmo_fsm_inst_state_chg(fi, VLR_ULA_S_WAIT_IMEISV, - vlr_timer(vlr, 3270), 3270); + vlr_timer_secs(vlr, 3270), 3270); } } diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index 5d3db69..384a069 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -941,7 +941,7 @@ vlr_subscr_put(vsub, __func__); /* Let T3212 (periodic Location update timer) expire */ - fake_time_passes(vlr_timer(net->vlr, 3212) + 60 * 4, 0); + fake_time_passes(vlr_timer_secs(net->vlr, 3212) + 60 * 4, 0); /* The subscriber should now be gone. */ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38356?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic46ddb578962619fc08bd63645c76852e676fcc9 Gerrit-Change-Number: 38356 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: vlr: set the correct CN domain on GSUP messages
by lynxis lazus 16 Oct '24

16 Oct '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38406?usp=email ) Change subject: vlr: set the correct CN domain on GSUP messages ...................................................................... vlr: set the correct CN domain on GSUP messages In preparation of splitting up the libvlr code, set the CN domain on all required GSUP messages which allow the CN domain to be present. The test cases expect the exact GSUP message. The additional TLV is 280102 (IE: CN domain, length 1, CS (2)). Change-Id: I045f29647b0f122a653881030d09de35b64f4dd1 --- M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err 5 files changed, 17 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 97f2484..8a1b470 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -429,6 +429,8 @@ gsup_msg.hlr_enc_len = vsub->hlr.len; gsup_msg.hlr_enc = vsub->hlr.buf; + gsup_msg.cn_domain = vlr_is_cs(vsub->vlr) ? OSMO_GSUP_CN_DOMAIN_CS : OSMO_GSUP_CN_DOMAIN_PS; + return vlr_subscr_tx_gsup_message(vsub, &gsup_msg); } @@ -886,7 +888,7 @@ vlr_rate_ctr_inc(vsub->vlr, VLR_CTR_GSUP_TX_UL_REQ); gsup_msg.message_type = OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST; - gsup_msg.cn_domain = vsub->vlr->cfg.is_ps ? OSMO_GSUP_CN_DOMAIN_PS : OSMO_GSUP_CN_DOMAIN_CS; + gsup_msg.cn_domain = vlr_is_cs(vsub->vlr) ? OSMO_GSUP_CN_DOMAIN_CS : OSMO_GSUP_CN_DOMAIN_PS; rc = vlr_subscr_tx_gsup_message(vsub, &gsup_msg); return rc; @@ -903,7 +905,7 @@ gsup_msg.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST; gsup_msg.auts = auts; gsup_msg.rand = auts_rand; - gsup_msg.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; + gsup_msg.cn_domain = vlr_is_cs(vsub->vlr) ? OSMO_GSUP_CN_DOMAIN_CS : OSMO_GSUP_CN_DOMAIN_PS; return vlr_subscr_tx_gsup_message(vsub, &gsup_msg); } @@ -940,6 +942,7 @@ struct osmo_gsup_message gsup_msg = { .message_class = OSMO_GSUP_MESSAGE_CLASS_SUBSCRIBER_MANAGEMENT, .message_type = OSMO_GSUP_MSGT_AUTH_FAIL_REPORT, + .cn_domain = vlr_is_cs(vsub->vlr) ? OSMO_GSUP_CN_DOMAIN_CS : OSMO_GSUP_CN_DOMAIN_PS, }; vlr_rate_ctr_inc(vsub->vlr, VLR_CTR_GSUP_TX_AUTH_FAIL_REP); @@ -1284,6 +1287,7 @@ "update procedure" : "subscription withdraw"); gsup_reply.message_type = OSMO_GSUP_MSGT_LOCATION_CANCEL_RESULT; + gsup_reply.cn_domain = vlr_is_cs(vsub->vlr) ? OSMO_GSUP_CN_DOMAIN_CS : OSMO_GSUP_CN_DOMAIN_PS; rc = vlr_subscr_tx_gsup_message(vsub, &gsup_reply); vlr_subscr_cancel_attach_fsm(vsub, fsm_cause, vlr_gmm_cause_to_reject_cause_domain(gsup_msg->cause, true)); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c index 6d7e88a..3be928c 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c @@ -1170,7 +1170,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response with too short SRES data, auth is thwarted."); - gsup_expect_tx("0b010809710000004026f0" VLR_TO_HLR); /* OSMO_GSUP_MSGT_AUTH_FAIL_REPORT */ + gsup_expect_tx("0b010809710000004026f0280102" VLR_TO_HLR); /* OSMO_GSUP_MSGT_AUTH_FAIL_REPORT */ expect_bssap_clear(); ms_sends_msg("05542d8b2c"); VERBOSE_ASSERT(lu_result_sent, == RES_REJECT, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 94c1694..44c0a53 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -3273,7 +3273,7 @@ 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 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 +GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000004026f02801020a0101 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) DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_FAILURE diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index 0a2a446..0f09491 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -704,7 +704,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response of wrong RES size, VLR thwarts"); - gsup_expect_tx("0b010809710000000156f0" VLR_TO_HLR); /* OSMO_GSUP_MSGT_AUTH_FAIL_REPORT */ + gsup_expect_tx("0b010809710000000156f0280102" VLR_TO_HLR); /* OSMO_GSUP_MSGT_AUTH_FAIL_REPORT */ expect_release_clear(via_ran); ms_sends_msg("0554" "e229c19e" "2103" "791f2e" /* nipped one byte */); VERBOSE_ASSERT(lu_result_sent, == RES_REJECT, "%d"); @@ -804,7 +804,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response of wrong RES size, VLR thwarts"); - gsup_expect_tx("0b010809710000000156f0" VLR_TO_HLR); /* OSMO_GSUP_MSGT_AUTH_FAIL_REPORT */ + gsup_expect_tx("0b010809710000000156f0280102" VLR_TO_HLR); /* OSMO_GSUP_MSGT_AUTH_FAIL_REPORT */ expect_release_clear(via_ran); ms_sends_msg("0554" "e229c19e" "2105" "791f2e4123" /* added one byte */); VERBOSE_ASSERT(lu_result_sent, == RES_REJECT, "%d"); @@ -909,7 +909,7 @@ else btw("MS sends Authen Response of wrong RES size, VLR thwarts:" " UTRAN disallows GSM AKA altogether"); - gsup_expect_tx("0b010809710000000156f0" VLR_TO_HLR); /* OSMO_GSUP_MSGT_AUTH_FAIL_REPORT */ + gsup_expect_tx("0b010809710000000156f0280102" VLR_TO_HLR); /* OSMO_GSUP_MSGT_AUTH_FAIL_REPORT */ expect_release_clear(via_ran); ms_sends_msg("0554" "e229c19e" /* Only the SRES half of the RES */); VERBOSE_ASSERT(lu_result_sent, == RES_REJECT, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index aacff39..cf402cc 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -2649,7 +2649,7 @@ 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 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 +GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_FAILURE @@ -2765,7 +2765,7 @@ 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 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 +GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTH_FAILED}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_FAILURE @@ -2881,7 +2881,7 @@ 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 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 +GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_FAILURE @@ -2997,7 +2997,7 @@ 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 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 +GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTH_FAILED}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_FAILURE @@ -3113,7 +3113,7 @@ 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 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 +GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_AUTH_FAILED}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_FAILURE @@ -3229,7 +3229,7 @@ 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 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 +GSUP --> HLR: OSMO_GSUP_MSGT_AUTH_FAIL_REPORT: 0b010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTH_FAILED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_AUTH_FAILED}: Removing from parent vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_FAILURE -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38406?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I045f29647b0f122a653881030d09de35b64f4dd1 Gerrit-Change-Number: 38406 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-msc[master]: vlr: add functions for vlr_is_cs() vlr_is_ps()
by lynxis lazus 16 Oct '24

16 Oct '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38405?usp=email ) Change subject: vlr: add functions for vlr_is_cs() vlr_is_ps() ...................................................................... vlr: add functions for vlr_is_cs() vlr_is_ps() Make the code more readable when checking for cs or ps. Change-Id: I88810f3703813e98be8a37d0445ad641b0cac11d --- M include/osmocom/vlr/vlr.h 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/vlr/vlr.h b/include/osmocom/vlr/vlr.h index 5d01397..3fdb6d9 100644 --- a/include/osmocom/vlr/vlr.h +++ b/include/osmocom/vlr/vlr.h @@ -328,6 +328,9 @@ int vlr_start(struct vlr_instance *vlr, struct gsup_client_mux *gcm); int vlr_gsup_rx(struct gsup_client_mux *gcm, void *data, const struct osmo_gsup_message *gsup_msg); +static inline bool vlr_is_cs(struct vlr_instance *vlr) { return !vlr->cfg.is_ps; }; +static inline bool vlr_is_ps(struct vlr_instance *vlr) { return vlr->cfg.is_ps; }; + /* internal use only */ void sub_pres_vlr_fsm_start(struct osmo_fsm_inst **fsm, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38405?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I88810f3703813e98be8a37d0445ad641b0cac11d Gerrit-Change-Number: 38405 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: vlr: add the location update type to the callbacks tx_lu_acc/tx_lu_rej
by lynxis lazus 16 Oct '24

16 Oct '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38407?usp=email ) Change subject: vlr: add the location update type to the callbacks tx_lu_acc/tx_lu_rej ...................................................................... vlr: add the location update type to the callbacks tx_lu_acc/tx_lu_rej The location update type (IMSI attach, periodic, location area change) is required when the SGSN is using the vlr code to send back the correct PDU to the MS. The MSC always sends Location Update Accept/Reject, but the SGSN has to transmit either Routing Area Accept/Reject or Attach Accept/Reject. Change-Id: I980a637333e92b15f2d516683feeaded910105b6 --- M include/osmocom/vlr/vlr.h M src/libmsc/gsm_04_08.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_tests.c 4 files changed, 21 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/vlr/vlr.h b/include/osmocom/vlr/vlr.h index 3fdb6d9..b2f70d3 100644 --- a/include/osmocom/vlr/vlr.h +++ b/include/osmocom/vlr/vlr.h @@ -239,8 +239,8 @@ /* encode + transmit an IDENTITY REQUEST towards the MS */ int (*tx_id_req)(void *msc_conn_ref, uint8_t mi_type); - int (*tx_lu_acc)(void *msc_conn_ref, uint32_t send_tmsi); - int (*tx_lu_rej)(void *msc_conn_ref, enum gsm48_reject_value cause); + int (*tx_lu_acc)(void *msc_conn_ref, uint32_t send_tmsi, enum vlr_lu_type lu_type); + int (*tx_lu_rej)(void *msc_conn_ref, enum gsm48_reject_value cause, enum vlr_lu_type lu_type); int (*tx_cm_serv_acc)(void *msc_conn_ref, enum osmo_cm_service_type cm_service_type); int (*tx_cm_serv_rej)(void *msc_conn_ref, enum osmo_cm_service_type cm_service_type, enum gsm48_reject_value cause); @@ -298,7 +298,7 @@ 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, + enum vlr_lu_type lu_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, diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 34f7b76..cf3df48 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1474,14 +1474,14 @@ } /* VLR asks us to transmit a Location Update Accept */ -static int msc_vlr_tx_lu_acc(void *msc_conn_ref, uint32_t send_tmsi) +static int msc_vlr_tx_lu_acc(void *msc_conn_ref, uint32_t send_tmsi, enum vlr_lu_type lu_type) { struct msc_a *msc_a = msc_conn_ref; return gsm0408_loc_upd_acc(msc_a, send_tmsi); } /* VLR asks us to transmit a Location Update Reject */ -static int msc_vlr_tx_lu_rej(void *msc_conn_ref, enum gsm48_reject_value cause) +static int msc_vlr_tx_lu_rej(void *msc_conn_ref, enum gsm48_reject_value cause, enum vlr_lu_type lu_type) { struct msc_a *msc_a = msc_conn_ref; return gsm0408_loc_upd_rej(msc_a, cause); diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 7101240..5b63afd 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -339,6 +339,7 @@ enum vlr_fsm_result result; uint8_t cause; bool assign_tmsi; + enum vlr_lu_type lu_type; }; static inline struct lu_compl_vlr_priv *lu_compl_vlr_fi_priv(struct osmo_fsm_inst *fi); @@ -434,7 +435,7 @@ osmo_fsm_inst_state_chg(fi, LU_COMPL_VLR_S_WAIT_TMSI_CNF, vlr_timer_secs(vlr, 3250), 3250); - vlr->ops.tx_lu_acc(lcvp->msc_conn_ref, vsub->tmsi_new); + vlr->ops.tx_lu_acc(lcvp->msc_conn_ref, vsub->tmsi_new, lcvp->lu_type); } /* After completion of Subscriber_Present_VLR */ @@ -473,7 +474,7 @@ vsub->tmsi = GSM_RESERVED_TMSI; /* Location Updating Accept */ - vlr->ops.tx_lu_acc(lcvp->msc_conn_ref, GSM_RESERVED_TMSI); + vlr->ops.tx_lu_acc(lcvp->msc_conn_ref, GSM_RESERVED_TMSI, lcvp->lu_type); vlr_lu_compl_fsm_success(fi); } @@ -520,7 +521,7 @@ vsub->tmsi = GSM_RESERVED_TMSI; /* No TMSI needed, accept now. */ - vlr->ops.tx_lu_acc(lcvp->msc_conn_ref, GSM_RESERVED_TMSI); + vlr->ops.tx_lu_acc(lcvp->msc_conn_ref, GSM_RESERVED_TMSI, lcvp->lu_type); vlr_lu_compl_fsm_success(fi); } @@ -616,7 +617,8 @@ void *msc_conn_ref, uint32_t parent_event_success, uint32_t parent_event_failure, - bool assign_tmsi) + bool assign_tmsi, + enum vlr_lu_type lu_type) { struct osmo_fsm_inst *fi; struct lu_compl_vlr_priv *lcvp; @@ -632,6 +634,7 @@ lcvp->parent_event_success = parent_event_success; lcvp->parent_event_failure = parent_event_failure; lcvp->assign_tmsi = assign_tmsi; + lcvp->lu_type = lu_type; fi->priv = lcvp; return fi; @@ -675,7 +678,7 @@ enum vlr_fsm_result result; uint8_t rej_cause; - enum vlr_lu_type type; + enum vlr_lu_type lu_type; bool lu_by_tmsi; char imsi[16]; uint32_t tmsi; @@ -762,7 +765,7 @@ static void lu_fsm_failure(struct osmo_fsm_inst *fi, enum gsm48_reject_value rej_cause) { struct lu_fsm_priv *lfp = lu_fsm_fi_priv(fi); - lfp->vlr->ops.tx_lu_rej(lfp->msc_conn_ref, rej_cause ? : GSM48_REJECT_NETWORK_FAILURE); + lfp->vlr->ops.tx_lu_rej(lfp->msc_conn_ref, rej_cause ? : GSM48_REJECT_NETWORK_FAILURE, lfp->lu_type); _lu_fsm_done(fi, VLR_FSM_RESULT_FAILURE); } @@ -773,7 +776,8 @@ lu_compl_vlr_proc_alloc(fi, lfp->vsub, lfp->msc_conn_ref, VLR_ULA_E_LU_COMPL_SUCCESS, VLR_ULA_E_LU_COMPL_FAILURE, - lfp->assign_tmsi); + lfp->assign_tmsi, + lfp->lu_type); osmo_fsm_inst_dispatch(lfp->lu_compl_vlr_fsm, LU_COMPL_VLR_E_START, NULL); } @@ -1106,7 +1110,7 @@ /* See 3GPP TS 23.012, procedure Retrieve_IMEISV_If_Required */ if ((!vlr->cfg.retrieve_imeisv_early) - || (lfp->type == VLR_LU_TYPE_PERIODIC && lfp->vsub->imeisv[0])) { + || (lfp->lu_type == VLR_LU_TYPE_PERIODIC && lfp->vsub->imeisv[0])) { /* R_IMEISV_IR1 passed */ _start_lu_main(fi); } else { @@ -1307,7 +1311,7 @@ /* TODO: Notify_gsmSCF 23.078 */ /* TODO: Authenticated Radio Contact Established -> ARC */ - if (lfp->type == VLR_LU_TYPE_IMSI_ATTACH) + if (lfp->lu_type == VLR_LU_TYPE_IMSI_ATTACH) lfp->vlr->ops.tx_mm_info(lfp->msc_conn_ref); lu_fsm_success(fi); @@ -1529,7 +1533,7 @@ lfp->vlr = vlr; lfp->msc_conn_ref = msc_conn_ref; lfp->tmsi = tmsi; - lfp->type = type; + lfp->lu_type = type; lfp->old_lai = *old_lai; lfp->new_lai = *new_lai; lfp->lu_by_tmsi = true; diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 062d8a3..7bf975c 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -934,7 +934,7 @@ osmo_fsm_inst_dispatch(cl->fi, CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE, cl->rtp[dir]); } -static int fake_vlr_tx_lu_acc(void *msc_conn_ref, uint32_t send_tmsi) +static int fake_vlr_tx_lu_acc(void *msc_conn_ref, uint32_t send_tmsi, enum vlr_lu_type lu_type) { struct msc_a *msc_a = msc_conn_ref; if (send_tmsi == GSM_RESERVED_TMSI) @@ -946,7 +946,7 @@ return 0; } -static int fake_vlr_tx_lu_rej(void *msc_conn_ref, enum gsm48_reject_value cause) +static int fake_vlr_tx_lu_rej(void *msc_conn_ref, enum gsm48_reject_value cause, enum vlr_lu_type lu_type) { struct msc_a *msc_a = msc_conn_ref; btw("sending LU Reject for %s, cause %u", msc_a->c.fi->id, cause); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38407?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I980a637333e92b15f2d516683feeaded910105b6 Gerrit-Change-Number: 38407 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: msc_net_init: replace spaces with tabs as indention
by lynxis lazus 16 Oct '24

16 Oct '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38409?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: msc_net_init: replace spaces with tabs as indention ...................................................................... msc_net_init: replace spaces with tabs as indention Change-Id: I9290cc585601dbadda3a85eddd50ccd0354b0b0b --- M src/libmsc/msc_net_init.c 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 9b8a8b3..ad0c19a 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -107,20 +107,20 @@ /* Allocate net->vlr so that the VTY may configure the VLR's data structures */ int msc_vlr_alloc(struct gsm_network *net) { - net->vlr = vlr_alloc(net, &msc_vlr_ops); - if (!net->vlr) - return -ENOMEM; - net->vlr->user_ctx = net; - return 0; + net->vlr = vlr_alloc(net, &msc_vlr_ops); + if (!net->vlr) + return -ENOMEM; + net->vlr->user_ctx = net; + return 0; } /* Launch the VLR, i.e. its GSUP connection */ int msc_vlr_start(struct gsm_network *net) { - OSMO_ASSERT(net->vlr); - OSMO_ASSERT(net->gcm); + OSMO_ASSERT(net->vlr); + OSMO_ASSERT(net->gcm); - return vlr_start(net->vlr, net->gcm); + return vlr_start(net->vlr, net->gcm); } int msc_gsup_client_start(struct gsm_network *net) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38409?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9290cc585601dbadda3a85eddd50ccd0354b0b0b Gerrit-Change-Number: 38409 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-msc[master]: vlr_auth_fsm: fix missing space
by lynxis lazus 16 Oct '24

16 Oct '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38408?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: vlr_auth_fsm: fix missing space ...................................................................... vlr_auth_fsm: fix missing space Change-Id: I8976221ca7e314cc655f43c3ccffd9f15364cc0e --- M src/libvlr/vlr_auth_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index 964c4d7..1182ee2 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -473,7 +473,7 @@ case VLR_AUTH_E_HLR_SAI_NACK: auth_fsm_term(fi, AUTH_FSM_FAILURE, - gsup->cause == GMM_CAUSE_IMSI_UNKNOWN? + gsup->cause == GMM_CAUSE_IMSI_UNKNOWN ? GSM48_REJECT_IMSI_UNKNOWN_IN_HLR : GSM48_REJECT_NETWORK_FAILURE); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38408?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8976221ca7e314cc655f43c3ccffd9f15364cc0e Gerrit-Change-Number: 38408 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: vlr: add the location update type to the callbacks tx_lu_acc/tx_lu_rej
by lynxis lazus 16 Oct '24

16 Oct '24

lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38407?usp=email ) Change subject: vlr: add the location update type to the callbacks tx_lu_acc/tx_lu_rej ...................................................................... Patch Set 4: (1 comment) Patchset: PS2: > The lu_type is already present in the libvlr and the FSMs it has. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38407?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: I980a637333e92b15f2d516683feeaded910105b6 Gerrit-Change-Number: 38407 Gerrit-PatchSet: 4 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-Comment-Date: Wed, 16 Oct 2024 15:09:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0