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

[L] Change in osmo-ttcn3-hacks[master]: PFCP: rework templates, get rid of functions

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37942?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: PFCP: rework templates, get rid of functions ...................................................................... PFCP: rework templates, get rid of functions This patch fixes dozens of compilation warnings, turning functions returning templates into templates inheriting from {tr,ts}_PDU_PFCP_. Change-Id: I04735adf88c81b949e1dca6e9ab9a3b37ba78bd6 Related: SYS#6772 --- M library/PFCP_Templates.ttcn M upf/UPF_Tests.ttcn 2 files changed, 173 insertions(+), 126 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/37942/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37942?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04735adf88c81b949e1dca6e9ab9a3b37ba78bd6 Gerrit-Change-Number: 37942 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

10 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: PFCP: fix SEID value in {ts,tr}_PFCP_Session_Est_Req

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37943?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: PFCP: fix SEID value in {ts,tr}_PFCP_Session_Est_Req ...................................................................... PFCP: fix SEID value in {ts,tr}_PFCP_Session_Est_Req According to 3GPP TS 29.244, section 7.2.2.4.2 "Conditions for Sending SEID=0 in PFCP Header": if a peer's SEID is not available, the SEID field shall still be present in the header and its value shall be set to "0" in the following messages: * PFCP Session Establishment Request message on Sxa/Sxb/Sxc/N4; ... Change-Id: Iacfbd68336b6fc4481c15ca5b304636df4491da4 Related: SYS#6772 --- M library/PFCP_Templates.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/37943/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37943?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iacfbd68336b6fc4481c15ca5b304636df4491da4 Gerrit-Change-Number: 37943 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

10 months, 1 week

1
0
0 0

[XL] Change in docker-playground[master]: Remove ttcn3 testsuites ported to testenv, part 1

by daniel

Attention is currently required from: laforge, osmith. daniel has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/37714?usp=email ) Change subject: Remove ttcn3 testsuites ported to testenv, part 1 ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: > I thin kit makes sense to add some kind of README or other document that describes where those test […] ACK. The README mentions testenv, but (a link to) some more documentation would be nice. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37714?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7182c7e8eb00a9323fe1b6d27f630d253b4d34f6 Gerrit-Change-Number: 37714 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 28 Aug 2024 13:21:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

10 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: cosmetic: reorder module parameters

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37938?usp=email ) Change subject: s1gw: cosmetic: reorder module parameters ...................................................................... s1gw: cosmetic: reorder module parameters Change-Id: I6ee5d2e283327f52320ef5580b195c42e400c8de --- M s1gw/S1GW_Tests.cfg M s1gw/S1GW_Tests.ttcn 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/37938/1 diff --git a/s1gw/S1GW_Tests.cfg b/s1gw/S1GW_Tests.cfg index 8365b13..9ae6d12 100644 --- a/s1gw/S1GW_Tests.cfg +++ b/s1gw/S1GW_Tests.cfg @@ -12,8 +12,8 @@ [MODULE_PARAMETERS] S1GW_Tests.mp_s1gw_enb_ip := "127.0.1.1"; -S1GW_Tests.mp_s1gw_mme_ip := "127.0.2.1"; S1GW_Tests.mp_enb_bind_ip := "127.0.1.10"; +S1GW_Tests.mp_s1gw_mme_ip := "127.0.2.1"; S1GW_Tests.mp_mme_bind_ip := "127.0.2.10"; [MAIN_CONTROLLER] diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 9448ed5..5d28dc9 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -39,10 +39,10 @@ modulepar { charstring mp_s1gw_enb_ip := "127.0.1.1"; /* eNB facing address of the S1GW */ - charstring mp_s1gw_mme_ip := "127.0.2.1"; /* MME facing address of the S1GW */ - charstring mp_s1gw_upf_ip := "127.0.3.1"; /* UPF facing address of the S1GW */ charstring mp_enb_bind_ip := "127.0.1.10"; /* eNB address to use locally when connecting to S1GW */ + charstring mp_s1gw_mme_ip := "127.0.2.1"; /* MME facing address of the S1GW */ charstring mp_mme_bind_ip := "127.0.2.10"; /* MME address on which we get connections from S1GW */ + charstring mp_s1gw_upf_ip := "127.0.3.1"; /* UPF facing address of the S1GW */ charstring mp_upf_bind_ip := "127.0.3.10"; /* UPF address on which we get connections from S1GW */ } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37938?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6ee5d2e283327f52320ef5580b195c42e400c8de Gerrit-Change-Number: 37938 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

10 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: osmo-s1gw.config: fix pfcp_{loc,rem}_addr comments

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37940?usp=email ) Change subject: s1gw: osmo-s1gw.config: fix pfcp_{loc,rem}_addr comments ...................................................................... s1gw: osmo-s1gw.config: fix pfcp_{loc,rem}_addr comments Change-Id: I4b5b18750de48b5db1a23a95a427ba1fd3d3905d --- M s1gw/osmo-s1gw.config 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/37940/1 diff --git a/s1gw/osmo-s1gw.config b/s1gw/osmo-s1gw.config index a04d1cf..ed87ae8 100644 --- a/s1gw/osmo-s1gw.config +++ b/s1gw/osmo-s1gw.config @@ -14,8 +14,8 @@ [{s1gw_bind_addr, "127.0.1.1"}, %% S1GW bind address for incoming eNB connections {mme_loc_addr, "127.0.2.1"}, %% local address for outgoing connections to the MME {mme_rem_addr, "127.0.2.10"}, %% remote address for outgoing connections to the MME - {pfcp_loc_addr, "127.0.3.1"}, %% local address for outgoing connections to the UPF - {pfcp_rem_addr, "127.0.3.10"} %% local address for outgoing connections to the UPF + {pfcp_loc_addr, "127.0.3.1"}, %% local address for incoming PFCP PDUs from the UPF + {pfcp_rem_addr, "127.0.3.10"} %% remote address for outgoing PFCP PDUs to the UPF ]}, %% ================================================================================ %% kernel config -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37940?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4b5b18750de48b5db1a23a95a427ba1fd3d3905d Gerrit-Change-Number: 37940 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

10 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: S1GW_Tests.cfg: add PFCP related module params

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37939?usp=email ) Change subject: s1gw: S1GW_Tests.cfg: add PFCP related module params ...................................................................... s1gw: S1GW_Tests.cfg: add PFCP related module params Change-Id: Id134f2fd0e2e138ee6cb7a8f8a3e2af7f027bda4 --- M s1gw/S1GW_Tests.cfg 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/37939/1 diff --git a/s1gw/S1GW_Tests.cfg b/s1gw/S1GW_Tests.cfg index 9ae6d12..dfcdbb9 100644 --- a/s1gw/S1GW_Tests.cfg +++ b/s1gw/S1GW_Tests.cfg @@ -15,6 +15,8 @@ S1GW_Tests.mp_enb_bind_ip := "127.0.1.10"; S1GW_Tests.mp_s1gw_mme_ip := "127.0.2.1"; S1GW_Tests.mp_mme_bind_ip := "127.0.2.10"; +S1GW_Tests.mp_s1gw_upf_ip := "127.0.3.1"; +S1GW_Tests.mp_upf_bind_ip := "127.0.3.10"; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37939?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id134f2fd0e2e138ee6cb7a8f8a3e2af7f027bda4 Gerrit-Change-Number: 37939 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

10 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: osmo-s1gw.config: enable colors in logging

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37941?usp=email ) Change subject: s1gw: osmo-s1gw.config: enable colors in logging ...................................................................... s1gw: osmo-s1gw.config: enable colors in logging Change-Id: I49fa2ca9d7aea5a2728d07f176b80a6438551047 --- M s1gw/osmo-s1gw.config 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/37941/1 diff --git a/s1gw/osmo-s1gw.config b/s1gw/osmo-s1gw.config index ed87ae8..86a89c1 100644 --- a/s1gw/osmo-s1gw.config +++ b/s1gw/osmo-s1gw.config @@ -24,14 +24,14 @@ [{logger_level, debug}, {logger, [{handler, default, logger_std_h, - #{level => debug, - formatter => {logger_formatter, - #{template => [time, " ", - "[", level, "]", - {pid, [" ", pid, ""], ""}, - {prefix, [" ", prefix, " ::"], ""}, - " ", msg, - {mfa, [" (", mfa, ":", line, ")"], ""}, - "\n"]}}}}]}]}]. + #{formatter => + {logger_color_formatter, #{legacy_header => false, + single_line => false, + template => [time, " ", color, "[", level, "]", + {pid, [" ", pid, ""], ""}, + {prefix, [" ", prefix, " ::"], ""}, + " ", msg, + {mfa, [" (", mfa, ":", line, ")"], ""}, + reset, "\n"]}}}}]}]}]. %% vim:set ts=2 sw=2 et: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37941?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I49fa2ca9d7aea5a2728d07f176b80a6438551047 Gerrit-Change-Number: 37941 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

10 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: PFCP: fix SEID value in {ts,tr}_PFCP_Session_Est_Req

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37943?usp=email ) Change subject: PFCP: fix SEID value in {ts,tr}_PFCP_Session_Est_Req ...................................................................... PFCP: fix SEID value in {ts,tr}_PFCP_Session_Est_Req According to 3GPP TS 29.244, section 7.2.2.4.2 "Conditions for Sending SEID=0 in PFCP Header": if a peer's SEID is not available, the SEID field shall still be present in the header and its value shall be set to "0" in the following messages: * PFCP Session Establishment Request message on Sxa/Sxb/Sxc/N4; ... Change-Id: Iacfbd68336b6fc4481c15ca5b304636df4491da4 Related: SYS#6772 --- M library/PFCP_Templates.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/37943/1 diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn index 329ea88..f4a946a 100644 --- a/library/PFCP_Templates.ttcn +++ b/library/PFCP_Templates.ttcn @@ -499,7 +499,7 @@ Create_PDR_list create_pdr, Create_FAR_list create_far) modifies ts_PDU_PFCP_ := { - seid := omit, /* FIXME: shall be set to 0 as per 7.2.2.4.2 */ + seid := 0, /* shall be set to 0 as per 7.2.2.4.2 */ message_body := { pfcp_session_establishment_request := { node_id := node_id, @@ -519,7 +519,7 @@ template (present) PDU_PFCP tr_PFCP_Session_Est_Req(template (present) Node_ID node_id := ?) modifies tr_PDU_PFCP_ := { - seid := ?, + seid := 0, /* shall be set to 0 as per 7.2.2.4.2 */ message_body := { pfcp_session_establishment_request := { node_id := node_id, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37943?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iacfbd68336b6fc4481c15ca5b304636df4491da4 Gerrit-Change-Number: 37943 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

10 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: PFCP: rework templates, get rid of functions

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37942?usp=email ) Change subject: PFCP: rework templates, get rid of functions ...................................................................... PFCP: rework templates, get rid of functions This patch fixes dozens of compilation warnings, turning functions returning templates into templates inheriting from {tr,ts}_PDU_PFCP_. Change-Id: I04735adf88c81b949e1dca6e9ab9a3b37ba78bd6 Related: SYS#6772 --- M library/PFCP_Templates.ttcn 1 file changed, 167 insertions(+), 120 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/37942/1 diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn index 3acc287..329ea88 100644 --- a/library/PFCP_Templates.ttcn +++ b/library/PFCP_Templates.ttcn @@ -124,7 +124,10 @@ seid := seid }; -template (value) PDU_PFCP ts_PFCP_Assoc_Setup_Req(template (value) Node_ID node_id, LIN4_BO_LAST recovery_timestamp) +/* 7.4.4.1 PFCP Association Setup Request */ +template (value) PDU_PFCP +ts_PFCP_Assoc_Setup_Req(template (value) Node_ID node_id, + LIN4_BO_LAST recovery_timestamp) modifies ts_PDU_PFCP_ := { message_body := { pfcp_association_setup_request := { @@ -136,10 +139,10 @@ } } }; - -function tr_PFCP_Assoc_Setup_Req(template (present) Node_ID node_id := ?) return template (present) PDU_PFCP { - var template PDU_PFCP t := tr_PDU_PFCP(); - t.message_body := { +template (present) PDU_PFCP +tr_PFCP_Assoc_Setup_Req(template (present) Node_ID node_id := ?) +modifies tr_PDU_PFCP_ := { + message_body := { pfcp_association_setup_request := { node_id := node_id, time_stamp := ?, @@ -147,14 +150,15 @@ cp_function_features := *, UP_IP_resource_list := * } - }; - return t; + } }; -template (value) PDU_PFCP ts_PFCP_Assoc_Setup_Resp(LIN3_BO_LAST sequence_number, - template (value) Node_ID node_id, - template (value) Cause cause, - LIN4_BO_LAST recovery_timestamp) +/* 7.4.4.2 PFCP Association Setup Response */ +template (value) PDU_PFCP +ts_PFCP_Assoc_Setup_Resp(LIN3_BO_LAST sequence_number, + template (value) Node_ID node_id, + template (value) Cause cause, + LIN4_BO_LAST recovery_timestamp) modifies ts_PDU_PFCP_ := { sequence_number := sequence_number, message_body := { @@ -168,11 +172,11 @@ } } }; - -function tr_PFCP_Assoc_Setup_Resp(template (present) Node_ID node_id := ?, - template (present) Cause cause := ?) return template (present) PDU_PFCP { - var template PDU_PFCP t := tr_PDU_PFCP(); - t.message_body := { +template (present) PDU_PFCP +tr_PFCP_Assoc_Setup_Resp(template (present) Node_ID node_id := ?, + template (present) Cause cause := ?) +modifies tr_PDU_PFCP_ := { + message_body := { pfcp_association_setup_response := { node_id := node_id, cause := cause, @@ -181,31 +185,53 @@ cp_function_features := *, UP_IP_resource_list := * } - }; - return t; + } }; -function ts_PFCP_Assoc_Release_Req(template (value) Node_ID node_id) return template (value) PDU_PFCP { - var template (value) PDU_PFCP t := ts_PDU_PFCP(); - - t.message_body := { +/* 7.4.4.5 PFCP Association Release Request */ +template (value) PDU_PFCP +ts_PFCP_Assoc_Release_Req(template (value) Node_ID node_id) +modifies ts_PDU_PFCP_ := { + message_body := { pfcp_association_release_request := { node_id := node_id } - }; - return t; + } +}; +template (present) PDU_PFCP +tr_PFCP_Assoc_Release_Req(template (present) Node_ID node_id := ?) +modifies tr_PDU_PFCP_ := { + message_body := { + pfcp_association_release_request := { + node_id := node_id + } + } }; -function tr_PFCP_Assoc_Release_Resp(template (present) Node_ID node_id := ?, template (present) Cause cause := ?) - return template (present) PDU_PFCP { - var template PDU_PFCP t := tr_PDU_PFCP(); - t.message_body := { +/* 7.4.4.6 PFCP Association Release Response */ +template (value) PDU_PFCP +ts_PFCP_Assoc_Release_Resp(LIN3_BO_LAST sequence_number, + template (value) Node_ID node_id, + template (value) Cause cause) +modifies ts_PDU_PFCP_ := { + sequence_number := sequence_number, + message_body := { pfcp_association_release_response := { node_id := node_id, cause := cause } - }; - return t; + } +}; +template (present) PDU_PFCP +tr_PFCP_Assoc_Release_Resp(template (present) Node_ID node_id := ?, + template (present) Cause cause := ?) +modifies tr_PDU_PFCP_ := { + message_body := { + pfcp_association_release_response := { + node_id := node_id, + cause := cause + } + } }; template (value) F_SEID ts_PFCP_F_SEID_ipv4(OCT4 addr_v4, OCT8 seid) := { @@ -281,15 +307,12 @@ return qname; } -function ts_PFCP_Network_Instance(charstring netinst_name) return Network_Instance -{ - var Network_Instance netinst := { - elementIdentifier := 22, - lengthIndicator := 0, - pdn_instance := f_netinst_str_to_qname(netinst_name) - } - return netinst; -} +template (value) Network_Instance +ts_PFCP_Network_Instance(charstring netinst_name) := { + elementIdentifier := 22, + lengthIndicator := 0, + pdn_instance := f_netinst_str_to_qname(netinst_name) +}; template (value) PDI_IE ts_PFCP_PDI(e_PFCP_Src_Iface src_iface, template (omit) F_TEID local_F_TEID := omit, @@ -321,9 +344,7 @@ spare := '000'B } -function ts_PFCP_Apply_Action_FORW() return template (value) Apply_Action { - return ts_PFCP_Apply_Action(forw := '1'B); -} +template (value) Apply_Action ts_PFCP_Apply_Action_FORW := ts_PFCP_Apply_Action(forw := '1'B); template (value) Apply_Action ts_PFCP_Apply_Action_DROP := ts_PFCP_Apply_Action(drop := '1'B); template (value) Apply_Action ts_PFCP_Apply_Action_BUFF := ts_PFCP_Apply_Action(buff := '1'B); @@ -471,13 +492,15 @@ } } -function ts_PFCP_Session_Est_Req(template (value) Node_ID node_id, - template (value) F_SEID cp_f_seid, - Create_PDR_list create_pdr, - Create_FAR_list create_far) - return template (value) PDU_PFCP { - var template (value) PDU_PFCP t := ts_PDU_PFCP(); - t.message_body := { +/* 7.5.2 PFCP Session Establishment Request */ +template (value) PDU_PFCP +ts_PFCP_Session_Est_Req(template (value) Node_ID node_id, + template (value) F_SEID cp_f_seid, + Create_PDR_list create_pdr, + Create_FAR_list create_far) +modifies ts_PDU_PFCP_ := { + seid := omit, /* FIXME: shall be set to 0 as per 7.2.2.4.2 */ + message_body := { pfcp_session_establishment_request := { node_id := node_id, CP_F_SEID := cp_f_seid, @@ -491,18 +514,27 @@ node_list := omit, up_inactivity_timer := omit } - }; - return t; + } } - -function tr_PFCP_Session_Est_Req() return template (present) PDU_PFCP { - var template PDU_PFCP t := tr_PDU_PFCP(?); - t.message_body := { +template (present) PDU_PFCP +tr_PFCP_Session_Est_Req(template (present) Node_ID node_id := ?) +modifies tr_PDU_PFCP_ := { + seid := ?, + message_body := { pfcp_session_establishment_request := { - node_id := ? + node_id := node_id, + CP_F_SEID := ?, + create_PDR_list := ?, + create_FAR_list := ?, + create_URR_list := *, + create_QER_list := *, + create_BAR := *, + create_traffic_endpoint_list := *, + pdn_type := *, + node_list := *, + up_inactivity_timer := * } - }; - return t; + } } template (value) Created_PDR ts_PFCP_Created_PDR(PDR_ID pdr_id, template (value) F_TEID local_F_TEID) := { @@ -514,22 +546,27 @@ } } -function ts_PFCP_Session_Est_Resp(LIN3_BO_LAST seq_nr, template (value) Node_ID node_id, OCT8 seid) - return template (value) PDU_PFCP { - var template (value) PDU_PFCP t := ts_PDU_PFCP(seq_nr, seid); - t.sequence_number := seq_nr; - t.message_body := { +/* 7.5.3 PFCP Session Establishment Response */ +template (value) PDU_PFCP +ts_PFCP_Session_Est_Resp(template (value) LIN3_BO_LAST seq_nr, + template (value) Node_ID node_id, + template (value) OCT8 seid) +modifies ts_PDU_PFCP_ := { + seid := seid, + sequence_number := seq_nr, + message_body := { pfcp_session_establishment_response := { node_id := node_id, cause := ts_PFCP_Cause(REQUEST_ACCEPTED) } - }; - return t; + } } - -function tr_PFCP_Session_Est_Resp(template (present) OCT8 hdr_seid := ?) return template (present) PDU_PFCP { - var template PDU_PFCP t := tr_PDU_PFCP(hdr_seid); - t.message_body := { +template (present) PDU_PFCP +tr_PFCP_Session_Est_Resp(template (present) OCT8 seid := ?) +modifies tr_PDU_PFCP_ := { + seid := seid, + sequence_number := ?, + message_body := { pfcp_session_establishment_response := { node_id := ?, cause := tr_PFCP_Cause(REQUEST_ACCEPTED), @@ -542,14 +579,16 @@ failed_rule_id := *, created_traffic_endpoint_list := * } - }; - return t; + } } -function ts_PFCP_Session_Mod_Req(OCT8 up_seid, Update_FAR update_far) - return template (value) PDU_PFCP { - var template (value) PDU_PFCP t := ts_PDU_PFCP(seid := up_seid); - t.message_body := { +/* 7.5.4 PFCP Session Modification Request */ +template (value) PDU_PFCP +ts_PFCP_Session_Mod_Req(template (value) OCT8 seid, + Update_FAR update_far) +modifies ts_PDU_PFCP_ := { + seid := seid, + message_body := { pfcp_session_modification_request := { f_seid := omit, remove_PDR_list := omit, @@ -576,21 +615,25 @@ up_inactivity_timer := omit, querry_urr_reference := omit } - }; - return t; + } } - -function tr_PFCP_Session_Mod_Req(template (present) OCT8 seid := ?) return template (present) PDU_PFCP { - var template PDU_PFCP t := tr_PDU_PFCP(seid); - t.message_body := { +template (present) PDU_PFCP +tr_PFCP_Session_Mod_Req(template (present) OCT8 seid := ?) +modifies tr_PDU_PFCP_ := { + seid := seid, + message_body := { pfcp_session_modification_request := ? - }; - return t; + } } -function ts_PFCP_Session_Mod_Resp(LIN3_BO_LAST seq_nr, OCT8 seid) return template (value) PDU_PFCP { - var template (value) PDU_PFCP t := ts_PDU_PFCP(seq_nr, seid); - t.message_body := { +/* 7.5.5 PFCP Session Modification Response */ +template (value) PDU_PFCP +ts_PFCP_Session_Mod_Resp(template (value) LIN3_BO_LAST seq_nr, + template (value) OCT8 seid) +modifies ts_PDU_PFCP_ := { + seid := seid, + sequence_number := seq_nr, + message_body := { pfcp_session_modification_response := { cause := ts_PFCP_Cause(REQUEST_ACCEPTED), offending_IE := omit, @@ -602,54 +645,59 @@ additional_usage_reports_information := omit, created_updated_traffic_endpoint := omit } - }; - return t; + } } - -function tr_PFCP_Session_Mod_Resp(template (present) OCT8 seid := ?) return template (present) PDU_PFCP { - var template PDU_PFCP t := tr_PDU_PFCP(seid); - t.message_body := { +template (present) PDU_PFCP +tr_PFCP_Session_Mod_Resp(template (present) OCT8 seid := ?) +modifies tr_PDU_PFCP_ := { + seid := seid, + message_body := { pfcp_session_modification_response := ? - }; - return t; + } } -function ts_PFCP_Session_Del_Req(OCT8 seid) return template (value) PDU_PFCP { - var template (value) PDU_PFCP t := ts_PDU_PFCP(seid := seid); - t.message_body := { +/* 7.5.6 PFCP Session Deletion Request */ +template (value) PDU_PFCP +ts_PFCP_Session_Del_Req(template (value) OCT8 seid) +modifies ts_PDU_PFCP_ := { + seid := seid, + message_body := { pfcp_session_deletion_request := { } - }; - return t; + } } - -function tr_PFCP_Session_Del_Req(template (present) OCT8 seid := ?) return template (present) PDU_PFCP { - var template PDU_PFCP t := tr_PDU_PFCP(seid); - t.message_body := { +template (present) PDU_PFCP +tr_PFCP_Session_Del_Req(template (present) OCT8 seid := ?) +modifies tr_PDU_PFCP_ := { + seid := seid, + message_body := { pfcp_session_deletion_request := ? - }; - return t; + } } -function ts_PFCP_Session_Del_Resp(LIN3_BO_LAST seq_nr, OCT8 seid, e_PFCP_Cause cause := REQUEST_ACCEPTED) - return template (value) PDU_PFCP { - var template (value) PDU_PFCP t := ts_PDU_PFCP(seq_nr, seid); - t.message_body := { +/* 7.5.7 PFCP Session Deletion Response */ +template (value) PDU_PFCP +ts_PFCP_Session_Del_Resp(template (value) LIN3_BO_LAST seq_nr, + template (value) OCT8 seid, + template (value) Cause cause := ts_PFCP_Cause(REQUEST_ACCEPTED)) +modifies ts_PDU_PFCP_ := { + seid := seid, + sequence_number := seq_nr, + message_body := { pfcp_session_deletion_response := { - cause := ts_PFCP_Cause(cause), + cause := cause, offending_IE := omit, load_control_information := omit, overload_control_information := omit, usage_report := omit } - }; - return t; + } } - -function tr_PFCP_Session_Del_Resp(template (present) OCT8 seid := ?, - template (present) Cause cause := tr_PFCP_Cause(REQUEST_ACCEPTED)) - return template (present) PDU_PFCP { - var template PDU_PFCP t := tr_PDU_PFCP(seid); - t.message_body := { +template (present) PDU_PFCP +tr_PFCP_Session_Del_Resp(template (present) OCT8 seid, + template (present) Cause cause := tr_PFCP_Cause(REQUEST_ACCEPTED)) +modifies tr_PDU_PFCP_ := { + seid := seid, + message_body := { pfcp_session_deletion_response := { cause := cause, offending_IE := *, @@ -657,8 +705,7 @@ overload_control_information := *, usage_report := * } - }; - return t; + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37942?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04735adf88c81b949e1dca6e9ab9a3b37ba78bd6 Gerrit-Change-Number: 37942 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

10 months, 1 week

1
0
0 0

[XS] Change in pysim[master]: scp: fix key length in dek_encrypt and dek_decrypt

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37931?usp=email ) Change subject: scp: fix key length in dek_encrypt and dek_decrypt ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/pysim/+/37931/comment/74c33d5e_037b1da9?usp=em… : PS1, Line 9: When creating the DES cipher object with DES.new, we use the property : card_keys.dek. This property may hold a 16 byte key, but DES uses : an 8 byte key. Pycryptodome does not automatically ignore excess key : bytes. Instead it throws an exception. This means we need to make sure : to supply only the first 8 bytes of card_keys.dek > did you check the spec and determie that this truncation is required/intended? IF yes, it would be […] Yes, I have checked it. It seems to be an implementation detail of pyCryptoDome. They say: "key (bytes/bytearray/memoryview) – The secret key to use in the symmetric cipher. It must be 8 byte long. The parity bits will be ignored." In other code locations one can find the truncation as well. I have now put a reference to the pyCryptoDome manual into the commit message. I don't think that we need an extra comment in the code, since it is only a pyCryptoDome related. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37931?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I92e0dc6a6196b532bd8b53fca7b9e78070d6903f Gerrit-Change-Number: 37931 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 28 Aug 2024 12:48:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

10 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2024