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

Change in pysim[master]: ts_51_011: Properly decode EF.OPL

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27333 ) Change subject: ts_51_011: Properly decode EF.OPL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I74bcf10b0a8977af0f2844044a812c5780af1706 Gerrit-Change-Number: 27333 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:18:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_31_102: Fix decoding of UServiceTable

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27332 ) Change subject: ts_31_102: Fix decoding of UServiceTable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I22bbc481de342685352bf5b13d54931d3f37f9b7 Gerrit-Change-Number: 27332 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:18:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27348 ) Change subject: ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: please make sure to also do those changes in the configs in osmo-ttcn3-hacks -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If3344c8acc9bc3b43ed0a13af52807d2a6050a81 Gerrit-Change-Number: 27348 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:18:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27347 ) Change subject: ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27347 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: Iab19963f8e869af8fe0c385abd0fd7bbd9221790 Gerrit-Change-Number: 27347 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:17:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ggsn[master]: vty: Fix cmd 'no echo-interval' doing nothing

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27346 ) Change subject: vty: Fix cmd 'no echo-interval' doing nothing ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5e03c4965d05871d3f2e56675da6e75af0ec18c2 Gerrit-Change-Number: 27346 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:17:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: octsim: tester support

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345 ) Change subject: octsim: tester support ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: likewise, needs more verbose commitlog. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345 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: Id7c7e529a5444cffc8e79b385959a522dc9a6beb Gerrit-Change-Number: 27345 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:16:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace emulation: adjust templates to support octsim tester

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27344 ) Change subject: simtrace emulation: adjust templates to support octsim tester ...................................................................... Patch Set 1: (1 comment) File library/SIMTRACE_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27344/comment/45963e0a_6594… PS1, Line 218: ts_SIMTRACE_CEMU_CONFIG(template (value) CardEmu_FeatureFlags flags, integer slotnr) := if you say "integer slotnr := 0" then the template will be backwards compatible, i.e , one can still use it with a single argument as before. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27344 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: I00576170a2b6921d99906ed8bd45d9eece053056 Gerrit-Change-Number: 27344 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:16:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace emulation: set usb configuration

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27343 ) Change subject: simtrace emulation: set usb configuration ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27343 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: I9def79343b4d2575f8b1bc7b9c9c8170b631ed49 Gerrit-Change-Number: 27343 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:15:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace emulation: check that port is connected to prevent errors du...

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27342 ) Change subject: simtrace emulation: check that port is connected to prevent errors due to delayed msg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27342 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: I5d5dda0cf1443223b2615f1059cfdcf698f1acae Gerrit-Change-Number: 27342 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:15:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: move SIMTRACE_{Types,Templates,Emulation}.ttcn to library

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27338 ) Change subject: move SIMTRACE_{Types,Templates,Emulation}.ttcn to library ...................................................................... move SIMTRACE_{Types,Templates,Emulation}.ttcn to library this will allow us to us SIMTRACE as part of a test suite testing e.g. CCID readers. Change-Id: I4349019e2deac114f4c040f1441b70663a521ec2 --- R library/SIMTRACE_Emulation.ttcn R library/SIMTRACE_Templates.ttcn R library/SIMTRACE_Types.ttcn M simtrace/gen_links.sh 4 files changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/simtrace/SIMTRACE_Emulation.ttcn b/library/SIMTRACE_Emulation.ttcn similarity index 100% rename from simtrace/SIMTRACE_Emulation.ttcn rename to library/SIMTRACE_Emulation.ttcn diff --git a/simtrace/SIMTRACE_Templates.ttcn b/library/SIMTRACE_Templates.ttcn similarity index 100% rename from simtrace/SIMTRACE_Templates.ttcn rename to library/SIMTRACE_Templates.ttcn diff --git a/simtrace/SIMTRACE_Types.ttcn b/library/SIMTRACE_Types.ttcn similarity index 100% rename from simtrace/SIMTRACE_Types.ttcn rename to library/SIMTRACE_Types.ttcn diff --git a/simtrace/gen_links.sh b/simtrace/gen_links.sh index 72787b9..eef1fea 100755 --- a/simtrace/gen_links.sh +++ b/simtrace/gen_links.sh @@ -15,6 +15,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn " FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="SIMTRACE_Types.ttcn SIMTRACE_Templates.ttcn SIMTRACE_Emulation.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27338 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: I4349019e2deac114f4c040f1441b70663a521ec2 Gerrit-Change-Number: 27338 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27339 ) Change subject: ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB ...................................................................... ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB Change-Id: Ie110ad1511b01fe84e1ad181b0e053e25f80f522 --- M ccid/CCID_Tests.ttcn M deps/Makefile 2 files changed, 1 insertion(+), 140 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index f7423cd..e650f37 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -29,13 +29,6 @@ var Slot_CT vc_SLOT[NR_SLOTS]; }; -/* per-slot test component; manages one slot */ -type component Slot_CT { - var uint8_t g_slot_nr; - port CCID_SLOT_PT CCID; - timer g_Tguard := 120.0; -}; - /* maximum number of slots we are supporting in the test suite */ private const integer NR_SLOTS := 16; @@ -96,25 +89,6 @@ type function void_fn() runs on Slot_CT; -/* altstep running on the per-slot test component */ -private altstep as_Tguard() runs on Slot_CT { - [] g_Tguard.timeout { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout"); - } -} - -private altstep as_ccid_any() runs on Slot_CT { - var CCID_PDU pdu; - [] CCID.receive(CCID_PDU:?) -> value pdu { - setverdict(fail, "Received unexpected CCID ", pdu); - self.stop; - } - [] CCID.receive { - setverdict(fail, "Received unexpected non-CCID"); - self.stop; - } -} - /* first function inside Slot_CT; wait for CCID_EVENT_UP + call testcase-specific function */ private function f_handler_init(void_fn fn, integer slot_nr) runs on Slot_CT { g_slot_nr := slot_nr; @@ -163,119 +137,6 @@ } -/* transceive a CCID command (send 'tx' on OUT; expect 'rx' on IN) */ -private function f_ccid_xceive(template (value) CCID_PDU tx, template (present) CCID_PDU exp_rx) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - tx.hdr.bSlot := g_slot_nr; - exp_rx.hdr.bSlot := g_slot_nr; - - CCID.send(tx); - alt { - [] CCID.receive(exp_rx) -> value pdu { - return pdu; - } - [] as_ccid_any(); - } - return pdu; -} - -private template (present) CCID_Header_IN tr_inact := - tr_CCID_HeaderIN_OK(icc_status := (CCID_ICC_STATUS_PRES_INACT, CCID_ICC_STATUS_NO_ICC)); - -private template (present) CCID_Header_IN tr_act := - tr_CCID_HeaderIN_OK(icc_status := CCID_ICC_STATUS_PRES_ACT); - -/* Send IccPowerOn on OUT; expect DataBlock in retunr */ -private function f_ccid_power_on(CCID_PowerSelect psel := CCID_PWRSEL_AUTO, - template (present) CCID_Header_IN hdr_in := tr_act) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_IccPowerOn(g_slot_nr, psel), - tr_CCID_DataBlock(g_slot_nr, hdr_in := hdr_in) ); - return pdu; -} - -/* Send IccPowerOn on OUT; expect SlotStatus in return */ -private function f_ccid_power_off(template (present) CCID_Header_IN hdr_in := tr_inact) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_IccPowerOff(g_slot_nr), - tr_CCID_SlotStatus(slot := g_slot_nr, hdr_in := hdr_in) ); - return pdu; -} - -/* Send IccClockCommand on OUT; expect SlotStatus in return */ -private function f_ccid_clock_cmd(CCID_ClockCommand cmd, - template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_ClockCommand(g_slot_nr, cmd), - tr_CCID_SlotStatus(slot := g_slot_nr, hdr_in := hdr_in)); - return pdu; -} - -/* Send XfrBlock on OUT; expect DataBlock in return */ -private function f_ccid_xfr(octetstring tx, template octetstring rx) runs on Slot_CT return octetstring { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_XfrBlock(g_slot_nr, tx, 0), - tr_CCID_DataBlock(g_slot_nr, ?, ?, rx) ); - return pdu.u.DataBlock.abData; -} - -/* Send SetParameters on OUT; expect Parameters on IN */ -private function f_ccid_set_par(template (value) CCID_ProtocolData par, - template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_SetParameters(g_slot_nr, par), - tr_CCID_Parameters(g_slot_nr, hdr_in := hdr_in)); - return pdu; -} - -/* Send GetParameters on OUT; expect Parameters on IN */ -private function f_ccid_get_par(template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_GetParameters(g_slot_nr), - tr_CCID_Parameters(g_slot_nr, hdr_in := hdr_in)); - return pdu; -} - -/* Send ResetParameters on OUT; expect Parameters on IN */ -private function f_ccid_reset_par(template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - /* [at least] Omnikey seems to have failed to follow the CCID spec here :/ */ - if (mp_quirk_resetpar_returns_slotsts) { - pdu := f_ccid_xceive(ts_CCID_ResetParameters(g_slot_nr), - tr_CCID_SlotStatus(g_slot_nr, hdr_in := hdr_in)); - } else { - pdu := f_ccid_xceive(ts_CCID_ResetParameters(g_slot_nr), - tr_CCID_Parameters(g_slot_nr, hdr_in := hdr_in)); - } - return pdu; -} - -/* Send Escape on OUT; expect Escape on IN */ -private function f_ccid_escape(template (value) octetstring data, - template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_Escape(g_slot_nr, data), - tr_CCID_EscapeIN(g_slot_nr, hdr_in := hdr_in)); - return pdu; -} - /*********************************************************************** * Test behavior regarding valid situations diff --git a/deps/Makefile b/deps/Makefile index e67b499..2a906eb 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -126,7 +126,7 @@ titan.TestPorts.TELNETasp_commit= 873fe539642542cd9a901c208f1ec11c6d2f5387 titan.TestPorts.UDPasp_commit= c20d77a34f288dd70dd4aaa30e520778876e9336 titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-13-gd34ab71 -titan.TestPorts.USB_commit= 4c742e931aae66c0046cebfe3c1de4618b6f9ffc +titan.TestPorts.USB_commit= a9470fdc99c82fbf988f4508c3161118c9106e28 osmo-uecups_commit= 8362efef7c6fa341eb947a75786878e0685767b7 all: $(foreach dir,$(ALL_REPOS),$(dir)/update) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27339 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: Ie110ad1511b01fe84e1ad181b0e053e25f80f522 Gerrit-Change-Number: 27339 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace: Add support for slot_mux_nr to CardEmu_BD_Config

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340 ) Change subject: simtrace: Add support for slot_mux_nr to CardEmu_BD_Config ...................................................................... Patch Set 1: (1 comment) File library/SIMTRACE_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340/comment/f4c34b86_928a… PS1, Line 225: ? I guess this should be * not ?, otherwise any message without this entirely optional part would no longer match. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340 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: Id29584764a2f27b9de5fa9ff67fd0ae3e912f02e Gerrit-Change-Number: 27340 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:14:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27339 ) Change subject: ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27339 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: Ie110ad1511b01fe84e1ad181b0e053e25f80f522 Gerrit-Change-Number: 27339 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:13:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: move SIMTRACE_{Types,Templates,Emulation}.ttcn to library

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27338 ) Change subject: move SIMTRACE_{Types,Templates,Emulation}.ttcn to library ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27338 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: I4349019e2deac114f4c040f1441b70663a521ec2 Gerrit-Change-Number: 27338 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:12:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27348 ) Change subject: ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools ...................................................................... ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools This is needed for test TC_lots_of_concurrent_pdp_ctx, which creates up to 1000 pdp contexts. Change-Id: If3344c8acc9bc3b43ed0a13af52807d2a6050a81 --- M ttcn3-ggsn-test/ogs/smfd.yaml M ttcn3-ggsn-test/ogs/upfd-setup.sh M ttcn3-ggsn-test/ogs/upfd.yaml M ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg M ttcn3-ggsn-test/osmo-ggsn.cfg 5 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/48/27348/1 diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml b/ttcn3-ggsn-test/ogs/smfd.yaml index 0860074..96463e5 100644 --- a/ttcn3-ggsn-test/ogs/smfd.yaml +++ b/ttcn3-ggsn-test/ogs/smfd.yaml @@ -340,11 +340,11 @@ - addr: 172.18.3.201 port: 2152 subnet: - - addr: 176.16.222.1/24 + - addr: 176.16.16.1/20 dnn: internet - addr: 2001:780:44:2000:0:0:0:1/56 dnn: inet6 - - addr: 176.16.46.1/24 + - addr: 176.16.32.1/20 dnn: inet46 - addr: 2001:780:44:2100:0:0:0:1/56 dnn: inet46 diff --git a/ttcn3-ggsn-test/ogs/upfd-setup.sh b/ttcn3-ggsn-test/ogs/upfd-setup.sh index c96a561..b185ac0 100755 --- a/ttcn3-ggsn-test/ogs/upfd-setup.sh +++ b/ttcn3-ggsn-test/ogs/upfd-setup.sh @@ -18,9 +18,9 @@ create_tun "ogstun6" create_tun "ogstun46" -add_addr "ogstun4" "176.16.222.1/16" +add_addr "ogstun4" "176.16.16.1/20" add_addr "ogstun6" "2001:780:44:2000:0:0:0:1/56" -add_addr "ogstun46" "176.16.46.1/24" +add_addr "ogstun46" "176.16.32.1/20" add_addr "ogstun46" "2001:780:44:2100:0:0:0:1/56" ip link set ogstun4 up diff --git a/ttcn3-ggsn-test/ogs/upfd.yaml b/ttcn3-ggsn-test/ogs/upfd.yaml index 8fe932b..b38bc34 100644 --- a/ttcn3-ggsn-test/ogs/upfd.yaml +++ b/ttcn3-ggsn-test/ogs/upfd.yaml @@ -156,13 +156,13 @@ - addr: 172.18.3.222 port: 2152 subnet: - - addr: 176.16.222.1/24 + - addr: 176.16.16.1/20 dnn: internet dev: ogstun4 - addr: 2001:780:44:2000:0:0:0:1/56 dnn: inet6 dev: ogstun6 - - addr: 176.16.46.1/24 + - addr: 176.16.32.1/20 dnn: inet46 dev: ogstun46 - addr: 2001:780:44:2100:0:0:0:1/56 diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg index 0288d60..6fbfd0e 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg @@ -48,10 +48,10 @@ gtpu-mode kernel-gtp tun-device tun4 type-support v4 - ip prefix dynamic 176.16.222.0/24 + ip prefix dynamic 176.16.16.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 - ip ifconfig 176.16.222.0/24 + ip ifconfig 176.16.16.0/20 no shutdown # apn inet6 # apn inet46 diff --git a/ttcn3-ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn.cfg index 972ee93..b27a6e4 100644 --- a/ttcn3-ggsn-test/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn.cfg @@ -48,10 +48,10 @@ gtpu-mode tun tun-device tun4 type-support v4 - ip prefix dynamic 176.16.222.0/24 + ip prefix dynamic 176.16.16.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 - ip ifconfig 176.16.222.0/24 + ip ifconfig 176.16.16.0/20 no shutdown apn inet6 gtpu-mode tun @@ -66,10 +66,10 @@ gtpu-mode tun tun-device tun46 type-support v4v6 - ip prefix dynamic 176.16.46.0/24 + ip prefix dynamic 176.16.32.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 - ip ifconfig 176.16.46.0/24 + ip ifconfig 176.16.32.0/20 ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 ipv6 dns 0 fd02:db8:3::201 ipv6 dns 1 2001:4860:4860::8844 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If3344c8acc9bc3b43ed0a13af52807d2a6050a81 Gerrit-Change-Number: 27348 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27347 ) Change subject: ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx ...................................................................... ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx Change-Id: Iab19963f8e869af8fe0c385abd0fd7bbd9221790 --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 115 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/27347/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index b66d7ba..58a12a6 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1862,6 +1862,119 @@ setverdict(pass); } + /* Test creation, user plane and deletion of big amount (1000) of concurrent PDP context */ + testcase TC_lots_of_concurrent_pdp_ctx() runs on GT_CT { + var Gtp1cUnitdata udc; + var Gtp1uUnitdata udu; + const integer num_ctx := 1000; + var PdpContext ctx[num_ctx]; + timer T_next := 0.01; + var integer next_req_ctx := 0; + var integer rx_resp_ctx := 0; + var integer rx_pong := 0; + var OCT4 dns1_addr; + var OCT4 saddr; + var integer teic; + var integer idx; + + f_init(); + + for (var integer i := 0; i < num_ctx; i := i + 1) { + ctx[i] := valueof(t_DefinePDP(f_rnd_imsi('26242'H), f_rnd_msisdn('1234'O), c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx[i].teic := int2oct(i+1, 4); /* +1: skip TEIC=0 */ + ctx[i].teid := int2oct(i+1, 4); /* +1: skip TEID=0 */ + ctx[i].pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + } + + T_default.start(60.0); + + T_next.start; + alt { + [DIAMETER_PROC.checkstate("Connected")] as_DIA_CCR(INITIAL_REQUEST) { repeat; } + [] pingpong(); + [] T_next.timeout { + f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].imsi, g_restart_ctr, + ctx[next_req_ctx].teid, ctx[next_req_ctx].teic, ctx[next_req_ctx].nsapi, + ctx[next_req_ctx].eua, ctx[next_req_ctx].apn, g_sgsn_ip_c, g_sgsn_ip_u, + ctx[next_req_ctx].msisdn, ctx[next_req_ctx].pco_req, ctx[next_req_ctx].ratType, + ctx[next_req_ctx].uli)); + next_req_ctx := next_req_ctx + 1; + if (next_req_ctx < num_ctx) { + T_next.start; + } + repeat; + } + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ?)) -> value udc { + teic := oct2int(udc.gtpc.teid); + if (not match(teic, (1 .. num_ctx))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Rx Unexpected TEIC"); + } + idx := teic - 1; + f_handle_create_req(ctx[idx], udc); + rx_resp_ctx := rx_resp_ctx + 1; + + dns1_addr := f_PCO_extract_proto(ctx[idx].pco_neg, '000d'O); + saddr := ctx[idx].eua.endUserAddress.endUserAddressIPv4.ipv4_address; + f_send_gtpu(ctx[idx], f_gen_icmpv4_echo(saddr, dns1_addr)); + repeat; + } + [] GTPU.receive(tr_GTPU_GPDU(g_peer_u, ?)) -> value udu { + var octetstring gpdu := udu.gtpu.gtpu_IEs.g_PDU_IEs.data; + var IPv4_packet ip4 := f_IPv4_dec(gpdu); + if (ip4.header.ver != 4) { + repeat; + } + var PDU_ICMP icmp4 := f_dec_PDU_ICMP(ip4.payload); + if (not match(icmp4, (tr_ICMPv4_ERP, tr_ICMPv4_DU))) { + repeat; + } + rx_pong := rx_pong + 1; + if (rx_pong < num_ctx) { + repeat; + } + setverdict(pass); + } + [] GTPC.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPC"); } + [] GTPU.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPU"); } + } + + /* Let's close them now: */ + next_req_ctx := 0; + rx_resp_ctx := 0; + T_next.start; + alt { + [DIAMETER_PROC.checkstate("Connected")] as_DIA_CCR(TERMINATION_REQUEST) { repeat; } + [] pingpong(); + [] T_next.timeout { + f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].teic_remote, ctx[next_req_ctx].nsapi, '1'B)); + next_req_ctx := next_req_ctx + 1; + if (next_req_ctx < num_ctx) { + T_next.start; + } + repeat; + } + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextResponse, ?)) -> value udc { + teic := oct2int(udc.gtpc.teid); + if (not match(teic, (1 .. num_ctx))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Rx Unexpected TEIC"); + } + rx_resp_ctx := rx_resp_ctx + 1; + if (rx_resp_ctx < num_ctx) { + repeat; + } + setverdict(pass); + } + [] GTPC.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPC"); } + [] GTPU.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPU"); } + } + T_next.stop; + + T_default.stop; + setverdict(pass); + } + control { execute(TC_pdp4_act_deact()); execute(TC_pdp4_act_deact_ipcp()); @@ -1904,5 +2017,7 @@ execute(TC_act_deact_retrans_duplicate()); execute(TC_pdp_act_restart_ctr_echo()); + + execute(TC_lots_of_concurrent_pdp_ctx()); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27347 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: Iab19963f8e869af8fe0c385abd0fd7bbd9221790 Gerrit-Change-Number: 27347 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ggsn[master]: vty: Fix cmd 'no echo-interval' doing nothing

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27346 ) Change subject: vty: Fix cmd 'no echo-interval' doing nothing ...................................................................... vty: Fix cmd 'no echo-interval' doing nothing It was incorrectly implemented and in practice was a NOOP. Change-Id: I5e03c4965d05871d3f2e56675da6e75af0ec18c2 --- M ggsn/ggsn_vty.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/46/27346/1 diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index 1738e70..9591bf7 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -389,10 +389,9 @@ NO_STR "Send an echo request to this static GGSN every interval.\n") { struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index; - int prev_interval = ggsn->cfg.echo_interval; struct sgsn_peer *sgsn; - if (prev_interval == ggsn->cfg.echo_interval) + if (ggsn->cfg.echo_interval == 0) return CMD_SUCCESS; ggsn->cfg.echo_interval = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5e03c4965d05871d3f2e56675da6e75af0ec18c2 Gerrit-Change-Number: 27346 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace emulation: adjust templates to support octsim tester

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27344 ) Change subject: simtrace emulation: adjust templates to support octsim tester ...................................................................... simtrace emulation: adjust templates to support octsim tester It has multiple switchable slots. Change-Id: I00576170a2b6921d99906ed8bd45d9eece053056 --- M library/SIMTRACE_Templates.ttcn M library/SIMTRACE_Types.ttcn 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/27344/1 diff --git a/library/SIMTRACE_Templates.ttcn b/library/SIMTRACE_Templates.ttcn index ef857fe..d71828a 100644 --- a/library/SIMTRACE_Templates.ttcn +++ b/library/SIMTRACE_Templates.ttcn @@ -215,9 +215,9 @@ template (value) SIMTRACE_PDU -ts_SIMTRACE_CEMU_CONFIG(template (value) CardEmu_FeatureFlags flags) := +ts_SIMTRACE_CEMU_CONFIG(template (value) CardEmu_FeatureFlags flags, integer slotnr) := ts_SIMTRACE(SIMTRACE_MSGT_BD_CEMU_CONFIG, { cardem_bd_config := { features := flags, - slot_mux_nr := 0} }); + slot_mux_nr := slotnr} }); template (present) SIMTRACE_PDU tr_SIMTRACE_CEMU_CONFIG(template (present) CardEmu_FeatureFlags flags) := diff --git a/library/SIMTRACE_Types.ttcn b/library/SIMTRACE_Types.ttcn index d28df2f..25a1adf 100644 --- a/library/SIMTRACE_Types.ttcn +++ b/library/SIMTRACE_Types.ttcn @@ -195,7 +195,7 @@ /* CEMU_USB_MSGT_DT_CARDINSERT */ type record Cardemu_DT_CardInsert { - uint8_t card_insert + uint8_t card_insert (0..1) }; /* CEMU_USB_MSGT_DT_SET_ATR */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27344 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: I00576170a2b6921d99906ed8bd45d9eece053056 Gerrit-Change-Number: 27344 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: octsim: tester support

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345 ) Change subject: octsim: tester support ...................................................................... octsim: tester support Change-Id: Id7c7e529a5444cffc8e79b385959a522dc9a6beb --- M octsim/OCTSIM_Tests.cfg M octsim/OCTSIM_Tests.ttcn 2 files changed, 439 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/27345/1 diff --git a/octsim/OCTSIM_Tests.cfg b/octsim/OCTSIM_Tests.cfg index 79b78a3..d701325 100644 --- a/octsim/OCTSIM_Tests.cfg +++ b/octsim/OCTSIM_Tests.cfg @@ -1,20 +1,28 @@ [ORDERED_INCLUDE] # Common configuration, shared between test suites -"../Common.cfg" +#"../Common.cfg" # testsuite specific configuration, not expected to change "./OCTSIM_Tests.default" # Local configuration below [LOGGING] -ConsoleMask := ERROR | WARNING | TESTCASE | USER; +LogFile := "%e-%c-%h-%r.%s" +AppendFile := Yes; +SourceInfoFormat := Stack; +LogSourceInfo := Yes; +LogEventTypes := Yes; +LoggerPlugins := { JUnitLogger := "libjunitlogger2" } +FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; +ConsoleMask := ERROR | WARNING | TESTCASE | USER | VERDICTOP; # | MATCHING| DEBUG| PORTEVENT ; [TESTPORT_PARAMETERS] [MODULE_PARAMETERS] - +mp_cardem_usb_interface := 0 [MAIN_CONTROLLER] [EXECUTE] OCTSIM_Tests.control +#OCTSIM_Tests.TC_test_grouped diff --git a/octsim/OCTSIM_Tests.ttcn b/octsim/OCTSIM_Tests.ttcn index 941cfa3..14dd45a 100644 --- a/octsim/OCTSIM_Tests.ttcn +++ b/octsim/OCTSIM_Tests.ttcn @@ -19,10 +19,11 @@ import from SIMTRACE_Emulation all; modulepar { - //USB_Device_Match mp_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '60e3'H} }; - charstring mp_cardem_usb_path := "1-2"; + //charstring mp_cardem_usb_path := "2-15"; integer mp_cardem_usb_interface := 0; - USB_Device_Match mp_ccid_usb_dev_match := { vid_pid := { vid := '076b'H, pid := '6622'H } }; + USB_Device_Match mp_ccid_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '6141'H } }; + USB_Device_Match mp_st_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '616d'H } }; + boolean true_card := false; } type component test_CT extends Slot_CT { @@ -31,6 +32,7 @@ port ST_USER_PT ST_IRQ; var CCID_Emulation_CT vc_CCID; + timer t_transaction_guard := 3.0; }; private template (value) USB_IF_Params ts_UsbPars_path(charstring path, uint8_t if_nr) := { @@ -47,20 +49,23 @@ g_slot_nr := slot_nr; var USB_IF_Params st_usb_pars; - st_usb_pars := valueof(ts_UsbPars_path(mp_cardem_usb_path, mp_cardem_usb_interface)); + st_usb_pars.usb_dev_match := mp_st_usb_dev_match;// := valueof(ts_UsbPars_path(mp_cardem_usb_path, mp_cardem_usb_interface)); + st_usb_pars.usb_if_nr := mp_cardem_usb_interface; vc_ST := ST_Emulation_CT.create("ST"); map(vc_ST:USB, system:USB); connect(vc_ST:INOUT, self:ST); connect(vc_ST:IRQ, self:ST_IRQ); vc_ST.start(SIMTRACE_Emulation.main(st_usb_pars)); + f_st_drain(0.5); + /* remove the virtual card */ ST.send(ts_SIMTRACE_CEMU_CARDINSERT(0)); - /* TODO: set the ATR */ + ST.send(ts_SIMTRACE_CEMU_SET_ATR('3B9F96801FC78031A073BE21136743200718000001A5'O)); /* Enable the use of the IRQ endpoint to report status updates */ - f_st_xceive(ts_SIMTRACE_CEMU_CONFIG(ts_FeatureFlags(true)), + f_st_xceive(ts_SIMTRACE_CEMU_CONFIG(ts_FeatureFlags(true), slot_nr), tr_SIMTRACE_CEMU_CONFIG(tr_FeatureFlags(true))) @@ -78,8 +83,8 @@ f_ccid_power_off(?); } -function f_st_drain() runs on test_CT { - timer T := 0.1; +function f_st_drain(float waittime := 0.1) runs on test_CT { + timer T := waittime; T.start; alt { [] ST.receive { @@ -151,7 +156,7 @@ } [] ST_IRQ.receive(tr_SIMTRACE_CEMU_STATUS) -> value rx_st { log("Ignoring non-matching flags of ", rx_st); - repeat; + repeat; } } @@ -159,81 +164,456 @@ tr_CardEmu_DataFlags(false, false, false, tpdu_hdr := true); /* transceive a TPDU, either with e rx data part, or a tx data part */ -function f_xceive(octetstring apdu, octetstring sw := '9000'O, boolean rx := true) runs on test_CT { +function f_xceive(octetstring apdu, octetstring sw := '9000'O, boolean rx := true) runs on test_CT return octetstring { var octetstring apdu_hdr := substr(apdu, 0, 5); var octetstring pb := substr(apdu, 1, 1); var octetstring data := substr(apdu, 5, lengthof(apdu)-5); + var CCID_PDU rx_ccid; - CCID.send(ts_CCID_XfrBlock(g_slot_nr, apdu)); - ST.receive(tr_SIMTRACE_CEMU_RX_DATA(tr_cef_tpdu_hdr, apdu_hdr)); - if (rx) { - /* transmit procedure byte and wait for remainder */ - ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_rx:=true), pb)); - /* expect reader to transmit the remaining data */ - ST.receive(tr_SIMTRACE_CEMU_RX_DATA(tr_CardEmu_DataFlags(final:=true), data)); - /* respond with status word */ - ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(final:=true), sw)); - /* expect reader to receive status word */ - CCID.receive(tr_CCID_DataBlock(g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK, data := sw)); + if (rx == true) { + CCID.send(ts_CCID_XfrBlock(g_slot_nr, apdu)); } else { - /* FIXmE: doesn't work yet! */ + /* the octsim judges the command type by length: >header size means data, and data means "rx = true" here */ + CCID.send(ts_CCID_XfrBlock(g_slot_nr, apdu_hdr)); + } + + if(not true_card){ + ST.receive(tr_SIMTRACE_CEMU_RX_DATA(tr_cef_tpdu_hdr, apdu_hdr)); + } + if (rx) { + if(not true_card){ + /* transmit procedure byte and wait for remainder */ + ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_rx:=true), pb)); + /* expect reader to transmit the remaining data */ + ST.receive(tr_SIMTRACE_CEMU_RX_DATA(tr_CardEmu_DataFlags(final:=true), data)); + /* respond with status word */ + ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(final:=true), sw)); + } + /* expect reader to receive status word */ + CCID.receive(tr_CCID_DataBlock(g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK, data := sw)) -> value rx_ccid; + } else { /* transmit procedure byte and remainder */ var octetstring tx := data; - ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx:=true), pb & data)); - ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx:=true, final:=true), sw)); + + if(not true_card){ + ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx:=true, final:=true), pb & data & sw)); + + // attempt to split the transfer causes proplems with 5m/512/32 ?! apparently anything above 4m/372/2 + //ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx:=true), pb & data)); + //f_sleep(0.1); + //ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx:=true, final:=true), sw)); + } /* expect reader to receive status word */ - CCID.receive(tr_CCID_DataBlock(g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK, data := tx)); + CCID.receive(tr_CCID_DataBlock(g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK, data := data & sw)) -> value rx_ccid; } setverdict(pass); + + + return rx_ccid.u.DataBlock.abData; } -testcase TC_test() runs on test_CT +private function f_update(integer slot_nr := 0) runs on test_CT +{ + /* remove the virtual card */ + ST.send(ts_SIMTRACE_CEMU_CARDINSERT(0)); + + f_st_drain(); + disconnect(vc_CCID:SLOT[g_slot_nr], self:CCID); + g_slot_nr := slot_nr; + //f_sleep(1.0); + connect(vc_CCID:SLOT[g_slot_nr], self:CCID); + //f_ccid_power_off(?); + f_st_drain(); + /* Enable the use of the IRQ endpoint to report status updates */ + f_st_xceive(ts_SIMTRACE_CEMU_CONFIG(ts_FeatureFlags(true), slot_nr), + tr_SIMTRACE_CEMU_CONFIG(tr_FeatureFlags(true))) + + +} + +private function f_pps_512_32() runs on test_CT { + var CCID_PDU rx_ccid; + var CCID_ProtocolData pd := { + T0 := { + + // does not work with sjs1! + // card will nak by being unresponsive + //Findex := bit2int('0000'B), + //Dindex := bit2int('0110'B), + + Findex := bit2int('1001'B), + Dindex := bit2int('0101'B), + //Dindex := bit2int('0100'B), + + + // ok: 2.5m / 372/2 + //Findex := bit2int('0001'B), + //Dindex := bit2int('0010'B), + + bRFU := '000000'B, + inv_convention := false, + bRFU2 := '0'B, + + bGuardTimeT0 := 0, + bWaitingIntegerT0 := 10, + bClockStop := STOPPING_NOT_ALLOWED + } + } + CCID.send(ts_CCID_SetParameters(g_slot_nr, pd)); + if(not true_card){ + ST.receive(tr_SIMTRACE_CEMU_PTS(?,?)); + } + CCID.receive(tr_CCID_Parameters(g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK)); + +} + +private altstep as_guardtimer() runs on test_CT { + [] t_transaction_guard.timeout { + setverdict(fail, "t_transaction_guard timeout!"); + mtc.stop; + } +} + +private function TC_test_common(integer slotnr,CCID_PowerSelect psel := CCID_PWRSEL_AUTO ,boolean use_ppss := true) runs on test_CT { var template (present) CardEmu_StatusFlags exp_flags; var CCID_PDU rx_ccid; - f_init(); - f_st_drain(); + f_update(slotnr); - f_sleep(1.0); + f_st_drain(); + f_ccid_power_off(?); /* insert the virtual card */ - ST.send(ts_SIMTRACE_CEMU_CARDINSERT(1)); + ST.send(ts_SIMTRACE_CEMU_CARDINSERT(2)); //f_ccid_xceive(ts_CCID_GetSlotStatus(0, g_slot_nr), tr_CCID_SlotStatus(slot := g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK(?))); + //f_sleep(1.0); - rx_ccid := f_ccid_power_on(); + f_st_drain(); - if (false) { - /* FIXME: why does this only work on the first time after powering both devices? */ - f_sleep(1.0); - /* wait for status with RESET active */ - exp_flags := tr_CardEmu_StatusFlags(reset_active := true, clk_active := true, vcc_present := true); + t_transaction_guard.start; + var default d1 := activate(as_guardtimer()) + + rx_ccid := f_ccid_power_on(psel); + + /* wait for status with RESET inactive/released */ + if(not true_card){ + exp_flags := tr_CardEmu_StatusFlags(reset_active := false, clk_active := true, vcc_present := true); as_st_irq_wait_flags(exp_flags); } - /* wait for status with RESET inactive/released */ - exp_flags := tr_CardEmu_StatusFlags(reset_active := false, clk_active := true, vcc_present := true); - as_st_irq_wait_flags(exp_flags); - - if (not match(rx_ccid, tr_CCID_DataBlock(data := '3B8080811FC759'O))) { - setverdict(fail, "Unexpected ATR on CCID side: ", rx_ccid.u.DataBlock.abData); + if (not match(rx_ccid, tr_CCID_DataBlock(data := '3B9F96801FC78031A073BE21136743200718000001A5'O))) { + setverdict(fail, "Unexpected ATR on CCID side: ", slotnr, psel, use_ppss, rx_ccid.u.DataBlock.abData); + mtc.stop; } - for (var integer i := 0; i < 100; i := i+1) { - f_xceive('a0a40004023f00'O); + f_sleep(0.1); + if (use_ppss){ + f_pps_512_32(); } - /* doesn't work yet */ - //f_xceive('a0a40004023f00'O, rx:=false); - f_sleep(2.0); + + for (var integer i := 0; i < 5; i := i+1) { + //f_xceive('a0a40004023f00'O); + var octetstring rv := f_xceive('a0a40000023f00'O, sw := '9f22'O); + + /* actual card data */ + var octetstring data := '00007fff3f0001000000000015b104050600838a838a008300830000000000000000'O + + //var OCT1 sw1 := substr(rv, 0, 1); + var OCT1 sw2 := substr(rv, 1, 1); + //var octetstring data := ''O; + //f_pad_oct(data, oct2int(sw2), '2B'O); + f_xceive('A0C00000'O & sw2 & data, rx:=false); + + //f_xceive('a0b0000004fefed00f'O, rx:=false); + } + + t_transaction_guard.stop; + deactivate(d1); + + f_sleep(0.1); + + f_ccid_power_off(?); + f_st_drain(); + + log("currently trying slot " & int2str(slotnr) & " with " , psel, getverdict); } +testcase TC_test_grouped() runs on test_CT +{ + f_init(0); + f_st_drain(1.0); + + + for (var integer j := 0; j < 1; j := j+1) { + for (var integer i := 0; i < 8; i := i+1) { + + //TC_test_common(1, CCID_PWRSEL_1V8); + + if (false) { + f_st_drain(); + + f_update(i); + /* insert the virtual card */ + ST.send(ts_SIMTRACE_CEMU_CARDINSERT(1)); + + f_sleep(1.0); + f_ccid_power_off(?); + f_sleep(1.0); + f_ccid_xceive(ts_CCID_IccPowerOn(i, CCID_PWRSEL_3V0), tr_CCID_DataBlock(?, hdr_in := ?) ); + } else { + TC_test_common(i, CCID_PWRSEL_1V8); + TC_test_common(i, CCID_PWRSEL_3V0); + TC_test_common(i, CCID_PWRSEL_5V0, false); + } + } + } + + f_ccid_power_off(?); + f_st_drain(); +} + +testcase TC_test_slot0_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(0); + TC_test_common(0, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot0_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(0); + TC_test_common(0, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot0_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(0); + TC_test_common(0, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot1_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(1); + TC_test_common(1, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot1_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(1); + TC_test_common(1, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot1_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(1); + TC_test_common(1, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot2_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(2); + TC_test_common(2, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot2_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(2); + TC_test_common(2, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot2_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(2); + TC_test_common(2, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot3_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(3); + TC_test_common(3, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot3_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(3); + TC_test_common(3, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot3_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(3); + TC_test_common(3, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot4_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(4); + TC_test_common(4, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot4_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(4); + TC_test_common(4, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot4_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(4); + TC_test_common(4, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot5_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(5); + TC_test_common(5, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot5_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(5); + TC_test_common(5, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot5_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(5); + TC_test_common(5, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot6_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(6); + TC_test_common(6, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot6_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(6); + TC_test_common(6, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot6_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(6); + TC_test_common(6, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot7_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(7); + TC_test_common(7, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot7_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(7); + TC_test_common(7, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot7_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(7); + TC_test_common(7, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} control { - execute( TC_test() ); + +execute( TC_test_slot0_CCID_PWRSEL_1V8() ); +execute( TC_test_slot0_CCID_PWRSEL_3V0() ); +execute( TC_test_slot0_CCID_PWRSEL_5V0() ); +execute( TC_test_slot1_CCID_PWRSEL_1V8() ); +execute( TC_test_slot1_CCID_PWRSEL_3V0() ); +execute( TC_test_slot1_CCID_PWRSEL_5V0() ); +execute( TC_test_slot2_CCID_PWRSEL_1V8() ); +execute( TC_test_slot2_CCID_PWRSEL_3V0() ); +execute( TC_test_slot2_CCID_PWRSEL_5V0() ); +execute( TC_test_slot3_CCID_PWRSEL_1V8() ); +execute( TC_test_slot3_CCID_PWRSEL_3V0() ); +execute( TC_test_slot3_CCID_PWRSEL_5V0() ); +execute( TC_test_slot4_CCID_PWRSEL_1V8() ); +execute( TC_test_slot4_CCID_PWRSEL_3V0() ); +execute( TC_test_slot4_CCID_PWRSEL_5V0() ); +execute( TC_test_slot5_CCID_PWRSEL_1V8() ); +execute( TC_test_slot5_CCID_PWRSEL_3V0() ); +execute( TC_test_slot5_CCID_PWRSEL_5V0() ); +execute( TC_test_slot6_CCID_PWRSEL_1V8() ); +execute( TC_test_slot6_CCID_PWRSEL_3V0() ); +execute( TC_test_slot6_CCID_PWRSEL_5V0() ); +execute( TC_test_slot7_CCID_PWRSEL_1V8() ); +execute( TC_test_slot7_CCID_PWRSEL_3V0() ); +execute( TC_test_slot7_CCID_PWRSEL_5V0() ); + } + } + + + +/* +python to generate tests + + +slots = range(0,8,1) +volts = ["CCID_PWRSEL_1V8", "CCID_PWRSEL_3V0", "CCID_PWRSEL_5V0"] + + +text="""testcase TC_test_slot{slot}_{volt}() runs on test_CT +{{ + f_init({slot}); + TC_test_common({slot}, {volt}, {pps}); + f_ccid_power_off(?); +}} +""" + +text2=""" +control { +""" +text3="""execute( TC_test_slot{slot}_{volt}() );""" +text4=""" +} +""" + + +for s in slots: + for i in volts: #range(0,10,1): + pps = "false" if i == "CCID_PWRSEL_5V0" else "true" + print(text.format(slot=s, volt=i, pps=pps)) + +print(text2) +for s in slots: + for i in volts: #range(0,10,1): + pps = "false" if i == "CCID_PWRSEL_5V0" else "true" + print(text3.format(slot=s, volt=i, pps=pps)) +print(text4) + +*/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345 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: Id7c7e529a5444cffc8e79b385959a522dc9a6beb Gerrit-Change-Number: 27345 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace emulation: check that port is connected to prevent errors du...

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27342 ) Change subject: simtrace emulation: check that port is connected to prevent errors due to delayed msg ...................................................................... simtrace emulation: check that port is connected to prevent errors due to delayed msg Change-Id: I5d5dda0cf1443223b2615f1059cfdcf698f1acae --- M library/SIMTRACE_Emulation.ttcn 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/27342/1 diff --git a/library/SIMTRACE_Emulation.ttcn b/library/SIMTRACE_Emulation.ttcn index c907608..74bc380 100644 --- a/library/SIMTRACE_Emulation.ttcn +++ b/library/SIMTRACE_Emulation.ttcn @@ -118,14 +118,18 @@ /* Submit another IN transfer */ f_usb_submit_xfer(g_ep_in); stpdu_in := dec_SIMTRACE_PDU(tc.data); - INOUT.send(stpdu_in); + if (INOUT.checkstate("Connected")) { + INOUT.send(stpdu_in); + } } [] USB.receive(tr_UsbXfer_compl(g_ep_irq, USB_TRANSFER_TYPE_INTERRUPT, USB_TRANSFER_COMPLETED, g_dev_hdl, ?))-> value tc { /* Submit another IRQ transfer */ f_usb_submit_xfer(g_ep_irq, ttype := USB_TRANSFER_TYPE_INTERRUPT); stpdu_in := dec_SIMTRACE_PDU(tc.data); - IRQ.send(stpdu_in); + if (IRQ.checkstate("Connected")) { + IRQ.send(stpdu_in); + } } [] USB.receive(tr_UsbXfer_compl(g_ep_irq, USB_TRANSFER_TYPE_INTERRUPT, USB_TRANSFER_TIMED_OUT, g_dev_hdl, ?)) -> value tc { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27342 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: I5d5dda0cf1443223b2615f1059cfdcf698f1acae Gerrit-Change-Number: 27342 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace emulation: set usb configuration

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27343 ) Change subject: simtrace emulation: set usb configuration ...................................................................... simtrace emulation: set usb configuration Change-Id: I9def79343b4d2575f8b1bc7b9c9c8170b631ed49 --- M library/SIMTRACE_Emulation.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/27343/1 diff --git a/library/SIMTRACE_Emulation.ttcn b/library/SIMTRACE_Emulation.ttcn index 74bc380..ae2fd2d 100644 --- a/library/SIMTRACE_Emulation.ttcn +++ b/library/SIMTRACE_Emulation.ttcn @@ -61,6 +61,7 @@ g_pars := pars; f_usb_init(g_pars.usb_dev_match); + f_usb_set_configuration(g_dev_hdl, 1); i_config := f_usb_get_config(); log("USB Configuration: ", i_config); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27343 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: I9def79343b4d2575f8b1bc7b9c9c8170b631ed49 Gerrit-Change-Number: 27343 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: octsim: initial commit

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341 ) Change subject: octsim: initial commit ...................................................................... octsim: initial commit Change-Id: Iada6422d694eb5fc862477c8b43b8642c8d96692 --- A octsim/OCTSIM_Tests.cfg A octsim/OCTSIM_Tests.default A octsim/OCTSIM_Tests.ttcn A octsim/gen_links.sh A octsim/regen_makefile.sh 5 files changed, 300 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/27341/1 diff --git a/octsim/OCTSIM_Tests.cfg b/octsim/OCTSIM_Tests.cfg new file mode 100644 index 0000000..79b78a3 --- /dev/null +++ b/octsim/OCTSIM_Tests.cfg @@ -0,0 +1,20 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./OCTSIM_Tests.default" + +# Local configuration below + +[LOGGING] +ConsoleMask := ERROR | WARNING | TESTCASE | USER; + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] + + +[MAIN_CONTROLLER] + +[EXECUTE] +OCTSIM_Tests.control diff --git a/octsim/OCTSIM_Tests.default b/octsim/OCTSIM_Tests.default new file mode 100644 index 0000000..b15f7fa --- /dev/null +++ b/octsim/OCTSIM_Tests.default @@ -0,0 +1,10 @@ +[LOGGING] +mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; +CCID.FileMask := USER; +ST.FileMask := USER; + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] + +[EXECUTE] diff --git a/octsim/OCTSIM_Tests.ttcn b/octsim/OCTSIM_Tests.ttcn new file mode 100644 index 0000000..941cfa3 --- /dev/null +++ b/octsim/OCTSIM_Tests.ttcn @@ -0,0 +1,239 @@ +module OCTSIM_Tests { + +import from Osmocom_Types all; +import from General_Types all; +import from Misc_Helpers all; + +import from USB_PortType all; +import from USB_Types all; +import from USB_Templates all; +import from USB_Component all; +import from USB_PortTypes all; + +import from CCID_Types all; +import from CCID_Templates all; +import from CCID_Emulation all; + +import from SIMTRACE_Types all; +import from SIMTRACE_Templates all; +import from SIMTRACE_Emulation all; + +modulepar { + //USB_Device_Match mp_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '60e3'H} }; + charstring mp_cardem_usb_path := "1-2"; + integer mp_cardem_usb_interface := 0; + USB_Device_Match mp_ccid_usb_dev_match := { vid_pid := { vid := '076b'H, pid := '6622'H } }; +} + +type component test_CT extends Slot_CT { + var ST_Emulation_CT vc_ST; + port ST_USER_PT ST; + port ST_USER_PT ST_IRQ; + + var CCID_Emulation_CT vc_CCID; +}; + +private template (value) USB_IF_Params ts_UsbPars_path(charstring path, uint8_t if_nr) := { + usb_dev_match := { + path := { + path := path + } + }, + usb_if_nr := if_nr +} + +private function f_init(integer slot_nr := 0) runs on test_CT +{ + g_slot_nr := slot_nr; + + var USB_IF_Params st_usb_pars; + st_usb_pars := valueof(ts_UsbPars_path(mp_cardem_usb_path, mp_cardem_usb_interface)); + vc_ST := ST_Emulation_CT.create("ST"); + map(vc_ST:USB, system:USB); + connect(vc_ST:INOUT, self:ST); + connect(vc_ST:IRQ, self:ST_IRQ); + vc_ST.start(SIMTRACE_Emulation.main(st_usb_pars)); + + /* remove the virtual card */ + ST.send(ts_SIMTRACE_CEMU_CARDINSERT(0)); + + /* TODO: set the ATR */ + + /* Enable the use of the IRQ endpoint to report status updates */ + f_st_xceive(ts_SIMTRACE_CEMU_CONFIG(ts_FeatureFlags(true)), + tr_SIMTRACE_CEMU_CONFIG(tr_FeatureFlags(true))) + + + var CCID_Emulation_Params cep := { usb_dev_match := mp_ccid_usb_dev_match }; + vc_CCID := CCID_Emulation_CT.create("CCID"); + map(vc_CCID:USB, system:USB); + connect(vc_CCID:SLOT[slot_nr], self:CCID); + vc_CCID.start(CCID_Emulation.main(cep)); + CCID.receive(CCID_Emulation_Event:{up_down:=CCID_EVENT_UP}); + + //activate(as_Tguard); + //g_Tguard.start; + + /* we want to start ind powered-off state */ + f_ccid_power_off(?); +} + +function f_st_drain() runs on test_CT { + timer T := 0.1; + T.start; + alt { + [] ST.receive { + log("Drained msg from INOUT"); + repeat; + } + [] ST_IRQ.receive { + log("Drained msg from IRQ"); + repeat; + } + [] T.timeout { } + } +} + + +function f_st_xceive(template (value) SIMTRACE_PDU tx, template (present) SIMTRACE_PDU exp_rx) +runs on test_CT return SIMTRACE_PDU { + var SIMTRACE_PDU rx; + timer T := 5.0; + + ST.send(tx); + T.start; + alt { + [] ST.receive(exp_rx) -> value rx { + T.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for ", exp_rx); + mtc.stop; + } + } + return rx; +} + +private altstep as_ccid_any() runs on test_CT { + var CCID_PDU pdu; + [] CCID.receive(CCID_PDU:?) -> value pdu { + setverdict(fail, "Received unexpected CCID ", pdu); + self.stop; + } + [] CCID.receive { + setverdict(fail, "Received unexpected non-CCID"); + self.stop; + } +} + +/* transceive a CCID command (send 'tx' on OUT; expect 'rx' on IN) */ +private function f_ccid_xceive(template (value) CCID_PDU tx, template (present) CCID_PDU exp_rx) +runs on test_CT return CCID_PDU { + var CCID_PDU pdu; + + tx.hdr.bSlot := g_slot_nr; + exp_rx.hdr.bSlot := g_slot_nr; + + CCID.send(tx); + alt { + [] CCID.receive(exp_rx) -> value pdu { + return pdu; + } + [] as_ccid_any(); + } + return pdu; +} + +private altstep as_st_irq_wait_flags(template (present) CardEmu_StatusFlags exp_flags) runs on test_CT { +var SIMTRACE_PDU rx_st; +[] ST_IRQ.receive(tr_SIMTRACE_CEMU_STATUS(flags := exp_flags)) { + log("Expected flags received, continuing ", exp_flags); + } +[] ST_IRQ.receive(tr_SIMTRACE_CEMU_STATUS) -> value rx_st { + log("Ignoring non-matching flags of ", rx_st); + repeat; + } +} + +private template (present) CardEmu_DataFlags tr_cef_tpdu_hdr := + tr_CardEmu_DataFlags(false, false, false, tpdu_hdr := true); + +/* transceive a TPDU, either with e rx data part, or a tx data part */ +function f_xceive(octetstring apdu, octetstring sw := '9000'O, boolean rx := true) runs on test_CT { + var octetstring apdu_hdr := substr(apdu, 0, 5); + var octetstring pb := substr(apdu, 1, 1); + var octetstring data := substr(apdu, 5, lengthof(apdu)-5); + + CCID.send(ts_CCID_XfrBlock(g_slot_nr, apdu)); + ST.receive(tr_SIMTRACE_CEMU_RX_DATA(tr_cef_tpdu_hdr, apdu_hdr)); + if (rx) { + /* transmit procedure byte and wait for remainder */ + ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_rx:=true), pb)); + /* expect reader to transmit the remaining data */ + ST.receive(tr_SIMTRACE_CEMU_RX_DATA(tr_CardEmu_DataFlags(final:=true), data)); + /* respond with status word */ + ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(final:=true), sw)); + /* expect reader to receive status word */ + CCID.receive(tr_CCID_DataBlock(g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK, data := sw)); + } else { + /* FIXmE: doesn't work yet! */ + /* transmit procedure byte and remainder */ + var octetstring tx := data; + ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx:=true), pb & data)); + ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx:=true, final:=true), sw)); + /* expect reader to receive status word */ + CCID.receive(tr_CCID_DataBlock(g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK, data := tx)); + } + setverdict(pass); +} + + +testcase TC_test() runs on test_CT +{ + var template (present) CardEmu_StatusFlags exp_flags; + var CCID_PDU rx_ccid; + + f_init(); + f_st_drain(); + + f_sleep(1.0); + + /* insert the virtual card */ + ST.send(ts_SIMTRACE_CEMU_CARDINSERT(1)); + + //f_ccid_xceive(ts_CCID_GetSlotStatus(0, g_slot_nr), tr_CCID_SlotStatus(slot := g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK(?))); + + rx_ccid := f_ccid_power_on(); + + if (false) { + /* FIXME: why does this only work on the first time after powering both devices? */ + f_sleep(1.0); + /* wait for status with RESET active */ + exp_flags := tr_CardEmu_StatusFlags(reset_active := true, clk_active := true, vcc_present := true); + as_st_irq_wait_flags(exp_flags); + } + + /* wait for status with RESET inactive/released */ + exp_flags := tr_CardEmu_StatusFlags(reset_active := false, clk_active := true, vcc_present := true); + as_st_irq_wait_flags(exp_flags); + + if (not match(rx_ccid, tr_CCID_DataBlock(data := '3B8080811FC759'O))) { + setverdict(fail, "Unexpected ATR on CCID side: ", rx_ccid.u.DataBlock.abData); + } + + for (var integer i := 0; i < 100; i := i+1) { + f_xceive('a0a40004023f00'O); + } + /* doesn't work yet */ + //f_xceive('a0a40004023f00'O, rx:=false); + f_sleep(2.0); +} + + + +control { + execute( TC_test() ); +} + + +} diff --git a/octsim/gen_links.sh b/octsim/gen_links.sh new file mode 100755 index 0000000..c1ae16c --- /dev/null +++ b/octsim/gen_links.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +#DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +#FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +#gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.USB/src +FILES="USB_PT.cc USB_PT.hh USB_PortType.ttcn USB_PortTypes.ttcn USB_Templates.ttcn USB_Types.ttcn USB_Component.ttcn " +FILES+="CCID_Types.ttcn CCID_Templates.ttcn CCID_Emulation.ttcn " +gen_links $DIR $FILES + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn " +FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="SIMTRACE_Types.ttcn SIMTRACE_Templates.ttcn SIMTRACE_Emulation.ttcn " +gen_links $DIR $FILES + +ignore_pp_results diff --git a/octsim/regen_makefile.sh b/octsim/regen_makefile.sh new file mode 100755 index 0000000..b258ccc --- /dev/null +++ b/octsim/regen_makefile.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +FILES="*.ttcn USB_PT.cc Native_FunctionDefs.cc " + +../regen-makefile.sh OCTSIM_Tests.ttcn $FILES + +#sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile +sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile +sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libusb-1.0`/' Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341 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: Iada6422d694eb5fc862477c8b43b8642c8d96692 Gerrit-Change-Number: 27341 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace: Add support for slot_mux_nr to CardEmu_BD_Config

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340 ) Change subject: simtrace: Add support for slot_mux_nr to CardEmu_BD_Config ...................................................................... simtrace: Add support for slot_mux_nr to CardEmu_BD_Config This catches up with a recent change in simtrace2.git (Change-Id I4cdb250d2e1dbc5b8b0169f8b7c21e288b492e1d) adding a new optional field to CardEmu_BD_Config Change-Id: Id29584764a2f27b9de5fa9ff67fd0ae3e912f02e --- M library/SIMTRACE_Templates.ttcn M library/SIMTRACE_Types.ttcn 2 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/27340/1 diff --git a/library/SIMTRACE_Templates.ttcn b/library/SIMTRACE_Templates.ttcn index 934253e..ef857fe 100644 --- a/library/SIMTRACE_Templates.ttcn +++ b/library/SIMTRACE_Templates.ttcn @@ -216,11 +216,13 @@ template (value) SIMTRACE_PDU ts_SIMTRACE_CEMU_CONFIG(template (value) CardEmu_FeatureFlags flags) := - ts_SIMTRACE(SIMTRACE_MSGT_BD_CEMU_CONFIG, { cardem_bd_config := { features := flags } }); + ts_SIMTRACE(SIMTRACE_MSGT_BD_CEMU_CONFIG, { cardem_bd_config := { features := flags, + slot_mux_nr := 0} }); template (present) SIMTRACE_PDU tr_SIMTRACE_CEMU_CONFIG(template (present) CardEmu_FeatureFlags flags) := - tr_SIMTRACE(SIMTRACE_MSGT_BD_CEMU_CONFIG, { cardem_bd_config := { features := flags } }); + tr_SIMTRACE(SIMTRACE_MSGT_BD_CEMU_CONFIG, { cardem_bd_config := { features := flags, + slot_mux_nr := ? } }); /*********************************************************************** diff --git a/library/SIMTRACE_Types.ttcn b/library/SIMTRACE_Types.ttcn index 7b1c857..d28df2f 100644 --- a/library/SIMTRACE_Types.ttcn +++ b/library/SIMTRACE_Types.ttcn @@ -273,7 +273,8 @@ }; type record CardEmu_BD_Config { - CardEmu_FeatureFlags features + CardEmu_FeatureFlags features, + uint8_t slot_mux_nr optional }; /*********************************************************************** -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340 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: Id29584764a2f27b9de5fa9ff67fd0ae3e912f02e Gerrit-Change-Number: 27340 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: move SIMTRACE_{Types,Templates,Emulation}.ttcn to library

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27338 ) Change subject: move SIMTRACE_{Types,Templates,Emulation}.ttcn to library ...................................................................... move SIMTRACE_{Types,Templates,Emulation}.ttcn to library this will allow us to us SIMTRACE as part of a test suite testing e.g. CCID readers. Change-Id: I4349019e2deac114f4c040f1441b70663a521ec2 --- R library/SIMTRACE_Emulation.ttcn R library/SIMTRACE_Templates.ttcn R library/SIMTRACE_Types.ttcn M simtrace/gen_links.sh 4 files changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/27338/1 diff --git a/simtrace/SIMTRACE_Emulation.ttcn b/library/SIMTRACE_Emulation.ttcn similarity index 100% rename from simtrace/SIMTRACE_Emulation.ttcn rename to library/SIMTRACE_Emulation.ttcn diff --git a/simtrace/SIMTRACE_Templates.ttcn b/library/SIMTRACE_Templates.ttcn similarity index 100% rename from simtrace/SIMTRACE_Templates.ttcn rename to library/SIMTRACE_Templates.ttcn diff --git a/simtrace/SIMTRACE_Types.ttcn b/library/SIMTRACE_Types.ttcn similarity index 100% rename from simtrace/SIMTRACE_Types.ttcn rename to library/SIMTRACE_Types.ttcn diff --git a/simtrace/gen_links.sh b/simtrace/gen_links.sh index 72787b9..eef1fea 100755 --- a/simtrace/gen_links.sh +++ b/simtrace/gen_links.sh @@ -15,6 +15,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn " FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="SIMTRACE_Types.ttcn SIMTRACE_Templates.ttcn SIMTRACE_Emulation.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27338 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: I4349019e2deac114f4c040f1441b70663a521ec2 Gerrit-Change-Number: 27338 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27339 ) Change subject: ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB ...................................................................... ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB Change-Id: Ie110ad1511b01fe84e1ad181b0e053e25f80f522 --- M ccid/CCID_Tests.ttcn M deps/Makefile 2 files changed, 1 insertion(+), 140 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/27339/1 diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index f7423cd..e650f37 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -29,13 +29,6 @@ var Slot_CT vc_SLOT[NR_SLOTS]; }; -/* per-slot test component; manages one slot */ -type component Slot_CT { - var uint8_t g_slot_nr; - port CCID_SLOT_PT CCID; - timer g_Tguard := 120.0; -}; - /* maximum number of slots we are supporting in the test suite */ private const integer NR_SLOTS := 16; @@ -96,25 +89,6 @@ type function void_fn() runs on Slot_CT; -/* altstep running on the per-slot test component */ -private altstep as_Tguard() runs on Slot_CT { - [] g_Tguard.timeout { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout"); - } -} - -private altstep as_ccid_any() runs on Slot_CT { - var CCID_PDU pdu; - [] CCID.receive(CCID_PDU:?) -> value pdu { - setverdict(fail, "Received unexpected CCID ", pdu); - self.stop; - } - [] CCID.receive { - setverdict(fail, "Received unexpected non-CCID"); - self.stop; - } -} - /* first function inside Slot_CT; wait for CCID_EVENT_UP + call testcase-specific function */ private function f_handler_init(void_fn fn, integer slot_nr) runs on Slot_CT { g_slot_nr := slot_nr; @@ -163,119 +137,6 @@ } -/* transceive a CCID command (send 'tx' on OUT; expect 'rx' on IN) */ -private function f_ccid_xceive(template (value) CCID_PDU tx, template (present) CCID_PDU exp_rx) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - tx.hdr.bSlot := g_slot_nr; - exp_rx.hdr.bSlot := g_slot_nr; - - CCID.send(tx); - alt { - [] CCID.receive(exp_rx) -> value pdu { - return pdu; - } - [] as_ccid_any(); - } - return pdu; -} - -private template (present) CCID_Header_IN tr_inact := - tr_CCID_HeaderIN_OK(icc_status := (CCID_ICC_STATUS_PRES_INACT, CCID_ICC_STATUS_NO_ICC)); - -private template (present) CCID_Header_IN tr_act := - tr_CCID_HeaderIN_OK(icc_status := CCID_ICC_STATUS_PRES_ACT); - -/* Send IccPowerOn on OUT; expect DataBlock in retunr */ -private function f_ccid_power_on(CCID_PowerSelect psel := CCID_PWRSEL_AUTO, - template (present) CCID_Header_IN hdr_in := tr_act) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_IccPowerOn(g_slot_nr, psel), - tr_CCID_DataBlock(g_slot_nr, hdr_in := hdr_in) ); - return pdu; -} - -/* Send IccPowerOn on OUT; expect SlotStatus in return */ -private function f_ccid_power_off(template (present) CCID_Header_IN hdr_in := tr_inact) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_IccPowerOff(g_slot_nr), - tr_CCID_SlotStatus(slot := g_slot_nr, hdr_in := hdr_in) ); - return pdu; -} - -/* Send IccClockCommand on OUT; expect SlotStatus in return */ -private function f_ccid_clock_cmd(CCID_ClockCommand cmd, - template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_ClockCommand(g_slot_nr, cmd), - tr_CCID_SlotStatus(slot := g_slot_nr, hdr_in := hdr_in)); - return pdu; -} - -/* Send XfrBlock on OUT; expect DataBlock in return */ -private function f_ccid_xfr(octetstring tx, template octetstring rx) runs on Slot_CT return octetstring { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_XfrBlock(g_slot_nr, tx, 0), - tr_CCID_DataBlock(g_slot_nr, ?, ?, rx) ); - return pdu.u.DataBlock.abData; -} - -/* Send SetParameters on OUT; expect Parameters on IN */ -private function f_ccid_set_par(template (value) CCID_ProtocolData par, - template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_SetParameters(g_slot_nr, par), - tr_CCID_Parameters(g_slot_nr, hdr_in := hdr_in)); - return pdu; -} - -/* Send GetParameters on OUT; expect Parameters on IN */ -private function f_ccid_get_par(template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_GetParameters(g_slot_nr), - tr_CCID_Parameters(g_slot_nr, hdr_in := hdr_in)); - return pdu; -} - -/* Send ResetParameters on OUT; expect Parameters on IN */ -private function f_ccid_reset_par(template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - /* [at least] Omnikey seems to have failed to follow the CCID spec here :/ */ - if (mp_quirk_resetpar_returns_slotsts) { - pdu := f_ccid_xceive(ts_CCID_ResetParameters(g_slot_nr), - tr_CCID_SlotStatus(g_slot_nr, hdr_in := hdr_in)); - } else { - pdu := f_ccid_xceive(ts_CCID_ResetParameters(g_slot_nr), - tr_CCID_Parameters(g_slot_nr, hdr_in := hdr_in)); - } - return pdu; -} - -/* Send Escape on OUT; expect Escape on IN */ -private function f_ccid_escape(template (value) octetstring data, - template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_Escape(g_slot_nr, data), - tr_CCID_EscapeIN(g_slot_nr, hdr_in := hdr_in)); - return pdu; -} - /*********************************************************************** * Test behavior regarding valid situations diff --git a/deps/Makefile b/deps/Makefile index e67b499..2a906eb 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -126,7 +126,7 @@ titan.TestPorts.TELNETasp_commit= 873fe539642542cd9a901c208f1ec11c6d2f5387 titan.TestPorts.UDPasp_commit= c20d77a34f288dd70dd4aaa30e520778876e9336 titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-13-gd34ab71 -titan.TestPorts.USB_commit= 4c742e931aae66c0046cebfe3c1de4618b6f9ffc +titan.TestPorts.USB_commit= a9470fdc99c82fbf988f4508c3161118c9106e28 osmo-uecups_commit= 8362efef7c6fa341eb947a75786878e0685767b7 all: $(foreach dir,$(ALL_REPOS),$(dir)/update) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27339 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: Ie110ad1511b01fe84e1ad181b0e053e25f80f522 Gerrit-Change-Number: 27339 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_51_011: Better decode of EF_OPL LAI

by laforge

laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/pysim/+/27334 ) Change subject: ts_51_011: Better decode of EF_OPL LAI ...................................................................... ts_51_011: Better decode of EF_OPL LAI before: { "lai": "62f2300000fffe", "pnn_record_id": 1 } after: { "lai": { "mcc_mnc": "262f03", "lac_min": "0000", "lac_max": "fffe" }, "pnn_record_id": 1 } Change-Id: I82581220e9c33a8e67cbefd5dfeb40bbc2c31179 --- M pySim/ts_51_011.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/34/27334/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I82581220e9c33a8e67cbefd5dfeb40bbc2c31179 Gerrit-Change-Number: 27334 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_31_102: Further decode LAI in EF_LOCI

by laforge

laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/pysim/+/27336 ) Change subject: ts_31_102: Further decode LAI in EF_LOCI ...................................................................... ts_31_102: Further decode LAI in EF_LOCI Change-Id: I21d9356e541eb320848a373804781ae0bef7d012 --- M pySim/ts_31_102.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/27336/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I21d9356e541eb320848a373804781ae0bef7d012 Gerrit-Change-Number: 27336 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_51_011: Better decode of EF_OPL LAI

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27334 ) Change subject: ts_51_011: Better decode of EF_OPL LAI ...................................................................... Patch Set 1: (1 comment) File pySim/ts_51_011.py: https://gerrit.osmocom.org/c/pysim/+/27334/comment/bc0a36c3_14fbe2ae PS1, Line 892: mcc_nmc typo! -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I82581220e9c33a8e67cbefd5dfeb40bbc2c31179 Gerrit-Change-Number: 27334 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 25 Feb 2022 14:44:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in libosmo-abis[master]: stats: add BTS index to IPA RSL TCP stats name

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27323 ) Change subject: stats: add BTS index to IPA RSL TCP stats name ...................................................................... stats: add BTS index to IPA RSL TCP stats name With this change, the new TCP stat names more closely resemble existing RSL related stat names. Change-Id: If7ae7f0e75de37e2e52a8ed724c861f57d0da574 --- M src/input/ipaccess.c 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index b410a7e..8dc1008 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -296,6 +296,7 @@ struct e1inp_ts *ts; struct osmo_fd *newbfd; struct e1inp_line *new_line; + char tcp_stat_name[32]; sign_link = line->ops->sign_link_up(&unit_data, line, @@ -342,9 +343,9 @@ "could not register FD\n"); goto err; } - char stat_name[16]; - snprintf(stat_name, sizeof(stat_name), "ipa-rsl-%u", unit_data.trx_id); - osmo_stats_tcp_osmo_fd_register(newbfd, stat_name); + snprintf(tcp_stat_name, sizeof(tcp_stat_name), "bts.%u.ipa-rsl.%u", + unit_data.bts_id, unit_data.trx_id); + osmo_stats_tcp_osmo_fd_register(newbfd, tcp_stat_name); e1i_ts = ipaccess_line_ts(newbfd, new_line); ipaccess_bsc_keepalive_fsm_alloc(e1i_ts, newbfd, "rsl_bsc_to_bts"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If7ae7f0e75de37e2e52a8ed724c861f57d0da574 Gerrit-Change-Number: 27323 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in libosmo-abis[master]: stats: add BTS index to IPA RSL TCP stats name

by laforge

Attention is currently required from: iedemam, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27323 ) Change subject: stats: add BTS index to IPA RSL TCP stats name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If7ae7f0e75de37e2e52a8ed724c861f57d0da574 Gerrit-Change-Number: 27323 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 14:42:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in libosmocore[master]: stats: use tcp stat names as provided

by daniel

Attention is currently required from: dexter. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: use tcp stat names as provided ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: > Hi all, […] I'd like some input from pmaier on this since I remember the purpose of the tcp stats was to explicitly track individual connections. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 14:42:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-gbproxy[master]: gbproxy: Only route to an SGSN if the BVC is not blocked

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/27322 ) Change subject: gbproxy: Only route to an SGSN if the BVC is not blocked ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: maybe some kind of counetr or whatever else might help noticing such events? -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0b54813c04bae2c63975082ad2dacae8affd3127 Gerrit-Change-Number: 27322 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 14:42:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in libosmocore[master]: stats: use tcp stat names as provided

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: use tcp stat names as provided ...................................................................... stats: use tcp stat names as provided If an API user has defined a name for this particular stat, we should consider it unique and not append ip and port information from the connection. By appending ip and port information to all tcp stat names, we end up creating unique stat names every time a reconnection occurs and the source port changes. This makes the statistic impossible to track over time as it is continually using a different name. A quick example from the field over the course of a day: tcp.ipa-rsl-0,r=192.168.55.88.33056<->l=192.168.0.1.3003.tcp.rtt tcp.ipa-rsl-0,r=192.168.55.88.33311<->l=192.168.0.1.3003.tcp.rtt tcp.ipa-rsl-0,r=192.168.55.88.35510<->l=192.168.0.1.3003.tcp.rtt tcp.ipa-rsl-0,r=192.168.55.88.35958<->l=192.168.0.1.3003.tcp.rtt tcp.ipa-rsl-0,r=192.168.55.88.36110<->l=192.168.0.1.3003.tcp.rtt tcp.ipa-rsl-0,r=192.168.55.88.39269<->l=192.168.0.1.3003.tcp.rtt tcp.ipa-rsl-0,r=192.168.55.88.40394<->l=192.168.0.1.3003.tcp.rtt tcp.ipa-rsl-0,r=192.168.55.88.40397<->l=192.168.0.1.3003.tcp.rtt tcp.ipa-rsl-0,r=192.168.55.88.42920<->l=192.168.0.1.3003.tcp.rtt tcp.ipa-rsl-0,r=192.168.55.88.43839<->l=192.168.0.1.3003.tcp.rtt This change would treat tcp stats like other stats around the system. A unique name must be set by the API user. This would let us set a unique name like the following to avoid the situation above: bts.0.rsl.0.tcp.rtt Matching the existing rsl related stats: bts.0.rsl.delete_ind bts.0.rsl.ipa_nack bts.0.rsl.unknown ...they retain a constant name regardless of the underlying connectivity situation. Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 --- M src/stats_tcp.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/stats_tcp.c b/src/stats_tcp.c index dec5b5d..ebb380e 100644 --- a/src/stats_tcp.c +++ b/src/stats_tcp.c @@ -119,8 +119,7 @@ /* Update statistics */ if (stats_tcp_entry->name) - snprintf(stat_name, sizeof(stat_name), "%s,%s", stats_tcp_entry->name, - osmo_sock_get_name2(stats_tcp_entry->fd->fd)); + snprintf(stat_name, sizeof(stat_name), "%s", stats_tcp_entry->name); else snprintf(stat_name, sizeof(stat_name), "%s", osmo_sock_get_name2(stats_tcp_entry->fd->fd)); osmo_stat_item_group_set_name(stats_tcp_entry->stats_tcp, stat_name); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in libosmocore[master]: stats: use tcp stat names as provided

by laforge

Attention is currently required from: iedemam, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: use tcp stat names as provided ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 14:41:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass: check for more than one RAB assignment req

by laforge

Attention is currently required from: pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27321 ) Change subject: ranap_rab_ass: check for more than one RAB assignment req ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0f1d868fd0b4dc413533d6fcc5482862825181be Gerrit-Change-Number: 27321 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 14:40:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-hnbgw[master]: osmo-hnbgw.cfg: use local port 2729 as default for MGCP client

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27331 ) Change subject: osmo-hnbgw.cfg: use local port 2729 as default for MGCP client ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I55179c2bff3e6ef0e54fee6b1b90fc76f541e58e Gerrit-Change-Number: 27331 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 14:39:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_31_102: Further decode Location Area Identifier

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27336 ) Change subject: ts_31_102: Further decode Location Area Identifier ...................................................................... ts_31_102: Further decode Location Area Identifier Change-Id: I21d9356e541eb320848a373804781ae0bef7d012 --- M pySim/ts_31_102.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/27336/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 3298534..231d387 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -712,8 +712,8 @@ class EF_LOCI(TransparentEF): def __init__(self, fid='6f7e', sfid=0x0b, name='EF.LOCI', desc='Location information', size={11, 11}): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) - self._construct = Struct('tmsi'/HexAdapter(Bytes(4)), 'lai'/HexAdapter(Bytes(5)), 'rfu'/Int8ub, - 'lu_status'/Int8ub) + Lai = Struct('mcc_mnc'/BcdAdapter(Bytes(3)), 'lac'/HexAdapter(Bytes(2))) + self._construct = Struct('tmsi'/HexAdapter(Bytes(4)), 'lai'/Lai, 'rfu'/Int8ub, 'lu_status'/Int8ub) # TS 31.102 Section 4.2.18 class EF_AD(TransparentEF): class OP_MODE(enum.IntEnum): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I21d9356e541eb320848a373804781ae0bef7d012 Gerrit-Change-Number: 27336 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_31_102: Further decode TAI in EF.OPL5G

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27337 ) Change subject: ts_31_102: Further decode TAI in EF.OPL5G ...................................................................... ts_31_102: Further decode TAI in EF.OPL5G The TAI is not just an opaque bytestring but it consists of 3 fields. Change-Id: Ie5a5ce74713deb0e151218ae553d3f3d96cef17d --- M pySim/ts_31_102.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/37/27337/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 231d387..fec81bf 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1033,7 +1033,8 @@ class EF_OPL5G(LinFixedEF): def __init__(self, fid='6f08', sfid=0x08, name='EF.OPL5G', desc='5GS Operator PLMN List', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len={10, None}, **kwargs) - self._construct = Struct('tai'/Bytes(9), 'pnn_record_id'/Int8ub) + Tai = Struct('mcc_mnc'/BcdAdapter(Bytes(3)), 'tac_min'/Bytes(3), 'tac_max'/Bytes(3)) + self._construct = Struct('tai'/Tai, 'pnn_record_id'/Int8ub) # TS 31.102 Section 4.4.11.10 class EF_SUPI_NAI(TransparentEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie5a5ce74713deb0e151218ae553d3f3d96cef17d Gerrit-Change-Number: 27337 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in pysim[master]: pySim-shell: Add 'decode_hex' command for transparent + linear EF

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27335 ) Change subject: pySim-shell: Add 'decode_hex' command for transparent + linear EF ...................................................................... pySim-shell: Add 'decode_hex' command for transparent + linear EF These commands can be used to decode a user-provided hex-string, instead of decoding the data read from the file. This is useful for quickly manually decoding some values read from other locations, such as e.g. copy+pasted from a eSIM profile in ASN.1 value notation. Change-Id: I81f73bce2c26e3e5dfc7538d223bb2d2483c7fa0 --- M docs/shell.rst M pySim/filesystem.py 2 files changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/27335/1 diff --git a/docs/shell.rst b/docs/shell.rst index f24dc93..2c8da84 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -384,6 +384,13 @@ This allows for easy interactive modification of records. +decode_hex +~~~~~~~~~~ +.. argparse:: + :module: pySim.filesystem + :func: LinFixedEF.ShellCommands.dec_hex_parser + + Transparent EF commands ----------------------- @@ -460,6 +467,13 @@ This allows for easy interactive modification of file contents. +decode_hex +~~~~~~~~~~ +.. argparse:: + :module: pySim.filesystem + :func: TransparentEF.ShellCommands.dec_hex_parser + + BER-TLV EF commands ------------------- diff --git a/pySim/filesystem.py b/pySim/filesystem.py index f8b86c5..5bbd57b 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -526,6 +526,17 @@ def __init__(self): super().__init__() + dec_hex_parser = argparse.ArgumentParser() + dec_hex_parser.add_argument('--oneline', action='store_true', + help='No JSON pretty-printing, dump as a single line') + dec_hex_parser.add_argument('HEXSTR', help='Hex-string of encoded data to decode') + + @cmd2.with_argparser(dec_hex_parser) + def do_decode_hex(self, opts): + """Decode command-line provided hex-string as if it was read from the file.""" + data = self._cmd.rs.selected_file.decode_hex(opts.HEXSTR) + self._cmd.poutput_json(data, opts.oneline) + read_bin_parser = argparse.ArgumentParser() read_bin_parser.add_argument( '--offset', type=int, default=0, help='Byte offset for start of read') @@ -738,6 +749,17 @@ def __init__(self, **kwargs): super().__init__(**kwargs) + dec_hex_parser = argparse.ArgumentParser() + dec_hex_parser.add_argument('--oneline', action='store_true', + help='No JSON pretty-printing, dump as a single line') + dec_hex_parser.add_argument('HEXSTR', help='Hex-string of encoded data to decode') + + @cmd2.with_argparser(dec_hex_parser) + def do_decode_hex(self, opts): + """Decode command-line provided hex-string as if it was read from the file.""" + data = self._cmd.rs.selected_file.decode_record_hex(opts.HEXSTR) + self._cmd.poutput_json(data, opts.oneline) + read_rec_parser = argparse.ArgumentParser() read_rec_parser.add_argument( 'record_nr', type=int, help='Number of record to be read') -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I81f73bce2c26e3e5dfc7538d223bb2d2483c7fa0 Gerrit-Change-Number: 27335 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_51_011: Better decode of EF_OPL LAI

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27334 ) Change subject: ts_51_011: Better decode of EF_OPL LAI ...................................................................... ts_51_011: Better decode of EF_OPL LAI before: { "lai": "62f2300000fffe", "pnn_record_id": 1 } after: { "lai": { "mcc_nmc": "262f03", "lac_min": "0000", "lac_max": "fffe" }, "pnn_record_id": 1 } Change-Id: I82581220e9c33a8e67cbefd5dfeb40bbc2c31179 --- M pySim/ts_51_011.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/34/27334/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 9a6aff9..7e5fd3b 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -889,7 +889,7 @@ class EF_OPL(LinFixedEF): def __init__(self, fid='6fc6', sfid=None, name='EF.OPL', rec_len={8, 8}, desc='Operator PLMN List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) - self._construct = Struct('lai'/Bytes(7), 'pnn_record_id'/Int8ub) + self._construct = Struct('lai'/Struct('mcc_nmc'/BcdAdapter(Bytes(3)), 'lac_min'/Bytes(2), 'lac_max'/Bytes(2)), 'pnn_record_id'/Int8ub) # TS 51.011 Section 10.3.44 + TS 31.102 4.2.62 class EF_MBI(LinFixedEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I82581220e9c33a8e67cbefd5dfeb40bbc2c31179 Gerrit-Change-Number: 27334 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_31_102: Fix decoding of UServiceTable

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27332 ) Change subject: ts_31_102: Fix decoding of UServiceTable ...................................................................... ts_31_102: Fix decoding of UServiceTable range(0,7) in python is 0..6, and not 0..7, so we need range(0.8) to produce the desired range covering all bits of a byte. This resulted in services 8,16,24,... not being displayed in the decoded output of EF.UST / EF.IST. Change-Id: I22bbc481de342685352bf5b13d54931d3f37f9b7 --- M pySim/ts_31_102.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/32/27332/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index c6bfa2d..3298534 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -554,7 +554,7 @@ ret = {} for i in range(0, len(in_bin)): byte = in_bin[i] - for bitno in range(0, 7): + for bitno in range(0, 8): service_nr = i * 8 + bitno + 1 ret[service_nr] = { 'activated': True if byte & (1 << bitno) else False -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I22bbc481de342685352bf5b13d54931d3f37f9b7 Gerrit-Change-Number: 27332 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_51_011: Properly decode EF.OPL

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27333 ) Change subject: ts_51_011: Properly decode EF.OPL ...................................................................... ts_51_011: Properly decode EF.OPL The OPL has 7 bytes "LAI" as the LAI actually contains a LAC range (so two more bytes for the end of the 16bit range). Change-Id: I74bcf10b0a8977af0f2844044a812c5780af1706 --- M pySim/ts_51_011.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/33/27333/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index ddfed95..9a6aff9 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -889,7 +889,7 @@ class EF_OPL(LinFixedEF): def __init__(self, fid='6fc6', sfid=None, name='EF.OPL', rec_len={8, 8}, desc='Operator PLMN List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) - self._construct = Struct('lai'/Bytes(5), 'pnn_record_id'/Int8ub) + self._construct = Struct('lai'/Bytes(7), 'pnn_record_id'/Int8ub) # TS 51.011 Section 10.3.44 + TS 31.102 4.2.62 class EF_MBI(LinFixedEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I74bcf10b0a8977af0f2844044a812c5780af1706 Gerrit-Change-Number: 27333 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-hnbgw[master]: osmo-hnbgw.cfg: use local port 2729 as default for MGCP client

by osmith

Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27331 ) Change subject: osmo-hnbgw.cfg: use local port 2729 as default for MGCP client ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I55179c2bff3e6ef0e54fee6b1b90fc76f541e58e Gerrit-Change-Number: 27331 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 14:13:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-hnbgw[master]: osmo-hnbgw.cfg: use local port 2729 as default for MGCP client

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27331 ) Change subject: osmo-hnbgw.cfg: use local port 2729 as default for MGCP client ...................................................................... osmo-hnbgw.cfg: use local port 2729 as default for MGCP client There are several osmo processes that talk to osmo-mgw via osmo-mgcp-client. The sample config for osmo-bsc suggest 2727 and the sample config for osmo-msc suggests 2728 as local port default. To make it less likely for users to get port collisions whlie setting up their networks we should use a different port for osmo-hnbgw. Lets use 2729. Change-Id: I55179c2bff3e6ef0e54fee6b1b90fc76f541e58e --- M doc/examples/osmo-hnbgw/osmo-hnbgw.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/31/27331/1 diff --git a/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg b/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg index a683187..53b5508 100644 --- a/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg +++ b/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg @@ -25,6 +25,7 @@ hnbap-allow-tmsi 1 mgcp mgw remote-ip 127.0.0.1 + mgw local-port 2729 mgw remote-port 2427 mgw reset-endpoint rtpbridge/* -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I55179c2bff3e6ef0e54fee6b1b90fc76f541e58e Gerrit-Change-Number: 27331 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in meta-telephony[laforge/nightly]: osmo-hnbgw: depend on osmo-mgw

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/27330 ) Change subject: osmo-hnbgw: depend on osmo-mgw ...................................................................... osmo-hnbgw: depend on osmo-mgw Fix for: | checking for LIBOSMOMGCPCLIENT... no | configure: error: Package requirements (libosmo-mgcp-client >= 1.9.0) were not met: | | No package 'libosmo-mgcp-client' found Required since osmo-hnbgw Ib9b62e0145184b91c56ce5d8870760bfa49cc5a4. Change-Id: I79b0525cff5030d72235640eddeabd7540f1bcf9 --- M recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc index 3e45f9b..696c864 100644 --- a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc +++ b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc @@ -3,7 +3,7 @@ LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -DEPENDS = "libosmocore libosmo-netif libosmo-sccp osmo-iuh libasn1c lksctp-tools" +DEPENDS = "libosmocore libosmo-netif libosmo-sccp osmo-iuh libasn1c lksctp-tools osmo-mgw" INC_PR="r0.${META_TELEPHONY_OSMO_INC}" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/27330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I79b0525cff5030d72235640eddeabd7540f1bcf9 Gerrit-Change-Number: 27330 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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, 2 months

1
0
0 0

Change in meta-telephony[laforge/nightly]: osmo-hnbgw: depend on osmo-mgw

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/27330 ) Change subject: osmo-hnbgw: depend on osmo-mgw ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/27330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I79b0525cff5030d72235640eddeabd7540f1bcf9 Gerrit-Change-Number: 27330 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-Comment-Date: Fri, 25 Feb 2022 13:04:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in meta-telephony[laforge/nightly]: osmo-hnbgw: depend on osmo-mgw

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/27330 ) Change subject: osmo-hnbgw: depend on osmo-mgw ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: added reference to osmo-hnbgw commit, re-applying +2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/27330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I79b0525cff5030d72235640eddeabd7540f1bcf9 Gerrit-Change-Number: 27330 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-Comment-Date: Fri, 25 Feb 2022 13:04:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in meta-telephony[laforge/nightly]: osmo-hnbgw: depend on osmo-mgw

by osmith

Attention is currently required from: osmith. Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/meta-telephony/+/27330 to look at the new patch set (#2). Change subject: osmo-hnbgw: depend on osmo-mgw ...................................................................... osmo-hnbgw: depend on osmo-mgw Fix for: | checking for LIBOSMOMGCPCLIENT... no | configure: error: Package requirements (libosmo-mgcp-client >= 1.9.0) were not met: | | No package 'libosmo-mgcp-client' found Required since osmo-hnbgw Ib9b62e0145184b91c56ce5d8870760bfa49cc5a4. Change-Id: I79b0525cff5030d72235640eddeabd7540f1bcf9 --- M recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/30/27330/2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/27330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I79b0525cff5030d72235640eddeabd7540f1bcf9 Gerrit-Change-Number: 27330 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_102_221: properly decode short file identifier

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27328 ) Change subject: ts_102_221: properly decode short file identifier ...................................................................... ts_102_221: properly decode short file identifier The SFI TLV contanins not the raw SFI, but it contains the SFI shifted to left by 3 bits (for some strange reason). So let's un-shift it. Change-Id: Ibc69b99010d2a25cbb69b6a3d1585d0cb63f1345 --- M pySim/ts_102_221.py 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index ac2a60e..708b50b 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -186,7 +186,14 @@ # ETSI TS 102 221 11.1.1.4.8 class ShortFileIdentifier(BER_TLV_IE, tag=0x88): - _construct = HexAdapter(COptional(Bytes(1))) + # If the length of the TLV is 1, the SFI value is indicated in the 5 most significant bits (bits b8 to b4) + # of the TLV value field. In this case, bits b3 to b1 shall be set to 0 + class Shift3RAdapter(Adapter): + def _decode(self, obj, context, path): + return obj >> 3 + def _encode(self, obj, context, path): + return obj << 3 + _construct = COptional(Shift3RAdapter(Byte)) # ETSI TS 102 221 11.1.1.4.9 class LifeCycleStatusInteger(BER_TLV_IE, tag=0x8A): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibc69b99010d2a25cbb69b6a3d1585d0cb63f1345 Gerrit-Change-Number: 27328 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_102_221: Fix decoding the 'num_of_rec' field

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27329 ) Change subject: ts_102_221: Fix decoding the 'num_of_rec' field ...................................................................... ts_102_221: Fix decoding the 'num_of_rec' field It is a 8bit integer, not a 16bit integer. See TS 102 221 11.1.1.4.3 Change-Id: I3e258547dad21a248650cfbc02e0576268d3b3fd --- M pySim/ts_102_221.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 708b50b..713d169 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -103,7 +103,7 @@ 'structure'/Enum(BitsInteger(3), no_info_given=0, transparent=1, linear_fixed=2, cyclic=6)) ) _construct = Struct('file_descriptor_byte'/FDB, Const(b'\x21'), - 'record_len'/COptional(Int16ub), 'num_of_rec'/COptional(Int16ub)) + 'record_len'/COptional(Int16ub), 'num_of_rec'/COptional(Int8ub)) # ETSI TS 102 221 11.1.1.4.4 class FileIdentifier(BER_TLV_IE, tag=0x83): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3e258547dad21a248650cfbc02e0576268d3b3fd Gerrit-Change-Number: 27329 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

2024

2023

2022

gerrit-log February 2022