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

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

3 years, 3 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

3 years, 3 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

3 years, 3 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

3 years, 3 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

3 years, 3 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

3 years, 3 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

3 years, 3 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

3 years, 3 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

3 years, 3 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

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022