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

Change in osmo-ttcn3-hacks[master]: library/GSM_Types: add {enc,dec}_BcdMccMnc() functions

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31278 ) Change subject: library/GSM_Types: add {enc,dec}_BcdMccMnc() functions ...................................................................... library/GSM_Types: add {enc,dec}_BcdMccMnc() functions Change-Id: Id501ea146eb596085c204a51387f1b92300d1285 Related: SYS#5602, OS#5901 --- M library/GSM_Types.ttcn 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index d48dc6c..b234bf4 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -435,6 +435,13 @@ type hexstring GsmBcdString with { variant "HEXORDER(low)" }; type GsmBcdString BcdMccMnc with { variant "FIELDLENGTH(6)" }; +/* hex2oct()/oct2hex() do not respect the HEXORDER/FIELDLENGTH attributes, + * so better use the functions, employing TITAN's RAW codec, dclared below. */ +external function enc_BcdMccMnc(in BcdMccMnc str) return octetstring + with { extension "prototype(convert) encode(RAW)" }; +external function dec_BcdMccMnc(in octetstring str) return BcdMccMnc + with { extension "prototype(convert) decode(RAW)" }; + /* Compute BcdMccMnc from a pair of GsmMcc/GsmMnc values */ function f_build_BcdMccMnc(GsmMcc mcc, GsmMnc mnc) return BcdMccMnc { if (lengthof(mnc) == 2) { @@ -468,6 +475,10 @@ if (not match('21F354'O, decmatch BcdMccMnc:'123F45'H)) { setverdict(fail); } if (not match('216354'O, decmatch BcdMccMnc:'123645'H)) { setverdict(fail); } + if (not match(enc_BcdMccMnc('262F42'H), '62F224'O)) { setverdict(fail); } + if (not match(enc_BcdMccMnc('123F45'H), '21F354'O)) { setverdict(fail); } + if (not match(enc_BcdMccMnc('123645'H), '216354'O)) { setverdict(fail); } + if (not match(f_build_BcdMccMnc('262'H, '42'H), BcdMccMnc:'262F42'H)) { setverdict(fail); } if (not match(f_build_BcdMccMnc('123'H, '45'H), BcdMccMnc:'123F45'H)) { setverdict(fail); } if (not match(f_build_BcdMccMnc('123'H, '456'H), BcdMccMnc:'123645'H)) { setverdict(fail); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31278 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: Id501ea146eb596085c204a51387f1b92300d1285 Gerrit-Change-Number: 31278 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PCU_Tests: improve coding style, use f_build_BcdMccMnc()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31279 ) Change subject: PCU_Tests: improve coding style, use f_build_BcdMccMnc() ...................................................................... PCU_Tests: improve coding style, use f_build_BcdMccMnc() Change-Id: Ia7066c6f36678650ada61c1633977b824777194d Related: OS#5901 --- M pcu/PCU_Tests.ttcn 1 file changed, 10 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index affe41d..ad93b5c 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -5134,14 +5134,12 @@ private function f_outbound_nacc_rim_tx_resp(PCUIF_info_ind info_ind) runs on RAW_PCU_Test_CT { - var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), - info_ind.lac), - info_ind.rac), + /* Source Cell Identifier IE is generated by osmo-pcu based on the INFO.ind */ + var BcdMccMnc src_mcc_mnc := f_build_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1); + var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(src_mcc_mnc, info_ind.lac), info_ind.rac), info_ind.cell_id)); - var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H, /* Decided by test itself (emulating BSC) */ - 423), - 2), - 5)); + /* Destination Cell Identifier IE is resolved by the testsuite itself (emulating BSC) */ + var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc('023'H, '43'H), 423), 2), 5)); var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); var template (value) RAN_Information_RIM_Container res_cont := @@ -5158,15 +5156,12 @@ altstep as_outbound_nacc_rim_resolve(PCUIF_info_ind info_ind, boolean do_answer := true, boolean do_repeat := false) runs on RAW_PCU_Test_CT { - /* RIM procedure: */ - var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), - info_ind.lac), - info_ind.rac), + /* Source Cell Identifier IE is generated by osmo-pcu based on the INFO.ind */ + var BcdMccMnc src_mcc_mnc := f_build_BcdMccMnc_int(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1); + var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(src_mcc_mnc, info_ind.lac), info_ind.rac), info_ind.cell_id)); - var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H, /* Decided by test itself (emulating BSC) */ - 423), - 2), - 5)); + /* Destination Cell Identifier IE is resolved by the testsuite itself (emulating BSC) */ + var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc('023'H, '43'H), 423), 2), 5)); var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); [] RIM.receive(tr_RAN_INFORMATION_REQUEST(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31279 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: Ia7066c6f36678650ada61c1633977b824777194d Gerrit-Change-Number: 31279 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PCU_Tests: define ts_BssgpCellIdDstAddr_default

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31280 ) Change subject: PCU_Tests: define ts_BssgpCellIdDstAddr_default ...................................................................... PCU_Tests: define ts_BssgpCellIdDstAddr_default Define hard-coded default Destination Cell ID in one place. Change-Id: I8f400ba52d4d32447e0b4a640a2f4b73699937c8 Related: OS#5901 --- M pcu/PCU_Tests.ttcn 1 file changed, 29 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index ad93b5c..6e858d5 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -5132,6 +5132,19 @@ return dl_block; } +private const GsmMcc c_BssgpCellMcc := '023'H; +private const GsmMnc c_BssgpCellMnc := '43'H; +private template (value) BssgpCellId ts_BssgpCellIdDstAddr_default := { + ra_id := { + lai := { + mcc_mnc := f_build_BcdMccMnc(c_BssgpCellMcc, c_BssgpCellMnc), + lac := 423 + }, + rac := 2 + }, + cell_id := 5 +} + private function f_outbound_nacc_rim_tx_resp(PCUIF_info_ind info_ind) runs on RAW_PCU_Test_CT { /* Source Cell Identifier IE is generated by osmo-pcu based on the INFO.ind */ @@ -5139,7 +5152,7 @@ var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(src_mcc_mnc, info_ind.lac), info_ind.rac), info_ind.cell_id)); /* Destination Cell Identifier IE is resolved by the testsuite itself (emulating BSC) */ - var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc('023'H, '43'H), 423), 2), 5)); + var BssgpCellId dst := valueof(ts_BssgpCellIdDstAddr_default); var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); var template (value) RAN_Information_RIM_Container res_cont := @@ -5161,7 +5174,7 @@ var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(src_mcc_mnc, info_ind.lac), info_ind.rac), info_ind.cell_id)); /* Destination Cell Identifier IE is resolved by the testsuite itself (emulating BSC) */ - var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_build_BcdMccMnc('023'H, '43'H), 423), 2), 5)); + var BssgpCellId dst := valueof(ts_BssgpCellIdDstAddr_default); var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); [] RIM.receive(tr_RAN_INFORMATION_REQUEST(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), @@ -5187,7 +5200,12 @@ int2str(req_arfcn) & "." & int2str(req_bsic); if (answer) { - f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + var BssgpCellId addr := valueof(ts_BssgpCellIdDstAddr_default); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, hex2str(c_BssgpCellMcc) & "-" & + hex2str(c_BssgpCellMnc) & "-" & + int2str(addr.ra_id.lai.lac) & "-" & + int2str(addr.ra_id.rac) & "-" & + int2str(addr.cell_id)); } else { f_ctrl_exp_get(IPA_CTRL, ctrl_var, omit); } @@ -5195,7 +5213,14 @@ var PCUIF_Message pcu_msg; BTS.receive(tr_PCUIF_NEIGH_ADDR_REQ(0, info_ind.lac, info_ind.cell_id, req_arfcn, req_bsic)) -> value pcu_msg; if (answer) { - BTS.send(ts_PCUIF_NEIGH_ADDR_CNF(0, pcu_msg.u.container.u.neigh_addr_req, 0, 23, 43, 0, 423, 2, 5)); + var BssgpCellId addr := valueof(ts_BssgpCellIdDstAddr_default); + BTS.send(ts_PCUIF_NEIGH_ADDR_CNF(0, pcu_msg.u.container.u.neigh_addr_req, 0, + str2int(hex2str(c_BssgpCellMcc)), + str2int(hex2str(c_BssgpCellMnc)), + lengthof(c_BssgpCellMnc) - 2, + addr.ra_id.lai.lac, + addr.ra_id.rac, + addr.cell_id)); } } } 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31280 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: I8f400ba52d4d32447e0b4a640a2f4b73699937c8 Gerrit-Change-Number: 31280 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PCU_Tests: use real values for c_BssgpCell{Mcc,Mnc}

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31281 ) Change subject: PCU_Tests: use real values for c_BssgpCell{Mcc,Mnc} ...................................................................... PCU_Tests: use real values for c_BssgpCell{Mcc,Mnc} There is no such country/operator with MCC=023/MNC=43. Wireshark complains about that when looking at the BSSGP messahes: Mobile Country Code (MCC): Unknown (23) Mobile Network Code (MNC): Unknown (43) This may look confusing, let's better use some real country/operator: Mobile Country Code (MCC): Central African Rep. (623) Mobile Network Code (MNC): Celca (Socatel) (03) Change-Id: Idc22128657d10893aa5c6d8ec80538a764de5c42 Related: OS#5901 --- M pcu/PCU_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 6e858d5..15ea195 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -5132,8 +5132,8 @@ return dl_block; } -private const GsmMcc c_BssgpCellMcc := '023'H; -private const GsmMnc c_BssgpCellMnc := '43'H; +private const GsmMcc c_BssgpCellMcc := '623'H; /* MCC: Central African Republic */ +private const GsmMnc c_BssgpCellMnc := '03'H; /* MNC: Celca (Socatel) */ private template (value) BssgpCellId ts_BssgpCellIdDstAddr_default := { ra_id := { lai := { 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31281 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: Idc22128657d10893aa5c6d8ec80538a764de5c42 Gerrit-Change-Number: 31281 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/GSM_Types: add {enc,dec}_BcdMccMnc() functions

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31278 ) Change subject: library/GSM_Types: add {enc,dec}_BcdMccMnc() functions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31278 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: Id501ea146eb596085c204a51387f1b92300d1285 Gerrit-Change-Number: 31278 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Feb 2023 19:57:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: check if LIBTRXCON_DIR (submodule) exists

by fixeria

Attention is currently required from: Hoernchen, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30795 ) Change subject: configure.ac: check if LIBTRXCON_DIR (submodule) exists ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: > did you validate you can build the resulting tar. […] Yes, I run make distcheck on my machine. Jenkins also did. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Gerrit-Change-Number: 30795 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Feb 2023 19:57:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-bts[master]: common: Fix memleak in get_smscb_block()

by arehbein

arehbein has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31155 ) Change subject: common: Fix memleak in get_smscb_block() ...................................................................... common: Fix memleak in get_smscb_block() Fix condition `block_nr == 4`, which was never reached, by effectively replacing - `4` by `msg->num_segs`, so we truly check if the current block is the last of this message - the index `block_nr` (which starts at zero) by `block_nr + 1`, so it is comparable to `msg->num_segs` Related: OS#5354 Change-Id: I3dc116d6c16c80b31712b2a969f0b2a6998b03f0 --- M src/common/cbch.c 1 file changed, 2 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/cbch.c b/src/common/cbch.c index f65df0d..915431d 100644 --- a/src/common/cbch.c +++ b/src/common/cbch.c @@ -139,12 +139,8 @@ block_type->seq_nr = block_nr; /* determine if this is the last block */ - if (block_nr + 1 == msg->num_segs) - block_type->lb = 1; - else - block_type->lb = 0; - - if (block_nr == 4) { + block_type->lb = (block_nr + 1 == msg->num_segs); + if (block_type->lb) { if (msg != bts_ss->default_msg) { DEBUGPGT(DLSMS, g_time, "%s: deleting fully-transmitted message %p\n", chan_name, msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3dc116d6c16c80b31712b2a969f0b2a6998b03f0 Gerrit-Change-Number: 31155 Gerrit-PatchSet: 8 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

Change in pysim[master]: cards: sysmo-isim-sja2: make sure an ADF is present in EF.DIR before ...

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/31288 ) Change subject: cards: sysmo-isim-sja2: make sure an ADF is present in EF.DIR before selecting it ...................................................................... cards: sysmo-isim-sja2: make sure an ADF is present in EF.DIR before selecting it sysmo-isim-sja2 may come in different configurations, so some may intentionally lack ADF.USIM or ADF.ISIM. Since select_adf_by_aid() may raise an exception when selecting a non existent file we should make sure that the ADF we intend to select is indeed present. A reliable way to do this is to check if the application is registered in EF.DIR. Change-Id: Icf6f6b36f246398af408ec432d493fe3f22963dd --- M pySim/cards.py 1 file changed, 18 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/88/31288/1 diff --git a/pySim/cards.py b/pySim/cards.py index 4dc20a4..b48a80c 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -307,6 +307,15 @@ return aid_known return None + def adf_present(self, adf="usim") -> bool: + """Check if the AID of the specified ADF is present in EF.DIR (call read_aids before use)""" + aid = self._get_aid(adf) + if aid: + aid_full = self._complete_aid(aid) + if aid_full: + return True + return False + def select_adf_by_aid(self, adf="usim"): """Select ADF.U/ISIM in the Card using its full AID""" if is_hex(adf): @@ -1437,6 +1446,9 @@ def program(self, p): self.verify_adm(h2b(p['pin_adm'])) + # Populate AIDs + self.read_aids() + # This type of card does not allow to reprogram the ICCID. # Reprogramming the ICCID would mess up the card os software # license management, so the ICCID must be kept at its factory @@ -1514,9 +1526,6 @@ if sw != '9000': print("Programming ACC failed with code %s" % sw) - # Populate AIDs - self.read_aids() - # update EF-SIM_AUTH_KEY (and EF-USIM_AUTH_KEY_2G, which is # hard linked to EF-USIM_AUTH_KEY) self._scc.select_path(['3f00']) @@ -1527,8 +1536,9 @@ self._scc.update_binary('6f20', p['opc'], 17) # update EF-USIM_AUTH_KEY in ADF.ISIM - data, sw = self.select_adf_by_aid(adf="isim") - if sw == '9000': + if self.adf_present("isim"): + self.select_adf_by_aid(adf="isim") + if p.get('ki'): self._scc.update_binary('af20', p['ki'], 1) if p.get('opc'): @@ -1575,8 +1585,9 @@ if sw != '9000': print("Programming IMPU failed with code %s" % sw) - data, sw = self.select_adf_by_aid(adf="usim") - if sw == '9000': + if self.adf_present("usim"): + self.select_adf_by_aid(adf="usim") + # EF.AD in ADF.USIM if (p.get('mcc') and p.get('mnc')) or p.get('opmode'): if p.get('mcc') and p.get('mnc'): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icf6f6b36f246398af408ec432d493fe3f22963dd Gerrit-Change-Number: 31288 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Introduce DL TBF creation through PCH ImmAss

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31286 to look at the new patch set (#5). Change subject: rlcmac: Introduce DL TBF creation through PCH ImmAss ...................................................................... rlcmac: Introduce DL TBF creation through PCH ImmAss This patch only introduces the gprs_rlcmac_dl_tbf subclass and allocates/frees it based on PCH ImmAss, and adds initial paths for received blocks. It also provides a unit test to showcase the scenario. Change-Id: I7f98e3456ef35d80becdad3481afeb771457b0ef --- M include/osmocom/gprs/rlcmac/Makefile.am M include/osmocom/gprs/rlcmac/gre.h M include/osmocom/gprs/rlcmac/rlcmac_private.h A include/osmocom/gprs/rlcmac/tbf_dl.h M src/rlcmac/Makefile.am M src/rlcmac/gre.c M src/rlcmac/rlcmac.c M src/rlcmac/rlcmac_prim.c A src/rlcmac/tbf_dl.c M tests/rlcmac/Makefile.am M tests/rlcmac/rlcmac_prim_test.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 13 files changed, 427 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/86/31286/5 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I7f98e3456ef35d80becdad3481afeb771457b0ef Gerrit-Change-Number: 31286 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Introduce DL TBF creation through PCH ImmAss

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31286 to look at the new patch set (#4). Change subject: rlcmac: Introduce DL TBF creation through PCH ImmAss ...................................................................... rlcmac: Introduce DL TBF creation through PCH ImmAss This patch only introduces the gprs_rlcmac_dl_tbf subclass and allocates/frees it based on PCH ImmAss. It provides a unit test to showcase the scenario. Change-Id: I7f98e3456ef35d80becdad3481afeb771457b0ef --- M include/osmocom/gprs/rlcmac/Makefile.am M include/osmocom/gprs/rlcmac/gre.h M include/osmocom/gprs/rlcmac/rlcmac_private.h A include/osmocom/gprs/rlcmac/tbf_dl.h M src/rlcmac/Makefile.am M src/rlcmac/gre.c M src/rlcmac/rlcmac.c M src/rlcmac/rlcmac_prim.c A src/rlcmac/tbf_dl.c M tests/rlcmac/Makefile.am M tests/rlcmac/rlcmac_prim_test.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 13 files changed, 381 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/86/31286/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I7f98e3456ef35d80becdad3481afeb771457b0ef Gerrit-Change-Number: 31286 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023