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

[S] Change in docker-playground[master]: scripts/kernel-test: add /dev/null

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36135?usp=email ) Change subject: scripts/kernel-test: add /dev/null ...................................................................... scripts/kernel-test: add /dev/null Some busybox programs need /dev/null, add it to the initramfs. Change-Id: Ie583ae816b517c10d13d77aa45155fc4d1209c26 --- M scripts/kernel-test/initrd-build.sh 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/35/36135/1 diff --git a/scripts/kernel-test/initrd-build.sh b/scripts/kernel-test/initrd-build.sh index d942719..e97ff89 100755 --- a/scripts/kernel-test/initrd-build.sh +++ b/scripts/kernel-test/initrd-build.sh @@ -117,6 +117,8 @@ initrd_add_file \ /lib/modules/*/modules.dep +mknod dev/null c 1 3 + # Required for osmo-ggsn mknod dev/net/tun c 10 200 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36135?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie583ae816b517c10d13d77aa45155fc4d1209c26 Gerrit-Change-Number: 36135 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-ggsn-test: tweak log options

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36134?usp=email ) Change subject: ttcn3-ggsn-test: tweak log options ...................................................................... ttcn3-ggsn-test: tweak log options Change-Id: I6c3095f4d3378d2026d3720bc32e27ce4c8345b3 --- M ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg M ttcn3-ggsn-test/osmo-ggsn.cfg 2 files changed, 17 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/34/36134/1 diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg index b377bfa..639a586 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg @@ -9,31 +9,12 @@ log stderr logging filter all 1 logging color 1 + logging print level 1 logging print category 1 - logging timestamp 1 + logging print category-hex 0 + logging print file basename last logging print extended-timestamp 1 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging level set-all debug ! stats interval 5 ! diff --git a/ttcn3-ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn.cfg index 2f09990..1848291 100644 --- a/ttcn3-ggsn-test/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn.cfg @@ -9,31 +9,12 @@ log stderr logging filter all 1 logging color 1 + logging print level 1 logging print category 1 - logging timestamp 1 + logging print category-hex 0 + logging print file basename last logging print extended-timestamp 1 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice + logging level set-all debug ! stats interval 5 ! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36134?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6c3095f4d3378d2026d3720bc32e27ce4c8345b3 Gerrit-Change-Number: 36134 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io_uring: Check if osmo_fd_register fails at iofd_uring_notify_c...

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36132?usp=email ) Change subject: osmo_io_uring: Check if osmo_fd_register fails at iofd_uring_notify_connected() ...................................................................... osmo_io_uring: Check if osmo_fd_register fails at iofd_uring_notify_connected() If it fails, do not set the IOFD_FLAG_NOTIFY_CONNECTED flag and log an error message. Closes: Coverity CID#349579 Change-Id: I34e8cc9a2b9df0c624841e5f9268a15c32418da1 --- M src/core/osmo_io_uring.c 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/36132/1 diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index cb636da..b174b22 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -496,8 +496,10 @@ if (!IOFD_FLAG_ISSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED)) { osmo_fd_setup(&iofd->u.uring.connect_ofd, iofd->fd, OSMO_FD_WRITE, iofd_uring_connected_cb, iofd, 0); - osmo_fd_register(&iofd->u.uring.connect_ofd); - IOFD_FLAG_SET(iofd, IOFD_FLAG_NOTIFY_CONNECTED); + if (osmo_fd_register(&iofd->u.uring.connect_ofd) < 0) + LOGPIO(iofd, LOGL_ERROR, "Failed to register FD for connect event.\n"); + else + IOFD_FLAG_SET(iofd, IOFD_FLAG_NOTIFY_CONNECTED); } } else iofd_uring_write_enable(iofd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36132?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I34e8cc9a2b9df0c624841e5f9268a15c32418da1 Gerrit-Change-Number: 36132 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: do check_mode_callback_compat() only if ioops is set at osmo...

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36131?usp=email ) Change subject: osmo_io: do check_mode_callback_compat() only if ioops is set at osmo_iofd_setup() ...................................................................... osmo_io: do check_mode_callback_compat() only if ioops is set at osmo_iofd_setup() Setting ioops is optional when calling osmo_iofd_setup(). If it is not set, do not call check_mode_callback_compat() to check for compatibility. Closes: Coverity CID#349578 Change-Id: I1e25f3e420f25a44cbf73a4da9a498b7561e9ddd --- M src/core/osmo_io.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/31/36131/1 diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 33466e5..5a5e05c 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -619,7 +619,7 @@ return NULL; } - if (!check_mode_callback_compat(mode, ioops)) + if (ioops && !check_mode_callback_compat(mode, ioops)) return NULL; iofd = talloc_zero(ctx, struct osmo_io_fd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36131?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1e25f3e420f25a44cbf73a4da9a498b7561e9ddd Gerrit-Change-Number: 36131 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ggsn_tests: Split out generic ICMP(v6) related templates and functions

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36130?usp=email ) Change subject: ggsn_tests: Split out generic ICMP(v6) related templates and functions ...................................................................... ggsn_tests: Split out generic ICMP(v6) related templates and functions Change-Id: I53a5da05caeef4cdd59778840a6f4eed489f1b93 --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh A library/ICMP_Templates.ttcn A library/ICMPv6_Templates.ttcn 4 files changed, 346 insertions(+), 308 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/36130/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 68157f3..55720ee 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -31,6 +31,8 @@ import from IP_Types all; import from ICMP_Types all; import from ICMPv6_Types all; + import from ICMP_Templates all; + import from ICMPv6_Templates all; import from Native_Functions all; import from Osmocom_VTY_Functions all; import from TELNETasp_PortType all; @@ -819,285 +821,6 @@ T_default.stop; } - /* IPv6 router solicitation fe80::2 -> ff02::2 from 02:88:b5:1f:25:59 */ - const octetstring c_router_solicit := '6000000000103afffe800000000000000000000000000002ff02000000000000000000000000000285009f2b0000000001010288b51f2559'O; - /* IPv6 neighbor solicitation fe80::2 -> ff02::1:ff00:2 from 02:88:b5:1f:25:59 */ - const octetstring c_neigh_solicit:= '6000000000203afffe800000000000000000000000000002ff0200000000000000000001ff00000287009f9600000000fe80000000000000000000000000000201010288b51f2559'O; - - /* template for sending an ICMPv4 echo request */ - template (value) PDU_ICMP ts_ICMPv4_ERQ(octetstring data := ''O) := { - echo := { - type_field := 8, - code := 0, - checksum := '0000'O, - identifier := '0345'O, - sequence_number := '0001'O, - data := data - } - } - - /* template for receiving/matching an ICMPv4 echo request */ - template (present) PDU_ICMP tr_ICMPv4_ERQ := { - echo := { - type_field := 8, - code := 0, - checksum := ?, - identifier := ?, - sequence_number := ?, - data := ? - } - } - - /* template for receiving/matching an ICMPv4 echo reply */ - template (present) PDU_ICMP tr_ICMPv4_ERP(template octetstring data := *) := { - echo_reply := { - type_field := 0, - code := 0, - checksum := ?, - identifier := ?, - sequence_number := ?, - data := data - } - } - - /* template for receiving/matching an ICMPv6 Destination Unreachable */ - template (present) PDU_ICMP tr_ICMPv4_DU := { - destination_unreachable := { - type_field := 1, - code := ?, - checksum := ?, - unused := ?, - original_ip_msg := ? - } - } - - /* template to construct IPv4_packet from input arguments, ready for use in f_IPv4_enc() */ - template (value) IPv4_packet ts_IP4(OCT4 srcaddr, OCT4 dstaddr, LIN1 proto, LIN2_BO_LAST tlen, octetstring payload) := { - header := { - ver := 4, - hlen := 5, - tos := 0, - tlen := tlen, - id := 35902, - res := '0'B, - dfrag := '1'B, - mfrag := '0'B, - foffset := 0, - ttl := 64, - proto := proto, - cksum := 0, - srcaddr := srcaddr, - dstaddr := dstaddr - }, - ext_headers := omit, - payload := payload - } - - /* template to generate a 'Prefix Information' ICMPv6 option */ - template (value) OptionField ts_ICMP6_OptPrefix(OCT16 prefix, INT1 prefix_len) := { - prefixInformation := { - typeField := 3, - lengthIndicator := 8, - prefixLength := prefix_len, - reserved1 := '000000'B, - a_Bit := '0'B, - l_Bit := '0'B, - validLifetime := oct2int('FFFFFFFF'O), - preferredLifetime := oct2int('FFFFFFFF'O), - reserved2 := '00000000'O, - prefix := prefix - } - } - - /* template for sending an ICMPv6 echo request */ - template (value) PDU_ICMPv6 ts_ICMPv6_ERQ := { - echoRequest := { - typeField := 128, - code := 0, - checksum := '0000'O, - identifier := 0, - sequenceNr := 0, - data := ''O - } - } - - /* template for sending an ICMPv6 router solicitation */ - template (value) PDU_ICMPv6 ts_ICMPv6_RS := { - routerSolicitation := { - typeField := 133, - code := 0, - checksum := '0000'O, - reserved := '00000000'O, - /* TODO: do we need 'Source link-layer address' ? */ - options := omit - } - } - - /* template for sending an ICMPv6 router advertisement */ - template (value) PDU_ICMPv6 ts_ICMPv6_RA(OCT16 prefix, INT1 prefix_len) := { - routerAdvertisement := { - typeField := 134, - code := 0, - checksum := '0000'O, - curHopLimit := 0, - reserved := '000000'B, - o_Bit := '0'B, - m_Bit := '0'B, - routerLifetime := oct2int('FFFF'O), - reachableTime := oct2int('FFFFFFFF'O), - retransTimer := oct2int('FFFFFFFF'O), - options := { - ts_ICMP6_OptPrefix(prefix, prefix_len) - } - } - } - - /* template for sending an ICMPv6 neighbor solicitation */ - template (value) PDU_ICMPv6 ts_ICMPv6_NS(OCT16 target_addr) := { - neighborSolicitation := { - typeField := 135, - code := 0, - checksum := '0000'O, - reserved := '00000000'O, - targetAddress := target_addr, - /* TODO: do we need 'Source link-layer address' ? */ - options := omit - } - } - - /* derive ICMPv6 link-local address from lower 64bit of link_id */ - /* template for receiving/matching an ICMPv6 'Prefix Information' option */ - template (present) OptionField tr_ICMP6_OptPrefix(template (present) OCT16 prefix, template (present) INT1 prefix_len) := { - prefixInformation := { - typeField := 3, - lengthIndicator := 4, - prefixLength := prefix_len, - reserved1 := ?, - a_Bit := ?, - l_Bit := ?, - validLifetime := ?, - preferredLifetime := ?, - reserved2 := ?, - prefix := prefix - } - } - - /* template for receiving/matching an ICMPv6 'MTU' option, rfc4861 4.6.4 */ - template (present) OptionField tr_ICMP6_OptMTU(template (present) integer mtu := ?) := { - mTU := { - typeField := 5, - lengthIndicator := 1, - reserved := ?, - mTU_Value := mtu - } - } - - /* template for receiving/matching an ICMPv6 router advertisement */ - template (present) PDU_ICMPv6 tr_ICMPv6_RA(template (present) OCT16 prefix, template (present) INT1 prefix_len) := { - routerAdvertisement := { - typeField := 134, - code := 0, - checksum := ?, - curHopLimit := ?, - reserved := ?, - o_Bit := '0'B, - m_Bit := '0'B, - routerLifetime := ?, - reachableTime := ?, - retransTimer := ?, - options := ({ tr_ICMP6_OptPrefix(prefix, prefix_len) }, - { tr_ICMP6_OptPrefix(prefix, prefix_len), tr_ICMP6_OptMTU } - ) - } - } - - /* template for receiving/matching an ICMPv6 Destination Unreachable */ - template (present) PDU_ICMPv6 tr_ICMPv6_DU := { - destinationUnreachable := { - typeField := 1, - code := ?, - checksum := ?, - unused := ?, - originalIpMsg := ? - } - } - - /* template for receiving/matching an ICMPv6 echo request */ - template (present) PDU_ICMPv6 tr_ICMPv6_ERQ := { - echoRequest := { - typeField := 128, - code := 0, - checksum := ?, - identifier := ?, - sequenceNr := ?, - data := ? - } - } - - /* template for receiving/matching an ICMPv6 echo reply */ - template (present) PDU_ICMPv6 tr_ICMPv6_ERP(template octetstring data := *) := { - echoReply := { - typeField := 129, - code := 0, - checksum := ?, - identifier := ?, - sequenceNr := ?, - data := data - } - } - - /* template to construct IPv6_packet from input arguments, ready for use in f_IPv6_enc() */ - template (value) IPv6_packet ts_IP6(OCT16 srcaddr, OCT16 dstaddr, LIN1 nexthead, octetstring payload, LIN1 hlim := 255) := { - header := { - ver := 6, - trclass := 0, - flabel := 0, - plen := 0, - nexthead := nexthead, - hlim := hlim, - srcaddr := srcaddr, - dstaddr := dstaddr - }, - ext_headers := omit, - payload := payload - } - - function f_ipv6_link_local(in OCT16 link_id) return OCT16 { - return 'FE80000000000000'O & substr(link_id, 8, 8); - } - - function f_ipv6_global(in OCT16 link_id) return OCT16 { - return substr(link_id, 0, 8) & '1234123412341234'O; - } - - /* Create a new different IPv6 addr from input. Starts mangling at byte prefix. */ - function f_ipv6_mangle(in OCT16 addr, in integer prefix := 0) return OCT16 { - var integer i; - var octetstring res := substr(addr, 0, prefix); - for (i := prefix; i < lengthof(addr); i := i + 1) { - var octetstring a := addr[i] xor4b '11'O; - res := res & a; - } - return res; - } - - /* Compute solicited-node multicast address as per RFC4291 2.7.1 */ - function f_ipv6_sol_node_mcast(in OCT16 addr) return OCT16 { - return 'FF0200000000000000000001FF'O & substr(addr, 13, 3); - } - - /* generate and encode ICMPv6 router solicitation */ - function f_gen_icmpv6_router_solicitation(in OCT16 link_id) return octetstring { - const OCT16 c_ip6_all_router_mcast := 'FF020000000000000000000000000002'O; - var OCT16 saddr := f_ipv6_link_local(link_id); - - var octetstring tmp; - tmp := f_enc_PDU_ICMPv6(valueof(ts_ICMPv6_RS), saddr, c_ip6_all_router_mcast); - var IPv6_packet ip6 := valueof(ts_IP6(saddr, c_ip6_all_router_mcast, 58, tmp)); - - return f_IPv6_enc(ip6); - } - /* Get link-id from PDP Context EUA */ function f_ctx_get_ipv6_interface_id(in PdpContext ctx) return OCT16 { var OCT16 interface_id; @@ -1117,14 +840,6 @@ return f_gen_icmpv6_router_solicitation(interface_id); } - /* generate and encode ICMPv6 neighbor solicitation */ - function f_gen_icmpv6_neigh_solicit(in OCT16 saddr, in OCT16 daddr, in OCT16 tgt_addr) return octetstring { - var octetstring tmp; - tmp := f_enc_PDU_ICMPv6(valueof(ts_ICMPv6_NS(tgt_addr)), saddr, daddr); - var IPv6_packet ip6 := valueof(ts_IP6(saddr, daddr, 58, tmp)); - return f_IPv6_enc(ip6); - } - /* generate and encode ICMPv6 neighbor solicitation for PDP Context */ function f_gen_icmpv6_neigh_solicit_for_pdp(in PdpContext ctx) return octetstring { var OCT16 interface_id := f_ctx_get_ipv6_interface_id(ctx); @@ -1134,25 +849,6 @@ return f_gen_icmpv6_neigh_solicit(link_local, daddr, link_local); } - /* Send an ICMPv4 echo msg through GTP given pdp ctx, and ip src and dst addr */ - function f_gen_icmpv4_echo(OCT4 saddr, OCT4 daddr, octetstring pl := ''O) return octetstring { - var octetstring tmp := f_enc_PDU_ICMP(valueof(ts_ICMPv4_ERQ(pl))); - var IPv4_packet ip4 := valueof(ts_IP4(saddr, daddr, 1, 50, tmp)); - var octetstring data := f_IPv4_enc(ip4); - var OCT2 cksum := f_IPv4_checksum(data); - data[10] := cksum[0]; - data[11] := cksum[1]; - return data; - } - - /* Send an ICMPv6 echo msg through GTP given pdp ctx, and ip src and dst addr */ - function f_gen_icmpv6_echo(OCT16 saddr, OCT16 daddr) return octetstring { - var octetstring tmp := f_enc_PDU_ICMPv6(valueof(ts_ICMPv6_ERQ), saddr, daddr); - var IPv6_packet ip6 := valueof(ts_IP6(saddr, daddr, 58, tmp)); - var octetstring data := f_IPv6_enc(ip6); - return data; - } - /* Wait for ICMPv4 from GTP */ function f_wait_icmp4(PdpContext ctx, template PDU_ICMP expected) runs on GT_CT { var Gtp1uUnitdata ud; @@ -1340,8 +1036,6 @@ f_pdp_ctx_act(ctx); f_PCO_ensure_no_duplicates(ctx.pco_neg); - //f_send_gtpu(ctx, c_router_solicit); - //f_send_gtpu(ctx, c_neigh_solicit); f_send_gtpu(ctx, f_icmpv6_rs_for_pdp(ctx)); f_wait_rtr_adv(ctx); diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index ebeb94b..c79e4a8 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -63,6 +63,7 @@ FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts32_299_Templates.ttcn " +FILES+="ICMP_Templates.ttcn ICMPv6_Templates.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " gen_links $DIR $FILES diff --git a/library/ICMP_Templates.ttcn b/library/ICMP_Templates.ttcn new file mode 100644 index 0000000..cf88e93 --- /dev/null +++ b/library/ICMP_Templates.ttcn @@ -0,0 +1,96 @@ +/* ICMP Templates in TTCN-3 + * (C) 2024 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 + */ + +module ICMP_Templates { + + import from General_Types all; + import from IP_Types all; + import from ICMP_Types all; + + /* template for sending an ICMPv4 echo request */ + template (value) PDU_ICMP ts_ICMPv4_ERQ(octetstring data := ''O) := { + echo := { + type_field := 8, + code := 0, + checksum := '0000'O, + identifier := '0345'O, + sequence_number := '0001'O, + data := data + } + } + + /* template for receiving/matching an ICMPv4 echo request */ + template (present) PDU_ICMP tr_ICMPv4_ERQ := { + echo := { + type_field := 8, + code := 0, + checksum := ?, + identifier := ?, + sequence_number := ?, + data := ? + } + } + + /* template for receiving/matching an ICMPv4 echo reply */ + template (present) PDU_ICMP tr_ICMPv4_ERP(template octetstring data := *) := { + echo_reply := { + type_field := 0, + code := 0, + checksum := ?, + identifier := ?, + sequence_number := ?, + data := data + } + } + + /* template for receiving/matching an ICMPv6 Destination Unreachable */ + template (present) PDU_ICMP tr_ICMPv4_DU := { + destination_unreachable := { + type_field := 1, + code := ?, + checksum := ?, + unused := ?, + original_ip_msg := ? + } + } + + /* template to construct IPv4_packet from input arguments, ready for use in f_IPv4_enc() */ + template (value) IPv4_packet ts_IP4(OCT4 srcaddr, OCT4 dstaddr, LIN1 proto, LIN2_BO_LAST tlen, octetstring payload) := { + header := { + ver := 4, + hlen := 5, + tos := 0, + tlen := tlen, + id := 35902, + res := '0'B, + dfrag := '1'B, + mfrag := '0'B, + foffset := 0, + ttl := 64, + proto := proto, + cksum := 0, + srcaddr := srcaddr, + dstaddr := dstaddr + }, + ext_headers := omit, + payload := payload + } + + /* Send an ICMPv4 echo msg through GTP given pdp ctx, and ip src and dst addr */ + function f_gen_icmpv4_echo(OCT4 saddr, OCT4 daddr, octetstring pl := ''O) return octetstring { + var octetstring tmp := f_enc_PDU_ICMP(valueof(ts_ICMPv4_ERQ(pl))); + var IPv4_packet ip4 := valueof(ts_IP4(saddr, daddr, 1, 50, tmp)); + var octetstring data := f_IPv4_enc(ip4); + var OCT2 cksum := f_IPv4_checksum(data); + data[10] := cksum[0]; + data[11] := cksum[1]; + return data; + } +} \ No newline at end of file diff --git a/library/ICMPv6_Templates.ttcn b/library/ICMPv6_Templates.ttcn new file mode 100644 index 0000000..687aad4 --- /dev/null +++ b/library/ICMPv6_Templates.ttcn @@ -0,0 +1,238 @@ +/* ICMPv6 Templates in TTCN-3 + * (C) 2024 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 + */ + +module ICMPv6_Templates { + + import from General_Types all; + import from IP_Types all; + import from ICMPv6_Types all; + + /* template to generate a 'Prefix Information' ICMPv6 option */ + template (value) OptionField ts_ICMP6_OptPrefix(OCT16 prefix, INT1 prefix_len) := { + prefixInformation := { + typeField := 3, + lengthIndicator := 8, + prefixLength := prefix_len, + reserved1 := '000000'B, + a_Bit := '0'B, + l_Bit := '0'B, + validLifetime := oct2int('FFFFFFFF'O), + preferredLifetime := oct2int('FFFFFFFF'O), + reserved2 := '00000000'O, + prefix := prefix + } + } + + /* template for sending an ICMPv6 echo request */ + template (value) PDU_ICMPv6 ts_ICMPv6_ERQ := { + echoRequest := { + typeField := 128, + code := 0, + checksum := '0000'O, + identifier := 0, + sequenceNr := 0, + data := ''O + } + } + + /* template for sending an ICMPv6 router solicitation */ + template (value) PDU_ICMPv6 ts_ICMPv6_RS := { + routerSolicitation := { + typeField := 133, + code := 0, + checksum := '0000'O, + reserved := '00000000'O, + /* TODO: do we need 'Source link-layer address' ? */ + options := omit + } + } + + /* template for sending an ICMPv6 router advertisement */ + template (value) PDU_ICMPv6 ts_ICMPv6_RA(OCT16 prefix, INT1 prefix_len) := { + routerAdvertisement := { + typeField := 134, + code := 0, + checksum := '0000'O, + curHopLimit := 0, + reserved := '000000'B, + o_Bit := '0'B, + m_Bit := '0'B, + routerLifetime := oct2int('FFFF'O), + reachableTime := oct2int('FFFFFFFF'O), + retransTimer := oct2int('FFFFFFFF'O), + options := { + ts_ICMP6_OptPrefix(prefix, prefix_len) + } + } + } + + /* template for sending an ICMPv6 neighbor solicitation */ + template (value) PDU_ICMPv6 ts_ICMPv6_NS(OCT16 target_addr) := { + neighborSolicitation := { + typeField := 135, + code := 0, + checksum := '0000'O, + reserved := '00000000'O, + targetAddress := target_addr, + /* TODO: do we need 'Source link-layer address' ? */ + options := omit + } + } + + /* derive ICMPv6 link-local address from lower 64bit of link_id */ + /* template for receiving/matching an ICMPv6 'Prefix Information' option */ + template (present) OptionField tr_ICMP6_OptPrefix(template (present) OCT16 prefix, template (present) INT1 prefix_len) := { + prefixInformation := { + typeField := 3, + lengthIndicator := 4, + prefixLength := prefix_len, + reserved1 := ?, + a_Bit := ?, + l_Bit := ?, + validLifetime := ?, + preferredLifetime := ?, + reserved2 := ?, + prefix := prefix + } + } + + /* template for receiving/matching an ICMPv6 'MTU' option, rfc4861 4.6.4 */ + template (present) OptionField tr_ICMP6_OptMTU(template (present) integer mtu := ?) := { + mTU := { + typeField := 5, + lengthIndicator := 1, + reserved := ?, + mTU_Value := mtu + } + } + + /* template for receiving/matching an ICMPv6 router advertisement */ + template (present) PDU_ICMPv6 tr_ICMPv6_RA(template (present) OCT16 prefix, template (present) INT1 prefix_len) := { + routerAdvertisement := { + typeField := 134, + code := 0, + checksum := ?, + curHopLimit := ?, + reserved := ?, + o_Bit := '0'B, + m_Bit := '0'B, + routerLifetime := ?, + reachableTime := ?, + retransTimer := ?, + options := ({ tr_ICMP6_OptPrefix(prefix, prefix_len) }, + { tr_ICMP6_OptPrefix(prefix, prefix_len), tr_ICMP6_OptMTU } + ) + } + } + + /* template for receiving/matching an ICMPv6 Destination Unreachable */ + template (present) PDU_ICMPv6 tr_ICMPv6_DU := { + destinationUnreachable := { + typeField := 1, + code := ?, + checksum := ?, + unused := ?, + originalIpMsg := ? + } + } + + /* template for receiving/matching an ICMPv6 echo request */ + template (present) PDU_ICMPv6 tr_ICMPv6_ERQ := { + echoRequest := { + typeField := 128, + code := 0, + checksum := ?, + identifier := ?, + sequenceNr := ?, + data := ? + } + } + + /* template for receiving/matching an ICMPv6 echo reply */ + template (present) PDU_ICMPv6 tr_ICMPv6_ERP(template octetstring data := *) := { + echoReply := { + typeField := 129, + code := 0, + checksum := ?, + identifier := ?, + sequenceNr := ?, + data := data + } + } + + /* template to construct IPv6_packet from input arguments, ready for use in f_IPv6_enc() */ + template (value) IPv6_packet ts_IP6(OCT16 srcaddr, OCT16 dstaddr, LIN1 nexthead, octetstring payload, LIN1 hlim := 255) := { + header := { + ver := 6, + trclass := 0, + flabel := 0, + plen := 0, + nexthead := nexthead, + hlim := hlim, + srcaddr := srcaddr, + dstaddr := dstaddr + }, + ext_headers := omit, + payload := payload + } + + function f_ipv6_link_local(in OCT16 link_id) return OCT16 { + return 'FE80000000000000'O & substr(link_id, 8, 8); + } + + function f_ipv6_global(in OCT16 link_id) return OCT16 { + return substr(link_id, 0, 8) & '1234123412341234'O; + } + + /* Create a new different IPv6 addr from input. Starts mangling at byte prefix. */ + function f_ipv6_mangle(in OCT16 addr, in integer prefix := 0) return OCT16 { + var integer i; + var octetstring res := substr(addr, 0, prefix); + for (i := prefix; i < lengthof(addr); i := i + 1) { + var octetstring a := addr[i] xor4b '11'O; + res := res & a; + } + return res; + } + + /* Send an ICMPv6 echo msg through GTP given pdp ctx, and ip src and dst addr */ + function f_gen_icmpv6_echo(OCT16 saddr, OCT16 daddr) return octetstring { + var octetstring tmp := f_enc_PDU_ICMPv6(valueof(ts_ICMPv6_ERQ), saddr, daddr); + var IPv6_packet ip6 := valueof(ts_IP6(saddr, daddr, 58, tmp)); + var octetstring data := f_IPv6_enc(ip6); + return data; + } + + /* Compute solicited-node multicast address as per RFC4291 2.7.1 */ + function f_ipv6_sol_node_mcast(in OCT16 addr) return OCT16 { + return 'FF0200000000000000000001FF'O & substr(addr, 13, 3); + } + + /* generate and encode ICMPv6 router solicitation */ + function f_gen_icmpv6_router_solicitation(in OCT16 link_id) return octetstring { + const OCT16 c_ip6_all_router_mcast := 'FF020000000000000000000000000002'O; + var OCT16 saddr := f_ipv6_link_local(link_id); + + var octetstring tmp; + tmp := f_enc_PDU_ICMPv6(valueof(ts_ICMPv6_RS), saddr, c_ip6_all_router_mcast); + var IPv6_packet ip6 := valueof(ts_IP6(saddr, c_ip6_all_router_mcast, 58, tmp)); + + return f_IPv6_enc(ip6); + } + + /* generate and encode ICMPv6 neighbor solicitation */ + function f_gen_icmpv6_neigh_solicit(in OCT16 saddr, in OCT16 daddr, in OCT16 tgt_addr) return octetstring { + var octetstring tmp; + tmp := f_enc_PDU_ICMPv6(valueof(ts_ICMPv6_NS(tgt_addr)), saddr, daddr); + var IPv6_packet ip6 := valueof(ts_IP6(saddr, daddr, 58, tmp)); + return f_IPv6_enc(ip6); + } + +} \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36130?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: I53a5da05caeef4cdd59778840a6f4eed489f1b93 Gerrit-Change-Number: 36130 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_upf_echo_req

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36129?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: epdg: Introduce test TC_upf_echo_req ...................................................................... epdg: Introduce test TC_upf_echo_req Change-Id: I3fd96f212175959cb113d2f6a362c0e77e5ca0d7 --- M epdg/EPDG_Tests.ttcn 1 file changed, 61 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/36129/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36129?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: I3fd96f212175959cb113d2f6a362c0e77e5ca0d7 Gerrit-Change-Number: 36129 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: Add support to handle GTPv1-U

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36128?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: GTPv2_Emulation: Add support to handle GTPv1-U ...................................................................... GTPv2_Emulation: Add support to handle GTPv1-U Change-Id: I34c744015c09a387cbf736063303bdb61ca4744e --- M epdg/EPDG_Tests.ttcn M epdg/gen_links.sh M epdg/regen_makefile.sh M library/GTPv2_Emulation.ttcn 4 files changed, 54 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/36128/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36128?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: I34c744015c09a387cbf736063303bdb61ca4744e Gerrit-Change-Number: 36128 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_upf_echo_req

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36129?usp=email ) Change subject: epdg: Introduce test TC_upf_echo_req ...................................................................... epdg: Introduce test TC_upf_echo_req Change-Id: I3fd96f212175959cb113d2f6a362c0e77e5ca0d7 --- M epdg/EPDG_Tests.ttcn 1 file changed, 59 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/36129/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 92f49ff..ef0882e 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -144,7 +144,9 @@ /* TEI (Data) local side */ OCT4 teid_local optional, /* TEI (Data) remote side */ - OCT4 teid_remote optional + OCT4 teid_remote optional, + /* GTP-U address of the peer (ePDG) */ + charstring gtpu_addr_remote optional }; type record EPDG_ConnHdlrPars { @@ -194,7 +196,8 @@ bearer := { ebi := omit, teid_local := omit, - teid_remote := omit + teid_remote := omit, + gtpu_addr_remote := omit }, vec := f_gen_auth_vec_3g() }; @@ -509,12 +512,21 @@ private function f_EPDG_ConnHdlr_parse_CreateSessionReq(PDU_GTPCv2 rx_msg) runs on EPDG_ConnHdlr { var BearerContextIEs rx_bctx_ies; + var FullyQualifiedTEID rx_fteid_gtpu; /* Parse TEIC and Bearer EBI and TEID and store it in g_pars */ g_pars.teic_remote := rx_msg.gtpcv2_pdu.createSessionRequest.fullyQualifiedTEID[0].tEID_GRE_Key; rx_bctx_ies := rx_msg.gtpcv2_pdu.createSessionRequest.bearerContextGrouped[0].bearerContextIEs; g_pars.bearer.ebi := rx_bctx_ies.ePS_Bearer_ID.ePS_Bearer_ID_Value; - g_pars.bearer.teid_remote := rx_bctx_ies.fullyQualifiedTEID[0].tEID_GRE_Key; + + rx_fteid_gtpu := rx_bctx_ies.fullyQualifiedTEID[0]; + g_pars.bearer.teid_remote := rx_fteid_gtpu.tEID_GRE_Key; + if (rx_fteid_gtpu.v4_Flag == '1'B) { + g_pars.bearer.gtpu_addr_remote := f_inet_ntoa(rx_fteid_gtpu.iPv4_Address); + } + /*if (rx_fteid_gtpu.v6_Flag == '1'B) { + g_gtpu6_remote := rx_fteid_gtpu.iPv6_Address; + }*/ /* allocate + register TEID-C on local side */ g_pars.teic_local := f_gtp2_allocate_teid(); @@ -666,6 +678,21 @@ as_GTP2C_DeleteBearer_success(); } +private template (value) Gtp1uPeer ts_GtpPeerU(octetstring ip) := { + connId := 1, + remName := f_inet_ntoa(ip), + remPort := GTP1U_PORT +} +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)); +} +private function f_GTP1U_echo_ping_pong() runs on EPDG_ConnHdlr { + var Gtp1uPeer peer := valueof(ts_GtpPeerU(f_inet_addr(g_pars.bearer.gtpu_addr_remote))); + GTP2.send(ts_GTPU_PING(peer, 0 /*seq*/)); + GTP2.receive(tr_GTPU_PONG(peer)); +} + /* GSUP AuthInfo Req + Resp, triggers SWx MAR + MAA. */ private function f_GSUP_AI_success() runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; @@ -710,7 +737,7 @@ /* GSUP TunnelEPDG Tunnel Req + Resp, triggers S2b CreateSession Req + Response. */ private function f_GSUP_EPDGTunnel_success() runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; - var template (value) PCO_DATA pco := ts_PCO({ ts_PCO_P_DNS_IPv4, ts_PCO_P_PCSCF_IPv4 }); + var template (value) PCO_DATA pco := PCO_Types.ts_PCO({ ts_PCO_P_DNS_IPv4, ts_PCO_P_PCSCF_IPv4 }); GSUP.send(ts_GSUP_EPDGTunnel_REQ(g_pars.imsi, pco)); as_GTP2C_CreateSession_success(); /* Expect a positive response back to the translator; */ @@ -721,7 +748,7 @@ tr_GSUP_IE_PDP_QOS(?), tr_GSUP_IE_Charging_Characteristics(?) }; - var template (present) PCO_DATA exp_pco := tr_PCO({ + var template (present) PCO_DATA exp_pco := PCO_Types.tr_PCO({ tr_PCO_P_DNS_IPv4(f_inet_addr(mp_s2b_dns_ipv4)), tr_PCO_P_PCSCF_IPv4(f_inet_addr(mp_s2b_pcscf_ipv4)) }); @@ -738,7 +765,7 @@ /* GSUP TunnelEPDG Tunnel Req + Resp, triggers S2b CreateSession Req + Response (rejected). */ private function f_GSUP_EPDGTunnel_error() runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; - var template (value) PCO_DATA pco := ts_PCO({ ts_PCO_P_DNS_IPv4, ts_PCO_P_PCSCF_IPv4 }); + var template (value) PCO_DATA pco := PCO_Types.ts_PCO({ ts_PCO_P_DNS_IPv4, ts_PCO_P_PCSCF_IPv4 }); GSUP.send(ts_GSUP_EPDGTunnel_REQ(g_pars.imsi, pco)); as_GTP2C_CreateSession_error(APN_access_denied__no_subscription); alt { @@ -897,6 +924,22 @@ f_TC_concurrent_ues_MTC(100) } +private function f_TC_upf_echo_req(charstring id) runs on EPDG_ConnHdlr { + f_initial_attach(); + /* Dispatch Echo Resp to this component: */ + f_gtp2_register_teid('00000000'O); + f_GTP1U_echo_ping_pong(); + f_GSUP_PurgeMS_success(); +} +testcase TC_upf_echo_req() 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_upf_echo_req), pars); + vc_conn.done; + setverdict(pass); +} + control { execute ( TC_authinfo_normal() ); execute ( TC_ho_lte_to_wifi() ); @@ -904,6 +947,7 @@ execute ( TC_s2b_CreateSession_rejected() ); execute ( TC_concurrent_ues2() ); execute ( TC_concurrent_ues100() ); + execute ( TC_upf_echo_req() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36129?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: I3fd96f212175959cb113d2f6a362c0e77e5ca0d7 Gerrit-Change-Number: 36129 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: Add support to handle GTPv1-U

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36128?usp=email ) Change subject: GTPv2_Emulation: Add support to handle GTPv1-U ...................................................................... GTPv2_Emulation: Add support to handle GTPv1-U Change-Id: I34c744015c09a387cbf736063303bdb61ca4744e --- M epdg/EPDG_Tests.ttcn M epdg/gen_links.sh M epdg/regen_makefile.sh M library/GTPv2_Emulation.ttcn 4 files changed, 54 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/36128/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 6263828..92f49ff 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -18,6 +18,10 @@ import from DIAMETER_ts29_273_Templates all; import from DIAMETER_Emulation all; +import from GTPv1U_CodecPort all; +import from GTPU_Types all; +import from GTPv1U_Templates all; + import from GTPv2_Types all; import from GTPv2_Templates all; import from GTPv2_Emulation all; @@ -50,6 +54,8 @@ charstring mp_s2b_dns_ipv6 := "::1"; charstring mp_s2b_pcscf_ipv4 := "5.6.7.8"; charstring mp_s2b_pcscf_ipv6 := "::2"; + /* our emulated PGW /* GTP1U */ + charstring mp_upf_gtpu_local_ip := "127.0.0.100"; charstring mp_diam_realm := "localdomain"; integer mp_diam_watchdog_initial_wait_sec := 6*3; @@ -289,6 +295,8 @@ gtpc_bind_port := mp_s2b_local_port, gtpc_remote_ip := mp_s2b_remote_ip, gtpc_remote_port := mp_s2b_remote_port, + gtpu_bind_ip := mp_upf_gtpu_local_ip, + gtpu_bind_port := GTP1U_PORT, sgw_role := false, use_gtpu_daemon := false /* TODO: maybe use, set to true */ }; diff --git a/epdg/gen_links.sh b/epdg/gen_links.sh index f981586..ed4209c 100755 --- a/epdg/gen_links.sh +++ b/epdg/gen_links.sh @@ -33,6 +33,10 @@ FILES="UECUPS_CodecPort.ttcn UECUPS_CodecPort_CtrlFunct.ttcn UECUPS_CodecPort_CtrlFunctDef.cc UECUPS_Types.ttcn " gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.GTP_v13.5.0/src +FILES="GTPU_EncDec.cc GTPU_Types.ttcn " +gen_links $DIR $FILES + DIR=$BASEDIR/titan.ProtocolModules.GTPv2_v13.7.0/src FILES="GTPv2_Types.ttcn" gen_links $DIR $FILES @@ -47,6 +51,7 @@ 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 " +FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn " FILES+="GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " FILES+="GTPv2_CodecPort.ttcn GTPv2_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunct.ttcn GTPv2_Emulation.ttcn " gen_links $DIR $FILES diff --git a/epdg/regen_makefile.sh b/epdg/regen_makefile.sh index 8be3bde..eb5935e 100755 --- a/epdg/regen_makefile.sh +++ b/epdg/regen_makefile.sh @@ -16,6 +16,8 @@ DIAMETER_EncDec.cc DIAMETER_CodecPort_CtrlFunctDef.cc UECUPS_CodecPort_CtrlFunctDef.cc + GTPU_EncDec.cc + GTPv1U_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunctDef.cc " diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn index 054bd4b..3909b3b 100644 --- a/library/GTPv2_Emulation.ttcn +++ b/library/GTPv2_Emulation.ttcn @@ -14,6 +14,9 @@ import from IPL4asp_Types all; import from General_Types all; import from Osmocom_Types all; +import from GTPU_Types all; +import from GTPv1U_CodecPort all; +import from GTPv1U_CodecPort_CtrlFunct all; import from GTPv2_Types all; import from GTPv2_Templates all; import from GTPv2_CodecPort all; @@ -40,8 +43,8 @@ IPL4asp_Types.PortNumber gtpc_bind_port, HostName gtpc_remote_ip, IPL4asp_Types.PortNumber gtpc_remote_port, - //HostName gtpu_bind_ip, - //PortNumber gtpu_bind_port, + HostName gtpu_bind_ip optional, + IPL4asp_Types.PortNumber gtpu_bind_port optional, boolean sgw_role, boolean use_gtpu_daemon }; @@ -49,6 +52,7 @@ type component GTPv2_Emulation_CT { /* Communication with underlying GTP CodecPort */ port GTPv2C_PT GTP2C; + port GTPU_PT GTPU; /* Control port to GTP-U Daemon */ port UECUPS_CODEC_PT UECUPS; @@ -63,7 +67,7 @@ /* State */ var Gtp2cPeer g_peer; - var integer g_gtp2c_id; + var integer g_gtp2c_id, g_gtp1u_id; var OCT1 g_restart_ctr; var uint16_t g_c_seq_nr; var TidTableRec TidTable[256]; @@ -508,6 +512,11 @@ /* clear all tunnel state in the daemon at start */ f_uecups_xceive({reset_all_state := {}}, {reset_all_state_res:=?}, 30.0); + } else if (isvalue(cfg.gtpu_bind_ip) and isvalue(cfg.gtpu_bind_port)) { + map(self:GTPU, system:GTPU); + res := GTPv1U_CodecPort_CtrlFunct.f_GTPU_listen(GTPU, cfg.gtpu_bind_ip, + cfg.gtpu_bind_port, {udp:={}}); + g_gtp1u_id := res.connId; } /* make sure we always pass incoming UECUPS indications whenever receiving fom the UECUPS port */ @@ -543,6 +552,7 @@ function main(Gtp2EmulationCfg cfg) runs on GTPv2_Emulation_CT { var Gtp2cUnitdata g2c_ud; + var Gtp1uUnitdata g1u_ud; var PDU_GTPCv2 g2c; var GTP2_ConnHdlr vc_conn; var hexstring imsi; @@ -589,6 +599,16 @@ } } + [] GTPU.receive(Gtp1uUnitdata:?) -> value g1u_ud { + if (f_teid_known(g2c_ud.gtpc.tEID)) { + vc_conn := f_comp_by_teid(g1u_ud.gtpu.teid); + CLIENT.send(g1u_ud) to vc_conn; + } else if (g1u_ud.gtpu.teid == '00000000'O) { + TEID0.send(g1u_ud); + } else { + log("No client registered for TEID=", g1u_ud.gtpu.teid, "!"); + } + } [] TEID0.receive(PDU_GTPCv2:?) -> value g2c sender vc_conn { /* patch in the next sequence number on outbound Initial message */ @@ -603,6 +623,9 @@ f_seq_tbl_add(g2c.sequenceNumber, vc_conn); } } + [] TEID0.receive(Gtp1uUnitdata:?) -> value g1u_ud sender vc_conn { + GTPU.send(g1u_ud); + } [] CLIENT.receive(PDU_GTPCv2:?) -> value g2c sender vc_conn { /* patch in the next sequence number on outbound Initial message */ @@ -617,6 +640,9 @@ f_seq_tbl_add(g2c.sequenceNumber, vc_conn); } } + [] CLIENT.receive(Gtp1uUnitdata:?) -> value g1u_ud sender vc_conn { + GTPU.send(g1u_ud); + } [] CLIENT_PROC.getcall(GTP2EM_register_imsi:{?}) -> param(imsi) sender vc_conn { f_imsi_tbl_add(imsi, vc_conn); @@ -662,7 +688,7 @@ * Interaction between Main and Client Components ***********************************************************************/ type port GTP2EM_PT message { - inout PDU_GTPCv2, UECUPS_ProgramTermInd; + inout PDU_GTPCv2, Gtp1uUnitdata, UECUPS_ProgramTermInd; } with { extension "internal" }; signature GTP2EM_register_imsi(hexstring imsi); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36128?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: I34c744015c09a387cbf736063303bdb61ca4744e Gerrit-Change-Number: 36128 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp/osmo-stp.cfg: tune the logging formatting

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36097?usp=email ) Change subject: stp/osmo-stp.cfg: tune the logging formatting ...................................................................... stp/osmo-stp.cfg: tune the logging formatting Change-Id: Ieafa0599246f40958be6333512b7c41379b38a20 --- M stp/osmo-stp.cfg 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/stp/osmo-stp.cfg b/stp/osmo-stp.cfg index 5f67dff..13b1b71 100644 --- a/stp/osmo-stp.cfg +++ b/stp/osmo-stp.cfg @@ -4,11 +4,12 @@ ! log stderr logging filter all 1 - logging color 1 - logging print category-hex 1 + logging print file basename last + logging print category-hex 0 logging print category 1 + logging print level 1 logging timestamp 0 - logging print file 1 + logging color 1 logging level lglobal notice logging level llapd notice logging level linp notice -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36097?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: Ieafa0599246f40958be6333512b7c41379b38a20 Gerrit-Change-Number: 36097 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024