- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: library: add HTTP_Emulation
by dexter 04 Mar '24

04 Mar '24

Attention is currently required from: dexter, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36155?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: library: add HTTP_Emulation ...................................................................... library: add HTTP_Emulation We already have an HTTP_Adapter, which plays the client role. Now let's add an HTTP_Emulation, that will allow us to play the server role as well. Related: SYS#6563 Change-Id: Ie9a3b31a047b617ae69b7a65e1d69b8d3da863e5 --- A library/HTTP_Server_Emulation.ttcn 1 file changed, 161 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/36155/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36155?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: Ie9a3b31a047b617ae69b7a65e1d69b8d3da863e5 Gerrit-Change-Number: 36155 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-netif[master]: stream_cli: Do not try to send msg, if socket is disconnected
by jolly 04 Mar '24

04 Mar '24

Attention is currently required from: laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36123?usp=email ) Change subject: stream_cli: Do not try to send msg, if socket is disconnected ...................................................................... Patch Set 6: (1 comment) File src/stream_cli.c: https://gerrit.osmocom.org/c/libosmo-netif/+/36123/comment/c40118a4_37d961d4 PS4, Line 998: if (cli->state != STREAM_CLI_STATE_CONNECTED) { > There is a TX queue (iofd->tx_queue). Maybe we can use that one and don't need this patch. […] Yes, it is possible to send messages before the socket is connected. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36123?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I9e5f5db9b45615dacb05115c4de8ff3f715815c8 Gerrit-Change-Number: 36123 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Mar 2024 12:56:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream_cli: Do not try to send msg, if socket is disconnected
by jolly 04 Mar '24

04 Mar '24

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/36123?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: stream_cli: Do not try to send msg, if socket is disconnected ...................................................................... stream_cli: Do not try to send msg, if socket is disconnected It is ok to send messages before or after client connection has been established using osmo_fd or osmo_io. Both implementations use a TX queue. In case of a connection failure, the socket is closed and messages will be dropped until the socket is created again. Related: OS#5753 Change-Id: I9e5f5db9b45615dacb05115c4de8ff3f715815c8 --- M src/stream_cli.c 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/23/36123/6 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36123?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I9e5f5db9b45615dacb05115c4de8ff3f715815c8 Gerrit-Change-Number: 36123 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in docker-playground[master]: ttcn3-epdg: Test GTP-U userplane
by pespin 04 Mar '24

04 Mar '24

Attention is currently required from: laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36138?usp=email ) Change subject: ttcn3-epdg: Test GTP-U userplane ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36138?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: Icc5710b42e5a5374aade6b952e1c543565ffad2e Gerrit-Change-Number: 36138 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 04 Mar 2024 12:17:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[XS] Change in docker-playground[master]: cosmetic: .txt file shouldn't have execute permissions set
by laforge 04 Mar '24

04 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35936?usp=email ) Change subject: cosmetic: .txt file shouldn't have execute permissions set ...................................................................... cosmetic: .txt file shouldn't have execute permissions set Change-Id: Ib1e0a79b97ae1af07e206b3be7762cc805820ae1 --- M nplab-m3ua-test/all-sgp-tests.txt 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/nplab-m3ua-test/all-sgp-tests.txt b/nplab-m3ua-test/all-sgp-tests.txt old mode 100755 new mode 100644 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35936?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: Ib1e0a79b97ae1af07e206b3be7762cc805820ae1 Gerrit-Change-Number: 35936 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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 0

[M] Change in docker-playground[master]: ttcn3-ggsn-test: tweak log options
by osmith 04 Mar '24

04 Mar '24

osmith has submitted this change. ( 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(-) Approvals: dexter: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg index b377bfa..afa36d6 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 info ! stats interval 5 ! diff --git a/ttcn3-ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn.cfg index 2f09990..eb1558e 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 info ! 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: enable dynamic debug
by osmith 04 Mar '24

04 Mar '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36133?usp=email ) Change subject: ttcn3-ggsn-test: enable dynamic debug ...................................................................... ttcn3-ggsn-test: enable dynamic debug Enable loglevel=8, as otherwise the messages do not show up. Change-Id: I048646c4f90233939809546d30c94c4218eedbb1 --- M scripts/kernel-test/run-qemu.sh M ttcn3-ggsn-test/fragment.config M ttcn3-ggsn-test/initrd-ggsn.sh 3 files changed, 20 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/scripts/kernel-test/run-qemu.sh b/scripts/kernel-test/run-qemu.sh index 0c4fa26..800fc25 100755 --- a/scripts/kernel-test/run-qemu.sh +++ b/scripts/kernel-test/run-qemu.sh @@ -11,6 +11,7 @@ console=ttyS0 panic=-1 init=/init + loglevel=8 $@ " diff --git a/ttcn3-ggsn-test/fragment.config b/ttcn3-ggsn-test/fragment.config index b5a07b5..b6e2071 100644 --- a/ttcn3-ggsn-test/fragment.config +++ b/ttcn3-ggsn-test/fragment.config @@ -267,6 +267,8 @@ # CONFIG_X86_X2APIC is not set # CONFIG_XEN is not set +CONFIG_DYNAMIC_DEBUG=y + # For libgtpnl's qemu tests CONFIG_NAMESPACES=y CONFIG_NET_NS=y diff --git a/ttcn3-ggsn-test/initrd-ggsn.sh b/ttcn3-ggsn-test/initrd-ggsn.sh index 831dfff..c554f8a 100644 --- a/ttcn3-ggsn-test/initrd-ggsn.sh +++ b/ttcn3-ggsn-test/initrd-ggsn.sh @@ -11,6 +11,12 @@ initrd_add_file \ /data/osmo-ggsn.cfg +# Enable dynamic_debug, if it is compiled into the kernel +initrd_add_cmd \ + "mount -t debugfs none /sys/kernel/debug || true" \ + "(cat /sys/kernel/debug/dynamic_debug/control | grep gtp) || true" \ + "echo -n 'module gtp +p' > /sys/kernel/debug/dynamic_debug/control || true" + initrd_add_cmd \ "ip addr add 172.18.3.201/24 brd 172.18.3.255 dev eth0" \ "ip route add default via 172.18.3.1 dev eth0" \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36133?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: I048646c4f90233939809546d30c94c4218eedbb1 Gerrit-Change-Number: 36133 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: enable dynamic debug
by dexter 04 Mar '24

04 Mar '24

Attention is currently required from: fixeria, osmith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36133?usp=email ) Change subject: ttcn3-ggsn-test: enable dynamic debug ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: The patch seems plausible. Unfortunately I can not say whether or not there is a performance impact or something. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36133?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: I048646c4f90233939809546d30c94c4218eedbb1 Gerrit-Change-Number: 36133 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Mar 2024 11:47:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: xua_accept_cb(): distinguish ASPs using different trans_proto
by laforge 04 Mar '24

04 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36152?usp=email ) Change subject: xua_accept_cb(): distinguish ASPs using different trans_proto ...................................................................... xua_accept_cb(): distinguish ASPs using different trans_proto This fixes a problem found by TTCN-3 testcases: two ASPs can have identical socket address/port, but different transport protocols. We need to take this into account in ss7_asp_find_by_socket_addr(). Change-Id: I28aab37e8967de51ad2714543fd235d407e304c5 Related: osmo-ttcn3-hacks.git I1e2a887aa22f317783b3207494fd707d7b426439 Related: SYS#5424 --- M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c M src/ss7_internal.h 3 files changed, 20 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index f211872..5bab5ff 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -458,7 +458,7 @@ * \param[in] fd socket descriptor of given socket * \returns SS7 ASP in case a matching one is found; NULL otherwise */ struct osmo_ss7_asp * -ss7_asp_find_by_socket_addr(int fd) +ss7_asp_find_by_socket_addr(int fd, int trans_proto) { struct osmo_ss7_instance *inst; struct sockaddr_storage sa_l, sa_r; @@ -505,6 +505,8 @@ llist_for_each_entry(inst, &osmo_ss7_instances, list) { struct osmo_ss7_asp *asp; llist_for_each_entry(asp, &inst->asp_list, list) { + if (asp->cfg.trans_proto != trans_proto) + continue; if (asp->cfg.local.port != local_port) continue; if (asp->cfg.remote.port && asp->cfg.remote.port != remote_port) diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index 0b83b19..6da7b7a 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -101,7 +101,7 @@ return -1; } - asp = ss7_asp_find_by_socket_addr(fd); + asp = ss7_asp_find_by_socket_addr(fd, oxs->cfg.trans_proto); if (asp) { LOGP(DLSS7, LOGL_INFO, "%s: matched connection to ASP %s\n", sock_name, asp->cfg.name); diff --git a/src/ss7_internal.h b/src/ss7_internal.h index ed4fae7..758da90 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -20,7 +20,7 @@ bool ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp); bool ss7_asp_is_started(const struct osmo_ss7_asp *asp); int ss7_asp_get_fd(const struct osmo_ss7_asp *asp); -struct osmo_ss7_asp *ss7_asp_find_by_socket_addr(int fd); +struct osmo_ss7_asp *ss7_asp_find_by_socket_addr(int fd, int trans_proto); bool ss7_asp_protocol_check_trans_proto(enum osmo_ss7_asp_protocol proto, int trans_proto); int ss7_default_trans_proto_for_asp_proto(enum osmo_ss7_asp_protocol proto); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36152?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I28aab37e8967de51ad2714543fd235d407e304c5 Gerrit-Change-Number: 36152 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-sccp[master]: xua_accept_cb(): distinguish ASPs using different trans_proto
by laforge 04 Mar '24

04 Mar '24

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36152?usp=email ) Change subject: xua_accept_cb(): distinguish ASPs using different trans_proto ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36152?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I28aab37e8967de51ad2714543fd235d407e304c5 Gerrit-Change-Number: 36152 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Mar 2024 11:40:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log