- gerrit-log - lists.osmocom.org

[S] Change in libosmo-abis[rel-1.4.2]: Bump version: 1.4.1.2-a5ac → 1.4.2
by fixeria 14 Mar '24

14 Mar '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36279?usp=email ) Change subject: Bump version: 1.4.1.2-a5ac → 1.4.2 ...................................................................... Bump version: 1.4.1.2-a5ac → 1.4.2 Change-Id: I9072cd5c89d2deb0eb75f47c8fd04ad175549e41 --- M debian/changelog M src/Makefile.am 2 files changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/79/36279/1 diff --git a/debian/changelog b/debian/changelog index 01a7089..f2eae12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libosmo-abis (1.4.2) unstable; urgency=medium + + [ Harald Welte ] + * input/ipaccess: Make sure to say "TCP keepalive" + * Fix critical bug in default TCP keepalive user timeout + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Fri, 15 Mar 2024 00:11:56 +0700 + libosmo-abis (1.4.1) unstable; urgency=medium [ Oliver Smith ] diff --git a/src/Makefile.am b/src/Makefile.am index 2c99150..6f94c9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -ABIS_LIBVERSION=12:0:2 +ABIS_LIBVERSION=12:1:2 TRAU_LIBVERSION=8:0:6 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36279?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.4.2 Gerrit-Change-Id: I9072cd5c89d2deb0eb75f47c8fd04ad175549e41 Gerrit-Change-Number: 36279 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: jobs/ttcn3: run io_uring tests on specific nodes
by laforge 14 Mar '24

14 Mar '24

Attention is currently required from: osmith. laforge 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 (1 comment) Patchset: PS1: which nodes specifically? hard to investigate without details. In general, debian11 also already supports io_uring and has liburing. Maybe it is related to using the debian12-liburing on a debian11 system? OS#6357 also contains no related info -- 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 16:49:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Several fixes to TC_hss_initiated_deregister_permanent_termination
by pespin 14 Mar '24

14 Mar '24

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved 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-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Several fixes to TC_hss_initiated_deregister_permanent_termination
by pespin 14 Mar '24

14 Mar '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36275?usp=email ) Change subject: epdg: Several fixes to TC_hss_initiated_deregister_permanent_termination ...................................................................... Patch Set 1: Code-Review+2 -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 16:44:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-gsm-manuals[master]: gsup: Document ePDG Tunnel Req/Res/Err
by pespin 14 Mar '24

14 Mar '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/36276?usp=email ) Change subject: gsup: Document ePDG Tunnel Req/Res/Err ...................................................................... gsup: Document ePDG Tunnel Req/Res/Err Related: OS#6091 Change-Id: I9d98d0fbb2d4d006bc980b40828ea38f358d7108 --- M common/chapters/gsup.adoc 1 file changed, 60 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/76/36276/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index d88c579..f5cce14 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -1088,6 +1088,53 @@ |31|Session State|<<gsup-ie-session-state>>|O|TLV|3 |=== +[[gsup-msg-epdg-tunnel-req]] +==== ePDG Tunnel Request + +Direction: GSUP Client (strongswan) => GSUP Server (ePDG) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<<gsup-ie-msgtype>>|M|V|1 +|01|IMSI|<<gsup-ie-imsi>>|M|TLV|2-10 +|0a|Message Class|<<gsup-ie-message-class>>|M|TLV|3 +|15|PCO|<<gsup-ie-pco>>|O|TLV|1-... +|28|CN Domain|<<gsup-ie-cndomain>>|O|TLV|3 +|60|Source Name|<<gsup-ie-source-name>>|O|TLV|2-... +|=== + +[[gsup-msg-epdg-tunnel-err]] +==== ePDG Tunnel Error + +Direction: GSUP Server (ePDG) => GSUP Client (strongswan) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<<gsup-ie-msgtype>>|M|V|1 +|01|IMSI|<<gsup-ie-imsi>>|M|TLV|2-10 +|0a|Message Class|<<gsup-ie-message-class>>|M|TLV|3 +|02|Cause|<<gsup-ie-cause>>|M|TLV|3 +|=== + +[[gsup-msg-epdg-tunnel-res]] +==== ePDG Tunnel Result + +Direction: GSUP Server (ePDG) => GSUP Client (strongswan) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<<gsup-ie-msgtype>>|M|V|1 +|01|IMSI|<<gsup-ie-imsi>>|M|TLV|2-10 +|0a|Message Class|<<gsup-ie-message-class>>|M|TLV|3 +|04|PDP info complete|<<gsup-ie-empty>>|M|TLV|2 +|05|PDP info|<<gsup-ie-pdpinfo>>|M|TLV|2-N +|15|PCO|<<gsup-ie-pco>>|O|TLV|1-... +|28|CN Domain|<<gsup-ie-cndomain>>|O|TLV|3 +|60|Source Name|<<gsup-ie-source-name>>|O|TLV|2-... +|=== === Information Elements @@ -1145,6 +1192,9 @@ |0x47|E Close|<<gsup-msg-e-close>> |0x4B|E Abort|<<gsup-msg-e-abort>> |0x4E|E Routing Error|<<gsup-msg-e-routing-err>> +|0x50|ePDG Tunnel Request|<<gsup-msg-epdg-tunnel-req>> +|0x51|ePDG Tunnel Error|<<gsup-msg-epdg-tunnel-err>> +|0x52|ePDG Tunnel Result|<<gsup-msg-epdg-tunnel-res>> |=== The category of the message is indicated by the last two bits of the type. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/36276?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I9d98d0fbb2d4d006bc980b40828ea38f358d7108 Gerrit-Change-Number: 36276 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in ...osmo-epdg[master]: Implement RTR Deregistration-Reason PERMANENT_TERMINATION
by pespin 14 Mar '24

14 Mar '24

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 0

[L] Change in ...osmo-epdg[master]: Implement RTR Deregistration-Reason PERMANENT_TERMINATION
by pespin 14 Mar '24

14 Mar '24

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 0

[L] Change in ...osmo-epdg[master]: Implement RTR Deregistration-Reason PERMANENT_TERMINATION
by pespin 14 Mar '24

14 Mar '24

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 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Several fixes to TC_hss_initiated_deregister_permanent_termination
by pespin 14 Mar '24

14 Mar '24

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 0

[M] Change in pysim[master]: pySim-prog: convert from optparse to argparse
by laforge 14 Mar '24

14 Mar '24

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 0

2026

2025

2024

2023

2022

gerrit-log