May 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-bsc[master]: systemd: depend on networking-online.target

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33012 ) Change subject: systemd: depend on networking-online.target ...................................................................... systemd: depend on networking-online.target Related: SYS#6400 Change-Id: I9c0cc0779f9ddb7520a565668b7cde07c6ad55d8 --- M contrib/systemd/osmo-bsc.service 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/osmo-bsc.service b/contrib/systemd/osmo-bsc.service index 0f8819b..a345c47 100644 --- a/contrib/systemd/osmo-bsc.service +++ b/contrib/systemd/osmo-bsc.service @@ -1,6 +1,8 @@ [Unit] Description=Osmocom Base Station Controller (BSC) Wants=osmo-mgw.service +After=network-online.target +Wants=network-online.target [Service] Type=simple -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9c0cc0779f9ddb7520a565668b7cde07c6ad55d8 Gerrit-Change-Number: 33012 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in libosmo-sccp[master]: systemd: depend on networking-online.target

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33011 ) Change subject: systemd: depend on networking-online.target ...................................................................... systemd: depend on networking-online.target Related: SYS#6400 Change-Id: I7e88d7f48fb1f359fc9147acf3e69525c856d4e8 --- M contrib/systemd/osmo-stp.service 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/systemd/osmo-stp.service b/contrib/systemd/osmo-stp.service index 79394fa..027ea91 100644 --- a/contrib/systemd/osmo-stp.service +++ b/contrib/systemd/osmo-stp.service @@ -1,6 +1,8 @@ [Unit] Description=Osmocom STP (Signal Transfer Point) Documentation=https://osmocom.org/projects/osmo-stp/wiki +After=network-online.target +Wants=network-online.target [Service] Type=simple -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I7e88d7f48fb1f359fc9147acf3e69525c856d4e8 Gerrit-Change-Number: 33011 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Fix typo checking IE presence in Rx Attach Rej

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33055 ) Change subject: gmm: Fix typo checking IE presence in Rx Attach Rej ...................................................................... gmm: Fix typo checking IE presence in Rx Attach Rej Change-Id: Ifaf653d89efd4ff4776e0e9b9e8dff625c4f9ebb --- M src/gmm/gmm.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/55/33055/1 diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 97d4de8..3b6c380 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -968,7 +968,7 @@ if (TLVP_PRES_LEN(&tp, GSM48_IE_GMM_TIMER_T3302, 1)) gmme->t3302 = *TLVP_VAL(&tp, GSM48_IE_GMM_TIMER_T3302); - if (TLVP_PRES_LEN(&tp, GSM48_IE_GMM_TIMER_T3302, 1)) + if (TLVP_PRES_LEN(&tp, GSM48_IE_GMM_TIMER_T3346, 1)) gmme->t3346 = *TLVP_VAL(&tp, GSM48_IE_GMM_TIMER_T3346); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ifaf653d89efd4ff4776e0e9b9e8dff625c4f9ebb Gerrit-Change-Number: 33055 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Stop READY timer upon receiving force_stdby IE

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32998 to look at the new patch set (#3). Change subject: gmm: Stop READY timer upon receiving force_stdby IE ...................................................................... gmm: Stop READY timer upon receiving force_stdby IE Change-Id: I44d0f69571f6425fef74a10602001aca4ecb5716 --- M src/gmm/gmm.c M tests/gmm/gmm_prim_test.err 2 files changed, 28 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/98/32998/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I44d0f69571f6425fef74a10602001aca4ecb5716 Gerrit-Change-Number: 32998 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Implement submitting GMMSM-RELEASE.ind when MS becomes detached

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33000 to look at the new patch set (#3). Change subject: gmm: Implement submitting GMMSM-RELEASE.ind when MS becomes detached ...................................................................... gmm: Implement submitting GMMSM-RELEASE.ind when MS becomes detached Change-Id: I74176eba870b19b30666ab5deef5eb56f0f0fd83 --- M include/osmocom/gprs/gmm/gmm_private.h M src/gmm/gmm.c M src/gmm/gmm_ms_fsm.c M tests/gmm/gmm_prim_test.c M tests/gmm/gmm_prim_test.ok 5 files changed, 30 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/00/33000/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I74176eba870b19b30666ab5deef5eb56f0f0fd83 Gerrit-Change-Number: 33000 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: gmm: Tx Auth & Ciph Failure

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33053 ) Change subject: gmm: Tx Auth & Ciph Failure ...................................................................... gmm: Tx Auth & Ciph Failure Change-Id: I3ebb3dba20010e57f29dd5b8bbec457c2b08a8e1 --- M include/osmocom/gprs/gmm/gmm_pdu.h M include/osmocom/gprs/gmm/gmm_private.h M src/gmm/gmm.c M src/gmm/gmm_pdu.c M src/gmm/gmm_prim.c 5 files changed, 77 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/53/33053/1 diff --git a/include/osmocom/gprs/gmm/gmm_pdu.h b/include/osmocom/gprs/gmm/gmm_pdu.h index 18a181c..541cb48 100644 --- a/include/osmocom/gprs/gmm/gmm_pdu.h +++ b/include/osmocom/gprs/gmm/gmm_pdu.h @@ -3,6 +3,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/gsm_04_08_gprs.h> struct gprs_gmm_entity; enum gprs_gmm_upd_type; @@ -39,6 +40,9 @@ enum osmo_gprs_gmm_detach_poweroff_type poweroff_type, struct msgb *msg); +int gprs_gmm_build_auth_ciph_fail(struct gprs_gmm_entity *gmme, + struct msgb *msg, enum gsm48_gmm_cause cause); + int gprs_gmm_build_rau_req(struct gprs_gmm_entity *gmme, enum gprs_gmm_upd_type rau_type, struct msgb *msg); diff --git a/include/osmocom/gprs/gmm/gmm_private.h b/include/osmocom/gprs/gmm/gmm_private.h index ac64ea1..0308d1e 100644 --- a/include/osmocom/gprs/gmm/gmm_private.h +++ b/include/osmocom/gprs/gmm/gmm_private.h @@ -12,6 +12,7 @@ #include <osmocom/core/endian.h> #include <osmocom/core/tdef.h> #include <osmocom/gsm/protocol/gsm_23_003.h> +#include <osmocom/gsm/protocol/gsm_04_08_gprs.h> #include <osmocom/gprs/llc/llc_prim.h> #include <osmocom/gprs/gmm/gmm.h> @@ -132,6 +133,7 @@ enum osmo_gprs_gmm_detach_poweroff_type poweroff_type); int gprs_gmm_tx_rau_req(struct gprs_gmm_entity *gmme, enum gprs_gmm_upd_type rau_type); int gprs_gmm_tx_auth_ciph_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres); +int gprs_gmm_tx_auth_ciph_fail(struct gprs_gmm_entity *gmme, enum gsm48_gmm_cause cause); int gprs_gmm_submit_gmmreg_attach_cnf(struct gprs_gmm_entity *gmme, bool accepted, uint8_t cause); int gprs_gmm_submit_gmmsm_establish_cnf(struct gprs_gmm_entity *gmme, bool accepted, uint8_t cause); diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index b4ac97b..c6356f6 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -704,6 +704,42 @@ return rc; } +/* Tx GMM Authentication and Ciphering Failure, 9.4.10a */ +int gprs_gmm_tx_auth_ciph_fail(struct gprs_gmm_entity *gmme, enum gsm48_gmm_cause cause) +{ + struct osmo_gprs_llc_prim *llc_prim; + int rc; + struct msgb *msg; + + LOGGMME(gmme, LOGL_INFO, "Tx GMM AUTHENTICATION AND CIPHERING FAILURE cause=0x%02x '%s'\n", + cause, get_value_string(gsm48_gmm_cause_names, cause)); + + llc_prim = osmo_gprs_llc_prim_alloc_ll_unitdata_req( + gmme->tlli, OSMO_GPRS_LLC_SAPI_GMM, NULL, GPRS_GMM_ALLOC_SIZE); + msg = llc_prim->oph.msg; + msg->l3h = msg->tail; + rc = gprs_gmm_build_auth_ciph_fail(gmme, msg, cause); + if (rc < 0) { + msgb_free(msg); + return -EBADMSG; + } + llc_prim->ll.l3_pdu = msg->l3h; + llc_prim->ll.l3_pdu_len = msgb_l3len(msg); + /* TODO: + llc_prim->ll.qos_params.*; + llc_prim->ll.radio_prio; + llc_prim->ll.apply_gea; + llc_prim->ll.apply_gia; + */ + + /* invalidate active reference: */ + gmme->auth_ciph.req.ac_ref_nr = 0xff; + rc = gprs_gmm_prim_call_llc_down_cb(llc_prim); + if (rc < 0) + return rc; + return rc; +} + /* Tx GMM Routing area update request, 9.4.14 */ int gprs_gmm_tx_rau_req(struct gprs_gmm_entity *gmme, enum gprs_gmm_upd_type rau_type) @@ -1167,6 +1203,7 @@ if (len < sizeof(*gh) + sizeof(*acreq)) { LOGGMME(gmme, LOGL_ERROR, "Rx GMM AUTHENTICATION AND CIPHERING REQUEST with wrong size %u\n", len); + gprs_gmm_tx_auth_ciph_fail(gmme, GMM_CAUSE_SEM_INCORR_MSG); return -EINVAL; } @@ -1178,6 +1215,7 @@ len - (sizeof(*gh) + sizeof(*acreq))); if (rc < 0) { LOGGMME(gmme, LOGL_ERROR, "Rx GMM AUTHENTICATION AND CIPHERING REQUEST: failed to parse TLVs %d\n", rc); + gprs_gmm_tx_auth_ciph_fail(gmme, GMM_CAUSE_COND_IE_ERR); return -EINVAL; } if (TLVP_PRESENT(&tp, GSM48_IE_GMM_AUTH_RAND)) { @@ -1207,14 +1245,17 @@ if (rand) { /* SIM AUTH needed. Answer GMM req asynchronously in GMMREG-SIM_AUTH.rsp: */ rc = gprs_gmm_submit_gmmreg_sim_auth_ind(gmme); - /* TODO: if rc < 0, transmit AUTHENTICATION AND CIPHERING FAILURE (9.4.10a) */ + if (rc < 0) { + gprs_gmm_tx_auth_ciph_fail(gmme, GMM_CAUSE_GSM_AUTH_UNACCEPT); + return rc; + } } else { /* Submit LLGMM-ASSIGN-REQ as per TS 24.007 Annex C.1 */ rc = gprs_gmm_submit_llgmm_assing_req(gmme); if (rc < 0) { - /* TODO: if rc < 0, transmit AUTHENTICATION AND CIPHERING FAILURE (9.4.10a) */ /* invalidate active reference: */ gmme->auth_ciph.req.ac_ref_nr = 0xff; + gprs_gmm_tx_auth_ciph_fail(gmme, GMM_CAUSE_ILLEGAL_MS); return rc; } rc = gprs_gmm_tx_auth_ciph_resp(gmme, NULL); diff --git a/src/gmm/gmm_pdu.c b/src/gmm/gmm_pdu.c index 5ff7a20..7c83ac5 100644 --- a/src/gmm/gmm_pdu.c +++ b/src/gmm/gmm_pdu.c @@ -295,6 +295,24 @@ return 0; } +/* 9.4.10a Authentication and Ciphering Failure */ +int gprs_gmm_build_auth_ciph_fail(struct gprs_gmm_entity *gmme, struct msgb *msg, + enum gsm48_gmm_cause cause) +{ + struct gsm48_hdr *gh; + + gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); + gh->proto_discr = GSM48_PDISC_MM_GPRS; + gh->msg_type = GSM48_MT_GMM_PTMSI_REALL_COMPL; + + /* 10.5.5.14 Cause */ + msgb_put_u8(msg, (uint8_t)cause); + + /* TODO: 10.5.3.2.2 Authentication Failure parameter */ + return 0; +} + + /* Chapter 9.4.14: Routing area update request */ int gprs_gmm_build_rau_req(struct gprs_gmm_entity *gmme, enum gprs_gmm_upd_type rau_type, diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c index bea8341..df6a348 100644 --- a/src/gmm/gmm_prim.c +++ b/src/gmm/gmm_prim.c @@ -447,9 +447,9 @@ rc = gprs_gmm_submit_llgmm_assing_req(gmme); if (rc < 0) { - /* TODO: if rc < 0, transmit AUTHENTICATION AND CIPHERING FAILURE (9.4.10a) */ /* invalidate active reference: */ gmme->auth_ciph.req.ac_ref_nr = 0xff; + gprs_gmm_tx_auth_ciph_fail(gmme, GMM_CAUSE_ILLEGAL_MS); return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I3ebb3dba20010e57f29dd5b8bbec457c2b08a8e1 Gerrit-Change-Number: 33053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: gmm: Initial implementation of T3166, rx Auth & Ciph Reject

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33054 ) Change subject: gmm: Initial implementation of T3166, rx Auth & Ciph Reject ...................................................................... gmm: Initial implementation of T3166, rx Auth & Ciph Reject As specified in 3GPP TS 24.008 Table 11.3/3. Change-Id: I2c24b968e90cf5ec71fa8a777ec57b407eec015f --- M include/osmocom/gprs/gmm/gmm_private.h M src/gmm/gmm.c M src/gmm/gmm_ms_fsm.c M src/gmm/gmm_prim.c M tests/gmm/gmm_prim_test.err 5 files changed, 84 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/54/33054/1 diff --git a/include/osmocom/gprs/gmm/gmm_private.h b/include/osmocom/gprs/gmm/gmm_private.h index 0308d1e..5a29600 100644 --- a/include/osmocom/gprs/gmm/gmm_private.h +++ b/include/osmocom/gprs/gmm/gmm_private.h @@ -89,6 +89,7 @@ unsigned long t3314_assigned_sec; /* value assigned by the network */ struct osmo_timer_list t3312; /* periodic RAU, in seconds */ unsigned long t3312_assigned_sec; /* value assigned by the network */ + struct osmo_timer_list t3316; /* Delete stored RAND & SRES */ /* network name */ char name_long[32]; @@ -124,6 +125,8 @@ bool gprs_gmm_gmme_ready_timer_running(const struct gprs_gmm_entity *gmme); void gprs_gmm_gmme_t3312_start(struct gprs_gmm_entity *gmme); void gprs_gmm_gmme_t3312_stop(struct gprs_gmm_entity *gmme); +void gprs_gmm_gmme_t3316_start(struct gprs_gmm_entity *gmme); +void gprs_gmm_gmme_t3316_stop(struct gprs_gmm_entity *gmme); int gprs_gmm_rx(struct gprs_gmm_entity *gmme, struct gsm48_hdr *gh, unsigned int len); int gprs_gmm_tx_att_req(struct gprs_gmm_entity *gmme, enum osmo_gprs_gmm_attach_type attach_type, diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index c6356f6..7b78c3b 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -88,6 +88,7 @@ static void t3314_ready_timer_cb(void *data); static void t3312_periodic_rau_timer_cb(void *data); +static void t3316_delete_rand_sres_cb(void *data); static void gprs_gmm_ctx_free(void) { @@ -186,6 +187,7 @@ osmo_timer_setup(&gmme->t3314, t3314_ready_timer_cb, gmme); osmo_timer_setup(&gmme->t3312, t3312_periodic_rau_timer_cb, gmme); + osmo_timer_setup(&gmme->t3316, t3316_delete_rand_sres_cb, gmme); llist_add(&gmme->list, &g_gmm_ctx->gmme_list); @@ -202,6 +204,8 @@ osmo_timer_del(&gmme->t3314); if (osmo_timer_pending(&gmme->t3312)) osmo_timer_del(&gmme->t3312); + if (osmo_timer_pending(&gmme->t3316)) + osmo_timer_del(&gmme->t3316); gprs_gmm_ms_fsm_ctx_release(&gmme->ms_fsm); llist_del(&gmme->list); talloc_free(gmme); @@ -389,6 +393,37 @@ } +/* T3316 (Delete stored RAND & SRES) is started: */ +void gprs_gmm_gmme_t3316_start(struct gprs_gmm_entity *gmme) +{ + unsigned long timeout_sec = osmo_tdef_get(g_gmm_ctx->T_defs, 3316, OSMO_TDEF_S, -1); + + if (timeout_sec == 0) + return; + LOGGMME(gmme, LOGL_INFO, "T3316 started (expires in %lu seconds)\n", timeout_sec); + osmo_timer_schedule(&gmme->t3316, timeout_sec, 0); +} + +/* T3316 (Delete stored RAND & SRES) is stopped: */ +void gprs_gmm_gmme_t3316_stop(struct gprs_gmm_entity *gmme) +{ + if (!osmo_timer_pending(&gmme->t3316)) + return; + + LOGGMME(gmme, LOGL_INFO, "T3316 stopped\n"); + osmo_timer_del(&gmme->t3316); +} + +/* T3312 (Delete stored RAND & SRES) timer expiration: */ +static void t3316_delete_rand_sres_cb(void *data) +{ + struct gprs_gmm_entity *gmme = (struct gprs_gmm_entity *)data; + LOGGMME(gmme, LOGL_INFO, "T3316 (Delete stored RAND & SRES timer) expired\n"); + /* invalidate active reference: */ + gmme->auth_ciph.req.ac_ref_nr = 0xff; + /* Nothing more to do yet, since we really never store RAND & SRES so far? */ +} + int gprs_gmm_submit_gmmreg_attach_cnf(struct gprs_gmm_entity *gmme, bool accepted, uint8_t cause) { struct osmo_gprs_gmm_prim *gmm_prim_tx; @@ -732,8 +767,14 @@ llc_prim->ll.apply_gia; */ + /* TS 24.008 4.7.7.5.1: "If the MS returns an AUTHENTICATION AND CIPHERING FAILURE + * message to the network, the MS shall delete any previously stored RAND and RES + * and shall stop timer T3316, if running." + */ + gprs_gmm_gmme_t3316_stop(gmme); /* invalidate active reference: */ gmme->auth_ciph.req.ac_ref_nr = 0xff; + rc = gprs_gmm_prim_call_llc_down_cb(llc_prim); if (rc < 0) return rc; @@ -1265,6 +1306,18 @@ return rc; } +/* Rx GMM Authentication and ciphering reject, 9.4.11 */ +static int gprs_gmm_rx_auth_ciph_rej(struct gprs_gmm_entity *gmme, struct gsm48_hdr *gh, unsigned int len) +{ + int rc; + + LOGGMME(gmme, LOGL_NOTICE, "Rx GMM AUTHENTICATION AND CIPHERING REJECT\n"); + + enum gsm48_gmm_cause cause = GMM_CAUSE_GSM_AUTH_UNACCEPT; + rc = osmo_fsm_inst_dispatch(gmme->ms_fsm.fi, GPRS_GMM_MS_EV_ATTACH_REJECTED, &cause); + return rc; +} + /* Rx GMM Status, 9.4.18 */ static int gprs_gmm_rx_status(struct gprs_gmm_entity *gmme, struct gsm48_hdr *gh, unsigned int len) { @@ -1336,6 +1389,9 @@ case GSM48_MT_GMM_AUTH_CIPH_REQ: rc = gprs_gmm_rx_auth_ciph_req(gmme, gh, len); break; + case GSM48_MT_GMM_AUTH_CIPH_REJ: + rc = gprs_gmm_rx_auth_ciph_rej(gmme, gh, len); + break; case GSM48_MT_GMM_STATUS: rc = gprs_gmm_rx_status(gmme, gh, len); break; diff --git a/src/gmm/gmm_ms_fsm.c b/src/gmm/gmm_ms_fsm.c index a344494..e5a7002 100644 --- a/src/gmm/gmm_ms_fsm.c +++ b/src/gmm/gmm_ms_fsm.c @@ -72,6 +72,12 @@ return gprs_gmm_tx_rau_req(ctx->gmme, ctx->rau.type); } +static void st_gmm_ms_null_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gprs_gmm_ms_fsm_ctx *ctx = (struct gprs_gmm_ms_fsm_ctx *)fi->priv; + gprs_gmm_gmme_t3316_stop(ctx->gmme); +} + static void st_gmm_ms_null(struct osmo_fsm_inst *fi, uint32_t event, void *data) { switch (event) { @@ -89,6 +95,7 @@ memset(&ctx->attach, 0, sizeof(ctx->attach)); gprs_gmm_gmme_t3312_stop(ctx->gmme); + gprs_gmm_gmme_t3316_stop(ctx->gmme); /* TS 24.007 9.5.1.4: informs SM layerthat the MS has been GPRS detached, e.g. by timer expiry */ if (prev_state != GPRS_GMM_MS_ST_NULL) @@ -241,6 +248,7 @@ //mm_ms_fsm_state_chg(fi, GPRS_GMM_MS_ST_DEREGISTERED_INITIATED); break; case GPRS_GMM_MS_EV_RAU_ACCEPTED: + gprs_gmm_gmme_t3316_stop(ctx->gmme); /* TS 24.007 C.15: submit LLGM-RESUME-REQ */ llc_prim_tx = osmo_gprs_llc_prim_alloc_llgmm_resume_req(ctx->gmme->tlli); OSMO_ASSERT(llc_prim_tx); @@ -284,6 +292,7 @@ .out_state_mask = X(GPRS_GMM_MS_ST_DEREGISTERED), .name = "Null", + .onenter = st_gmm_ms_null_on_enter, .action = st_gmm_ms_null, }, [GPRS_GMM_MS_ST_DEREGISTERED] = { diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c index df6a348..07d4145 100644 --- a/src/gmm/gmm_prim.c +++ b/src/gmm/gmm_prim.c @@ -445,6 +445,8 @@ /* Copy over Kc: */ memcpy(gmme->auth_ciph.kc, gmm_prim->gmmreg.sim_auth_rsp.kc, sizeof(gmme->auth_ciph.kc)); + gprs_gmm_gmme_t3316_start(gmme); + rc = gprs_gmm_submit_llgmm_assing_req(gmme); if (rc < 0) { /* invalidate active reference: */ diff --git a/tests/gmm/gmm_prim_test.err b/tests/gmm/gmm_prim_test.err index 64af93b..fa670cf 100644 --- a/tests/gmm/gmm_prim_test.err +++ b/tests/gmm/gmm_prim_test.err @@ -13,6 +13,7 @@ DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Rx GMM AUTHENTICATION AND CIPHERING REQUEST DLGLOBAL INFO Rx from upper layers: GMMREG-SIM_AUTH.response +DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) T3316 started (expires in 30 seconds) DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Tx GMM GMM AUTHENTICATION AND CIPHERING RESPONSE DLGLOBAL INFO Rx from lower layers: GMRR-LLC_TRANSMITTED.indication DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication @@ -24,6 +25,7 @@ DLGLOBAL INFO GMM_MS{RegisteredInitiated}: state_chg to Registered DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-ea711b41:TLLI-ea711b41) READY timer expired DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-ea711b41:TLLI-ea711b41) T3312 started (expires in 600 seconds) +DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-ea711b41:TLLI-ea711b41) T3316 (Delete stored RAND & SRES timer) expired DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-ea711b41:TLLI-ea711b41) T3312 Periodic RAU timer expired DLGLOBAL INFO GMM_MS{Registered}: Received Event RAU_REQUESTED DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-ea711b41:TLLI-ea711b41) Tx GMM RAU REQUEST @@ -66,6 +68,7 @@ DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Rx GMM AUTHENTICATION AND CIPHERING REQUEST DLGLOBAL INFO Rx from upper layers: GMMREG-SIM_AUTH.response +DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) T3316 started (expires in 30 seconds) DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Tx GMM GMM AUTHENTICATION AND CIPHERING RESPONSE DLGLOBAL INFO Rx from lower layers: GMRR-LLC_TRANSMITTED.indication DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I2c24b968e90cf5ec71fa8a777ec57b407eec015f Gerrit-Change-Number: 33054 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Rename s/ciph_auth/auth_ciph/

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33052 ) Change subject: gmm: Rename s/ciph_auth/auth_ciph/ ...................................................................... gmm: Rename s/ciph_auth/auth_ciph/ The procedure is called "Authentication and ciphering", not the other way around. Change-Id: I02c7edede8db8dbe94e129529ad8fb03fe1b4089 --- M include/osmocom/gprs/gmm/gmm_pdu.h M include/osmocom/gprs/gmm/gmm_private.h M src/gmm/gmm.c M src/gmm/gmm_pdu.c M src/gmm/gmm_prim.c 5 files changed, 19 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/52/33052/1 diff --git a/include/osmocom/gprs/gmm/gmm_pdu.h b/include/osmocom/gprs/gmm/gmm_pdu.h index 249c94f..18a181c 100644 --- a/include/osmocom/gprs/gmm/gmm_pdu.h +++ b/include/osmocom/gprs/gmm/gmm_pdu.h @@ -31,7 +31,7 @@ uint8_t mi_type, struct msgb *msg); -int gprs_gmm_build_ciph_auth_resp(const struct gprs_gmm_entity *gmme, +int gprs_gmm_build_auth_ciph_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres, struct msgb *msg); int gprs_gmm_build_detach_req(struct gprs_gmm_entity *gmme, diff --git a/include/osmocom/gprs/gmm/gmm_private.h b/include/osmocom/gprs/gmm/gmm_private.h index 48068d9..ac64ea1 100644 --- a/include/osmocom/gprs/gmm/gmm_private.h +++ b/include/osmocom/gprs/gmm/gmm_private.h @@ -131,7 +131,7 @@ enum osmo_gprs_gmm_detach_ms_type detach_type, enum osmo_gprs_gmm_detach_poweroff_type poweroff_type); int gprs_gmm_tx_rau_req(struct gprs_gmm_entity *gmme, enum gprs_gmm_upd_type rau_type); -int gprs_gmm_tx_ciph_auth_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres); +int gprs_gmm_tx_auth_ciph_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres); int gprs_gmm_submit_gmmreg_attach_cnf(struct gprs_gmm_entity *gmme, bool accepted, uint8_t cause); int gprs_gmm_submit_gmmsm_establish_cnf(struct gprs_gmm_entity *gmme, bool accepted, uint8_t cause); diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index bc28206..b4ac97b 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -537,7 +537,7 @@ /* Tx GMM Authentication and ciphering response, 9.4.10 * sres can be NULL if no authentication was requested. */ -int gprs_gmm_tx_ciph_auth_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres) +int gprs_gmm_tx_auth_ciph_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres) { struct osmo_gprs_llc_prim *llc_prim; int rc; @@ -549,7 +549,7 @@ gmme->tlli, OSMO_GPRS_LLC_SAPI_GMM, NULL, GPRS_GMM_ALLOC_SIZE); msg = llc_prim->oph.msg; msg->l3h = msg->tail; - rc = gprs_gmm_build_ciph_auth_resp(gmme, sres, msg); + rc = gprs_gmm_build_auth_ciph_resp(gmme, sres, msg); if (rc < 0) { msgb_free(msg); return -EBADMSG; @@ -1217,7 +1217,7 @@ gmme->auth_ciph.req.ac_ref_nr = 0xff; return rc; } - rc = gprs_gmm_tx_ciph_auth_resp(gmme, NULL); + rc = gprs_gmm_tx_auth_ciph_resp(gmme, NULL); /* invalidate active reference: */ gmme->auth_ciph.req.ac_ref_nr = 0xff; } diff --git a/src/gmm/gmm_pdu.c b/src/gmm/gmm_pdu.c index d213e70..5ff7a20 100644 --- a/src/gmm/gmm_pdu.c +++ b/src/gmm/gmm_pdu.c @@ -413,7 +413,7 @@ } /* Tx GMM Authentication and ciphering response, 9.4.10 */ -int gprs_gmm_build_ciph_auth_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres, struct msgb *msg) +int gprs_gmm_build_auth_ciph_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres, struct msgb *msg) { struct gsm48_hdr *gh; struct gsm48_auth_ciph_resp *acr; diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c index b6d8dac..bea8341 100644 --- a/src/gmm/gmm_prim.c +++ b/src/gmm/gmm_prim.c @@ -453,7 +453,7 @@ return rc; } - rc = gprs_gmm_tx_ciph_auth_resp(gmme, gmm_prim->gmmreg.sim_auth_rsp.sres); + rc = gprs_gmm_tx_auth_ciph_resp(gmme, gmm_prim->gmmreg.sim_auth_rsp.sres); /* invalidate active reference: */ gmme->auth_ciph.req.ac_ref_nr = 0xff; return rc; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I02c7edede8db8dbe94e129529ad8fb03fe1b4089 Gerrit-Change-Number: 33052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_est_dchan(): add support for CSD channel modes

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33035 ) Change subject: BTS_Tests: f_est_dchan(): add support for CSD channel modes ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33035/comment/380f9426_47f5… PS1, Line 2546: case (tr_RSL_ChanMode_SIGN) > In fact, the select-case statement in TTCN3 always has a template in the case () part. […] I see, good to know. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33035 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: I066657941dd751183aa5e937a6bfe9ab7837d46b Gerrit-Change-Number: 33035 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 May 2023 14:49:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: ts_31_102: Add DF.SAIP support

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/32992 ) Change subject: ts_31_102: Add DF.SAIP support ...................................................................... ts_31_102: Add DF.SAIP support DF.SAIP (SIMalliance Interoperable Profile) is not part of 31.102, but something from the eSIM/eUICC universe of TCA (formerly known as SIMalliance). However, as 3GPP does not specify how/where the card stores the information required for SUCI calculation, the TCA/SIMalliance standard is the only standard there is. Some CardOS start to use this standard even for non-eSIM/eUICC use cases. Change-Id: Iffb65af335dfdbd7791fca9a0a6ad4b79814a57c --- M pySim/ts_31_102.py 1 file changed, 29 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 77b8325..76f1358 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1451,6 +1451,18 @@ self.add_files(files) +class DF_SAIP(CardDF): + """This is not really TS 31.102 but part of the eUICC Profile Package: Interoperable Format Technical + Specification as released by TCA (formerly SIMalliance)""" + def __init__(self, fid='5FD0', name='DF.SAIP', desc='SIMalliance Interoperable Profile', **kwargs): + super().__init__(fid=fid, name=name, desc=desc, **kwargs) + files = [ + # uses the same file format as DF.5GS/EF_SUCI_Calc_Info, but different FID + EF_SUCI_Calc_Info(fid='4f01') + ] + self.add_files(files) + + class ADF_USIM(CardADF): def __init__(self, aid='a0000000871002', name='ADF.USIM', fid=None, sfid=None, desc='USIM Application'): @@ -1576,6 +1588,7 @@ DF_USIM_5GS(service=[122, 123, 124, 125, 126, 127, 129, 130]), DF_SNPN(service=[143,146]), DF_5G_ProSe(service=139), + DF_SAIP(), ] self.add_files(files) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iffb65af335dfdbd7791fca9a0a6ad4b79814a57c Gerrit-Change-Number: 32992 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023