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

[XS] Change in osmo-ttcn3-hacks[master]: Cosmetic: ggsn: fix copy paste error
by laforge 11 Oct '24

11 Oct '24

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38380?usp=email ) Change subject: Cosmetic: ggsn: fix copy paste error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38380?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iad2424036ff3dd45a9cd67f28249fbb06e657e62 Gerrit-Change-Number: 38380 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Oct 2024 11:42:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ggsn[master]: gtp: allow packets with E-bit set
by laforge 11 Oct '24

11 Oct '24

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/38383?usp=email ) Change subject: gtp: allow packets with E-bit set ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/38383?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ic62f95874a877a2f295765b807d7f23b011aeaa3 Gerrit-Change-Number: 38383 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Oct 2024 11:42:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv: fix kernel args
by laforge 11 Oct '24

11 Oct '24

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38384?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv: fix kernel args ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I44facf5f50a0524707f868485a3eb34308071b7a Gerrit-Change-Number: 38384 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Oct 2024 11:41:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv: fix kernel args
by osmith 11 Oct '24

11 Oct '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/38384?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: jobs/ttcn3-testsuites-testenv: fix kernel args ...................................................................... jobs/ttcn3-testsuites-testenv: fix kernel args The -latest tests had slightly wrong arguments, fix it. Change-Id: I44facf5f50a0524707f868485a3eb34308071b7a --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/84/38384/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I44facf5f50a0524707f868485a3eb34308071b7a Gerrit-Change-Number: 38384 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv: fix kernel arg names
by osmith 11 Oct '24

11 Oct '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/38384?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: jobs/ttcn3-testsuites-testenv: fix kernel arg names ...................................................................... jobs/ttcn3-testsuites-testenv: fix kernel arg names It is --custom-kernel, not --kernel-custom. Same for debian. Change-Id: I44facf5f50a0524707f868485a3eb34308071b7a --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/84/38384/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I44facf5f50a0524707f868485a3eb34308071b7a Gerrit-Change-Number: 38384 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv: fix kernel arg name
by osmith 11 Oct '24

11 Oct '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38384?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv: fix kernel arg name ...................................................................... jobs/ttcn3-testsuites-testenv: fix kernel arg name It is --custom-kernel, not --kernel-custom. Change-Id: I44facf5f50a0524707f868485a3eb34308071b7a --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/84/38384/1 diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index f966b67..79f5b9c 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -193,13 +193,13 @@ - ttcn3-ggsn-test-kernel-latest-net-next: testsuite: ggsn - args: -b osmocom:latest -c 'osmo_ggsn_v*_only' --kernel-custom + args: -b osmocom:latest -c 'osmo_ggsn_v*_only' --custom-kernel kernel: net-next timer: H 10 * * * - ttcn3-ggsn-test-kernel-latest-torvalds: testsuite: ggsn - args: -b osmocom:latest -c 'osmo_ggsn_v*_only' --kernel-custom + args: -b osmocom:latest -c 'osmo_ggsn_v*_only' --custom-kernel kernel: torvalds timer: H 10 * * * -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I44facf5f50a0524707f868485a3eb34308071b7a Gerrit-Change-Number: 38384 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ggsn[master]: gtp: allow packets with E-bit set
by osmith 11 Oct '24

11 Oct '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/38383?usp=email ) Change subject: gtp: allow packets with E-bit set ...................................................................... gtp: allow packets with E-bit set Do not drop packets early that have the bit for indicating presence of next extension header set ("Unsupported packet flags 0x36"). With this patch, a packet with extension header gets into the "Check for extension headers" code path. There the GGSN currently rejects all such packages with an "Unsupported extension header" error log message, and sends a Supported Extension Headers Notification to the SGSN. Related: OS#6223 Change-Id: Ic62f95874a877a2f295765b807d7f23b011aeaa3 --- M gtp/gtp.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/83/38383/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index 02cf8a3..41a70ef 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -2992,8 +2992,13 @@ continue; } - /* Check packet flag field (allow both with and without sequence number) */ - if (((pheader->flags & 0xf5) != 0x30)) { + /* Check packet flag field (3GPP TS 29.060 § 6.1) + * Bitmask allows for 0 or 1 in: + * 0x02 S: sequence number + * 0x04 E: presence of next extension header + * 0x08 *: spare bit + * */ + if (((pheader->flags & 0xf1) != 0x30)) { rate_ctr_inc2(gsn->ctrg, GSN_CTR_PKT_UNSUP); GTP_LOGPKG(LOGL_ERROR, &peer, buffer, status, "Unsupported packet flags 0x%02x\n", pheader->flags); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/38383?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ic62f95874a877a2f295765b807d7f23b011aeaa3 Gerrit-Change-Number: 38383 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: ggsn: add test TC_pdp4_clients_interact_with_ext_hdr
by osmith 11 Oct '24

11 Oct '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38382?usp=email ) Change subject: ggsn: add test TC_pdp4_clients_interact_with_ext_hdr ...................................................................... ggsn: add test TC_pdp4_clients_interact_with_ext_hdr Related: OS#6223 Change-Id: Ic767f8b50f034171d71cae16512d1d26a07b24bf --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 36 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/38382/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index e88ab80..5cac964 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -144,7 +144,13 @@ var uint16_t g_d_seq_nr; port TELNETasp_PT GGSNVTY; + + /* gtpu_hdr_opt_part has 3GPP TS 29.060 § 6 GTP header optional + * fields and § 6.1 extension headers. When use_gtpu_txseq is + * set, the Sequence Number gets set automatically. */ + var template (omit) GTPU_Header_optional_part gtpu_hdr_opt_part := omit; var boolean use_gtpu_txseq := false; + var integer g_use_echo_intval := 0; /* 0 = disabled */ /* Emulated PCRF, used with m_ggsn_impl = GGSN_IMPL_OPEN5GS */ @@ -399,10 +405,15 @@ /* send GTP-U for a given context and increment sequence number */ function f_send_gtpu(inout PdpContext ctx, in octetstring data) runs on GT_CT { - var template (omit) GTPU_Header_optional_part opt_part; + var template (omit) GTPU_Header_optional_part opt_part := gtpu_hdr_opt_part; if (use_gtpu_txseq) { - opt_part := f_GTPU_opt_part_from_seq(g_d_seq_nr); + if (istemplatekind(opt_part, "omit")) { + opt_part := f_GTPU_opt_part_from_seq(g_d_seq_nr); + } else { + opt_part.sequenceNumber := int2oct(g_d_seq_nr, 2); + } + g_d_seq_nr := (g_d_seq_nr + 1) mod 65536; } @@ -1403,6 +1414,7 @@ /* Validate if different clients (pdp ctx) can reach one another through GGSN. */ testcase TC_pdp4_clients_interact_with_txseq() runs on GT_CT { use_gtpu_txseq := true; + gtpu_hdr_opt_part := omit; f_pdp4_clients_interact(); f_shutdown_helper(); } @@ -1410,6 +1422,27 @@ /* Validate if different clients (pdp ctx) can reach one another through GGSN (without Tx sequence number). */ testcase TC_pdp4_clients_interact_without_txseq() runs on GT_CT { use_gtpu_txseq := false; + gtpu_hdr_opt_part := omit; + f_pdp4_clients_interact(); + f_shutdown_helper(); + } + + /* Validate if different clients (pdp ctx) can reach one another through + * GGSN (with GTPU extension header, OS#6223) */ + testcase TC_pdp4_clients_interact_with_ext_hdr() runs on GT_CT { + use_gtpu_txseq := false; + gtpu_hdr_opt_part := { + sequenceNumber := '0000'O, + npduNumber := '00'O, + nextExtHeader := 'C0'O, /* PDCP PDU number */ + gTPU_extensionHeader_List := { + { + lengthfield := 1, + content := '0001'O, + nextExtHeader := '00'O + } + } + }; f_pdp4_clients_interact(); f_shutdown_helper(); } @@ -2283,6 +2316,7 @@ execute(TC_pdp4_act_deact_gtpu_access_ipv6_apn4()); execute(TC_pdp4_clients_interact_with_txseq()); execute(TC_pdp4_clients_interact_without_txseq()); + execute(TC_pdp4_clients_interact_with_ext_hdr()); execute(TC_pdp4_act_deact_with_single_dns()); execute(TC_pdp4_act_deact_with_separate_dns()); execute(TC_pdp4_act_update_teic()); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38382?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: Ic767f8b50f034171d71cae16512d1d26a07b24bf Gerrit-Change-Number: 38382 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/GTPv1U_Templates: support sending ext hdrs
by osmith 11 Oct '24

11 Oct '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38381?usp=email ) Change subject: library/GTPv1U_Templates: support sending ext hdrs ...................................................................... library/GTPv1U_Templates: support sending ext hdrs Replace the seq (sequenceNumber) parameter in ts_GTP1U_PDU with opt_part (GTPU_Header_optional_part). opt_part contains seq: type record GTPU_Header_optional_part { OCT2 sequenceNumber, OCT1 npduNumber, OCT1 nextExtHeader, GTPU_ExtensionHeader_List gTPU_extensionHeader_List optional } With this change it is possible to set the extension headers too when sending GTPU packets. This is in preparation for a GGSN test case with extension headers. Related: OS#6223 Change-Id: I5b1668d45f4454f92c234054678e17145bd4fe49 --- M epdg/EPDG_Tests.ttcn M ggsn_tests/GGSN_Tests.ttcn M hnodeb/HNBGW_ConnectionHandler.ttcn M library/GTPv1U_Templates.ttcn M sgsn/BSSGP_ConnHdlr.ttcn 5 files changed, 31 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/38381/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index f963994..d9300a6 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -862,7 +862,7 @@ } private function f_GTP1U_send(octetstring payload) runs on EPDG_ConnHdlr { var Gtp1uPeer peer := valueof(ts_GtpPeerU(f_inet_addr(g_pars.bearer.gtpu_addr_remote))); - GTP2.send(ts_GTP1U_GPDU(peer, 0 /*seq*/, g_pars.bearer.teid_remote, payload)); + GTP2.send(ts_GTP1U_GPDU(peer, omit /*opt_part*/, g_pars.bearer.teid_remote, payload)); } private function f_GTP1U_echo_ping_pong(uint16_t seq_nr := 0) runs on EPDG_ConnHdlr { var Gtp1uPeer peer := valueof(ts_GtpPeerU(f_inet_addr(g_pars.bearer.gtpu_addr_remote))); diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 7f4a7bb..e88ab80 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -399,12 +399,14 @@ /* send GTP-U for a given context and increment sequence number */ function f_send_gtpu(inout PdpContext ctx, in octetstring data) runs on GT_CT { + var template (omit) GTPU_Header_optional_part opt_part; + if (use_gtpu_txseq) { - GTPU.send(ts_GTP1U_GPDU(g_peer_u, g_d_seq_nr, ctx.teid_remote, data)); + opt_part := f_GTPU_opt_part_from_seq(g_d_seq_nr); g_d_seq_nr := (g_d_seq_nr + 1) mod 65536; - } else { - GTPU.send(ts_GTP1U_GPDU(g_peer_u, omit, ctx.teid_remote, data)); } + + GTPU.send(ts_GTP1U_GPDU(g_peer_u, opt_part, ctx.teid_remote, data)); } function f_handle_create_req(inout PdpContext ctx, in Gtp1cUnitdata ud, in template OCT1 exp_cause := '80'O) runs on GT_CT { diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn index a72b5f2..5afeede 100644 --- a/hnodeb/HNBGW_ConnectionHandler.ttcn +++ b/hnodeb/HNBGW_ConnectionHandler.ttcn @@ -200,7 +200,7 @@ function f_gtpu_send(uint32_t tei, octetstring payload) runs on HNBGW_ConnHdlr { var Gtp1uPeer peer := valueof(ts_GtpPeerU(g_pars.hnodeb_addr)); - GTP[0].send(ts_GTP1U_GPDU(peer, 0 /*seq*/, int2oct(tei, 4), payload)); + GTP[0].send(ts_GTP1U_GPDU(peer, omit /*opt_part*/, int2oct(tei, 4), payload)); } /* HNBLLIF socket may at any time receive a new INFO.ind */ diff --git a/library/GTPv1U_Templates.ttcn b/library/GTPv1U_Templates.ttcn index c242115..6efb96b 100644 --- a/library/GTPv1U_Templates.ttcn +++ b/library/GTPv1U_Templates.ttcn @@ -34,14 +34,24 @@ gtpu_IEs := ies } - function f_GTPU_s_bit(template (omit) uint16_t seq) return BIT1 { - if (istemplatekind(seq, "omit")) { + function f_GTPU_s_bit(template (omit) GTPU_Header_optional_part opt_part) return BIT1 { + if (istemplatekind(opt_part, "omit")) { return '0'B; } return '1'B; } - function f_GTPU_opt_part(template (omit) uint16_t seq) return template (omit) GTPU_Header_optional_part { + function f_GTPU_e_bit(template (omit) GTPU_Header_optional_part opt_part) return BIT1 { + if (istemplatekind(opt_part, "omit")) { + return '0'B; + } + if (istemplatekind(opt_part.gTPU_extensionHeader_List, "omit")) { + return '0'B; + } + return '1'B; + } + + function f_GTPU_opt_part_from_seq(template (omit) uint16_t seq) return template (omit) GTPU_Header_optional_part { if (istemplatekind(seq, "omit")) { return omit; } @@ -56,7 +66,7 @@ /* generalized GTP-U send template */ template (value) PDU_GTPU ts_GTP1U_PDU(template (value) OCT1 msg_type, - template (omit) uint16_t seq, + template (omit) GTPU_Header_optional_part opt_part, template (value) OCT4 teid, template (value) GTPU_IEs ies) := { /* N-PDU Number flag (PN): the GTP-U header contains a meaningful N-PDU Number field if the PN @@ -69,9 +79,9 @@ * Note that the caller must ensure that these conditions hold. * The caller can either pass a sequence number (we set s_bit to '1'B) when appropriate, * or may omit the sequence number (we set s_bit to '0'B). */ - s_bit := f_GTPU_s_bit(seq), + s_bit := f_GTPU_s_bit(opt_part), /* Extension header presence */ - e_bit := '0'B, + e_bit := f_GTPU_e_bit(opt_part), spare := '0'B, /* Protocol Type flag (PT) shall be set to '1' in GTP */ pt := '1'B, @@ -80,7 +90,7 @@ messageType := msg_type, lengthf := 0, /* we assume encoder overwrites this */ teid := teid, - opt_part := f_GTPU_opt_part(seq), + opt_part := opt_part, gtpu_IEs := ies } @@ -119,7 +129,7 @@ template (value) Gtp1uUnitdata ts_GTPU_PING(template (value) Gtp1uPeer peer, template (value) uint16_t seq) := { peer := peer, - gtpu := ts_GTP1U_PDU('01'O, seq, '00000000'O, ts_UEchoReqPDU) + gtpu := ts_GTP1U_PDU('01'O, f_GTPU_opt_part_from_seq(seq), '00000000'O, ts_UEchoReqPDU) } template GTPU_IEs ts_UEchoRespPDU(template (value) OCT1 restart_counter) := { @@ -137,7 +147,7 @@ template (value) uint16_t seq, template (value) OCT1 rest_ctr) := { peer := peer, - gtpu := ts_GTP1U_PDU('02'O, seq, '00000000'O, ts_UEchoRespPDU(rest_ctr)) + gtpu := ts_GTP1U_PDU('02'O, f_GTPU_opt_part_from_seq(seq), '00000000'O, ts_UEchoRespPDU(rest_ctr)) } template (present) GSNAddress_gtpu tr_UGsnAddr(template (present) octetstring ip_addr := ?) := { @@ -189,15 +199,15 @@ template (value) OCT4 teid, template (value) octetstring gsn_addr) := { peer := peer, - gtpu := ts_GTP1U_PDU('1A'O, seq, '00000000'O, ts_UErrorIndication(teid, gsn_addr)) + gtpu := ts_GTP1U_PDU('1A'O, f_GTPU_opt_part_from_seq(seq), '00000000'O, ts_UErrorIndication(teid, gsn_addr)) } /* master template for sending a GTP-U user plane data */ template (value) Gtp1uUnitdata ts_GTP1U_GPDU(template (value) Gtp1uPeer peer, - template (omit) uint16_t seq, + template (omit) GTPU_Header_optional_part opt_part, template (value) OCT4 teid, template (value) octetstring data) := { peer := peer, - gtpu := ts_GTP1U_PDU('FF'O, seq, teid, { g_PDU_IEs := { data := data }}) + gtpu := ts_GTP1U_PDU('FF'O, opt_part, teid, { g_PDU_IEs := { data := data }}) } } diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn index 055902a..c39b614 100644 --- a/sgsn/BSSGP_ConnHdlr.ttcn +++ b/sgsn/BSSGP_ConnHdlr.ttcn @@ -1060,7 +1060,7 @@ peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); rem_teid := apars.sgsn_tei_u; } - GTP[GTP_GGSN_IDX].send(ts_GTP1U_GPDU(peer, 0 /*seq*/, rem_teid, payload)); + GTP[GTP_GGSN_IDX].send(ts_GTP1U_GPDU(peer, omit /*opt_part*/, rem_teid, payload)); } altstep as_xid(PdpActPars apars, integer ran_index := 0) runs on BSSGP_ConnHdlr { @@ -1143,7 +1143,7 @@ } else if (is_iu(ran_index)) { /* Send PDU via GTPv1U from simulated MS/RNC directly to the simulated GGSN: */ rx_peer := valueof(ts_GtpPeerU(apars.rnc_ip_u)); - GTP[ran2gtp_idx(ran_index)].send(ts_GTP1U_GPDU(valueof(ts_GtpPeerU(apars.ggsn_ip_u)), 0 /*seq*/, apars.ggsn_tei_u, payload)); + GTP[ran2gtp_idx(ran_index)].send(ts_GTP1U_GPDU(valueof(ts_GtpPeerU(apars.ggsn_ip_u)), omit /*opt_part*/, apars.ggsn_tei_u, payload)); } /* Expect PDU via GTP from RNC/SGSN on simulated GGSN */ alt { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38381?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: I5b1668d45f4454f92c234054678e17145bd4fe49 Gerrit-Change-Number: 38381 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: Cosmetic: ggsn: fix copy paste error
by osmith 11 Oct '24

11 Oct '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38380?usp=email ) Change subject: Cosmetic: ggsn: fix copy paste error ...................................................................... Cosmetic: ggsn: fix copy paste error Change-Id: Iad2424036ff3dd45a9cd67f28249fbb06e657e62 --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/38380/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index c151346..7f4a7bb 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1329,7 +1329,7 @@ } /* Test PDP context activation for dynamic IPv4 EUA. - Test we can send ICMPv6 ping over GTPU to DNS server. */ + Test we can send ICMPv4 ping over GTPU to DNS server. */ testcase TC_pdp4_act_deact_gtpu_access() runs on GT_CT { f_init(); var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38380?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: Iad2424036ff3dd45a9cd67f28249fbb06e657e62 Gerrit-Change-Number: 38380 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0