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

[M] Change in osmo-ttcn3-hacks[master]: asterisk: AMI: Implement AuthReq procedure

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36871?usp=email ) Change subject: asterisk: AMI: Implement AuthReq procedure ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36871?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: I77aeeb79cbddfc515e1626385f1b176da7319ba0 Gerrit-Change-Number: 36871 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 22 May 2024 16:33:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Send P-Associated-URI in IMS Register Response

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36907?usp=email ) Change subject: asterisk: Send P-Associated-URI in IMS Register Response ...................................................................... asterisk: Send P-Associated-URI in IMS Register Response Change-Id: I4c163f34c052d0463baba799c44fecaaa15be394 --- M asterisk/IMS_ConnectionHandler.ttcn M library/SIP_Templates.ttcn 2 files changed, 62 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/36907/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 091f5da..a55935a 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -66,6 +66,7 @@ charstring user, charstring display_name, charstring password, + charstring msisdn, /* Expected User-Location-Info in P-Access-Network-Info */ charstring uli_str, octetstring rand, @@ -150,6 +151,7 @@ user := user, display_name := f_sip_str_quote(display_name), password := password, + msisdn := "90828", uli_str := "2380100010000101", /* The Nonce field is the Base64 encoded version of the RAND value and concatenated with the AUTN: */ rand := '14987631f65f8e3788a0798b6ebcd08e'O, @@ -404,6 +406,7 @@ var template (value) SipAddr to_addr; var template (value) CommaParam_List digestCln ; var template (value) WwwAuthenticate wwwAuthenticate; + var template (value) P_Associated_Uri p_associated_uri := ts_P_Associated_Uri({}); var template (value) Security_server security_server; var template (value) Server server_name := ts_Server({c_sip_server_name}); var template (value) Require require := ts_Require({"sec-agree"}); @@ -487,6 +490,7 @@ wwwAuthenticate, sip_seq_nr, "REGISTER", + p_associated_uri := p_associated_uri, security_server := security_server, server := server_name, supported := supported, @@ -537,6 +541,16 @@ /* Validate P-Access-Network-Info: */ f_ims_validate_register_P_Access_Network_info(g_rx_sip_req, exp_present := true); + p_associated_uri := ts_P_Associated_Uri({ + ts_P_Assoc_uri_spec(ts_NameAddr(ts_SipUrl(ts_HostPort(g_pars.realm), + ts_UserInfo(g_pars.msisdn), + scheme := "sip"))), + ts_P_Assoc_uri_spec(ts_NameAddr(ts_SipUrl(ts_HostPort(g_pars.msisdn), + omit, + scheme := "tel"))), + ts_P_Assoc_uri_spec(g_rx_sip_req.msgHeader.toField.addressField.nameAddr) + }); + /* Tx 200 OK */ to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); tx_resp := ts_SIP_Response(sip_call_id, @@ -546,6 +560,7 @@ sip_seq_nr, "OK", via, + p_associated_uri := p_associated_uri, require := require, server := server_name, supported := supported, diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 56404da..72a4426 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -37,16 +37,18 @@ } template (value) SipUrl ts_SipUrl(template (value) HostPort host_port, - template (omit) UserInfo user_info := omit) := { - scheme := "sip", + template (omit) UserInfo user_info := omit, + template (value) charstring scheme := "sip") := { + scheme := scheme, userInfo := user_info, hostPort := host_port, urlParameters := omit, headers := omit } template (present) SipUrl tr_SipUrl(template (present) HostPort host_port := ?, - template UserInfo user_info := *) := { - scheme := "sip", + template UserInfo user_info := *, + template (present) charstring scheme := "sip") := { + scheme := scheme, userInfo := user_info, hostPort := host_port, urlParameters := *, @@ -54,8 +56,9 @@ } template (value) SipUrl ts_SipUrlHost(template (value) charstring host, - template (omit) integer portField := omit) - := ts_SipUrl(ts_HostPort(host, portField)); + template (omit) integer portField := omit, + template (value) charstring scheme := "sip") + := ts_SipUrl(ts_HostPort(host, portField), scheme := scheme); function ts_SipUrl_from_Addr_Union(template (value) Addr_Union au) return template (value) SipUrl { @@ -241,6 +244,27 @@ access_net_specs := access_net_specs } +// [RFC3455 4.1] +template (present) P_Assoc_uri_spec tr_P_Assoc_uri_spec(template (present) NameAddr p_asso_uri := ?, + template SemicolonParam_List ai_params := *) := { + p_asso_uri := p_asso_uri, + ai_params := ai_params +} +template (value) P_Assoc_uri_spec ts_P_Assoc_uri_spec(template (value) NameAddr p_asso_uri, + template (omit) SemicolonParam_List ai_params := omit) := { + p_asso_uri := p_asso_uri, + ai_params := ai_params +} + +// [RFC3455 4.1] +template (present) P_Associated_Uri tr_P_Associated_Uri(template (present) P_Assoc_uri_spec_list p_assoc_uris := ?) := { + fieldName := P_ASSOCIATED_URI, + p_assoc_uris := p_assoc_uris +} +template (value) P_Associated_Uri ts_P_Associated_Uri(template (value) P_Assoc_uri_spec_list p_assoc_uris := {}) := { + fieldName := P_ASSOCIATED_URI, + p_assoc_uris := p_assoc_uris +} // [20.32] template (value) Require ts_Require(template (value) OptionTag_List optionsTags := {}) := { @@ -588,6 +612,7 @@ template (omit)Authorization authorization := omit, template (omit) Allow allow := ts_Allow(c_SIP_defaultMethods), template (omit) Expires expires := omit, + template (omit) P_Associated_Uri p_associated_uri := omit, template (omit) Require require := omit, template (omit) Security_client security_client := omit, template (omit) Security_server security_server := omit, @@ -616,6 +641,7 @@ addressField := from_addr.addr, fromParams := from_addr.params }, + p_associated_uri := p_associated_uri, require := require, security_client := security_client, security_server := security_server, @@ -644,6 +670,7 @@ template Allow allow := *, template Authorization authorization := *, template Expires expires := *, + template P_Associated_Uri p_associated_uri := *, template Require require := *, template Security_client security_client := *, template Security_server security_server := *, @@ -672,6 +699,7 @@ addressField := from_addr.addr, fromParams := from_addr.params }, + p_associated_uri := p_associated_uri, require := require, security_client := security_client, security_server := security_server, @@ -864,6 +892,7 @@ charstring reason, Via via, template (omit) Allow allow := omit, + template (omit) P_Associated_Uri p_associated_uri := omit, template (omit) Require require := omit, template (omit) Server server := omit, template (omit) Supported supported := omit, @@ -875,6 +904,7 @@ content_length := f_ContentLength(body), content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), allow := allow, + p_associated_uri := p_associated_uri, require := require, server := server, supported := supported, @@ -936,6 +966,7 @@ integer seq_nr, charstring method := "REGISTER", template (omit) Allow allow := omit, + template (omit) P_Associated_Uri p_associated_uri := omit, template (omit) Security_server security_server := omit, template (omit) Server server := omit, template (omit) Supported supported := omit, @@ -947,6 +978,7 @@ content_length := f_ContentLength(body), content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), allow := allow, + p_associated_uri := p_associated_uri, security_server := security_server, server := server, supported := supported, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36907?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: I4c163f34c052d0463baba799c44fecaaa15be394 Gerrit-Change-Number: 36907 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: f_sip_SipUrl_to_str(): Print username if present

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36905?usp=email ) Change subject: SIP_Templates: f_sip_SipUrl_to_str(): Print username if present ...................................................................... SIP_Templates: f_sip_SipUrl_to_str(): Print username if present Since now user is printed, adapt existing user in Asterisk_Tests to use the proper field. Change-Id: Ifb1470768222ddee1b1d96ecb9153412ed10fd42 --- M asterisk/IMS_ConnectionHandler.ttcn M library/SIP_Templates.ttcn 2 files changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/36905/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 0d11922..091f5da 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -503,7 +503,7 @@ */ authorization := f_tr_Authorization_AKAv1MD5(valueof(wwwAuthenticate), g_pars.user & "@" & g_pars.realm, - f_sip_SipUrl_to_str(g_pars.registrar_sip_record.addr.nameAddr.addrSpec)); + f_sip_SipUrl_to_str(g_pars.registrar_sip_req_uri)); /* TODO: match Authorization from above: */ exp_req := tr_SIP_REGISTER(g_pars.registrar_sip_req_uri, diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 7da56bc..56404da 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -1426,7 +1426,11 @@ } function f_sip_SipUrl_to_str(SipUrl uri) return charstring { - var charstring str := uri.scheme & ":" & f_sip_HostPort_to_str(uri.hostPort); + var charstring str := uri.scheme & ":"; + if (ispresent(uri.userInfo)) { + str := str & uri.userInfo.userOrTelephoneSubscriber & "@"; + } + str := str & f_sip_HostPort_to_str(uri.hostPort); return str; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36905?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: Ifb1470768222ddee1b1d96ecb9153412ed10fd42 Gerrit-Change-Number: 36905 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: AMI: Wait for Event Registry after IMS REGISTER

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36906?usp=email ) Change subject: asterisk: AMI: Wait for Event Registry after IMS REGISTER ...................................................................... asterisk: AMI: Wait for Event Registry after IMS REGISTER Change-Id: I735a4298ec0d13009d8971880fe870810608d7e0 --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.ttcn 2 files changed, 52 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/36906/1 diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index be1be70..a82af97 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -27,11 +27,14 @@ const charstring AMI_FIELD_ACTION := "Action"; const charstring AMI_FIELD_ACTION_ID := "ActionID"; +const charstring AMI_FIELD_CHAN_TYPE := "ChannelType"; +const charstring AMI_FIELD_DOMAIN := "Domain"; const charstring AMI_FIELD_EVENT := "Event"; const charstring AMI_FIELD_INFO := "Info"; -const charstring AMI_FIELD_USERNAME := "Username"; -const charstring AMI_FIELD_SECRET := "Secret"; const charstring AMI_FIELD_RESPONSE := "Response"; +const charstring AMI_FIELD_SECRET := "Secret"; +const charstring AMI_FIELD_STATUS := "Status"; +const charstring AMI_FIELD_USERNAME := "Username"; /* Extensions: */ const charstring AMI_FIELD_ALGORITHM := "Algorithm"; @@ -85,13 +88,19 @@ template (value) AMI_Field ts_AMI_Field_ActionId(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_ACTION_ID, val); template (value) AMI_Field +ts_AMI_Field_ChannelType(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_CHAN_TYPE, val); +template (value) AMI_Field +ts_AMI_Field_Domain(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_DOMAIN, val); +template (value) AMI_Field ts_AMI_Field_Event(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_EVENT, val); template (value) AMI_Field ts_AMI_Field_Info(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_INFO, val); template (value) AMI_Field -ts_AMI_Field_Username(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_USERNAME, val); -template (value) AMI_Field ts_AMI_Field_Secret(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_SECRET, val); +template (value) AMI_Field +ts_AMI_Field_Status(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_STATUS, val); +template (value) AMI_Field +ts_AMI_Field_Username(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_USERNAME, val); /* Extensions: */ template (value) AMI_Field ts_AMI_Field_Algorithm(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_ALGORITHM, val); @@ -115,15 +124,21 @@ template (present) AMI_Field tr_AMI_Field_ActionId(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_ACTION_ID, val); template (present) AMI_Field +tr_AMI_Field_ChannelType(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_CHAN_TYPE, val); +template (present) AMI_Field +tr_AMI_Field_Domain(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_DOMAIN, val); +template (present) AMI_Field tr_AMI_Field_Event(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_EVENT, val); template (present) AMI_Field tr_AMI_Field_Info(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_INFO, val); template (present) AMI_Field -tr_AMI_Field_Username(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val); +tr_AMI_Field_Response(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_RESPONSE, val); template (present) AMI_Field tr_AMI_Field_Secret(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_SECRET, val); template (present) AMI_Field -tr_AMI_Field_Response(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_RESPONSE, val); +tr_AMI_Field_Status(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_STATUS, val); +template (present) AMI_Field +tr_AMI_Field_Username(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val); /* Extensions: */ template (present) AMI_Field tr_AMI_Field_Algorithm(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_ALGORITHM, val); @@ -304,6 +319,25 @@ tr_AMI_Field_AUTN(autn) ); +/* Event: Registry + * Privilege: system,all + * ChannelType: PJSIP + * Username: sip:238010000090828@172.18.155.103 + * Domain: sip:172.18.155.103 + * Status: Registered + */ +template (present) AMI_Msg +tr_AMI_Event_Registry(template (present) charstring username := ?, + template (present) charstring domain := ?, + template (present) charstring status := ?, + template (present) charstring chan_type := "PJSIP") := superset( + tr_AMI_Field_Event("Registry"), + tr_AMI_Field_ChannelType(chan_type), + tr_AMI_Field_Username(username), + tr_AMI_Field_Domain(domain), + tr_AMI_Field_Status(status) +); + /*********************** * Adapter: ***********************/ diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 6852a57..e7d0616 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -400,13 +400,9 @@ ck := "9a6460bcc3c84a3eac69455a93b67a77", ik := "5238297dfcca759bd05d48ff49bc63fa"); - /* TODO: once registration is successful, rx: - * Event: Registry - * ChannelType: pjsip - * Username: <value> - * Domain: <value> - * Status: <value> - * Cause: <value> */ + AMI_CLIENT.receive(tr_AMI_Event_Registry(f_sip_SipAddr_to_str(pars.local_sip_record), + "sip:" & mp_local_ims_host, + "Registered")); /* TODO: test "Action: PJSIPUnregister" */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36906?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: I735a4298ec0d13009d8971880fe870810608d7e0 Gerrit-Change-Number: 36906 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in pysim[master]: pySim/cat: Fix contruct for Address class/IE

by Jenkins Builder

Attention is currently required from: laforge. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36839?usp=email ) Change subject: pySim/cat: Fix contruct for Address class/IE ...................................................................... Patch Set 2: (1 comment) File smpp_ota_apdu2.py: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16251): https://gerrit.osmocom.org/c/pysim/+/36839/comment/da9be05c_a5613ab5 PS2, Line 97: trailing whitespace -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36839?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: Idf8326298cab7ebc68b09c7e829bfc2061222f51 Gerrit-Change-Number: 36839 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 22 May 2024 16:17:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in pysim[master]: osmo-smdpp.py: Resolve possible variable use before assignment

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36902?usp=email ) Change subject: osmo-smdpp.py: Resolve possible variable use before assignment ...................................................................... osmo-smdpp.py: Resolve possible variable use before assignment osmo-smdpp.py:374:72: E0601: Using variable 'iccid_str' before assignment (used-before-assignment) Let's raise an exception in the erroneous case. Change-Id: I01b308226e12f91699b1b5c6bb06f853be47e185 --- M osmo-smdpp.py 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/02/36902/1 diff --git a/osmo-smdpp.py b/osmo-smdpp.py index 1f4311d..3dc6131 100755 --- a/osmo-smdpp.py +++ b/osmo-smdpp.py @@ -368,6 +368,9 @@ pes = saip.ProfileElementSequence.from_der(f.read()) iccid_str = b2h(pes.get_pe_for_type('header').decoded['iccid']) + # make pylint happy: E0601: Using variable 'iccid_str' before assignment (used-before-assignment) + assert iccid_str + # FIXME: we actually want to perform the profile binding herr, and read the profile metadat from the profile # Put together profileMetadata + _bin -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36902?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: I01b308226e12f91699b1b5c6bb06f853be47e185 Gerrit-Change-Number: 36902 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in pysim[master]: pySim-trace.py: Resolve possible variable use before assignment

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36904?usp=email ) Change subject: pySim-trace.py: Resolve possible variable use before assignment ...................................................................... pySim-trace.py: Resolve possible variable use before assignment pySim-trace.py:198:27: E0606: Possibly using variable 's' before assignment (possibly-used-before-assignment) Change-Id: I28c137a20143b2cd6ea9a0d5461ab61fcd6fe935 --- M pySim-trace.py 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/36904/1 diff --git a/pySim-trace.py b/pySim-trace.py index be1d40b..165e338 100755 --- a/pySim-trace.py +++ b/pySim-trace.py @@ -194,6 +194,8 @@ s = PysharkRsproLive(opts.interface) elif opts.source == 'gsmtap-pyshark-pcap': s = PysharkGsmtapPcap(opts.pcap_file) + else: + raise ValueError("unsupported source %s", opts.source) tracer = Tracer(source=s, suppress_status=opts.suppress_status, suppress_select=opts.suppress_select, show_raw_apdu=opts.show_raw_apdu) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36904?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: I28c137a20143b2cd6ea9a0d5461ab61fcd6fe935 Gerrit-Change-Number: 36904 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in pysim[master]: pySim-prog.py: Resolve possible variable use before assignment

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36903?usp=email ) Change subject: pySim-prog.py: Resolve possible variable use before assignment ...................................................................... pySim-prog.py: Resolve possible variable use before assignment pySim-prog.py:741:7: E0606: Possibly using variable 'cp' before assignment (possibly-used-before-assignment) Change-Id: I6ab307db378d2ca76dfeae53dc3befa7c103974d --- M pySim-prog.py 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/03/36903/1 diff --git a/pySim-prog.py b/pySim-prog.py index 3f506de..db9c327 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -723,6 +723,7 @@ card.erase() card.reset() + cp = None # Generate parameters if opts.source == 'cmdline': cp = gen_parameters(opts) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36903?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: I6ab307db378d2ca76dfeae53dc3befa7c103974d Gerrit-Change-Number: 36903 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in pysim[master]: euicc.py: Resolve possible variable use before assignment

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36901?usp=email ) Change subject: euicc.py: Resolve possible variable use before assignment ...................................................................... euicc.py: Resolve possible variable use before assignment pySim/euicc.py:436:31: E0606: Possibly using variable 'p_id' before assignment (possibly-used-before-assignment) pySim/euicc.py:455:31: E0606: Possibly using variable 'p_id' before assignment (possibly-used-before-assignment) pySim/euicc.py:473:31: E0606: Possibly using variable 'p_id' before assignment (possibly-used-before-assignment) Let's raise an exception in the erroneous case. Change-Id: Ifdf4651e503bae6ea3e91c89c2121b416a12fb1a --- M pySim/euicc.py 1 file changed, 27 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/36901/1 diff --git a/pySim/euicc.py b/pySim/euicc.py index c27c91f..7f4cdda 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -429,8 +429,11 @@ """Perform an ES10c EnableProfile function.""" if opts.isdp_aid: p_id = ProfileIdentifier(children=[IsdpAid(decoded=opts.isdp_aid)]) - if opts.iccid: + elif opts.iccid: p_id = ProfileIdentifier(children=[Iccid(decoded=opts.iccid)]) + else: + # this is guaranteed by argparse; but we need this to make pylint happy + raise ValueError('Either ISD-P AID or ICCID must be given') ep_cmd_contents = [p_id, RefreshFlag(decoded=opts.refresh_required)] ep_cmd = EnableProfileReq(children=ep_cmd_contents) ep = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, ep_cmd, EnableProfileResp) @@ -448,8 +451,11 @@ """Perform an ES10c DisableProfile function.""" if opts.isdp_aid: p_id = ProfileIdentifier(children=[IsdpAid(decoded=opts.isdp_aid)]) - if opts.iccid: + elif opts.iccid: p_id = ProfileIdentifier(children=[Iccid(decoded=opts.iccid)]) + else: + # this is guaranteed by argparse; but we need this to make pylint happy + raise ValueError('Either ISD-P AID or ICCID must be given') dp_cmd_contents = [p_id, RefreshFlag(decoded=opts.refresh_required)] dp_cmd = DisableProfileReq(children=dp_cmd_contents) dp = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, dp_cmd, DisableProfileResp) @@ -466,8 +472,11 @@ """Perform an ES10c DeleteProfile function.""" if opts.isdp_aid: p_id = IsdpAid(decoded=opts.isdp_aid) - if opts.iccid: + elif opts.iccid: p_id = Iccid(decoded=opts.iccid) + else: + # this is guaranteed by argparse; but we need this to make pylint happy + raise ValueError('Either ISD-P AID or ICCID must be given') dp_cmd_contents = [p_id] dp_cmd = DeleteProfileReq(children=dp_cmd_contents) dp = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc, dp_cmd, DeleteProfileResp) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36901?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: Ifdf4651e503bae6ea3e91c89c2121b416a12fb1a Gerrit-Change-Number: 36901 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in pysim[master]: commands.py: Resolve possible variable use before assignment

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36899?usp=email ) Change subject: commands.py: Resolve possible variable use before assignment ...................................................................... commands.py: Resolve possible variable use before assignment pySim/commands.py:223:18: E0606: Possibly using variable 'skip' before assignment (possibly-used-before-assignment) Let's raise an exception in the erroneous case. Change-Id: Id1a892c3446e472699e77f076c2414277e92c98d --- M pySim/commands.py 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/99/36899/1 diff --git a/pySim/commands.py b/pySim/commands.py index 9a49124..08537bd 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -211,6 +211,7 @@ # checking if the length of the remaining TLV string matches # what we get in the length field. # See also ETSI TS 102 221, chapter 11.1.1.3.0 Base coding. + # TODO: this likely just is normal BER-TLV ("All data objects are BER-TLV except if otherwise # defined.") exp_tlv_len = int(fcp[2:4], 16) if len(fcp[4:]) // 2 == exp_tlv_len: skip = 4 @@ -218,6 +219,7 @@ exp_tlv_len = int(fcp[2:6], 16) if len(fcp[4:]) // 2 == exp_tlv_len: skip = 6 + raise ValueError('Cannot determine length of TLV-length') # Skip FCP tag and length tlv = fcp[skip:] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36899?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: Id1a892c3446e472699e77f076c2414277e92c98d Gerrit-Change-Number: 36899 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024