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

[M] Change in osmo-ttcn3-hacks[master]: sgsn: Introduce test TC_pmm_idle_rx_mt_data

by pespin

Attention is currently required from: daniel, fixeria, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37646?usp=email ) Change subject: sgsn: Introduce test TC_pmm_idle_rx_mt_data ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37646?usp=email 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: I35d660b8e546f6ce0af8c05d7b5c56833a26fb76 Gerrit-Change-Number: 37646 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 31 Jul 2024 23:01:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/GTPv1U_Templates: Mark parameters as templates

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37645?usp=email ) Change subject: library/GTPv1U_Templates: Mark parameters as templates ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37645?usp=email 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: I278f7dbc64704c1ba2b8a75d6f540ac52b067598 Gerrit-Change-Number: 37645 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 31 Jul 2024 23:01:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months, 3 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: tbf_ul_ass_fsm: Clarify use of X2000 timer

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/37669?usp=email ) Change subject: tbf_ul_ass_fsm: Clarify use of X2000 timer ...................................................................... tbf_ul_ass_fsm: Clarify use of X2000 timer See 683ce64039bb9192b597e62344f0aa084b4ac4c9 for a complementary analysis and description of the timer. Related: OS#3928 Change-Id: Iee27d1b2a8ddac53e14efd20a8c8aec35de58174 --- M src/tbf_ul_ass_fsm.c M tests/tbf/TbfTest.err 2 files changed, 28 insertions(+), 5 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/tbf_ul_ass_fsm.c b/src/tbf_ul_ass_fsm.c index 6f88f11..de5b901 100644 --- a/src/tbf_ul_ass_fsm.c +++ b/src/tbf_ul_ass_fsm.c @@ -156,16 +156,26 @@ unsigned long val; unsigned int sec, micro; - /* Start release after rejecting only if it is UL TBF */ if (prev_state == TBF_UL_ASS_SEND_ASS_REJ && tbf_direction(ctx->tbf) == GPRS_RLCMAC_UL_TBF) { - /* tbf_free() called upon trigger */ + /* If TBF object doing the UL assignment is also an UL TBF, and + * it was just rejected over PACCH, then there's nothing more to do + * with this UL TBF other than freeing it and waiting for MS to + * retry asking for another UL TBF assignment. But since we are + * currently being called from the scheduled (we arrived here + * through st_send_ass_rej(TBF_UL_ASS_EV_CREATE_RLCMAC_MSG)), + * then we need to delay the tbf_free() to do it asynchrosnouly + * in the event loop. Using a fixed 0ms internal fsm timer + * number would have been fine here, but since for historical + * reasons we have VTY-configurable X2000 for this purpose, keep + * using it (it is expected to be 0 usually). + */ fi->T = -2000; val = osmo_tdef_get(the_pcu->T_defs, fi->T, OSMO_TDEF_MS, -1); sec = val / 1000; micro = (val % 1000) * 1000; - LOGPTBF(ctx->tbf, LOGL_DEBUG, "Starting timer X2000 [reject (PACCH)] with %u sec. %u microsec\n", - sec, micro); + LOGPTBF(ctx->tbf, LOGL_DEBUG, "Starting timer X2000 [delay free after Packet Access Reject (PACCH)] with %lums\n", + val); osmo_timer_schedule(&fi->timer, sec, micro); } diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 062dd23..fdaf917 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -11923,7 +11923,7 @@ UL_ASS_TBF(UL:TFI-0-0--1:G:TLLI-0xffeeddcc){NONE}: state_chg to SEND_ASS_REJ UL_ASS_TBF(UL:TFI-0-0--1:G:TLLI-0xffeeddcc){SEND_ASS_REJ}: Received Event CREATE_RLCMAC_MSG UL_ASS_TBF(UL:TFI-0-0--1:G:TLLI-0xffeeddcc){SEND_ASS_REJ}: state_chg to NONE -TBF(UL:TFI-0-0--1:G:TLLI-0xffeeddcc){ASSIGN} Starting timer X2000 [reject (PACCH)] with 0 sec. 0 microsec +TBF(UL:TFI-0-0--1:G:TLLI-0xffeeddcc){ASSIGN} Starting timer X2000 [delay free after Packet Access Reject (PACCH)] with 0ms PDCH(bts=0,trx=0,ts=7) FN=2654218 Scheduling control message at RTS for TBF(UL:TFI-0-0--1:G:TLLI-0xffeeddcc){ASSIGN} UL_ASS_TBF(UL:TFI-0-0--1:G:TLLI-0xffeeddcc){NONE}: Timeout of X2000 TBF(UL:TFI-0-0--1:G:TLLI-0xffeeddcc){ASSIGN} free -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/37669?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iee27d1b2a8ddac53e14efd20a8c8aec35de58174 Gerrit-Change-Number: 37669 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

10 months, 3 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: rcv_control_ack(): Improve logging of confirmation of Pkt Dl/Ul Ass

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/37672?usp=email ) Change subject: rcv_control_ack(): Improve logging of confirmation of Pkt Dl/Ul Ass ...................................................................... rcv_control_ack(): Improve logging of confirmation of Pkt Dl/Ul Ass This allows tracking which TBF is used to assigned the new TBF. Change-Id: I1f438cc31ceea24286a914801d3746f577385bfc --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 34 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/pdch.cpp b/src/pdch.cpp index 7ff1c7e..3cba690 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -389,7 +389,6 @@ osmo_fsm_inst_state_name(tbf_ul_ass_fi(tbf))); return; } - LOGPTBF(tbf, LOGL_DEBUG, "[DOWNLINK] UPLINK ASSIGNED\n"); pdch_ulc_release_fn(ulc, fn); if (tbf_direction(tbf) == GPRS_RLCMAC_DL_TBF) tbf->n_reset(N3105); @@ -397,10 +396,12 @@ new_tbf = ms_ul_tbf(ms); if (!new_tbf) { - LOGPDCH(this, DRLCMAC, LOGL_ERROR, "Got ACK, but UL " - "TBF is gone TLLI=0x%08x\n", tlli); + LOGPDCH(this, DRLCMAC, LOGL_ERROR, + "Got PKT_CTRL_ACK (UL_ASS) from %s, but UL TBF is gone (TLLI=0x%08x)\n", + tbf_name(tbf), tlli); return; } + LOGPTBF(tbf, LOGL_DEBUG, "Got PKT_CTRL_ACK confirming assignment of %s\n", tbf_name(new_tbf)); osmo_fsm_inst_dispatch(new_tbf->state_fi, TBF_EV_ASSIGN_ACK_PACCH, NULL); /* there might be LLC packets waiting in the queue, but the DL @@ -417,7 +418,6 @@ osmo_fsm_inst_state_name(tbf_dl_ass_fi(tbf))); return; } - LOGPTBF(tbf, LOGL_DEBUG, "[UPLINK] DOWNLINK ASSIGNED\n"); pdch_ulc_release_fn(ulc, fn); if (tbf_direction(tbf) == GPRS_RLCMAC_DL_TBF) tbf->n_reset(N3105); @@ -425,10 +425,12 @@ new_tbf = ms_dl_tbf(ms); if (!new_tbf) { - LOGPDCH(this, DRLCMAC, LOGL_ERROR, "Got ACK, but DL " - "TBF is gone TLLI=0x%08x\n", tlli); + LOGPDCH(this, DRLCMAC, LOGL_ERROR, + "Got PKT_CTRL_ACK (DL_ASS) from %s, but DL TBF is gone (TLLI=0x%08x)\n", + tbf_name(tbf), tlli); return; } + LOGPTBF(tbf, LOGL_DEBUG, "Got PKT_CTRL_ACK confirming assignment of %s\n", tbf_name(new_tbf)); if ((tbf->state_is(TBF_ST_WAIT_RELEASE) || tbf->state_is(TBF_ST_WAIT_REUSE_TFI)) && tbf->direction == new_tbf->direction) diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index fdaf917..a012989 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -2719,9 +2719,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654283 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654283 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} FN=2654283 Rx Packet Control Ack (reason=UL_ASS) -TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} [DOWNLINK] UPLINK ASSIGNED UL_ASS_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK UL_ASS_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} Got PKT_CTRL_ACK confirming assignment of TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} UL_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH UL_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184 @@ -2843,9 +2843,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654283 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654283 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} FN=2654283 Rx Packet Control Ack (reason=UL_ASS) -TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} [DOWNLINK] UPLINK ASSIGNED UL_ASS_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK UL_ASS_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} Got PKT_CTRL_ACK confirming assignment of TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} UL_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH UL_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184 @@ -2903,9 +2903,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654288 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654288 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FLOW} FN=2654288 Rx Packet Control Ack (reason=DL_ASS) -TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FLOW} [UPLINK] DOWNLINK ASSIGNED DL_ASS_TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK DL_ASS_TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FLOW} Got PKT_CTRL_ACK confirming assignment of TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN} DL_TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH DL_TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Expiring FN=2654288 but previous FN=2654279 is still reserved! @@ -3030,9 +3030,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654361 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654361 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-1:G:TLLI-0xf5667788){ASSIGN} FN=2654361 Rx Packet Control Ack (reason=UL_ASS) -TBF(UL:TFI-0-0-1:G:TLLI-0xf5667788){ASSIGN} [DOWNLINK] UPLINK ASSIGNED UL_ASS_TBF(UL:TFI-0-0-1:G:TLLI-0xf5667788){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK UL_ASS_TBF(UL:TFI-0-0-1:G:TLLI-0xf5667788){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-1:G:TLLI-0xf5667788){ASSIGN} Got PKT_CTRL_ACK confirming assignment of TBF(UL:TFI-0-0-1:G:TLLI-0xf5667788){ASSIGN} UL_TBF(UL:TFI-0-0-1:G:TLLI-0xf5667788){ASSIGN}: Received Event ASSIGN_ACK_PACCH UL_TBF(UL:TFI-0-0-1:G:TLLI-0xf5667788){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Expiring FN=2654361 but previous FN=2654353 is still reserved! @@ -3181,9 +3181,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654283 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654283 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} FN=2654283 Rx Packet Control Ack (reason=UL_ASS) -TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} [DOWNLINK] UPLINK ASSIGNED UL_ASS_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK UL_ASS_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} Got PKT_CTRL_ACK confirming assignment of TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} UL_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH UL_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184 @@ -3300,9 +3300,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654340 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654340 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN} FN=2654340 Rx Packet Control Ack (reason=UL_ASS) -TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN} [DOWNLINK] UPLINK ASSIGNED UL_ASS_TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK UL_ASS_TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN} Got PKT_CTRL_ACK confirming assignment of TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN} UL_TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH UL_TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW [DL] algo A <multi> (suggested TRX: 0): Alloc start @@ -3421,9 +3421,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654283 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654283 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} FN=2654283 Rx Packet Control Ack (reason=UL_ASS) -TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} [DOWNLINK] UPLINK ASSIGNED UL_ASS_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK UL_ASS_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} Got PKT_CTRL_ACK confirming assignment of TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} UL_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH UL_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184 @@ -3624,9 +3624,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654283 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654283 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} FN=2654283 Rx Packet Control Ack (reason=UL_ASS) -TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} [DOWNLINK] UPLINK ASSIGNED UL_ASS_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK UL_ASS_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} Got PKT_CTRL_ACK confirming assignment of TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN} UL_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH UL_TBF(UL:TFI-0-0-0:G:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184 @@ -3724,9 +3724,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654288 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654288 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FLOW} FN=2654288 Rx Packet Control Ack (reason=DL_ASS) -TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FLOW} [UPLINK] DOWNLINK ASSIGNED DL_ASS_TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK DL_ASS_TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FLOW} Got PKT_CTRL_ACK confirming assignment of TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN} DL_TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH DL_TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Expiring FN=2654288 but previous FN=2654279 is still reserved! @@ -4452,9 +4452,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654413 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654413 ------------------------- RX : Uplink Control Block ------------------------- TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_RELEASE} FN=2654413 Rx Packet Control Ack (reason=DL_ASS) -TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_RELEASE} [UPLINK] DOWNLINK ASSIGNED DL_ASS_TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK DL_ASS_TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_RELEASE} Got PKT_CTRL_ACK confirming assignment of TBF(DL:TFI-0-0-1:G:IMSI-0011223344:TLLI-0xf1223344){ASSIGN} TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_RELEASE} free PDCH(bts=0,trx=0,ts=7) Detaching TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_RELEASE}, 2 TBFs, USFs = 01, TFIs = 00000003. MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(DL:G:IMSI-0011223344:TLLI-0xf1223344){WAIT_RELEASE} @@ -4878,9 +4878,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654283 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654283 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} FN=2654283 Rx Packet Control Ack (reason=UL_ASS) -TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} [DOWNLINK] UPLINK ASSIGNED UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} Got PKT_CTRL_ACK confirming assignment of TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} UL_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH UL_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184 @@ -5010,9 +5010,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654283 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654283 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} FN=2654283 Rx Packet Control Ack (reason=UL_ASS) -TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} [DOWNLINK] UPLINK ASSIGNED UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} Got PKT_CTRL_ACK confirming assignment of TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} UL_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH UL_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184 @@ -9282,9 +9282,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654283 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654283 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} FN=2654283 Rx Packet Control Ack (reason=UL_ASS) -TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} [DOWNLINK] UPLINK ASSIGNED UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} Got PKT_CTRL_ACK confirming assignment of TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} UL_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH UL_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184 @@ -9516,9 +9516,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654283 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654283 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} FN=2654283 Rx Packet Control Ack (reason=UL_ASS) -TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} [DOWNLINK] UPLINK ASSIGNED UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} Got PKT_CTRL_ACK confirming assignment of TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} UL_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH UL_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=1, SI=0, TFI=0, CPS=5, RSB=0, rc=385 @@ -10048,9 +10048,9 @@ PDCH(bts=0,trx=0,ts=7) FN=2654283 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ PDCH(bts=0,trx=0,ts=7) FN=2654283 ------------------------- RX : Uplink Control Block ------------------------- TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} FN=2654283 Rx Packet Control Ack (reason=UL_ASS) -TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} [DOWNLINK] UPLINK ASSIGNED UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_ASS_CTRL_ACK UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE +TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} Got PKT_CTRL_ACK confirming assignment of TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN} UL_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN}: Received Event ASSIGN_ACK_PACCH UL_TBF(UL:TFI-0-0-0:E:TLLI-0xf1223344){ASSIGN}: state_chg to FLOW PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/37672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1f438cc31ceea24286a914801d3746f577385bfc Gerrit-Change-Number: 37672 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

10 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: pySim.tlv: Fix from_dict of nested TLVs

by fixeria

Attention is currently required from: laforge, lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37680?usp=email ) Change subject: pySim.tlv: Fix from_dict of nested TLVs ...................................................................... Patch Set 1: Verified+1 Code-Review+1 (1 comment) Patchset: PS1: I confirm that this patch fixes OS#6453. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37680?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic1f9db45db75b887227c2e20785198814cbab0f5 Gerrit-Change-Number: 37680 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 31 Jul 2024 21:40:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: pySim.tlv: Fix from_dict of nested TLVs

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37680?usp=email ) Change subject: pySim.tlv: Fix from_dict of nested TLVs ...................................................................... pySim.tlv: Fix from_dict of nested TLVs The existing logic is wrong. How we call from_dict() doesn't differ if a member IE itself contains a nested collection: We always must pass a single-entry dict with the snak-case name of the class to from_dict(). Change-Id: Ic1f9db45db75b887227c2e20785198814cbab0f5 Fixes: OS#6453 --- M pySim/tlv.py 1 file changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/80/37680/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index 8180fd1..bd3c901 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -495,12 +495,7 @@ # resolve the class for that name; create an instance of it cls = self.members_by_name[k] inst = cls() - if cls.nested_collection_cls: - # in case of collections, we want to pass the raw "value" portion to from_dict, - # as to_dict() below intentionally omits the collection-class-name as key - inst.from_dict(i[k]) - else: - inst.from_dict({k: i[k]}) + inst.from_dict({k: i[k]}) res.append(inst) else: raise ValueError('%s: Unknown TLV Class %s in %s; expected %s' % -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37680?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic1f9db45db75b887227c2e20785198814cbab0f5 Gerrit-Change-Number: 37680 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

10 months, 3 weeks

1
0
0 0

[M] Change in pysim[master]: Support EF.ICCID and EF.PL on classic TS 51.011 SIM

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37679?usp=email ) Change subject: Support EF.ICCID and EF.PL on classic TS 51.011 SIM ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: works with magicSIM and sysmoSIM-GR1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37679?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6eaa5b579f02c7d75f443ee2b2cc8ae0ba13f2fe Gerrit-Change-Number: 37679 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 31 Jul 2024 20:27:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months, 3 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: X2001 timeout: Update UL TBF's dl_ass_fsm state

by fixeria

Attention is currently required from: laforge, lynxis lazus, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/37678?usp=email ) Change subject: X2001 timeout: Update UL TBF's dl_ass_fsm state ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/37678?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I42cc264b1b77bf8d91ec01a18d8985e182a20024 Gerrit-Change-Number: 37678 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 31 Jul 2024 19:25:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months, 3 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: rcv_control_ack(): Improve logging of confirmation of Pkt Dl/Ul Ass

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/37672?usp=email ) Change subject: rcv_control_ack(): Improve logging of confirmation of Pkt Dl/Ul Ass ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/37672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1f438cc31ceea24286a914801d3746f577385bfc Gerrit-Change-Number: 37672 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 31 Jul 2024 19:24:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months, 3 weeks

1
0
0 0

[M] Change in pysim[master]: Support EF.ICCID and EF.PL on classic TS 51.011 SIM

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37679?usp=email ) Change subject: Support EF.ICCID and EF.PL on classic TS 51.011 SIM ...................................................................... Support EF.ICCID and EF.PL on classic TS 51.011 SIM So far we only had the EF.ICCID and EF.PL within our UICC card profile. However, a classic GSM SIM card is not an UICC, so the CardProfileSIM also needs those files. To avoid circular dependencies, move the definitions from ts_102_221.py to ts_51_011.py Change-Id: I6eaa5b579f02c7d75f443ee2b2cc8ae0ba13f2fe Closes: OS#6485 --- M pySim/ts_102_221.py M pySim/ts_51_011.py 2 files changed, 64 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/79/37679/1 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 211bf68..c326ad1 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -31,7 +31,7 @@ # A UICC will usually also support 2G functionality. If this is the case, we # need to add DF_GSM and DF_TELECOM along with the UICC related files -from pySim.ts_51_011 import AddonSIM +from pySim.ts_51_011 import AddonSIM, EF_ICCID, EF_PL from pySim.gsm_r import AddonGSMR from pySim.cdma_ruim import AddonRUIM @@ -666,44 +666,6 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(5, 54)) self._tlv = EF_DIR.ApplicationTemplate -# TS 102 221 Section 13.2 -class EF_ICCID(TransparentEF): - _test_de_encode = [ - ( '988812010000400310f0', { "iccid": "8988211000000430010" } ), - ] - def __init__(self, fid='2fe2', sfid=0x02, name='EF.ICCID', desc='ICC Identification'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size=(10, 10)) - - def _decode_hex(self, raw_hex): - return {'iccid': dec_iccid(raw_hex)} - - def _encode_hex(self, abstract): - return enc_iccid(abstract['iccid']) - -# TS 102 221 Section 13.3 -class EF_PL(TransRecEF): - _test_de_encode = [ - ( '6465', "de" ), - ( '656e', "en" ), - ( 'ffff', None ), - ] - - def __init__(self, fid='2f05', sfid=0x05, name='EF.PL', desc='Preferred Languages'): - super().__init__(fid, sfid=sfid, name=name, - desc=desc, rec_len=2, size=(2, None)) - - def _decode_record_bin(self, bin_data, **kwargs): - if bin_data == b'\xff\xff': - return None - else: - return bin_data.decode('ascii') - - def _encode_record_bin(self, in_json, **kwargs): - if in_json is None: - return b'\xff\xff' - else: - return in_json.encode('ascii') - # TS 102 221 Section 13.4 class EF_ARR(LinFixedEF): diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 9b56b0e..f6bd3cc 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -955,6 +955,44 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) +# TS 102 221 Section 13.2 / TS 31.101 Section 13 / TS 51.011 Section 10.1.1 +class EF_ICCID(TransparentEF): + _test_de_encode = [ + ( '988812010000400310f0', { "iccid": "8988211000000430010" } ), + ] + def __init__(self, fid='2fe2', sfid=0x02, name='EF.ICCID', desc='ICC Identification'): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=(10, 10)) + + def _decode_hex(self, raw_hex): + return {'iccid': dec_iccid(raw_hex)} + + def _encode_hex(self, abstract): + return enc_iccid(abstract['iccid']) + +# TS 102 221 Section 13.3 / TS 31.101 Secction 13 / TS 51.011 Section 10.1.2 +class EF_PL(TransRecEF): + _test_de_encode = [ + ( '6465', "de" ), + ( '656e', "en" ), + ( 'ffff', None ), + ] + + def __init__(self, fid='2f05', sfid=0x05, name='EF.PL', desc='Preferred Languages'): + super().__init__(fid, sfid=sfid, name=name, + desc=desc, rec_len=2, size=(2, None)) + + def _decode_record_bin(self, bin_data, **kwargs): + if bin_data == b'\xff\xff': + return None + else: + return bin_data.decode('ascii') + + def _encode_record_bin(self, in_json, **kwargs): + if in_json is None: + return b'\xff\xff' + else: + return in_json.encode('ascii') + class DF_GSM(CardDF): def __init__(self, fid='7f20', name='DF.GSM', desc='GSM Network related files'): super().__init__(fid=fid, name=name, desc=desc) @@ -1085,12 +1123,19 @@ }, } + files = [ + EF_ICCID(), + EF_PL(), + DF_TELECOM(), + DF_GSM(), + ] + addons = [ AddonGSMR, ] super().__init__('SIM', desc='GSM SIM Card', cla="a0", - sel_ctrl="0000", files_in_mf=[DF_TELECOM(), DF_GSM()], sw=sw, addons = addons) + sel_ctrl="0000", files_in_mf=files, sw=sw, addons = addons) @staticmethod def decode_select_response(resp_hex: str) -> object: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37679?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6eaa5b579f02c7d75f443ee2b2cc8ae0ba13f2fe Gerrit-Change-Number: 37679 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

10 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024