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

[L] Change in ...osmo-epdg[master]: Implement RTR Deregistration-Reason PERMANENT_TERMINATION

by pespin

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?usp=email ) Change subject: Implement RTR Deregistration-Reason PERMANENT_TERMINATION ...................................................................... Patch Set 7: (1 comment) File src/aaa_diameter_s6b.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262/comment/71a14409_a36b… PS2, Line 153: Ret = diameter_call(ASR, State), > This one is ending up with "Error: encode", and I couldn't find yet the culprit: […] Done -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I57f2e02dc4034b63c118e4a4139b2830e38a2138 Gerrit-Change-Number: 36262 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 14 Mar 2024 16:05:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[L] Change in ...osmo-epdg[master]: Implement RTR Deregistration-Reason PERMANENT_TERMINATION

by pespin

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?usp=email ) Change subject: Implement RTR Deregistration-Reason PERMANENT_TERMINATION ...................................................................... Patch Set 7: (1 comment) Patchset: PS7: This commit has become quite big, but let's merge as it is since I needed lots of improvements everywhere since it required going through the whole set of interfaces. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I57f2e02dc4034b63c118e4a4139b2830e38a2138 Gerrit-Change-Number: 36262 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 14 Mar 2024 16:05:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[L] Change in ...osmo-epdg[master]: Implement RTR Deregistration-Reason PERMANENT_TERMINATION

by pespin

Attention is currently required from: fixeria, laforge, lynxis lazus. Hello Jenkins Builder, fixeria, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Implement RTR Deregistration-Reason PERMANENT_TERMINATION ...................................................................... Implement RTR Deregistration-Reason PERMANENT_TERMINATION rebar.lock is updated to get newer osmo_gsup containing several enum defines. Change-Id: I57f2e02dc4034b63c118e4a4139b2830e38a2138 --- M config/sys.config M rebar.lock M src/aaa_diameter_s6b.erl M src/aaa_diameter_s6b_cb.erl M src/aaa_diameter_swm.erl M src/aaa_diameter_swx_cb.erl M src/aaa_ue_fsm.erl M src/conv.erl M src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl M src/gsup_server.erl 11 files changed, 441 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/62/36262/7 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36262?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I57f2e02dc4034b63c118e4a4139b2830e38a2138 Gerrit-Change-Number: 36262 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Several fixes to TC_hss_initiated_deregister_permanent_termination

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36275?usp=email ) Change subject: epdg: Several fixes to TC_hss_initiated_deregister_permanent_termination ...................................................................... epdg: Several fixes to TC_hss_initiated_deregister_permanent_termination I forgot to submit some fixes before merging. Fixes: a7823b96cb566dd9ce6a9f640803833c9f6c6a9f Change-Id: Ic4d0d649221d669dee32edeb94b89e95ec1b1c08 --- M epdg/EPDG_Tests.ttcn 1 file changed, 25 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/36275/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 71b65c0..bc4219b 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -473,7 +473,8 @@ /* Send RTR as HSS to AAA server, expect back RTA */ private function f_DIA_SWx_RT(template (value) CxDx_3GPP_Reason_Code reason_code, - template (present) GenericAVP exp_result_tmpl := tr_AVP_ResultCode(DIAMETER_SUCCESS)) runs on EPDG_ConnHdlr { + template (present) GenericAVP exp_result_tmpl := tr_AVP_ResultCode(DIAMETER_SUCCESS), + boolean exp_aaa_proc := true) runs on EPDG_ConnHdlr { var PDU_DIAMETER rx_dia; var UINT32 hbh_id := f_rnd_octstring(4); var UINT32 ete_id := f_rnd_octstring(4); @@ -489,12 +490,14 @@ hbh_id := hbh_id, ete_id := ete_id)); - if (match(reason_code_permanent_termination, reason_code)) { + if (match(reason_code_permanent_termination, reason_code) and exp_aaa_proc) { /* Expect Abort-Session procedure (ASR + ASA) in the S6b interface: */ as_DIA_S6b_AS_success(); /* Here AAA-Server starts an ASR + ASA procedure towards ePDG, which forwards it to strongswan: */ as_GSUP_rx_CL_REQ(OSMO_GSUP_CANCEL_TYPE_WITHDRAW); f_GSUP_tx_CL_RES(); + /* No need to so STR+STA, since the session was already aborted above during ASR+ASA: */ + as_GTP2C_DeleteSession_success(do_s6b_st_proc := false); } alt { @@ -566,7 +569,7 @@ [] S6b.receive(tr_DIA_S6b_ASR(f_nai())) -> value rx_dia { avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); - SWx.send(ts_DIA_S6b_ASA(DIAMETER_SUCCESS, + S6b.send(ts_DIA_S6b_ASA(DIAMETER_SUCCESS, sess_id := sess_id, hbh_id := rx_dia.hop_by_hop_id, ete_id := rx_dia.end_to_end_id)); @@ -702,7 +705,7 @@ } /* ePDG Deletes session at the PGW. PGW sends Diameter s6b AAR + AAA. */ -private altstep as_GTP2C_DeleteSession_success() runs on EPDG_ConnHdlr { +private altstep as_GTP2C_DeleteSession_success(boolean do_s6b_st_proc := true) runs on EPDG_ConnHdlr { var PDU_GTPCv2 rx_msg; var BearerContextIEs rx_bctx_ies; var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; @@ -710,8 +713,10 @@ var template (value) BearerContextIEs bctx_ies; [] GTP2.receive(tr_GTP2C_DeleteSessionReq(g_pars.teic_local)) -> value rx_msg { - /* Upon rx of DeleteSession, emulate PGW requesting the AAA server for Sesssion Termination. */ - f_S6b_ST_success(); + if (do_s6b_st_proc) { + /* Upon rx of DeleteSession, emulate PGW requesting the AAA server for Sesssion Termination. */ + f_S6b_ST_success(); + } GTP2.send(ts_GTP2C_DeleteSessionResp(g_pars.teic_remote, rx_msg.sequenceNumber, @@ -1121,7 +1126,8 @@ f_DIA_SWx_RT(PERMANENT_TERMINATION, tr_AVP_ResultCode(DIAMETER_SUCCESS)); /* Subscriber was already removed, it should fail if requested again: */ var DIAMETER_ts29_229_ExperimentalResultcode erc := DIAMETER_ERROR_USER_UNKNOWN; - f_DIA_SWx_RT(PERMANENT_TERMINATION, tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4))); + f_DIA_SWx_RT(PERMANENT_TERMINATION, tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4)), + exp_aaa_proc := false); } testcase TC_hss_initiated_deregister_permanent_termination() runs on MTC_CT { var EPDG_ConnHdlrPars pars := f_init_pars(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36275?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic4d0d649221d669dee32edeb94b89e95ec1b1c08 Gerrit-Change-Number: 36275 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pySim-prog: convert from optparse to argparse

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36274?usp=email ) Change subject: pySim-prog: convert from optparse to argparse ...................................................................... pySim-prog: convert from optparse to argparse We already use argparse everywhere else, and we have moved reader-driver argument parsing into the library expecting argparse. Change-Id: I7407496643247c754d002656688e9fdcbcf644a8 --- M pySim-prog.py 1 file changed, 65 insertions(+), 79 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/74/36274/1 diff --git a/pySim-prog.py b/pySim-prog.py index 2911b46..3f506de 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -25,7 +25,7 @@ # import hashlib -from optparse import OptionParser +import argparse import os import random import re @@ -35,7 +35,7 @@ import csv from pySim.commands import SimCardCommands -from pySim.transport import init_reader +from pySim.transport import init_reader, argparse_add_reader_args from pySim.legacy.cards import _cards_classes, card_detect from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc, calculate_luhn, dec_iccid from pySim.ts_51_011 import EF_AD @@ -46,169 +46,146 @@ def parse_options(): - parser = OptionParser(usage="usage: %prog [options]") + parser = argparse.ArgumentParser() + argparse_add_reader_args(parser) - parser.add_option("-d", "--device", dest="device", metavar="DEV", - help="Serial Device for SIM access [default: %default]", - default="/dev/ttyUSB0", - ) - parser.add_option("-b", "--baud", dest="baudrate", type="int", metavar="BAUD", - help="Baudrate used for SIM access [default: %default]", - default=9600, - ) - parser.add_option("-p", "--pcsc-device", dest="pcsc_dev", type='int', metavar="PCSC", - help="Which PC/SC reader number for SIM access", - default=None, - ) - parser.add_option("--modem-device", dest="modem_dev", metavar="DEV", - help="Serial port of modem for Generic SIM Access (3GPP TS 27.007)", - default=None, - ) - parser.add_option("--modem-baud", dest="modem_baud", type="int", metavar="BAUD", - help="Baudrate used for modem's port [default: %default]", - default=115200, - ) - parser.add_option("--osmocon", dest="osmocon_sock", metavar="PATH", - help="Socket path for Calypso (e.g. Motorola C1XX) based reader (via OsmocomBB)", - default=None, - ) - parser.add_option("-t", "--type", dest="type", - help="Card type (user -t list to view) [default: %default]", + parser.add_argument("-t", "--type", dest="type", + help="Card type (user -t list to view) [default: %(default)s]", default="auto", ) - parser.add_option("-T", "--probe", dest="probe", + parser.add_argument("-T", "--probe", dest="probe", help="Determine card type", default=False, action="store_true" ) - parser.add_option("-a", "--pin-adm", dest="pin_adm", + parser.add_argument("-a", "--pin-adm", dest="pin_adm", help="ADM PIN used for provisioning (overwrites default)", ) - parser.add_option("-A", "--pin-adm-hex", dest="pin_adm_hex", + parser.add_argument("-A", "--pin-adm-hex", dest="pin_adm_hex", help="ADM PIN used for provisioning, as hex string (16 characters long", ) - parser.add_option("-e", "--erase", dest="erase", action='store_true', - help="Erase beforehand [default: %default]", + parser.add_argument("-e", "--erase", dest="erase", action='store_true', + help="Erase beforehand [default: %(default)s]", default=False, ) - parser.add_option("-S", "--source", dest="source", - help="Data Source[default: %default]", + parser.add_argument("-S", "--source", dest="source", + help="Data Source[default: %(default)s]", default="cmdline", ) # if mode is "cmdline" - parser.add_option("-n", "--name", dest="name", - help="Operator name [default: %default]", + parser.add_argument("-n", "--name", dest="name", + help="Operator name [default: %(default)s]", default="Magic", ) - parser.add_option("-c", "--country", dest="country", type="int", metavar="CC", - help="Country code [default: %default]", + parser.add_argument("-c", "--country", dest="country", type=int, metavar="CC", + help="Country code [default: %(default)s]", default=1, ) - parser.add_option("-x", "--mcc", dest="mcc", type="string", - help="Mobile Country Code [default: %default]", + parser.add_argument("-x", "--mcc", dest="mcc", + help="Mobile Country Code [default: %(default)s]", default="901", ) - parser.add_option("-y", "--mnc", dest="mnc", type="string", - help="Mobile Network Code [default: %default]", + parser.add_argument("-y", "--mnc", dest="mnc", + help="Mobile Network Code [default: %(default)s]", default="55", ) - parser.add_option("--mnclen", dest="mnclen", type="choice", - help="Length of Mobile Network Code [default: %default]", + parser.add_argument("--mnclen", dest="mnclen", + help="Length of Mobile Network Code [default: %(default)s]", default="auto", choices=["2", "3", "auto"], ) - parser.add_option("-m", "--smsc", dest="smsc", + parser.add_argument("-m", "--smsc", dest="smsc", help="SMSC number (Start with + for international no.) [default: '00 + country code + 5555']", ) - parser.add_option("-M", "--smsp", dest="smsp", + parser.add_argument("-M", "--smsp", dest="smsp", help="Raw SMSP content in hex [default: auto from SMSC]", ) - parser.add_option("-s", "--iccid", dest="iccid", metavar="ID", + parser.add_argument("-s", "--iccid", dest="iccid", metavar="ID", help="Integrated Circuit Card ID", ) - parser.add_option("-i", "--imsi", dest="imsi", + parser.add_argument("-i", "--imsi", dest="imsi", help="International Mobile Subscriber Identity", ) - parser.add_option("--msisdn", dest="msisdn", + parser.add_argument("--msisdn", dest="msisdn", help="Mobile Subscriber Integrated Services Digital Number", ) - parser.add_option("-k", "--ki", dest="ki", + parser.add_argument("-k", "--ki", dest="ki", help="Ki (default is to randomize)", ) - parser.add_option("-o", "--opc", dest="opc", + parser.add_argument("-o", "--opc", dest="opc", help="OPC (default is to randomize)", ) - parser.add_option("--op", dest="op", + parser.add_argument("--op", dest="op", help="Set OP to derive OPC from OP and KI", ) - parser.add_option("--acc", dest="acc", + parser.add_argument("--acc", dest="acc", help="Set ACC bits (Access Control Code). not all card types are supported", ) - parser.add_option("--opmode", dest="opmode", type="choice", + parser.add_argument("--opmode", dest="opmode", help="Set UE Operation Mode in EF.AD (Administrative Data)", default=None, choices=['{:02X}'.format(int(m)) for m in EF_AD.OP_MODE], ) - parser.add_option("-f", "--fplmn", dest="fplmn", action="append", + parser.add_argument("-f", "--fplmn", dest="fplmn", action="append", help="Set Forbidden PLMN. Add multiple time for multiple FPLMNS", ) - parser.add_option("--epdgid", dest="epdgid", + parser.add_argument("--epdgid", dest="epdgid", help="Set Home Evolved Packet Data Gateway (ePDG) Identifier. (Only FQDN format supported)", ) - parser.add_option("--epdgSelection", dest="epdgSelection", + parser.add_argument("--epdgSelection", dest="epdgSelection", help="Set PLMN for ePDG Selection Information. (Only Operator Identifier FQDN format supported)", ) - parser.add_option("--pcscf", dest="pcscf", + parser.add_argument("--pcscf", dest="pcscf", help="Set Proxy Call Session Control Function (P-CSCF) Address. (Only FQDN format supported)", ) - parser.add_option("--ims-hdomain", dest="ims_hdomain", + parser.add_argument("--ims-hdomain", dest="ims_hdomain", help="Set IMS Home Network Domain Name in FQDN format", ) - parser.add_option("--impi", dest="impi", + parser.add_argument("--impi", dest="impi", help="Set IMS private user identity", ) - parser.add_option("--impu", dest="impu", + parser.add_argument("--impu", dest="impu", help="Set IMS public user identity", ) - parser.add_option("--read-imsi", dest="read_imsi", action="store_true", + parser.add_argument("--read-imsi", dest="read_imsi", action="store_true", help="Read the IMSI from the CARD", default=False ) - parser.add_option("--read-iccid", dest="read_iccid", action="store_true", + parser.add_argument("--read-iccid", dest="read_iccid", action="store_true", help="Read the ICCID from the CARD", default=False ) - parser.add_option("-z", "--secret", dest="secret", metavar="STR", + parser.add_argument("-z", "--secret", dest="secret", metavar="STR", help="Secret used for ICCID/IMSI autogen", ) - parser.add_option("-j", "--num", dest="num", type=int, + parser.add_argument("-j", "--num", dest="num", type=int, help="Card # used for ICCID/IMSI autogen", ) - parser.add_option("--batch", dest="batch_mode", - help="Enable batch mode [default: %default]", + parser.add_argument("--batch", dest="batch_mode", + help="Enable batch mode [default: %(default)s]", default=False, action='store_true', ) - parser.add_option("--batch-state", dest="batch_state", metavar="FILE", + parser.add_argument("--batch-state", dest="batch_state", metavar="FILE", help="Optional batch state file", ) # if mode is "csv" - parser.add_option("--read-csv", dest="read_csv", metavar="FILE", + parser.add_argument("--read-csv", dest="read_csv", metavar="FILE", help="Read parameters from CSV file rather than command line") - parser.add_option("--write-csv", dest="write_csv", metavar="FILE", + parser.add_argument("--write-csv", dest="write_csv", metavar="FILE", help="Append generated parameters in CSV file", ) - parser.add_option("--write-hlr", dest="write_hlr", metavar="FILE", + parser.add_argument("--write-hlr", dest="write_hlr", metavar="FILE", help="Append generated parameters to OpenBSC HLR sqlite3", ) - parser.add_option("--dry-run", dest="dry_run", + parser.add_argument("--dry-run", dest="dry_run", help="Perform a 'dry run', don't actually program the card", default=False, action="store_true") - parser.add_option("--card_handler", dest="card_handler_config", metavar="FILE", + parser.add_argument("--card_handler", dest="card_handler_config", metavar="FILE", help="Use automatic card handling machine") - (options, args) = parser.parse_args() + options = parser.parse_args() if options.type == 'list': for kls in _cards_classes: @@ -242,9 +219,6 @@ parser.error( "Can't give ICCID/IMSI for batch mode, need to use automatic parameters ! see --num and --secret for more information") - if args: - parser.error("Extraneous arguments") - return options -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36274?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7407496643247c754d002656688e9fdcbcf644a8 Gerrit-Change-Number: 36274 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: pcsc: open reader/card in EXCLUSIVE mode by default

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/36273?usp=email to look at the new patch set (#2). Change subject: pcsc: open reader/card in EXCLUSIVE mode by default ...................................................................... pcsc: open reader/card in EXCLUSIVE mode by default There was a support request hinting that other applications concurrently accessed the SIM and were messing up the card state while pySim-shell was running. Let's avoid such situations by opening the card/reader in EXCLUSIVE mode by default. If somebody really has a special use case, they can now add the --pcsc-shared flag to restore the legacy behavior (SHARED mode). Change-Id: I90d887714b559a4604708d3c6dd23b5e05f40576 --- M pySim/transport/pcsc.py 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/73/36273/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36273?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I90d887714b559a4604708d3c6dd23b5e05f40576 Gerrit-Change-Number: 36273 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: pcsc: open reader/card in EXCLUSIVE mode by default

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36273?usp=email ) Change subject: pcsc: open reader/card in EXCLUSIVE mode by default ...................................................................... pcsc: open reader/card in EXCLUSIVE mode by default There were some support request hinting that other applications concurrently accesse the SIM and were messing up the card state while pySim-shell was running. Let's avoid such situations by opening the card/reader in EXCLUSIVE mode by default. If somebody really has a special use case, they can now add the --pcsc-shared flag to restore the legacy behavior (SHARED mode). Change-Id: I90d887714b559a4604708d3c6dd23b5e05f40576 --- M pySim/transport/pcsc.py 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/73/36273/1 diff --git a/pySim/transport/pcsc.py b/pySim/transport/pcsc.py index 47976ae..9198816 100644 --- a/pySim/transport/pcsc.py +++ b/pySim/transport/pcsc.py @@ -25,6 +25,7 @@ from smartcard.CardRequest import CardRequest from smartcard.Exceptions import NoCardException, CardRequestTimeoutException, CardConnectionException from smartcard.System import readers +from smartcard.ExclusiveConnectCardConnection import ExclusiveConnectCardConnection from pySim.exceptions import NoCardError, ProtocolError, ReaderError from pySim.transport import LinkBase @@ -56,6 +57,8 @@ raise ReaderError('No matching reader found for regex %s' % opts.pcsc_regex) self._con = self._reader.createConnection() + if not opts.pcsc_shared: + self._con = ExclusiveConnectCardConnection(self._con) def __del__(self): try: @@ -119,6 +122,8 @@ Windows, MacOS X and Linux. Most vendors of smart card readers provide drivers that offer a PC/SC interface, if not even a generic USB CCID driver is used. You can use a tool like ``pcsc_scan -r`` to obtain a list of readers available on your system. """) + pcsc_group.add_argument('--pcsc-shared', action='store_true', + help='Open PC/SC reaer in SHARED access (default: EXCLUSIVE)') dev_group = pcsc_group.add_mutually_exclusive_group() dev_group.add_argument('-p', '--pcsc-device', type=int, dest='pcsc_dev', metavar='PCSC', default=None, help='Number of PC/SC reader to use for SIM access') -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36273?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I90d887714b559a4604708d3c6dd23b5e05f40576 Gerrit-Change-Number: 36273 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: run io_uring tests on specific nodes

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36272?usp=email ) Change subject: jobs/ttcn3: run io_uring tests on specific nodes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If917806f9056fdf99863f4132f44659b2bfd44c3 Gerrit-Change-Number: 36272 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 13:14:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: run io_uring tests on specific nodes

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36272?usp=email ) Change subject: jobs/ttcn3: run io_uring tests on specific nodes ...................................................................... jobs/ttcn3: run io_uring tests on specific nodes io_uring_queue_init fails on some of the jenkins nodes running the TTCN3 testsuites with io_uring. It seems that the kernel is too old on these nodes. Run the testsuites only on jenkins nodes with the new ttcn3-io_uring label, which have a recent kernel. Related: OS#6357 Change-Id: If917806f9056fdf99863f4132f44659b2bfd44c3 --- M jobs/ttcn3-testsuites.yml 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/72/36272/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 9497238..71bcb81 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -207,16 +207,22 @@ # With LIBOSMO_IO_BACKEND=IO_URING (OS#6357) - ttcn3-bsc-test-io_uring: timer: H 11 * * * + node: ttcn3-io_uring - ttcn3-msc-test-io_uring: timer: H 11 * * * + node: ttcn3-io_uring - ttcn3-hnbgw-test-io_uring: timer: H 11 * * * + node: ttcn3-io_uring - ttcn3-gbproxy-test-io_uring: timer: H 11 * * * + node: ttcn3-io_uring - ttcn3-sgsn-test-io_uring: timer: H 11 * * * + node: ttcn3-io_uring - ttcn3-stp-test-io_uring: timer: H 11 * * * + node: ttcn3-io_uring - job-template: name: '{job-name}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If917806f9056fdf99863f4132f44659b2bfd44c3 Gerrit-Change-Number: 36272 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-ci[master]: ttcn3: add ttcn3-stp-test-io_uring

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36271?usp=email ) Change subject: ttcn3: add ttcn3-stp-test-io_uring ...................................................................... ttcn3: add ttcn3-stp-test-io_uring Related: OS#6357 Change-Id: I996dee2f9ce27fcdd8771fa22379aa606192824d --- M jobs/ttcn3-testsuites.yml 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved jolly: Looks good to me, but someone else must approve diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 7b44cca..9497238 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -215,6 +215,8 @@ timer: H 11 * * * - ttcn3-sgsn-test-io_uring: timer: H 11 * * * + - ttcn3-stp-test-io_uring: + timer: H 11 * * * - job-template: name: '{job-name}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36271?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I996dee2f9ce27fcdd8771fa22379aa606192824d Gerrit-Change-Number: 36271 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024