- gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: pcsc: open reader/card in EXCLUSIVE mode by default
by laforge 14 Mar '24

14 Mar '24

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 0

[S] Change in pysim[master]: pcsc: open reader/card in EXCLUSIVE mode by default
by laforge 14 Mar '24

14 Mar '24

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 0

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

14 Mar '24

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 0

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

14 Mar '24

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 0

[S] Change in osmo-ci[master]: ttcn3: add ttcn3-stp-test-io_uring
by osmith 14 Mar '24

14 Mar '24

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 0

[S] Change in osmo-ci[master]: ttcn3: add ttcn3-stp-test-io_uring
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/+/36271?usp=email ) Change subject: ttcn3: add ttcn3-stp-test-io_uring ...................................................................... Patch Set 1: Code-Review+2 -- 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 12:37:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: ttcn3: add ttcn3-stp-test-io_uring
by jolly 14 Mar '24

14 Mar '24

Attention is currently required from: osmith. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36271?usp=email ) Change subject: ttcn3: add ttcn3-stp-test-io_uring ...................................................................... Patch Set 1: Code-Review+1 -- 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 12:24:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: ttcn3: add ttcn3-stp-test-io_uring
by osmith 14 Mar '24

14 Mar '24

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/36271/1 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-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test 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/+/36233?usp=email ) Change subject: epdg: Introduce test TC_hss_initiated_deregister_permanent_termination ...................................................................... epdg: Introduce test TC_hss_initiated_deregister_permanent_termination Change-Id: I50daa7a04e0f19dbf987a8baba7a979a353089a3 --- M epdg/EPDG_Tests.ttcn M epdg/expected-results.xml M library/DIAMETER_Templates.ttcn M library/DIAMETER_ts29_273_Templates.ttcn 4 files changed, 145 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 31963f4..71b65c0 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -478,6 +478,7 @@ var UINT32 hbh_id := f_rnd_octstring(4); var UINT32 ete_id := f_rnd_octstring(4); var octetstring reason_info := char2oct("test"); + var CxDx_3GPP_Reason_Code reason_code_permanent_termination := PERMANENT_TERMINATION; /* Unlike STR, STA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. @@ -488,6 +489,14 @@ hbh_id := hbh_id, ete_id := ete_id)); + if (match(reason_code_permanent_termination, reason_code)) { + /* 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(); + } + alt { [] SWx.receive(tr_DIA_SWx_RTA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { @@ -549,6 +558,25 @@ } } +/* Diameter S6b ASR + ASA, TS 29.273 9.1.2.3.4. */ +private altstep as_DIA_S6b_AS_success() runs on EPDG_ConnHdlr { + var PDU_DIAMETER rx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + [] 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, + sess_id := sess_id, + hbh_id := rx_dia.hop_by_hop_id, + ete_id := rx_dia.end_to_end_id)); + setverdict(pass); + } + [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); + } +} + private function f_exp_tr_GTP2C_APCO_in_CreateSessionReq() runs on EPDG_ConnHdlr return template (present) APCO { var template ProtocolIDs_and_ContainerIDs protos, protosV4, protosV6, protosV46; @@ -796,6 +824,10 @@ } } +/************ + * GSUP CEAI + ************/ + private function f_GSUP_tx_SAI_REQ(boolean req_resync := false) runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; var template (value) GSUP_IEs pdp_info; @@ -811,7 +843,6 @@ } } - private altstep as_GSUP_rx_SAI_RES() runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; var template (present) GSUP_IE auth_tuple_ie := tr_GSUP_IE_AuthTuple3G( @@ -838,6 +869,20 @@ } } +private altstep as_GSUP_rx_CL_REQ(template GSUP_CancelType ctype := omit) runs on EPDG_ConnHdlr { + var GSUP_PDU rx_gsup; + + [] GSUP.receive(tr_GSUP_CL_REQ(g_pars.imsi, dom := *, ctype := ctype)) -> value rx_gsup { + } + [] GSUP.receive(GSUP_PDU:?) -> value rx_gsup { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected GSUP msg rx: ", rx_gsup)); + } +} + +private function f_GSUP_tx_CL_RES() runs on EPDG_ConnHdlr { + GSUP.send(ts_GSUP_CL_RES(g_pars.imsi)); +} + /* GSUP AuthInfo Req + Resp, triggers SWx MAR + MAA. */ private function f_GSUP_AI_success(boolean req_resync := false) runs on EPDG_ConnHdlr { f_GSUP_tx_SAI_REQ(req_resync); @@ -1070,6 +1115,23 @@ setverdict(pass); } +private function f_TC_hss_initiated_deregister_permanent_termination(charstring id) runs on EPDG_ConnHdlr { + f_initial_attach(); + /* Procedure should be performed properly: */ + 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))); +} +testcase TC_hss_initiated_deregister_permanent_termination() runs on MTC_CT { + var EPDG_ConnHdlrPars pars := f_init_pars(); + var EPDG_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_hss_initiated_deregister_permanent_termination), pars); + vc_conn.done; + setverdict(pass); +} + private function f_TC_concurrent_ues(charstring id) runs on EPDG_ConnHdlr { COORD.send(COORD_CMD_READY); COORD.receive(COORD_CMD_START); @@ -1167,6 +1229,7 @@ execute ( TC_ho_wifi_to_lte() ); execute ( TC_s2b_CreateSession_rejected() ); execute ( TC_hss_initiated_deregister_new_server_assigned() ); + execute ( TC_hss_initiated_deregister_permanent_termination() ); execute ( TC_concurrent_ues2() ); execute ( TC_concurrent_ues100() ); execute ( TC_upf_echo_req() ); diff --git a/epdg/expected-results.xml b/epdg/expected-results.xml index bb28811..ccc69cb 100644 --- a/epdg/expected-results.xml +++ b/epdg/expected-results.xml @@ -8,6 +8,7 @@ <testcase classname='EPDG_Tests' name='TC_ho_wifi_to_lte' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_s2b_CreateSession_rejected' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_hss_initiated_deregister_new_server_assigned' time='MASKED'/> + <testcase classname='EPDG_Tests' name='TC_hss_initiated_deregister_permanent_termination' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_concurrent_ues2' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_concurrent_ues100' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_upf_echo_req' time='MASKED'/> diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 31ea821..933c97b 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -569,11 +569,11 @@ template (value) GenericAVP ts_AVP_SuppVendorId(Vendor_Id vendor_id) := ts_AVP_SuppVendorIdRaw(enum2int(vendor_id)); -template (value) GenericAVP ts_AVP_ResultCode(DIAMETER_Resultcode res_code) := { +template (value) GenericAVP ts_AVP_ResultCode(template (value) DIAMETER_Resultcode res_code) := { avp := { avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Result_Code), avp_data := { - avp_BASE_NONE_Result_Code := int2oct(enum2int(res_code), 4) + avp_BASE_NONE_Result_Code := int2oct(enum2int(valueof(res_code)), 4) } } } diff --git a/library/DIAMETER_ts29_273_Templates.ttcn b/library/DIAMETER_ts29_273_Templates.ttcn index 0a42d6a..e1a0700 100644 --- a/library/DIAMETER_ts29_273_Templates.ttcn +++ b/library/DIAMETER_ts29_273_Templates.ttcn @@ -486,4 +486,73 @@ /* Lots other Optional */ )); + +/* TS 29.273 9.2.2.4.1 Abort-Session-Request (ASR) */ +template (present) PDU_DIAMETER +tr_DIA_S6b_ASR(template (present) charstring username_nai := ?, + template (present) octetstring sess_id := ?, + template (present) charstring orig_host := ?, + template (present) charstring orig_realm := ?, + template (present) charstring dest_realm := ?, + template (present) charstring dest_host := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?) := + tr_DIAMETER(flags := '1???????'B, + cmd_code := Abort_Session, + app_id := int2oct(c_DIAMETER_3GPP_S6b_AID, 4), + hbh_id := hbh_id, + ete_id := ete_id, + avps := superset( + tr_AVP_SessionId(sess_id), + /* Optional: DRMP, */ + tr_AVP_OriginHost(orig_host), + tr_AVP_OriginRealm(orig_realm), + tr_AVP_DestinationRealm(dest_realm), + tr_AVP_DestinationHost(dest_host), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_3GPP_S6b_AID, 4)), + tr_AVP_UserName(char2oct_tmpl_present(username_nai)), + tr_AVP_AuthSessionState(NO_STATE_MAINTAINED) + )); + +/* TS 29.273 9.2.2.4.2 Abort-Session-Answer (ASA) */ +template (present) PDU_DIAMETER +tr_DIA_S6b_ASA(template (present) DIAMETER_Resultcode res_code := ?, + template (present) octetstring sess_id := ?, + template (present) charstring orig_host := ?, + template (present) charstring orig_realm := ?, + template (present) charstring dest_realm := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?) := + tr_DIAMETER(flags := '0???????'B, + cmd_code := Abort_Session, + app_id := int2oct(c_DIAMETER_3GPP_S6b_AID, 4), + hbh_id := hbh_id, ete_id := ete_id, + avps := superset( + tr_AVP_SessionId(sess_id), + /* Optional: DRMP */ + tr_AVP_ResultCode(res_code), + tr_AVP_OriginHost(orig_host), + tr_AVP_OriginRealm(orig_realm) + )); + +template (value) PDU_DIAMETER +ts_DIA_S6b_ASA(template (value) DIAMETER_Resultcode res_code := DIAMETER_SUCCESS, + template (value) octetstring sess_id := c_def_sess_id, + template (value) charstring orig_host := "aaa.localdomain", + template (value) charstring orig_realm := "localdomain", + template (value) charstring dest_realm := "localdomain", + template (value) UINT32 hbh_id := '00000000'O, + template (value) UINT32 ete_id := '00000000'O) := + ts_DIAMETER(flags := '01000000'B, + cmd_code := Abort_Session, + app_id := int2oct(c_DIAMETER_3GPP_S6b_AID, 4), + hbh_id := hbh_id, ete_id := ete_id, + avps := { + ts_AVP_SessionId(sess_id), + /* Optional: DRMP, */ + ts_AVP_ResultCode(res_code), + ts_AVP_OriginHost(orig_host), + ts_AVP_OriginRealm(orig_realm) + }); + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36233?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: I50daa7a04e0f19dbf987a8baba7a979a353089a3 Gerrit-Change-Number: 36233 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_hss_initiated_deregister_new_server_assigned
by pespin 14 Mar '24

14 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36230?usp=email ) Change subject: epdg: Introduce test TC_hss_initiated_deregister_new_server_assigned ...................................................................... epdg: Introduce test TC_hss_initiated_deregister_new_server_assigned Related: OS#6042 Change-Id: Ia5bf7708d11421710f3a88669d94c4f01060cdd6 --- M epdg/EPDG_Tests.ttcn M epdg/expected-results.xml M epdg/gen_links.sh M library/DIAMETER_Templates.ttcn A library/DIAMETER_ts29_229_Templates.ttcn M library/DIAMETER_ts29_273_Templates.ttcn M pgw/gen_links.sh 7 files changed, 194 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index d8112e8..31963f4 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -19,6 +19,7 @@ import from DIAMETER_Types all; import from DIAMETER_Templates all; import from DIAMETER_rfc4004_Templates all; +import from DIAMETER_ts29_229_Templates all; import from DIAMETER_ts29_272_Templates all; import from DIAMETER_ts29_273_Templates all; import from DIAMETER_Emulation all; @@ -470,6 +471,32 @@ } } +/* 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 { + var PDU_DIAMETER rx_dia; + var UINT32 hbh_id := f_rnd_octstring(4); + var UINT32 ete_id := f_rnd_octstring(4); + var octetstring reason_info := char2oct("test"); + + /* Unlike STR, STA contains no IMSI. Register ete_id in DIAMETER_Emulation, + * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. + */ + f_epdg_connhldr_SWx_expect_eteid(ete_id); + + SWx.send(ts_DIA_SWx_RTR(g_pars.imsi, reason_code, reason_info, + hbh_id := hbh_id, + ete_id := ete_id)); + + alt { + [] SWx.receive(tr_DIA_SWx_RTA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} + [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter SWx msg rx: ", rx_dia)); + } + } +} + + /* Send AAR as PGW to AAA server, expect back AAA */ private function f_S6b_AA_success() runs on EPDG_ConnHdlr { var PDU_DIAMETER rx_dia; @@ -1025,6 +1052,24 @@ setverdict(pass); } +/* 3GPP TS 29.273 Network Initiated De-Registration by HSS, Administrative */ +private function f_TC_hss_initiated_deregister_new_server_assigned(charstring id) runs on EPDG_ConnHdlr { + f_initial_attach(); + /* Procedure should be performed properly: */ + f_DIA_SWx_RT(NEW_SERVER_ASSIGNED, 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(NEW_SERVER_ASSIGNED, tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4))); +} +testcase TC_hss_initiated_deregister_new_server_assigned() runs on MTC_CT { + var EPDG_ConnHdlrPars pars := f_init_pars(); + var EPDG_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_hss_initiated_deregister_new_server_assigned), pars); + vc_conn.done; + setverdict(pass); +} + private function f_TC_concurrent_ues(charstring id) runs on EPDG_ConnHdlr { COORD.send(COORD_CMD_READY); COORD.receive(COORD_CMD_START); @@ -1121,6 +1166,7 @@ execute ( TC_ho_lte_to_wifi() ); execute ( TC_ho_wifi_to_lte() ); execute ( TC_s2b_CreateSession_rejected() ); + execute ( TC_hss_initiated_deregister_new_server_assigned() ); execute ( TC_concurrent_ues2() ); execute ( TC_concurrent_ues100() ); execute ( TC_upf_echo_req() ); diff --git a/epdg/expected-results.xml b/epdg/expected-results.xml index 6507cc2..bb28811 100644 --- a/epdg/expected-results.xml +++ b/epdg/expected-results.xml @@ -7,6 +7,7 @@ <testcase classname='EPDG_Tests' name='TC_ho_lte_to_wifi' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_ho_wifi_to_lte' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_s2b_CreateSession_rejected' time='MASKED'/> + <testcase classname='EPDG_Tests' name='TC_hss_initiated_deregister_new_server_assigned' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_concurrent_ues2' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_concurrent_ues100' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_upf_echo_req' time='MASKED'/> diff --git a/epdg/gen_links.sh b/epdg/gen_links.sh index f0b2f5c..55e449f 100755 --- a/epdg/gen_links.sh +++ b/epdg/gen_links.sh @@ -55,7 +55,7 @@ FILES+="L3_Common.ttcn " FILES+="DNS_Helpers.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " -FILES+="DIAMETER_Templates.ttcn DIAMETER_rfc4004_Templates.ttcn DIAMETER_rfc5447_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn " +FILES+="DIAMETER_Templates.ttcn DIAMETER_rfc4004_Templates.ttcn DIAMETER_rfc5447_Templates.ttcn DIAMETER_ts29_229_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn " FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp " FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 338899f..31ea821 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -682,7 +682,7 @@ } } } -template (value) GenericAVP ts_AVP_UserNameImsi(hexstring imsi) := ts_AVP_UserName(char2oct(hex2str(imsi))); +template (value) GenericAVP ts_AVP_UserNameImsi(template (value) hexstring imsi) := ts_AVP_UserName(char2oct(hex2str(valueof(imsi)))); template (present) GenericAVP tr_AVP_UserNameImsi(template (present) hexstring imsi := ?) := tr_AVP_UserName(char2oct_tmpl(hex2str_tmpl(imsi))); diff --git a/library/DIAMETER_ts29_229_Templates.ttcn b/library/DIAMETER_ts29_229_Templates.ttcn new file mode 100644 index 0000000..bab9bd9 --- /dev/null +++ b/library/DIAMETER_ts29_229_Templates.ttcn @@ -0,0 +1,78 @@ +module DIAMETER_ts29_229_Templates { + +/* (C) 2023 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * Templates for AVPs and messages for TS 29.273 + */ + +import from General_Types all; +import from DIAMETER_Types all; +import from DIAMETER_Templates all; +import from DIAMETER_rfc5447_Templates all; +import from DIAMETER_ts29_272_Templates all; +import from Osmocom_Types all; +import from Misc_Helpers all; + +/* 3GPP TS 29.229 section 6.2. Errors in Result-Code AVP values */ +type enumerated DIAMETER_ts29_229_ExperimentalResultcode { + /* Success */ + DIAMETER_FIRST_REGISTRATION (2001), + DIAMETER_SUBSEQUENT_REGISTRATION (2002), + DIAMETER_UNREGISTERED_SERVICE (2003), + DIAMETER_SUCCESS_SERVER_NAME_NOT_STORED (2004), + /* Permanent Failures */ + DIAMETER_ERROR_USER_UNKNOWN (5001), + DIAMETER_ERROR_IDENTITIES_DONT_MATCH (5002), + DIAMETER_ERROR_IDENTITY_NOT_REGISTERED (5003), + DIAMETER_ERROR_ROAMING_NOT_ALLOWED (5004), + DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED (5005), + DIAMETER_ERROR_AUTH_SCHEME_NOT_SUPPORTED (5006), + DIAMETER_ERROR_IN_ASSIGNMENT_TYPE (5007), + DIAMETER_ERROR_TOO_MUCH_DATA (5008), + DIAMETER_ERROR_NOT_SUPPORTED_USER_DATA (5009), + DIAMETER_ERROR_FEATURE_UNSUPPORTED (5011), + DIAMETER_ERROR_SERVING_NODE_FEATURE_UNSUPPORTED (5012) +} + +/* TS 29.229 6.3.16 Deregistration-Reason */ +template (value) GenericAVP ts_AVP_CxDx_3GPP_Deregistration_Reason(template (value) CxDx_3GPP_Reason_Code reason, + template (value) octetstring info) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Non_3GPP_User_Data), + avp_data := { + avp_CxDx_3GPP_Deregistration_Reason := { + ts_AVP_CxDx_3GPP_Reason_Code(reason), + ts_AVP_CxDx_3GPP_Reason_Info(info) + } + } + } +} + +/* TS 29.229 6.3.17 Reason-Code AVP */ +template (value) GenericAVP ts_AVP_CxDx_3GPP_Reason_Code(template (value) CxDx_3GPP_Reason_Code reason) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_Reason_Code), + avp_data := { + avp_CxDx_3GPP_Reason_Code := reason + } + } +} + + +/* 6.3.18 Reason-Info AVP */ +template (value) GenericAVP ts_AVP_CxDx_3GPP_Reason_Info(template (value) octetstring info) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_Reason_Info), + avp_data := { + avp_CxDx_3GPP_Reason_Info := info + } + } +} + +} diff --git a/library/DIAMETER_ts29_273_Templates.ttcn b/library/DIAMETER_ts29_273_Templates.ttcn index f0ac442..0a42d6a 100644 --- a/library/DIAMETER_ts29_273_Templates.ttcn +++ b/library/DIAMETER_ts29_273_Templates.ttcn @@ -15,6 +15,7 @@ import from DIAMETER_Types all; import from DIAMETER_Templates all; import from DIAMETER_rfc5447_Templates all; +import from DIAMETER_ts29_229_Templates all; import from DIAMETER_ts29_272_Templates all; import from Osmocom_Types all; import from Misc_Helpers all; @@ -269,6 +270,61 @@ */ }); +/* Registration-Termination-Request (RTR) , 8.2.2.4 Network Initiated De-Registration by HSS Procedure */ +template (value) PDU_DIAMETER +ts_DIA_SWx_RTR(template (value) hexstring imsi, + template (value) CxDx_3GPP_Reason_Code reason_code := PERMANENT_TERMINATION, + template (value) octetstring reason_info := ''O, + template (value) uint32_t vendor_app_id := c_DIAMETER_3GPP_SWx_AID, + template (value) octetstring sess_id := c_def_sess_id, + template (value) charstring orig_host := "hss.localdomain", + template (value) charstring orig_realm := "localdomain", + template (value) charstring dest_host := "aaa.localdomain", + template (value) charstring dest_realm := "localdomain", + template (value) UINT32 hbh_id := '00000000'O, + template (value) UINT32 ete_id := '00000000'O) := + ts_DIAMETER(flags := '11000000'B, + cmd_code := Registration_Termination, + app_id := int2oct(c_DIAMETER_3GPP_SWx_AID, 4), + hbh_id := hbh_id, + ete_id := ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_VendorSpecAppId(vendor_id_3GPP, valueof(vendor_app_id)), + ts_AVP_AuthSessionState(NO_STATE_MAINTAINED), + ts_AVP_OriginHost(orig_host), + ts_AVP_OriginRealm(orig_realm), + ts_AVP_DestinationHost(dest_host), + ts_AVP_DestinationRealm(dest_realm), + ts_AVP_UserNameImsi(imsi), + ts_AVP_CxDx_3GPP_Deregistration_Reason(reason_code, reason_info) + /* TODO: + * *[ Supported-Features ] + */ + }); + +template (present) PDU_DIAMETER +tr_DIA_SWx_RTA(template (present) GenericAVP tmpl_result := ?, + template (present) octetstring sess_id := ?, + template (present) charstring orig_host := ?, + template (present) charstring orig_realm := ?, + template (present) charstring dest_host := ?, + template (present) charstring dest_realm := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?) := + tr_DIAMETER(flags := '0???????'B, + cmd_code := Registration_Termination, + app_id := int2oct(c_DIAMETER_3GPP_SWx_AID, 4), + hbh_id := hbh_id, ete_id := ete_id, + avps := superset( + tr_AVP_SessionId(sess_id), + tr_AVP_VendorSpecAppId(?, ?), + tmpl_result, + tr_AVP_AuthSessionState(NO_STATE_MAINTAINED), + tr_AVP_OriginHost(orig_host), + tr_AVP_OriginRealm(orig_realm) + )); + /******************************* * S6b 3GPP TS 29.273 section 9 *******************************/ diff --git a/pgw/gen_links.sh b/pgw/gen_links.sh index 70494ce..9bdface 100755 --- a/pgw/gen_links.sh +++ b/pgw/gen_links.sh @@ -64,7 +64,7 @@ FILES+="GTPv2_CodecPort.ttcn GTPv2_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunct.ttcn GTPv2_Emulation.ttcn " FILES+="DNS_Helpers.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " -FILES+="DIAMETER_Templates.ttcn DIAMETER_rfc4004_Templates.ttcn DIAMETER_rfc5447_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn DIAMETER_ts32_299_Templates.ttcn " +FILES+="DIAMETER_Templates.ttcn DIAMETER_rfc4004_Templates.ttcn DIAMETER_rfc5447_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_229_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn DIAMETER_ts32_299_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36230?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: Ia5bf7708d11421710f3a88669d94c4f01060cdd6 Gerrit-Change-Number: 36230 Gerrit-PatchSet: 3 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log