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

[S] Change in osmo-ttcn3-hacks[master]: Update pcap pkt size to 1520 bytes

by osmith

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36091?usp=email ) Change subject: Update pcap pkt size to 1520 bytes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36091?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: I362371508ba83acc48376b6ed012a97a59d4b31b Gerrit-Change-Number: 36091 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 15:00:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples/stream-*: Add options, to set local/remote peer

by jolly

jolly has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35927?usp=email ) Change subject: examples/stream-*: Add options, to set local/remote peer ...................................................................... examples/stream-*: Add options, to set local/remote peer This helps to test connections via a network and failing connections. The client may add "-r <peer>" to the command line, to set the address of the remote peer. The server may add "-l <peer>" to the command line, to select address of local peer. By default "127.0.0.1" is used. Change-Id: Ie6da55ef248436e521c5d8f21f8053356c46a114 --- M examples/stream-client.c M examples/stream-server.c 2 files changed, 33 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/examples/stream-client.c b/examples/stream-client.c index e42748f..535804e 100644 --- a/examples/stream-client.c +++ b/examples/stream-client.c @@ -94,15 +94,19 @@ { struct osmo_fd *kbd_ofd; bool use_sctp = false; + const char *use_remote_addr = "127.0.0.1"; int opt, rc; - while ((opt = getopt(argc, argv, "s")) != -1) { + while ((opt = getopt(argc, argv, "sr:")) != -1) { switch (opt) { case 's': use_sctp = true; break; - default: + case 'r': + use_remote_addr = optarg; break; + default: + exit(0); } } @@ -121,11 +125,10 @@ exit(EXIT_FAILURE); } osmo_stream_cli_set_name(conn, "stream_client"); - osmo_stream_cli_set_addr(conn, "127.0.0.1"); + osmo_stream_cli_set_addr(conn, use_remote_addr); osmo_stream_cli_set_port(conn, 10000); if (use_sctp) osmo_stream_cli_set_proto(conn, IPPROTO_SCTP); - osmo_stream_cli_set_connect_cb(conn, connect_cb); osmo_stream_cli_set_disconnect_cb(conn, disconnect_cb); osmo_stream_cli_set_read_cb2(conn, read_cb); diff --git a/examples/stream-server.c b/examples/stream-server.c index 9faf307..bfbde6d 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -121,15 +121,19 @@ { struct osmo_fd *kbd_ofd; bool use_sctp = false; + const char *use_local_addr = "127.0.0.1"; int opt; - while ((opt = getopt(argc, argv, "s")) != -1) { + while ((opt = getopt(argc, argv, "sl:")) != -1) { switch (opt) { case 's': use_sctp = true; break; - default: + case 'l': + use_local_addr = optarg; break; + default: + exit(0); } } @@ -147,7 +151,7 @@ fprintf(stderr, "cannot create server link\n"); exit(EXIT_FAILURE); } - osmo_stream_srv_link_set_addr(srv, "127.0.0.1"); + osmo_stream_srv_link_set_addr(srv, use_local_addr); osmo_stream_srv_link_set_port(srv, 10000); if (use_sctp) osmo_stream_srv_link_set_proto(srv, IPPROTO_SCTP); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35927?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: Ie6da55ef248436e521c5d8f21f8053356c46a114 Gerrit-Change-Number: 35927 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples/stream-*: Support SCTP when called with "-s" argument

by jolly

jolly has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35234?usp=email ) Change subject: examples/stream-*: Support SCTP when called with "-s" argument ...................................................................... examples/stream-*: Support SCTP when called with "-s" argument Change-Id: I4137cdf1e21cb669b632fe5c126ec27475d98400 --- M examples/stream-client.c M examples/stream-server.c 2 files changed, 44 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/examples/stream-client.c b/examples/stream-client.c index 6781c72..e42748f 100644 --- a/examples/stream-client.c +++ b/examples/stream-client.c @@ -3,6 +3,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <netinet/in.h> #include <osmocom/core/select.h> #include <osmocom/core/talloc.h> @@ -89,10 +90,21 @@ return 0; } -int main(void) +int main(int argc, char **argv) { struct osmo_fd *kbd_ofd; - int rc; + bool use_sctp = false; + int opt, rc; + + while ((opt = getopt(argc, argv, "s")) != -1) { + switch (opt) { + case 's': + use_sctp = true; + break; + default: + break; + } + } tall_test = talloc_named_const(NULL, 1, "osmo_stream_cli_test"); msgb_talloc_ctx_init(tall_test, 0); @@ -111,12 +123,16 @@ osmo_stream_cli_set_name(conn, "stream_client"); osmo_stream_cli_set_addr(conn, "127.0.0.1"); osmo_stream_cli_set_port(conn, 10000); + if (use_sctp) + osmo_stream_cli_set_proto(conn, IPPROTO_SCTP); + osmo_stream_cli_set_connect_cb(conn, connect_cb); osmo_stream_cli_set_disconnect_cb(conn, disconnect_cb); osmo_stream_cli_set_read_cb2(conn, read_cb); - if (osmo_stream_cli_open(conn) < 0) { - fprintf(stderr, "cannot open cli\n"); + rc = osmo_stream_cli_open(conn); + if (rc < 0) { + fprintf(stderr, "cannot open cli: %d\n", rc); exit(EXIT_FAILURE); } diff --git a/examples/stream-server.c b/examples/stream-server.c index 8aa8b9b..9faf307 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -117,9 +117,21 @@ return 0; } -int main(void) +int main(int argc, char **argv) { struct osmo_fd *kbd_ofd; + bool use_sctp = false; + int opt; + + while ((opt = getopt(argc, argv, "s")) != -1) { + switch (opt) { + case 's': + use_sctp = true; + break; + default: + break; + } + } tall_test = talloc_named_const(NULL, 1, "osmo_stream_srv_test"); msgb_talloc_ctx_init(tall_test, 0); @@ -137,6 +149,8 @@ } osmo_stream_srv_link_set_addr(srv, "127.0.0.1"); osmo_stream_srv_link_set_port(srv, 10000); + if (use_sctp) + osmo_stream_srv_link_set_proto(srv, IPPROTO_SCTP); osmo_stream_srv_link_set_accept_cb(srv, accept_cb); if (osmo_stream_srv_link_open(srv) < 0) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35234?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: I4137cdf1e21cb669b632fe5c126ec27475d98400 Gerrit-Change-Number: 35234 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples/stream-{server,client}: Generate talloc report on SIGUSR1

by jolly

jolly has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36078?usp=email ) Change subject: examples/stream-{server,client}: Generate talloc report on SIGUSR1 ...................................................................... examples/stream-{server,client}: Generate talloc report on SIGUSR1 This can help with memleak debugging. Change-Id: Ia16632602b937db88e2da2b053192887bdb8a986 --- M examples/stream-client.c M examples/stream-server.c 2 files changed, 33 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve jolly: Looks good to me, approved diff --git a/examples/stream-client.c b/examples/stream-client.c index 535804e..da90e8c 100644 --- a/examples/stream-client.c +++ b/examples/stream-client.c @@ -90,6 +90,15 @@ return 0; } +static void signal_handler(int signum) +{ + switch (signum) { + case SIGUSR1: + talloc_report_full(tall_test, stdout); + break; + } +} + int main(int argc, char **argv) { struct osmo_fd *kbd_ofd; @@ -110,6 +119,8 @@ } } + signal(SIGUSR1, &signal_handler); + tall_test = talloc_named_const(NULL, 1, "osmo_stream_cli_test"); msgb_talloc_ctx_init(tall_test, 0); osmo_init_logging2(tall_test, &osmo_stream_cli_test_log_info); diff --git a/examples/stream-server.c b/examples/stream-server.c index bfbde6d..1cd3517 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -117,6 +117,15 @@ return 0; } +static void signal_handler(int signum) +{ + switch (signum) { + case SIGUSR1: + talloc_report(tall_test, stderr); + break; + } +} + int main(int argc, char **argv) { struct osmo_fd *kbd_ofd; @@ -137,6 +146,8 @@ } } + signal(SIGUSR1, &signal_handler); + tall_test = talloc_named_const(NULL, 1, "osmo_stream_srv_test"); msgb_talloc_ctx_init(tall_test, 0); osmo_init_logging2(tall_test, &osmo_stream_srv_test_log_info); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36078?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: Ia16632602b937db88e2da2b053192887bdb8a986 Gerrit-Change-Number: 36078 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples/stream-{server,client}: Generate talloc report on SIGUSR1

by jolly

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36078?usp=email ) Change subject: examples/stream-{server,client}: Generate talloc report on SIGUSR1 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36078?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: Ia16632602b937db88e2da2b053192887bdb8a986 Gerrit-Change-Number: 36078 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 28 Feb 2024 14:36:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples/stream-{server,client}: Generate talloc report on SIGUSR1

by jolly

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36078?usp=email ) Change subject: examples/stream-{server,client}: Generate talloc report on SIGUSR1 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36078?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: Ia16632602b937db88e2da2b053192887bdb8a986 Gerrit-Change-Number: 36078 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 28 Feb 2024 14:34:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in ...osmo-epdg[master]: Update osmo_ss7 to gerrit remote with latest patches

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36106?usp=email ) Change subject: Update osmo_ss7 to gerrit remote with latest patches ...................................................................... Update osmo_ss7 to gerrit remote with latest patches * Change the remote to gerrit, since it's the main repo (gitea is a read-only mirror). This allows easily pushing branches for development in gerrit. * Update the references to point to the latest commits containing several improvements and fixes needed for osmo-epdg. Related: OS#6377 Change-Id: Id16fb7d319f6b6eb5c1eeb2ae6c7d22a7f7e1641 --- M rebar.config M rebar.lock 2 files changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/06/36106/1 diff --git a/rebar.config b/rebar.config index 1dd0b08..07bd2e1 100644 --- a/rebar.config +++ b/rebar.config @@ -6,7 +6,7 @@ {lager, {git, "https://github.com/erlang-lager/lager", {tag, "3.9.2"}}}, {gtplib, {git, "https://github.com/osmocom/gtplib", {branch, "osmocom/master"}}}, {gtp_u_kmod, {git, "https://github.com/osmocom/gtp_u_kmod", {branch, "osmocom/master"}}}, - {osmo_ss7, {git, "https://gitea.osmocom.org/erlang/osmo_ss7", {ref, "9f294d3612f998860004820d1d85b4264721577b"}}}, + {osmo_ss7, {git, "https://gerrit.osmocom.org/erlang/osmo_ss7", {branch, "osmocom/epdg"}}}, {osmo_gsup, {git, "https://gerrit.osmocom.org/erlang/osmo_gsup", {branch, "osmocom/epdg"}}} ]}. diff --git a/rebar.lock b/rebar.lock index 79503ee..977acac 100644 --- a/rebar.lock +++ b/rebar.lock @@ -34,8 +34,8 @@ {ref,"25ace76f98f7f931691fb02d86667062b4f2c8ad"}}, 0}, {<<"osmo_ss7">>, - {git,"https://gitea.osmocom.org/erlang/osmo_ss7", - {ref,"9f294d3612f998860004820d1d85b4264721577b"}}, + {git,"https://gerrit.osmocom.org/erlang/osmo_ss7", + {ref,"eef65b5b2ccaaeb2b2cf4b408889e892e5d92827"}}, 0}, {<<"parse_trans">>, {git,"https://github.com/uwiger/parse_trans.git", -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36106?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Id16fb7d319f6b6eb5c1eeb2ae6c7d22a7f7e1641 Gerrit-Change-Number: 36106 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 2 weeks

1
0
0 0

[M] Change in ...osmo_ss7[master]: ipa_proto.erl: Implement TCP/IPA reassembly

by pespin

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36095?usp=email ) Change subject: ipa_proto.erl: Implement TCP/IPA reassembly ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36095?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I322e6ab9368ad66be66a9e8d113575f51f9c91c3 Gerrit-Change-Number: 36095 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 28 Feb 2024 14:01:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in ...osmo_ss7[master]: ipa: fix empty IPA CCM ID Tags

by pespin

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36105?usp=email ) Change subject: ipa: fix empty IPA CCM ID Tags ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I submitted these patches from @lynxis@fe80.eu which were in a lynxis/epdg branch, and which we seem to be using in osmo-epdg according to rebar.config. Let's them get merged in master... -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36105?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I6f44561f83c84bac7e5c98747f969f5436617f90 Gerrit-Change-Number: 36105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 28 Feb 2024 13:25:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in ...osmo_ss7[master]: ipa_proto: start_listen: use correct ok/error pattern

by pespin

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36104?usp=email ) Change subject: ipa_proto: start_listen: use correct ok/error pattern ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I submitted these patches from @lynxis@fe80.eu which were in a lynxis/epdg branch, and which we seem to be using in osmo-epdg according to rebar.config. Let's them get merged in master... -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36104?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I9b317c13089fae2406f401a1f420623de9a2dffa Gerrit-Change-Number: 36104 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 28 Feb 2024 13:25:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in ...osmo_ss7[master]: ipa_proto: start_listen: use correct ok/error pattern

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36104?usp=email ) Change subject: ipa_proto: start_listen: use correct ok/error pattern ...................................................................... ipa_proto: start_listen: use correct ok/error pattern The ok path only returned the port without an "ok". Also path back the ListenSock. Change-Id: I9b317c13089fae2406f401a1f420623de9a2dffa --- M src/ipa_proto.erl 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_ss7 refs/changes/04/36104/1 diff --git a/src/ipa_proto.erl b/src/ipa_proto.erl index fcd594b..c96d6bb 100644 --- a/src/ipa_proto.erl +++ b/src/ipa_proto.erl @@ -367,7 +367,7 @@ {ok, ListenSock} -> start_servers(NumServers, ListenSock, self()), {ok, Port} = inet:port(ListenSock), - Port; + {ok, ListenSock, Port}; {error, Reason} -> {error, Reason} end. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36104?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I9b317c13089fae2406f401a1f420623de9a2dffa Gerrit-Change-Number: 36104 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

2 months, 2 weeks

1
0
0 0

[S] Change in ...osmo_ss7[master]: ipa: fix empty IPA CCM ID Tags

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36105?usp=email ) Change subject: ipa: fix empty IPA CCM ID Tags ...................................................................... ipa: fix empty IPA CCM ID Tags decode_ies() would crash because lists:lasts([]) tries to access an empty lists. Change-Id: I6f44561f83c84bac7e5c98747f969f5436617f90 --- M src/ipa_proto_ccm.erl 1 file changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_ss7 refs/changes/05/36105/1 diff --git a/src/ipa_proto_ccm.erl b/src/ipa_proto_ccm.erl index 27ceba9..87eb15e 100644 --- a/src/ipa_proto_ccm.erl +++ b/src/ipa_proto_ccm.erl @@ -82,9 +82,12 @@ decode_ies(<<0:8, Len:8, TypeValue:Len/binary, Remain/binary>>, IeList) when is_list(IeList) -> <<Type:8, Value/binary>> = TypeValue, ValueList = binary_to_list(Value), - case lists:last(ValueList) of - 0 -> ValueStripped = lists:droplast(ValueList); - _ -> ValueStripped = ValueList + case ValueList of + [] -> ValueStripped = []; + _ -> case lists:last(ValueList) of + 0 -> ValueStripped = lists:droplast(ValueList); + _ -> ValueStripped = ValueList + end end, decode_ies(Remain, IeList ++ [{string, decode_idtag(Type), ValueStripped}]). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36105?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I6f44561f83c84bac7e5c98747f969f5436617f90 Gerrit-Change-Number: 36105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

2 months, 2 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-pgw-test: Configure open5gs-smfd S2b/S6b/P-CSCF related bits

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36088?usp=email ) Change subject: ttcn3-pgw-test: Configure open5gs-smfd S2b/S6b/P-CSCF related bits ...................................................................... ttcn3-pgw-test: Configure open5gs-smfd S2b/S6b/P-CSCF related bits Depends: osmo-ttcn3-hacks.git Change-Id I38e469edf0e00feca5a648035b64645e2c905937 Change-Id: I3ff503990167f52ddb94a7719e2773db3f889a39 --- M ttcn3-pgw-test/PGW_Tests.cfg M ttcn3-pgw-test/freeDiameter-smf.conf M ttcn3-pgw-test/open5gs-smf-latest.yaml M ttcn3-pgw-test/open5gs-smf-master.yaml 4 files changed, 20 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/ttcn3-pgw-test/PGW_Tests.cfg b/ttcn3-pgw-test/PGW_Tests.cfg index d17e782..5d3ff45 100644 --- a/ttcn3-pgw-test/PGW_Tests.cfg +++ b/ttcn3-pgw-test/PGW_Tests.cfg @@ -17,6 +17,7 @@ PGW_Tests.mp_ping_hostname := "10.45.0.1" PGW_Tests.mp_pcrf_local_ip:= "172.18.18.202" PGW_Tests.mp_ocs_local_ip:= "172.18.18.202" +PGW_Tests.mp_aaa_local_ip:= "172.18.18.202" GTPv2_Emulation.mp_uecups_host := "172.18.18.20" [MAIN_CONTROLLER] diff --git a/ttcn3-pgw-test/freeDiameter-smf.conf b/ttcn3-pgw-test/freeDiameter-smf.conf index afa9298..207d1cc 100644 --- a/ttcn3-pgw-test/freeDiameter-smf.conf +++ b/ttcn3-pgw-test/freeDiameter-smf.conf @@ -261,5 +261,5 @@ #ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ; ConnectPeer = "pcrf.localdomain" { ConnectTo = "172.18.18.202"; No_TLS; TcTimer = 2; }; ConnectPeer = "ocs.localdomain" { ConnectTo = "172.18.18.202"; Port = 3869; No_TLS; TcTimer = 2; }; - +ConnectPeer = "aaa.localdomain" { ConnectTo = "172.18.18.202"; Port = 3870; No_TLS; TcTimer = 2; }; ############################################################## diff --git a/ttcn3-pgw-test/open5gs-smf-latest.yaml b/ttcn3-pgw-test/open5gs-smf-latest.yaml index 622618b..0f80467 100644 --- a/ttcn3-pgw-test/open5gs-smf-latest.yaml +++ b/ttcn3-pgw-test/open5gs-smf-latest.yaml @@ -1,7 +1,7 @@ # See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/smf.yaml.in logger: - level: info + level: debug sbi: server: @@ -39,6 +39,9 @@ - 2001:4860:4860::8888 - 2001:4860:4860::8844 mtu: 1400 + p-cscf: + - 172.18.18.7 + - fd02:db8:18::7 ctf: enabled: auto freeDiameter: /data/freeDiameter-smf.conf diff --git a/ttcn3-pgw-test/open5gs-smf-master.yaml b/ttcn3-pgw-test/open5gs-smf-master.yaml index 3448aba..db91145 100644 --- a/ttcn3-pgw-test/open5gs-smf-master.yaml +++ b/ttcn3-pgw-test/open5gs-smf-master.yaml @@ -1,7 +1,7 @@ # See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/smf.yaml.in logger: - level: info + level: debug global: max: @@ -56,6 +56,9 @@ - 2001:4860:4860::8888 - 2001:4860:4860::8844 mtu: 1400 + p-cscf: + - 172.18.18.7 + - fd02:db8:18::7 ctf: enabled: auto freeDiameter: /data/freeDiameter-smf.conf -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36088?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: I3ff503990167f52ddb94a7719e2773db3f889a39 Gerrit-Change-Number: 36088 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 2 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-pgw-test: Configure open5gs-smfd S2b/S6b/P-CSCF related bits

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36088?usp=email ) Change subject: ttcn3-pgw-test: Configure open5gs-smfd S2b/S6b/P-CSCF related bits ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36088?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: I3ff503990167f52ddb94a7719e2773db3f889a39 Gerrit-Change-Number: 36088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 13:11:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn: osmo-*.cfg: tune logging configuration

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36103?usp=email ) Change subject: sgsn: osmo-*.cfg: tune logging configuration ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36103?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: I2f2cc69a481709e862d569b0298561b61506dfa7 Gerrit-Change-Number: 36103 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 13:05:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn/expected-results.xml: add missing testcases

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36102?usp=email ) Change subject: sgsn/expected-results.xml: add missing testcases ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36102?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: I09cc32bffde9d9dec59befa181a995e88112b2d2 Gerrit-Change-Number: 36102 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 13:05:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc/expected-results.xml: add missing testcases

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36101?usp=email ) Change subject: msc/expected-results.xml: add missing testcases ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36101?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: I1604bb955707d0e44bfd08ecd3a28a936731c166 Gerrit-Change-Number: 36101 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 13:04:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: input/ipaccess: fix regression in ipaccess_bts_handle_ccm()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36100?usp=email ) Change subject: input/ipaccess: fix regression in ipaccess_bts_handle_ccm() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/36100/comment/78267d74_393e4395 PS1, Line 897: LOGP(DLINP, LOGL_NOTICE, "received ID_GET for unit ID %u/%u/%u\n", maybe printing information about the link instead would be welcome. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36100?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic26181b580724a70c2af8a224155430902fe4101 Gerrit-Change-Number: 36100 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 13:04:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Add osmo_io_get_ioops() function

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36076?usp=email ) Change subject: osmo_io: Add osmo_io_get_ioops() function ...................................................................... Patch Set 1: (1 comment) File include/osmocom/core/osmo_io.h: https://gerrit.osmocom.org/c/libosmocore/+/36076/comment/fb97b828_fd806e90 PS1, Line 112: void osmo_iofd_get_ioops(struct osmo_io_fd *iofd, struct osmo_io_ops *ioops); > If you want to make it generic, it would probably be best to decoupple the segmentation callback fro […] Yeah well you can even do address calculation to change stuff even if you don't get the pointer, but that's not the point :P Fine, let's keep it this way then if it's good enough for whoever is writing the API. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36076?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: I03398c811b9534f50c6644b21eea89a04be29fb0 Gerrit-Change-Number: 36076 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 28 Feb 2024 13:02:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/M3UA: support TCP transport, implement desegmentation

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36098?usp=email ) Change subject: library/M3UA: support TCP transport, implement desegmentation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36098?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: If1dcdb185d08a08dc5a06c37d9d6ffe7d6da9325 Gerrit-Change-Number: 36098 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 13:00:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

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

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36097?usp=email ) Change subject: stp/osmo-stp.cfg: tune the logging formatting ...................................................................... Patch Set 1: Code-Review+1 -- 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: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 12:57:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples/stream-{server,client}: Generate talloc report on SIGUSR1

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36078?usp=email ) Change subject: examples/stream-{server,client}: Generate talloc report on SIGUSR1 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36078?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: Ia16632602b937db88e2da2b053192887bdb8a986 Gerrit-Change-Number: 36078 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 28 Feb 2024 12:57:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples/stream-*: Add options, to set local/remote peer

by pespin

Attention is currently required from: jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35927?usp=email ) Change subject: examples/stream-*: Add options, to set local/remote peer ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35927?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: Ie6da55ef248436e521c5d8f21f8053356c46a114 Gerrit-Change-Number: 35927 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 28 Feb 2024 12:56:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples/stream-*: Support SCTP when called with "-s" argument

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35234?usp=email ) Change subject: examples/stream-*: Support SCTP when called with "-s" argument ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35234?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: I4137cdf1e21cb669b632fe5c126ec27475d98400 Gerrit-Change-Number: 35234 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(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-Comment-Date: Wed, 28 Feb 2024 12:55:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pgw: Introduce test TC_s2b_createSession_v4_apco

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36085?usp=email ) Change subject: pgw: Introduce test TC_s2b_createSession_v4_apco ...................................................................... pgw: Introduce test TC_s2b_createSession_v4_apco Make sure APCO IE is properly handled and answered back. Change-Id: Ib01fe0512866924a5afc4d6719ceacb0b4b54df2 --- M library/GTPv2_Templates.ttcn M pgw/PGW_Tests.ttcn M pgw/expected-results.xml 3 files changed, 54 insertions(+), 12 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index c842230..a86145d 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -902,7 +902,8 @@ template (omit) FullyQualifiedTEID_List teid_list, template (value) OCT2 chg_car, template (value) uint4_t bearer_id, template (omit) UserLocationInfo uli := omit, - template (value) Bearer_QoS qos := ts_GTP2C_BearerQos('09'O, 0,0,0,0)) := + template (value) Bearer_QoS qos := ts_GTP2C_BearerQos('09'O, 0,0,0,0), + template (omit) APCO apco := omit) := ts_PDU_GTP2C('00000000'O, '000000'O, '20'O, { createSessionRequest := { iMSI := ts_GTP2C_Imsi(imsi), @@ -948,7 +949,7 @@ signallingPriorityIndication := omit, iP_Addr := omit, portNumber := omit, - aPCO := omit, + aPCO := apco, trustedWLANAccessNetworkIdentifier := omit, cNOperatorSelectionEntity := omit, presenceReportingAreaInformation := omit, @@ -1061,7 +1062,8 @@ template FullyQualifiedTEID_List fteids := *, template PDN_AddressAllocation addr := *, template APN_Restriction apn_restriction := *, - template BearerContextGrouped_List bctxg := *) := + template BearerContextGrouped_List bctxg := *, + template APCO exp_apco := *) := tr_PDU_GTP2C(d_teid, seq, { createSessionResponse := { cause := tr_GTP2C_Cause(cause), @@ -1081,7 +1083,7 @@ csid := *, lDN := *, pGW_Back_OffTime := *, - aPCO := *, + aPCO := exp_apco, trustedWLANIPv4Parameters := *, indicationFlags := *, presenceReportingAreaAction := *, diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index e39bd62..ea9f056 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -676,7 +676,9 @@ /* create a session on the PGW */ private function f_create_session(template (value) FullyQualifiedTEID fteid_c_ie, template (value) FullyQualifiedTEID fteid_u_ie, - template (omit) UserLocationInfo uli_ie := omit) runs on PGW_Session_CT { + template (omit) UserLocationInfo uli_ie := omit, + template (omit) APCO apco := omit, + template APCO exp_apco := *) runs on PGW_Session_CT { var PDU_GTPCv2 rx; /* Defaults used for s5/s8: */ @@ -698,7 +700,8 @@ teid_list := { fteid_u_ie }, chg_car := '0000'O, bearer_id := g_pars.bearer.ebi, - uli := uli_ie); + uli := uli_ie, + apco := apco); g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H); GTP2.send(g2c); @@ -715,7 +718,8 @@ alt { [] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid := g_pars.teic_local, cause := Request_accepted, - apn_restriction := apn_restriction)) -> value rx { + apn_restriction := apn_restriction, + exp_apco := exp_apco)) -> value rx { /* extract TEIDs */ var CreateSessionResponse resp := rx.gtpcv2_pdu.createSessionResponse; g_pars.teic_remote := resp.fullyQualifiedTEID[0].tEID_GRE_Key; @@ -780,7 +784,8 @@ } /* create a session on the PGW on a S2b interface (from ePDG)*/ -private function f_s2b_create_session() runs on PGW_Session_CT { +private function f_s2b_create_session(template (omit) APCO apco := omit, + template APCO exp_apco := *) runs on PGW_Session_CT { var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; var template (value) UserLocationInfo uli_ie; @@ -788,13 +793,12 @@ f_inet_addr(mp_local_hostname_c), omit); fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_ePDG_GTPU, g_pars.bearer.teid_local, 5, f_inet_addr(mp_local_hostname_u), omit); - f_create_session(fteid_c_ie, fteid_u_ie); - /* open5gs up to 1.2.3 won't accept it without ULI, despite not mandatory */ + var template (value) TAI tai := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0001'O }; var template (value) ECGI ecgi := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0'H, 23 }; uli_ie := ts_GTP2C_UserLocInfo(tai := tai, ecgi := ecgi); - f_create_session(fteid_c_ie, fteid_u_ie, uli_ie); + f_create_session(fteid_c_ie, fteid_u_ie, uli_ie := uli_ie, apco := apco, exp_apco := exp_apco); } @@ -1048,7 +1052,9 @@ /* create a session, expect it to succeed */ private function f_TC_s2b_createSession_v4_noapco() runs on PGW_Session_CT { - f_s2b_create_session(); + var template (omit) APCO apco := omit; + var template APCO exp_apco := omit; + f_s2b_create_session(apco, exp_apco); setverdict(pass); } testcase TC_s2b_createSession_v4_noapco() runs on PGW_Test_CT { @@ -1061,6 +1067,27 @@ vc_conn.done; } +private function f_TC_s2b_createSession_v4_apco() runs on PGW_Session_CT { + var template (omit) APCO apco := ts_GTP2C_APCO('0000'B, + {ts_GTP2C_PCO_P_DNS_IPv4(''O), + ts_GTP2C_PCO_P_PCSCF_IPv4(''O)}); + var template APCO exp_apco := tr_GTP2C_APCO('0000'B, + {tr_GTP2C_PCO_P_DNS_IPv4(?), + *, /* open5gs-smfd can contain several DNS servers */ + tr_GTP2C_PCO_P_PCSCF_IPv4(?)}); + f_s2b_create_session(apco, exp_apco); + setverdict(pass); +} +testcase TC_s2b_createSession_v4_apco() runs on PGW_Test_CT { + var PGW_Session_CT vc_conn; + var SessionPars pars := valueof(t_SessionPars('001010123456789'H, + "tun22", + rat_type := GTP2C_RAT_WLAN)); + f_init(); + vc_conn := f_start_handler(refers(f_TC_s2b_createSession_v4_apco), pars); + vc_conn.done; +} + control { execute( TC_tx_echo() ); execute( TC_createSession() ); @@ -1070,6 +1097,7 @@ execute( TC_deleteSession_unknown() ); execute( TC_gy_charging_cc_time() ); execute( TC_s2b_createSession_v4_noapco() ); + execute( TC_s2b_createSession_v4_apco() ); } diff --git a/pgw/expected-results.xml b/pgw/expected-results.xml index 0e252af..35d0ce9 100644 --- a/pgw/expected-results.xml +++ b/pgw/expected-results.xml @@ -8,4 +8,5 @@ <testcase classname='PGW_Tests' name='TC_deleteSession_unknown' time='MASKED'/> <testcase classname='PGW_Tests' name='TC_gy_charging_cc_time' time='MASKED'/> <testcase classname='PGW_Tests' name='TC_s2b_createSession_v4_noapco' time='MASKED'/> + <testcase classname='PGW_Tests' name='TC_s2b_createSession_v4_apco' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36085?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: Ib01fe0512866924a5afc4d6719ceacb0b4b54df2 Gerrit-Change-Number: 36085 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pgw: Introduce test TC_s2b_createSession_v4_no_apco

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36075?usp=email ) Change subject: pgw: Introduce test TC_s2b_createSession_v4_no_apco ...................................................................... pgw: Introduce test TC_s2b_createSession_v4_no_apco This test allows initial testing of a session creation through the S2b interface (emulating an ePDG). A follow-up test will be added to test the APCO IE (feature which open5gs-smfd still doesn't support). Change-Id: I38e469edf0e00feca5a648035b64645e2c905937 --- M library/DIAMETER_Emulation.ttcn M library/DIAMETER_ts29_273_Templates.ttcn M library/GTPv2_Templates.ttcn M library/Osmocom_Types.ttcn M pgw/PGW_Tests.ttcn M pgw/expected-results.xml M pgw/gen_links.sh 7 files changed, 237 insertions(+), 12 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index e7481ca..69107d4 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -37,6 +37,7 @@ import from DIAMETER_Templates all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from TCCConversion_Functions all; import from Native_Functions all; type hexstring IMSI; @@ -297,7 +298,13 @@ return str2hex(oct2char(grp[1].avp.avp_data.avp_DCC_NONE_Subscription_Id_Data)); } else { var octetstring imsi_oct := valueof(imsi_avp.avp_data.avp_BASE_NONE_User_Name); - return str2hex(oct2char(imsi_oct)); + var charstring imsi_str := oct2char(imsi_oct); + /* Username may be a NAI instead of IMSI: "<IMSI>@nai.epc.mnc<MNC>.mcc<MCC>.3gppnetwork.org" */ + var integer pos := f_strstr(imsi_str, "@"); + if (pos != -1) { + imsi_str := substr(imsi_str, 0, pos); + } + return str2hex(imsi_str); } } diff --git a/library/DIAMETER_ts29_273_Templates.ttcn b/library/DIAMETER_ts29_273_Templates.ttcn index e3a6c2f..87d1601 100644 --- a/library/DIAMETER_ts29_273_Templates.ttcn +++ b/library/DIAMETER_ts29_273_Templates.ttcn @@ -204,6 +204,35 @@ *******************************/ /* TS 29.273 9.2.2.5.1 AA-Request (AAR) */ +template (present) PDU_DIAMETER +tr_DIA_S6b_AAR(template (present) charstring username_nai := ?, + template (present) MIPv6_NONE_MIP6_Feature_Vector mip6_feat_vec := ?, + template (present) charstring apn := ?, + template (present) octetstring sess_id := ?, + template (present) charstring orig_host := ?, + template (present) charstring orig_realm := ?, + template (present) charstring dest_realm := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?) := + tr_DIAMETER(flags := '1???????'B, + cmd_code := Authorize_Authenticate, + app_id := int2oct(c_DIAMETER_3GPP_S6b_AID, 4), + hbh_id := hbh_id, + ete_id := ete_id, + avps := superset( + tr_AVP_SessionId(sess_id), + /* Optional: DRMP, */ + tr_AVP_AuthAppId(int2oct(c_DIAMETER_3GPP_S6b_AID, 4)), + tr_AVP_OriginHost(orig_host), + tr_AVP_OriginRealm(orig_realm), + tr_AVP_DestinationRealm(dest_realm), + tr_AVP_AuthRequestType(AUTHORIZE_ONLY), + tr_AVP_UserName(char2oct_tmpl_present(username_nai)), + tr_AVP_MIP6FeatureVector(mip6_feat_vec), + tr_AVP_ServiceSelection(apn) + /* TODO: Lots other optional */ + )); + template (value) PDU_DIAMETER ts_DIA_S6b_AAR(template (value) charstring username_nai, template (value) MIPv6_NONE_MIP6_Feature_Vector mip6_feat_vec, @@ -257,6 +286,27 @@ tr_AVP_OriginRealm(orig_realm) )); +template (value) PDU_DIAMETER +ts_DIA_S6b_AAA(template (value) octetstring sess_id := c_def_sess_id, + template (value) charstring orig_host := "aaa.localdomain", + template (value) charstring orig_realm := "localdomain", + template (value) charstring dest_realm := "localdomain", + template (value) UINT32 hbh_id := '00000000'O, + template (value) UINT32 ete_id := '00000000'O) := + ts_DIAMETER(flags := '01000000'B, + cmd_code := Authorize_Authenticate, + app_id := int2oct(c_DIAMETER_3GPP_S6b_AID, 4), + hbh_id := hbh_id, ete_id := ete_id, + avps := { + ts_AVP_SessionId(sess_id), + /* Optional: DRMP, */ + ts_AVP_AuthAppId(int2oct(c_DIAMETER_3GPP_S6b_AID, 4)), + ts_AVP_AuthRequestType(AUTHORIZE_ONLY), + ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_OriginHost(orig_host), + ts_AVP_OriginRealm(orig_realm) + }); + /* TS 29.273 9.2.2.3.1 Session-Termination-Request (STR) Command, * Table 9.1.2.3.1/1: S6b Session Termination Request (STR), based on RFC 6733 8.4.1 */ template (value) PDU_DIAMETER diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index 431415a..c842230 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -407,6 +407,20 @@ } /* 8.17 */ +type enumerated GTP2C_RAT_Type { + GTP2C_RAT_reserved ('00'O), + GTP2C_RAT_UTRAN ('01'O), + GTP2C_RAT_GERAN ('02'O), + GTP2C_RAT_WLAN ('03'O), + GTP2C_RAT_GAN ('04'O), + GTP2C_RAT_HSPA_EVOLUTION ('05'O), + GTP2C_RAT_EUTRAN ('06'O), + GTP2C_RAT_Virtual ('07'O), + GTP2C_RAT_EUTRAN_NB_IoT ('08'O), + GTP2C_RAT_LTE_M ('09'O), + GTP2C_RAT_NR ('0A'O) +} with { variant "FIELDLENGTH(8)" encode "RAW" }; + template (value) RAT_Type ts_GTP2C_RatType(template (value) integer rat) := { elementIdentifier := '52'O, lengthIndicator := 0, /* overwritten */ @@ -1046,6 +1060,7 @@ template (present) GTP2C_Cause cause := ?, template FullyQualifiedTEID_List fteids := *, template PDN_AddressAllocation addr := *, + template APN_Restriction apn_restriction := *, template BearerContextGrouped_List bctxg := *) := tr_PDU_GTP2C(d_teid, seq, { createSessionResponse := { @@ -1055,7 +1070,7 @@ heNBInformationReporting := *, fullyQualifiedTEID := fteids, pDN_AddressAllocation := addr, - aPN_Restriction := ?, + aPN_Restriction := apn_restriction, ambr := *, linkedEPS_Bearer_ID := *, protocolConfigOptions := *, diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index d034a74..6653408 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -179,6 +179,15 @@ } } +function char2oct_tmpl_present(template (present) charstring inp) return template (present) octetstring +{ + if (istemplatekind(inp, "?")) { + return ?; + } else { + return char2oct(valueof(inp)); + } +} + function hex2str_tmpl(template hexstring inp) return template charstring { if (istemplatekind(inp, "omit")) { diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index bd32760..e39bd62 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -20,6 +20,7 @@ import from DIAMETER_Templates all; import from DIAMETER_ts29_212_Templates all; import from DIAMETER_ts29_272_Templates all; +import from DIAMETER_ts29_273_Templates all; import from DIAMETER_ts32_299_Templates all; import from DIAMETER_Emulation all; @@ -39,6 +40,9 @@ charstring mp_ocs_local_ip := "127.0.0.9"; integer mp_ocs_local_port := 3869; + charstring mp_aaa_local_ip := "127.0.0.9"; + integer mp_aaa_local_port := 3870; + charstring mp_diam_realm := "localdomain"; } @@ -55,6 +59,10 @@ var DIAMETER_Emulation_CT vc_Gy; port DIAMETER_PT Gy_UNIT; port DIAMETEREM_PROC_PT Gy_PROC; + /* emulated AAA-Server */ + var DIAMETER_Emulation_CT vc_S6b; + port DIAMETER_PT S6b_UNIT; + port DIAMETEREM_PROC_PT S6b_PROC; /* global test case guard timer (actual timeout value is set in f_init()) */ timer T_guard; } @@ -97,6 +105,7 @@ port DIAMETER_Conn_PT Gx; port DIAMETER_Conn_PT Gy; + port DIAMETER_Conn_PT S6b; /* GTP-U IPv4 address remote sie */ var OCT4 g_gtpu4_remote; @@ -128,7 +137,7 @@ hexstring imsi, hexstring msisdn optional, // serving network - integer rat_type, + GTP2C_RAT_Type rat_type, // flags? charstring apn, /* Apn subscribed or non-subscribed */ @@ -155,8 +164,13 @@ } template (value) SessionPars -t_SessionPars(hexstring imsi, charstring tundev, template (omit) hexstring msisdn := '1234'H, integer rat_type := 6, charstring apn := "internet", - boolean selection_mode := false, BIT3 pdn_type := '001'B) := { +t_SessionPars(hexstring imsi, + charstring tundev, + template (omit) hexstring msisdn := '1234'H, + GTP2C_RAT_Type rat_type := GTP2C_RAT_EUTRAN, + charstring apn := "internet", + boolean selection_mode := false, + BIT3 pdn_type := '001'B) := { imsi := imsi, msisdn := msisdn, rat_type := rat_type, @@ -228,8 +242,26 @@ connect(vc_Gy:DIAMETER_PROC, self:Gy_PROC); vc_Gy.start(DIAMETER_Emulation.main(ops, pars, id)); + /* S6b setup: */ + pars := { + remote_ip := mp_pgw_hostname, + remote_sctp_port := -1, + local_ip := mp_aaa_local_ip, + local_sctp_port := mp_aaa_local_port, + origin_host := "aaa." & mp_diam_realm, + origin_realm := mp_diam_realm, + auth_app_id := c_DIAMETER_3GPP_S6b_AID, + vendor_app_id := c_DIAMETER_3GPP_S6b_AID + }; + vc_S6b := DIAMETER_Emulation_CT.create(id); + map(vc_S6b:DIAMETER, system:DIAMETER_CODEC_PT); + connect(vc_S6b:DIAMETER_UNIT, self:S6b_UNIT); + connect(vc_S6b:DIAMETER_PROC, self:S6b_PROC); + vc_S6b.start(DIAMETER_Emulation.main(ops, pars, id)); + f_diameter_wait_capability(Gx_UNIT); f_diameter_wait_capability(Gy_UNIT); + f_diameter_wait_capability(S6b_UNIT); /* Give some time for our emulation to get out of SUSPECT list of SUT (3 watchdong ping-pongs): * RFC6733 sec 5.1 * RFC3539 sec 3.4.1 [5] @@ -266,7 +298,7 @@ function f_start_handler(void_fn fn, template (omit) SessionPars pars_tmpl := omit) runs on PGW_Test_CT return PGW_Session_CT { var charstring id := testcasename(); - var DIAMETER_ConnHdlr_CT vc_conn_gx, vc_conn_gy; + var DIAMETER_ConnHdlr_CT vc_conn_gx, vc_conn_gy, vc_conn_s6b; var PGW_Session_CT vc_conn; var SessionPars pars; @@ -296,6 +328,14 @@ vc_conn_gy.start(f_diam_connhldr_ct_main(pars.imsi)); } + if (isbound(vc_S6b)) { + vc_conn_s6b := DIAMETER_ConnHdlr_CT.create(id); + connect(vc_conn_s6b:DIAMETER, vc_S6b:DIAMETER_CLIENT); + connect(vc_conn_s6b:DIAMETER_PROC, vc_S6b:DIAMETER_PROC); + connect(vc_conn:S6b, vc_conn_s6b:DIAMETER_CLIENT); + vc_conn_s6b.start(f_diam_connhldr_ct_main(pars.imsi)); + } + vc_conn.start(f_handler_init(fn, pars)); return vc_conn; } @@ -325,6 +365,28 @@ return f_concat_pad(15, '26242'H, suffix); } +/* S6b emulation (AAA-Server) */ +private altstep as_DIA_S6b_AAR() runs on PGW_Session_CT { + var PDU_DIAMETER rx_dia; + [] S6b.receive(tr_DIA_S6b_AAR()) -> value rx_dia { + var template (omit) AVP avp; + var octetstring sess_id; + + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + S6b.send(ts_DIA_S6b_AAA(sess_id, "aaa." & mp_diam_realm, + mp_diam_realm, mp_diam_realm, + rx_dia.hop_by_hop_id, rx_dia.end_to_end_id)); + setverdict(pass); + } + [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected DIAMETER ", rx_dia)); + } +} + +/* Gx emulation (PCRF)*/ private altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; [] Gx.receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { @@ -347,6 +409,7 @@ } } +/* Gy emulation (OCS) */ function f_tr_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT return template (present) PDU_DIAMETER { @@ -359,7 +422,7 @@ var template (present) OCT1 nsapi := ?; imsi := char2oct(f_dec_TBCD(imsi_hex2oct(g_pars.imsi))); //msisdn := char2oct(f_dec_TBCD(substr(ctx_val.msisdn, 1, lengthof(ctx_val.msisdn) -1))); - rat_type := int2oct(g_pars.rat_type, 1); + rat_type := int2oct(enum2int(g_pars.rat_type), 1); charging_char := char2oct(oct2str('0000'O)); // f_s5s8_create_session() uses hardcoded chg_car := '0000'O nsapi := int2oct(g_pars.bearer.ebi, 1); select (req_type) { @@ -538,6 +601,10 @@ } } +/* GTPv2C */ +private function is_s2b_iface() runs on PGW_Session_CT return boolean { + return (g_pars.rat_type == GTP2C_RAT_WLAN or g_pars.rat_type == GTP2C_RAT_Virtual); +} /* find TEID of given interface type (and optionally instance) */ private function f_find_teid(FullyQualifiedTEID_List list, @@ -558,12 +625,23 @@ /* process one to-be-created bearer context */ private function process_bctx_create(BearerContextGrouped bctx) runs on PGW_Session_CT { - /* FIXME: EPS Bearer ID */ + g_pars.bearer.ebi := bctx.bearerContextIEs.ePS_Bearer_ID.ePS_Bearer_ID_Value; /* FIXME: Cause */ + var integer exp_fteid_if_type; + var BIT4 exp_fteid_instance; + if (is_s2b_iface()) { + exp_fteid_if_type := 33; + exp_fteid_instance := '0100'B; + } else { + exp_fteid_if_type := 5; + exp_fteid_instance := '0010'B; + } + /* find F-TEID of the P-GW U side */ var FullyQualifiedTEID rx_fteid; - rx_fteid := valueof(f_find_teid(bctx.bearerContextIEs.fullyQualifiedTEID, 5, '0010'B)); + rx_fteid := valueof(f_find_teid(bctx.bearerContextIEs.fullyQualifiedTEID, + exp_fteid_if_type, exp_fteid_instance)); g_pars.bearer.teid_remote := rx_fteid.tEID_GRE_Key; if (rx_fteid.v4_Flag == '1'B) { g_gtpu4_remote := rx_fteid.iPv4_Address; @@ -601,10 +679,19 @@ template (omit) UserLocationInfo uli_ie := omit) runs on PGW_Session_CT { var PDU_GTPCv2 rx; + /* Defaults used for s5/s8: */ + var boolean do_s6b := false; + var template APN_Restriction apn_restriction := ?; + /* Change behavior when on S2b: */ + if (is_s2b_iface()) { + do_s6b := true; + apn_restriction := omit; + } + var template (value) PDU_GTPCv2 g2c := ts_GTP2C_CreateSessionReq(imsi := g_pars.imsi, msisdn := g_pars.msisdn, - rat_type := g_pars.rat_type, + rat_type := enum2int(g_pars.rat_type), sender_fteid := fteid_c_ie, apn := f_enc_dns_hostname(g_pars.apn), pdn_type := g_pars.pdn_type, @@ -615,14 +702,20 @@ g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H); GTP2.send(g2c); + if (do_s6b and S6b.checkstate("Connected")) { + as_DIA_S6b_AAR(); + } if (Gx.checkstate("Connected")) { as_DIA_Gx_CCR(INITIAL_REQUEST); } + /* FIXME: When on S2b interface, SMF is not using the Gy interface, unknown reason. */ if (Gy.checkstate("Connected")) { as_DIA_Gy_CCR(INITIAL_REQUEST); } alt { - [] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid:=g_pars.teic_local, cause:=Request_accepted)) -> value rx { + [] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid := g_pars.teic_local, + cause := Request_accepted, + apn_restriction := apn_restriction)) -> value rx { /* extract TEIDs */ var CreateSessionResponse resp := rx.gtpcv2_pdu.createSessionResponse; g_pars.teic_remote := resp.fullyQualifiedTEID[0].tEID_GRE_Key; @@ -686,6 +779,25 @@ } +/* create a session on the PGW on a S2b interface (from ePDG)*/ +private function f_s2b_create_session() runs on PGW_Session_CT { + var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; + var template (value) UserLocationInfo uli_ie; + + fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S2b_ePDG_GTPC, g_pars.teic_local, 0, + f_inet_addr(mp_local_hostname_c), omit); + fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_ePDG_GTPU, g_pars.bearer.teid_local, 5, + f_inet_addr(mp_local_hostname_u), omit); + f_create_session(fteid_c_ie, fteid_u_ie); + /* open5gs up to 1.2.3 won't accept it without ULI, despite not mandatory */ + var template (value) TAI tai := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0001'O }; + var template (value) ECGI ecgi := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0'H, 23 }; + uli_ie := ts_GTP2C_UserLocInfo(tai := tai, ecgi := ecgi); + + f_create_session(fteid_c_ie, fteid_u_ie, uli_ie); + +} + /* delete the session from the PGW */ private function f_delete_session(template (omit) GTP2C_Cause tx_cause := omit, template (present) OCT4 exp_teid, @@ -934,6 +1046,21 @@ vc_conn.done; } +/* create a session, expect it to succeed */ +private function f_TC_s2b_createSession_v4_noapco() runs on PGW_Session_CT { + f_s2b_create_session(); + setverdict(pass); +} +testcase TC_s2b_createSession_v4_noapco() runs on PGW_Test_CT { + var PGW_Session_CT vc_conn; + var SessionPars pars := valueof(t_SessionPars('001010123456789'H, + "tun22", + rat_type := GTP2C_RAT_WLAN)); + f_init(); + vc_conn := f_start_handler(refers(f_TC_s2b_createSession_v4_noapco), pars); + vc_conn.done; +} + control { execute( TC_tx_echo() ); execute( TC_createSession() ); @@ -942,6 +1069,7 @@ execute( TC_createSession_deleteSession() ); execute( TC_deleteSession_unknown() ); execute( TC_gy_charging_cc_time() ); + execute( TC_s2b_createSession_v4_noapco() ); } diff --git a/pgw/expected-results.xml b/pgw/expected-results.xml index 0643289..0e252af 100644 --- a/pgw/expected-results.xml +++ b/pgw/expected-results.xml @@ -7,4 +7,5 @@ <testcase classname='PGW_Tests' name='TC_createSession_deleteSession' time='MASKED'/> <testcase classname='PGW_Tests' name='TC_deleteSession_unknown' time='MASKED'/> <testcase classname='PGW_Tests' name='TC_gy_charging_cc_time' time='MASKED'/> + <testcase classname='PGW_Tests' name='TC_s2b_createSession_v4_noapco' time='MASKED'/> </testsuite> diff --git a/pgw/gen_links.sh b/pgw/gen_links.sh index 9aebfc2..40671f9 100755 --- a/pgw/gen_links.sh +++ b/pgw/gen_links.sh @@ -64,7 +64,7 @@ FILES+="GTPv2_CodecPort.ttcn GTPv2_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunct.ttcn GTPv2_Emulation.ttcn " FILES+="DNS_Helpers.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " -FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts32_299_Templates.ttcn " +FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_rfc5447_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn DIAMETER_ts32_299_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36075?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: I38e469edf0e00feca5a648035b64645e2c905937 Gerrit-Change-Number: 36075 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pgw: Introduce test TC_s2b_createSession_v4_apco

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36085?usp=email ) Change subject: pgw: Introduce test TC_s2b_createSession_v4_apco ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36085?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: Ib01fe0512866924a5afc4d6719ceacb0b4b54df2 Gerrit-Change-Number: 36085 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 12:54:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pgw: Introduce test TC_s2b_createSession_v4_no_apco

by pespin

Attention is currently required from: laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36075?usp=email ) Change subject: pgw: Introduce test TC_s2b_createSession_v4_no_apco ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36075?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: I38e469edf0e00feca5a648035b64645e2c905937 Gerrit-Change-Number: 36075 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 28 Feb 2024 12:54:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in ...osmo_ss7[master]: cosmetic: ipa_proto.erl: Fix trailing whitespace

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36094?usp=email ) Change subject: cosmetic: ipa_proto.erl: Fix trailing whitespace ...................................................................... cosmetic: ipa_proto.erl: Fix trailing whitespace Change-Id: I8b742ae041670452745d5f0022e49b1bed0f1cf5 --- M src/ipa_proto.erl 1 file changed, 12 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipa_proto.erl b/src/ipa_proto.erl index ceb024a..fcd594b 100644 --- a/src/ipa_proto.erl +++ b/src/ipa_proto.erl @@ -1,4 +1,4 @@ -% ip.access IPA multiplex protocol +% ip.access IPA multiplex protocol % (C) 2010,2012,2019 by Harald Welte <laforge(a)gnumonks.org> % (C) 2010 by On-Waves @@ -50,12 +50,12 @@ register_socket(Socket) -> IpaPid = spawn(?MODULE, init_sock, [Socket, self()]), % synchronously wait for init_sock to be done - receive + receive {ipa_init_sock_done, Socket} -> % assign ownership of the socket to the new IPA handler process gen_tcp:controlling_process(Socket, IpaPid), {ok, IpaPid} - after + after ?TIMEOUT -> {error, timeout} end. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I8b742ae041670452745d5f0022e49b1bed0f1cf5 Gerrit-Change-Number: 36094 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 2 weeks

1
0
0 0

[S] Change in ...osmo_ss7[master]: cosmetic: ipa_proto.erl: Fix trailing whitespace

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36094?usp=email ) Change subject: cosmetic: ipa_proto.erl: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/36094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_ss7 Gerrit-Branch: master Gerrit-Change-Id: I8b742ae041670452745d5f0022e49b1bed0f1cf5 Gerrit-Change-Number: 36094 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 12:53:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn: osmo-*.cfg: tune logging configuration

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36103?usp=email ) Change subject: sgsn: osmo-*.cfg: tune logging configuration ...................................................................... sgsn: osmo-*.cfg: tune logging configuration Change-Id: I2f2cc69a481709e862d569b0298561b61506dfa7 --- M sgsn/osmo-sgsn.cfg M sgsn/osmo-sgsn.sns.cfg M sgsn/osmo-stp.cfg 3 files changed, 24 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/36103/1 diff --git a/sgsn/osmo-sgsn.cfg b/sgsn/osmo-sgsn.cfg index b446f87..4a5f236 100644 --- a/sgsn/osmo-sgsn.cfg +++ b/sgsn/osmo-sgsn.cfg @@ -8,12 +8,12 @@ ! log stderr logging filter all 1 - logging color 1 - logging print category 1 - logging print category-hex 0 - logging timestamp 1 logging print extended-timestamp 1 - logging print file 1 + logging print file basename last + logging print category-hex 0 + logging print category 1 + logging print level 1 + logging color 1 logging level mm debug logging level pag notice logging level meas notice diff --git a/sgsn/osmo-sgsn.sns.cfg b/sgsn/osmo-sgsn.sns.cfg index 5d09b1b..327535e 100644 --- a/sgsn/osmo-sgsn.sns.cfg +++ b/sgsn/osmo-sgsn.sns.cfg @@ -8,12 +8,12 @@ ! log stderr logging filter all 1 - logging color 1 - logging print category 1 - logging print category-hex 0 - logging timestamp 1 logging print extended-timestamp 1 - logging print file 1 + logging print file basename last + logging print category-hex 0 + logging print category 1 + logging print level 1 + logging color 1 logging level mm debug logging level pag notice logging level meas notice diff --git a/sgsn/osmo-stp.cfg b/sgsn/osmo-stp.cfg index 7823f2a..23c4e8f 100644 --- a/sgsn/osmo-stp.cfg +++ b/sgsn/osmo-stp.cfg @@ -7,12 +7,13 @@ logging filter all 1 ! log stderr - logging color 1 logging filter all 1 - logging print level 1 - logging print category 1 - logging timestamp 1 logging print extended-timestamp 1 + logging print file basename last + logging print category-hex 0 + logging print category 1 + logging print level 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/+/36103?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: I2f2cc69a481709e862d569b0298561b61506dfa7 Gerrit-Change-Number: 36103 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn/expected-results.xml: add missing testcases

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36102?usp=email ) Change subject: sgsn/expected-results.xml: add missing testcases ...................................................................... sgsn/expected-results.xml: add missing testcases Change-Id: I09cc32bffde9d9dec59befa181a995e88112b2d2 --- M sgsn/expected-results.xml 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/36102/1 diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index 944f871..35b2926 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -4,6 +4,7 @@ <testcase classname='SGSN_Tests' name='TC_attach_mnc3' time='MASKED'/> <testcase classname='SGSN_Tests' name='TC_attach_umts_aka_umts_res' time='MASKED'/> <testcase classname='SGSN_Tests' name='TC_attach_umts_aka_gsm_sres' time='MASKED'/> + <testcase classname='SGSN_Tests' name='TC_attach_timeout_after_pdp_act' time='MASKED'/> <testcase classname='SGSN_Tests' name='TC_attach_auth_id_timeout' time='MASKED'/> <testcase classname='SGSN_Tests' name='TC_attach_auth_sai_timeout' time='MASKED'/> <testcase classname='SGSN_Tests' name='TC_attach_auth_sai_reject' time='MASKED'/> @@ -84,6 +85,7 @@ <testcase classname='SGSN_Tests' name='TC_cell_change_different_ci_attach' time='MASKED'/> <testcase classname='SGSN_Tests' name='TC_cell_change_different_ci_data' time='MASKED'/> <testcase classname='SGSN_Tests' name='TC_attach_req_id_req_ra_update' time='MASKED'/> +  <testcase classname='SGSN_Tests_Iu' name='TC_iu_attach' time='MASKED'/> <testcase classname='SGSN_Tests_Iu' name='TC_iu_attach_encr' time='MASKED'/> <testcase classname='SGSN_Tests_Iu' name='TC_iu_attach_geran_rau' time='MASKED'> @@ -93,4 +95,13 @@ </failure> </testcase> <testcase classname='SGSN_Tests_Iu' name='TC_geran_attach_iu_rau' time='MASKED'/> +  + <testcase classname='SGSN_Tests_NS' name='TC_SNS_size' time='MASKED'/> + <testcase classname='SGSN_Tests_NS' name='TC_SNS_size_too_big' time='MASKED'/> + <testcase classname='SGSN_Tests_NS' name='TC_SNS_config_bss' time='MASKED'/> + <testcase classname='SGSN_Tests_NS' name='TC_SNS_config_sgsn' time='MASKED'/> + <testcase classname='SGSN_Tests_NS' name='TC_SNS_and_alive' time='MASKED'/> +  + <testcase classname='SGSN_Tests_NS' name='TC_NS_connect_alive' time='MASKED'/> + <testcase classname='SGSN_Tests_NS' name='TC_NS_connect_reset' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36102?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: I09cc32bffde9d9dec59befa181a995e88112b2d2 Gerrit-Change-Number: 36102 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 2 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: kernel-gtp: add ipv6

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33802?usp=email ) Change subject: ttcn3-ggsn-test: kernel-gtp: add ipv6 ...................................................................... ttcn3-ggsn-test: kernel-gtp: add ipv6 Related: OS#6096 Change-Id: If3549db216ff89bdb963744bb38015ad68d4cf6a --- M ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg 1 file changed, 19 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg index 6fbfd0e..b377bfa 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg @@ -44,14 +44,21 @@ ggsn ggsn0 gtp state-dir /tmp gtp bind-ip 172.18.3.201 + # OS#6106: Currently it is not possible to configure multiple APNs with + # gtpu-mode kernel-gtp in OsmoGGSN, because it cannot share the GTP-U bind + # socket between tunnels. apn internet gtpu-mode kernel-gtp - tun-device tun4 - type-support v4 + tun-device tun46 + type-support v4v6 ip prefix dynamic 176.16.16.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 ip ifconfig 176.16.16.0/20 + ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 + ipv6 dns 0 fd02:db8:3::201 + ipv6 dns 1 2001:4860:4860::8844 + ipv6 ifconfig 2001:780:44:2100:0:0:0:0/56 no shutdown # apn inet6 # apn inet46 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33802?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: If3549db216ff89bdb963744bb38015ad68d4cf6a Gerrit-Change-Number: 33802 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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

2 months, 2 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: kernel-gtp: add ipv6

by osmith

Attention is currently required from: daniel, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33802?usp=email ) Change subject: ttcn3-ggsn-test: kernel-gtp: add ipv6 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33802?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: If3549db216ff89bdb963744bb38015ad68d4cf6a Gerrit-Change-Number: 33802 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 10:06:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc/expected-results.xml: add missing testcases

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36101?usp=email ) Change subject: msc/expected-results.xml: add missing testcases ...................................................................... msc/expected-results.xml: add missing testcases Change-Id: I1604bb955707d0e44bfd08ecd3a28a936731c166 --- M msc/expected-results.xml 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/36101/1 diff --git a/msc/expected-results.xml b/msc/expected-results.xml index a77bdc5..f8fa0ec 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -130,11 +130,13 @@ <testcase classname='MSC_Tests' name='TC_ho_inter_bsc_a5_3' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_ho_inter_bsc_a5_4' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_ho_inter_bsc_ipv6' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_ho_inter_bsc_csd' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_ho_inter_msc_out' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_ho_inter_msc_out_a5_1' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_ho_inter_msc_out_a5_3' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_ho_inter_msc_out_a5_4' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_ho_inter_msc_out_ipv6' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_ho_inter_msc_out_csd' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_lu_imsi_auth_tmsi_check_imei' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_lu_imsi_auth3g_tmsi_check_imei' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_lu_imsi_noauth_tmsi_check_imei' time='MASKED'/> @@ -158,6 +160,21 @@ <testcase classname='MSC_Tests' name='TC_call_re_establishment_auth' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_call_re_establishment_ciph' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_cm_serv_wrong_mi' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_auth_options_0' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_auth_options_1' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_auth_options_2' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_auth_options_3' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_auth_options_4' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_auth_options_5' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_auth_options_6' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_auth_options_7' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_auth_options_8' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_auth_options_9' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_auth_options_10' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_auth_options_11' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_lu_and_mo_csd' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_lu_and_mt_csd' time='MASKED'/> +  <testcase classname='MSC_Tests_Iu' name='TC_iu_lu_imsi_reject' time='MASKED'/> <testcase classname='MSC_Tests_Iu' name='TC_iu_lu_imsi_timeout_gsup' time='MASKED'/> <testcase classname='MSC_Tests_Iu' name='TC_iu_lu_imsi_auth3g_tmsi' time='MASKED'/> @@ -233,4 +250,10 @@ </testcase> <testcase classname='MSC_Tests_Iu' name='TC_iu_lu_and_expire_while_paging' time='MASKED'/> <testcase classname='MSC_Tests_Iu' name='TC_mo_cc_iu_release' time='MASKED'/> +  + <testcase classname='MSC_Tests_ASCI' name='TC_no_callref' time='MASKED'/> + <testcase classname='MSC_Tests_ASCI' name='TC_setup_refuse' time='MASKED'/> + <testcase classname='MSC_Tests_ASCI' name='TC_assign_fail' time='MASKED'/> + <testcase classname='MSC_Tests_ASCI' name='TC_complete_vgcs' time='MASKED'/> + <testcase classname='MSC_Tests_ASCI' name='TC_complete_vbs' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36101?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: I1604bb955707d0e44bfd08ecd3a28a936731c166 Gerrit-Change-Number: 36101 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: input/ipaccess: fix regression in ipaccess_bts_handle_ccm()

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36100?usp=email ) Change subject: input/ipaccess: fix regression in ipaccess_bts_handle_ccm() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36100?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic26181b580724a70c2af8a224155430902fe4101 Gerrit-Change-Number: 36100 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 09:58:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: kernel-gtp: add ipv6

by laforge

Attention is currently required from: daniel, fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33802?usp=email ) Change subject: ttcn3-ggsn-test: kernel-gtp: add ipv6 ...................................................................... Patch Set 3: Code-Review+1 (1 comment) Patchset: PS1: > See the commit message description: […] no, that's not in the scope. it's apparently a constraint that nobody reported or complainted about so far, and I was not aware of. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33802?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: If3549db216ff89bdb963744bb38015ad68d4cf6a Gerrit-Change-Number: 33802 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 09:47:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: input/ipaccess: fix regression in ipaccess_bts_handle_ccm()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36100?usp=email ) Change subject: input/ipaccess: fix regression in ipaccess_bts_handle_ccm() ...................................................................... input/ipaccess: fix regression in ipaccess_bts_handle_ccm() As stated in a comment in this function, link->line might be NULL: /* line might not exist if != bsc||bts */ struct e1inp_line *line = link->line; so we cannot use LOGPIL, which dereferences it unconditionally. Change-Id: Ic26181b580724a70c2af8a224155430902fe4101 Fixes: a87de3cd "input/ipaccess: Always log with context, if we have any" Related: OS#6379 --- M src/input/ipaccess.c 1 file changed, 24 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/00/36100/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 22ac0ef..da2f04d 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -894,13 +894,13 @@ if (link->ofd->priv_nr >= E1INP_SIGN_RSL) trx_nr = link->ofd->priv_nr - E1INP_SIGN_RSL; - LOGPIL(line, DLINP, LOGL_NOTICE, "received ID_GET for unit ID %u/%u/%u\n", - dev->site_id, dev->bts_id, trx_nr); + LOGP(DLINP, LOGL_NOTICE, "received ID_GET for unit ID %u/%u/%u\n", + dev->site_id, dev->bts_id, trx_nr); rmsg = ipa_bts_id_resp(dev, data + 1, len - 1, trx_nr); ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); if (ret != rmsg->len) { - LOGPIL(line, DLINP, LOGL_ERROR, "cannot send ID_RESP message. Reason: %s\n", - strerror(errno)); + LOGP(DLINP, LOGL_ERROR, "cannot send ID_RESP message. Reason: %s\n", + strerror(errno)); goto err_rmsg; } msgb_free(rmsg); @@ -909,8 +909,8 @@ rmsg = ipa_bts_id_ack(); ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); if (ret != rmsg->len) { - LOGPIL(line, DLINP, LOGL_ERROR, "cannot send ID_ACK message. Reason: %s\n", - strerror(errno)); + LOGP(DLINP, LOGL_ERROR, "cannot send ID_ACK message. Reason: %s\n", + strerror(errno)); goto err_rmsg; } msgb_free(rmsg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36100?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic26181b580724a70c2af8a224155430902fe4101 Gerrit-Change-Number: 36100 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples/stream-*: Add options, to set local/remote peer

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35927?usp=email ) Change subject: examples/stream-*: Add options, to set local/remote peer ...................................................................... Patch Set 5: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-netif/+/35927/comment/108ef916_f6d353fb PS2, Line 12: remove > remote Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35927?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: Ie6da55ef248436e521c5d8f21f8053356c46a114 Gerrit-Change-Number: 35927 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 28 Feb 2024 09:29:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Add osmo_io_get_ioops() function

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36076?usp=email ) Change subject: osmo_io: Add osmo_io_get_ioops() function ...................................................................... Patch Set 1: (1 comment) File include/osmocom/core/osmo_io.h: https://gerrit.osmocom.org/c/libosmocore/+/36076/comment/4c518b00_3d5c1975 PS1, Line 112: void osmo_iofd_get_ioops(struct osmo_io_fd *iofd, struct osmo_io_ops *ioops); > It may make more sense to return a "const struct osmo_io_ops*" so that no copy is needed by default. […] If you want to make it generic, it would probably be best to decoupple the segmentation callback from the other callbacks, or even all of the callbacks from each other. That way there wouldn't be any shared struct between the lib and applications. Using a const pointer doesn't really guarantee that the user won't be able to modify the instance of the struct used/owned by the library. The user can just type-cast it to non-const and then overwrite library data. The copy avoids that. Regarding struct size: The application and lib already need to agree on this, as the set_io_ops operating also uses that very same struct. So if they need to agree on the "set" side, it is not a problem if the same assumption holds true for the "get" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36076?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: I03398c811b9534f50c6644b21eea89a04be29fb0 Gerrit-Change-Number: 36076 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 09:14:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/M3UA: support TCP transport, implement desegmentation

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36098?usp=email ) Change subject: library/M3UA: support TCP transport, implement desegmentation ...................................................................... library/M3UA: support TCP transport, implement desegmentation Change-Id: If1dcdb185d08a08dc5a06c37d9d6ffe7d6da9325 Related: libosmo-sccp.git I8c76d271472befacbeb998a93bbdc9e8660d9b5d Related: SYS#5424 --- M library/M3UA_CodecPort.ttcn M library/M3UA_CodecPort_CtrlFunct.ttcn M library/M3UA_CodecPort_CtrlFunctDef.cc 3 files changed, 48 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/36098/1 diff --git a/library/M3UA_CodecPort.ttcn b/library/M3UA_CodecPort.ttcn index 94d16d6..e88b6a0 100644 --- a/library/M3UA_CodecPort.ttcn +++ b/library/M3UA_CodecPort.ttcn @@ -15,6 +15,7 @@ import from IPL4asp_PortType all; import from IPL4asp_Types all; + import from M3UA_CodecPort_CtrlFunct all; import from M3UA_Types all; type record M3UA_RecvFrom { @@ -37,7 +38,7 @@ type record M3UA_Send { ConnectionId connId, - integer stream, + integer stream optional, PDU_M3UA msg } @@ -59,14 +60,18 @@ private function M3UA_to_IPL4_Send(in M3UA_Send pin, out ASP_Send pout) { pout.connId := pin.connId; - pout.proto := { - sctp := { - sinfo_stream := pin.stream, - sinfo_ppid := 3, - remSocks := omit, - assocId := omit - } - }; + if (ispresent(pin.stream)) { + pout.proto := { + sctp := { + sinfo_stream := pin.stream, + sinfo_ppid := 3, + remSocks := omit, + assocId := omit + } + }; + } else { + pout.proto := { tcp := { } }; + } pout.msg := enc_PDU_M3UA(pin.msg); } with { extension "prototype(fast)" }; @@ -80,5 +85,12 @@ in(ASP_RecvFrom -> M3UA_RecvFrom: function(IPL4_to_M3UA_RecvFrom); ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; ASP_Event -> ASP_Event: simple)" + }; + + function f_set_tcp_segmentation(M3UA_CODEC_PT pt, ConnectionId connId) { + /* Set function for dissecting the binary stream into packets */ + var f_IPL4_getMsgLen vl_f := refers(f_IPL4_fixedMsgLen); + /* Offset: 4, size of length: 4, delta: 0, multiplier: 1, big-endian */ + M3UA_CodecPort_CtrlFunct.f_IPL4_setGetMsgLen(pt, connId, vl_f, {4, 4, 0, 1, 0}); } } diff --git a/library/M3UA_CodecPort_CtrlFunct.ttcn b/library/M3UA_CodecPort_CtrlFunct.ttcn index fc38e43..6f06e2c 100644 --- a/library/M3UA_CodecPort_CtrlFunct.ttcn +++ b/library/M3UA_CodecPort_CtrlFunct.ttcn @@ -40,5 +40,12 @@ out UserData userData ) return Result; + external function f_IPL4_setGetMsgLen( + inout M3UA_CODEC_PT portRef, + in ConnectionId id, + inout f_IPL4_getMsgLen f, + in ro_integer msgLenArgs + ) + } diff --git a/library/M3UA_CodecPort_CtrlFunctDef.cc b/library/M3UA_CodecPort_CtrlFunctDef.cc index 62533de..7ddacdc 100644 --- a/library/M3UA_CodecPort_CtrlFunctDef.cc +++ b/library/M3UA_CodecPort_CtrlFunctDef.cc @@ -51,6 +51,15 @@ { return f__IPL4__PROVIDER__getUserData(portRef, connId, userData); } + + void f__IPL4__setGetMsgLen( + M3UA__CodecPort::M3UA__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + Socket__API__Definitions::f__getMsgLen& f, + const Socket__API__Definitions::ro__integer& msgLenArgs) + { + return f__IPL4__PROVIDER__setGetMsgLen(portRef, connId, f, msgLenArgs); + } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36098?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: If1dcdb185d08a08dc5a06c37d9d6ffe7d6da9325 Gerrit-Change-Number: 36098 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 2 weeks

1
0
0 0

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

by fixeria

fixeria has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/36097/1 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: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: WIP

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36099?usp=email ) Change subject: WIP ...................................................................... WIP Change-Id: I6dfed05adb332c29404997ea7dc93ec3dabfc43a --- M start-testsuite.sh M stp/STP_Tests.ttcn M stp/STP_Tests_M3UA.ttcn M ttcn3-tcpdump-start.sh M ttcn3-tcpdump-stop.sh 5 files changed, 141 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/36099/1 diff --git a/start-testsuite.sh b/start-testsuite.sh index 4b88501..6ffacd2 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -50,8 +50,8 @@ ulimit -n 100000 # below is for the debian packages -TTCN3_BIN_DIR="${TTCN3_BIN_DIR:-/usr/bin}" -TITAN_LIBRARY_PATH="${TITAN_LIBRARY_PATH:-/usr/lib/titan:/usr/ttcn3/lib}" +TTCN3_BIN_DIR="${TTCN3_DIR}/bin" +TITAN_LIBRARY_PATH="${TTCN3_DIR}/lib" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" "$TTCN3_BIN_DIR/ttcn3_start" $SUITE $CFG $TEST expected="$SUITE_DIR/expected-results.xml" diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn index e2e5336..8c6a065 100644 --- a/stp/STP_Tests.ttcn +++ b/stp/STP_Tests.ttcn @@ -60,6 +60,34 @@ } } +/* Test routing of SCCP between an M3UA-o-SCTP and an M3UA-o-TCP */ +testcase TC_m3ua_tcp() runs on IPA_M3UA_CT { + var OCT4 rctx_sender := int2oct(1023, 4); + var OCT4 pc_sender := int2oct(23, 4); + var OCT4 pc_receiver := int2oct(5, 4); + + f_init_m3ua(); + f_init_ipa(); + + f_connect_ipa(3); + f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx + + /* send a well-formed, encoded SCCP message via M3UA */ + var octetstring data := f_rnd_octstring_rnd_len(100); + var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); + var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); + var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); + var octetstring sccp_enc := enc_PDU_SCCP(sccp); + var template (value) M3UA_Protocol_Data tx_pd; + tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, '00'O, sccp_enc); + f_M3UA_send(0, ts_M3UA_DATA(rctx_sender, tx_pd), 1); + + /* expect to receive it via IPA */ + // f_IPA_exp(3, sccp_enc); + + f_clear_m3ua(); +} + /* Test routing of SCCP between an M3UA and an IPA ASP */ testcase TC_m3ua_to_ipa() runs on IPA_M3UA_CT { var OCT4 rctx_sender := int2oct(1023, 4); diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 5af894a..8592d4a 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -45,41 +45,47 @@ M3uaConfigs mp_m3ua_configs := { /* as-sender: One ASP within AS */ { - remote_sctp_port := 2905, - local_sctp_port := 9999, + use_tcp := false, + remote_port := 2905, + local_port := 9999, point_code := 23, routing_ctx := 1023 }, /* as-receiver: Two ASP within AS */ { - remote_sctp_port := 2905, - local_sctp_port := 10000, + use_tcp := false, + remote_port := 2905, + local_port := 10000, point_code := 42, routing_ctx := 1042 }, { - remote_sctp_port := 2905, - local_sctp_port := 10001, + use_tcp := false, + remote_port := 2905, + local_port := 10001, point_code := 42, routing_ctx := 1042 }, /* as-client: One ASP within AS */ { - remote_sctp_port := 2906, - local_sctp_port := 10002, + use_tcp := false, + remote_port := 2906, + local_port := 10002, point_code := 55, routing_ctx := 1055 }, /* as-client60-norctx */ { - remote_sctp_port := 2907, - local_sctp_port := 11060, + use_tcp := false, + remote_port := 2907, + local_port := 11060, point_code := 60, routing_ctx := - }, /* as-client61-norctx */ { - remote_sctp_port := 2907, - local_sctp_port := 11061, + use_tcp := false, + remote_port := 2907, + local_port := 11061, point_code := 61, routing_ctx := - } @@ -89,10 +95,12 @@ } type record M3uaConfig { - /* STP-side SCTP port for M3UA */ - integer remote_sctp_port, + /* use TCP (true) or SCTP (false) */ + boolean use_tcp, + /* STP-side SCTP (or TCP) port for M3UA */ + integer remote_port, /* local M3UA base port on TTCN3 side */ - integer local_sctp_port, + integer local_port, /* point code routed via this M3U */ integer point_code, /* associated routing context */ @@ -119,7 +127,7 @@ sctpPeerAddrChange := ? } } -private template PortEvent tr_SctpConnOpened := { +private template PortEvent tr_ConnOpened := { connOpened := ? } @@ -137,9 +145,13 @@ } } -friend function f_M3UA_send(integer idx, template (present) PDU_M3UA msg, template integer stream := 0) +friend function f_M3UA_send(integer idx, template (present) PDU_M3UA msg, integer stream := 0) runs on RAW_M3UA_CT { - M3UA[idx].send(t_M3UA_Send(g_m3ua_conn_id[idx], msg, stream)); + if (mp_m3ua_configs[idx].use_tcp) { + M3UA[idx].send(t_M3UA_Send(g_m3ua_conn_id[idx], msg, omit)); + } else { + M3UA[idx].send(t_M3UA_Send(g_m3ua_conn_id[idx], msg, stream)); + } } friend function f_M3UA_exp(integer idx, template (present) PDU_M3UA msg) runs on RAW_M3UA_CT { @@ -192,7 +204,7 @@ assocId := omit }; -friend function f_M3UA_connect(integer i) runs on RAW_M3UA_CT { +friend function f_M3UA_connect_sctp(integer i) runs on RAW_M3UA_CT { var Result res; var Option opt_add_local_addrs; var OptionList opt_list := {}; @@ -213,15 +225,15 @@ if (lengthof(mp_stp_m3ua_ip) > 1) { for (var integer j := 1; j < lengthof(mp_stp_m3ua_ip); j := j + 1) { - var Socket sk := valueof(ts_Socket(mp_stp_m3ua_ip[j], m3cfg.remote_sctp_port)); + var Socket sk := valueof(ts_Socket(mp_stp_m3ua_ip[j], m3cfg.remote_port)); opt_add_remote_addrs[j - 1] := sk; } } else { opt_add_remote_addrs := omit; } - res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i], mp_stp_m3ua_ip[0], m3cfg.remote_sctp_port, - mp_local_m3ua_ip[0], m3cfg.local_sctp_port, 0, + res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i], mp_stp_m3ua_ip[0], m3cfg.remote_port, + mp_local_m3ua_ip[0], m3cfg.local_port, 0, {sctp:=valueof(ts_SCTP(3, 0, opt_add_remote_addrs))}, opt_list); if (not ispresent(res.connId)) { @@ -231,9 +243,34 @@ g_m3ua_conn_id[i] := res.connId; } +friend function f_M3UA_connect_tcp(integer i) runs on RAW_M3UA_CT { + var M3uaConfig m3cfg := mp_m3ua_configs[i]; + var Result res; + + if (lengthof(mp_local_m3ua_ip) == 0 or lengthof(mp_stp_m3ua_ip) == 0) { + setverdict(fail, "Empty local or remote address trying to connect TCP socket: ", + mp_local_m3ua_ip, " / ", mp_stp_m3ua_ip); + mtc.stop; + } + + res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i], mp_stp_m3ua_ip[0], m3cfg.remote_port, + mp_local_m3ua_ip[0], m3cfg.local_port, 0, + {tcp:={}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect M3UA socket, check your configuration"); + mtc.stop; + } + g_m3ua_conn_id[i] := res.connId; + M3UA_CodecPort.f_set_tcp_segmentation(M3UA[i], res.connId); +} + friend function f_M3UA_close(integer i) runs on RAW_M3UA_CT { var Result res; - res := M3UA_CodecPort_CtrlFunct.f_IPL4_close(M3UA[i], g_m3ua_conn_id[i], {sctp:=valueof(ts_SCTP)}); + if (mp_m3ua_configs[i].use_tcp) { + res := M3UA_CodecPort_CtrlFunct.f_IPL4_close(M3UA[i], g_m3ua_conn_id[i], {tcp:={}}); + } else { + res := M3UA_CodecPort_CtrlFunct.f_IPL4_close(M3UA[i], g_m3ua_conn_id[i], {sctp:=valueof(ts_SCTP)}); + } g_m3ua_conn_id[i] := 0; } @@ -255,12 +292,20 @@ opt_list := {opt_add_local_addrs}; } - res := M3UA_CodecPort_CtrlFunct.f_IPL4_listen(M3UA[i], mp_local_m3ua_ip[0], m3cfg.local_sctp_port, - {sctp:=valueof(ts_SCTP)}, opt_list); + if (mp_m3ua_configs[i].use_tcp) { + res := M3UA_CodecPort_CtrlFunct.f_IPL4_listen(M3UA[i], mp_local_m3ua_ip[0], m3cfg.local_port, + {tcp:={}}); + } else { + res := M3UA_CodecPort_CtrlFunct.f_IPL4_listen(M3UA[i], mp_local_m3ua_ip[0], m3cfg.local_port, + {sctp:=valueof(ts_SCTP)}, opt_list); + } if (not ispresent(res.connId)) { setverdict(fail, "Could not bind M3UA socket, check your configuration"); mtc.stop; } + if (mp_m3ua_configs[i].use_tcp) { + M3UA_CodecPort.f_set_tcp_segmentation(M3UA[i], res.connId); + } } friend function f_init_m3ua(boolean ignore_ssnm := true) runs on RAW_M3UA_CT { @@ -275,7 +320,11 @@ for (i := 0; i < NR_M3UA; i:=i+1) { map(self:M3UA[i], system:M3UA_CODEC_PT); - f_M3UA_connect(i); + if (mp_m3ua_configs[i].use_tcp) { + f_M3UA_connect_tcp(i); + } else { + f_M3UA_connect_sctp(i); + } } } @@ -294,15 +343,15 @@ friend function f_init_m3ua_srv() runs on RAW_M3UA_CT { var integer i; - var PortEvent sctp_evt; + var PortEvent port_evt; for (i := NR_M3UA; i < NR_M3UA+NR_M3UA_SRV; i:=i+1) { map(self:M3UA[i], system:M3UA_CODEC_PT); /* bind+ listen */ f_M3UA_listen(i); /* wait for accept() */ - M3UA[i].receive(tr_SctpConnOpened) -> value sctp_evt { - g_m3ua_conn_id[i] := sctp_evt.connOpened.connId; + M3UA[i].receive(tr_ConnOpened) -> value port_evt { + g_m3ua_conn_id[i] := port_evt.connOpened.connId; } } } @@ -982,12 +1031,30 @@ f_M3UA_exp(0, tr_M3UA_SCON({adv_pc}, rctx0)); } +private function f_asp_cfg_str(charstring asp_name, in M3uaConfig cfg) +return charstring { + var charstring str; + + str := "asp " & asp_name; + str := str & " " & int2str(cfg.local_port); + str := str & " " & int2str(cfg.remote_port); + str := str & " m3ua"; + + if (cfg.use_tcp) { + str := str & " tcp"; + } + + return str; +} + private function f_quirk(charstring quirk) runs on RAW_M3UA_CT { - f_vty_config2(VTY, {"cs7 instance 0", "asp asp-client0 10002 2906 m3ua"}, "quirk " & quirk); + var charstring asp_cfg_str := f_asp_cfg_str("asp-client0", mp_m3ua_configs[3]); + f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, "quirk " & quirk); } private function f_no_quirk(charstring quirk) runs on RAW_M3UA_CT { - f_vty_config2(VTY, {"cs7 instance 0", "asp asp-client0 10002 2906 m3ua"}, "no quirk " & quirk); + var charstring asp_cfg_str := f_asp_cfg_str("asp-client0", mp_m3ua_configs[3]); + f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, "no quirk " & quirk); } /* quirk 'no_notify': Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */ diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index c4905d9..003d439 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -36,6 +36,8 @@ TTCN3_PCAP_PATH=/tmp fi +exit + kill_rm_pidfile $PIDFILE_NETCAT kill_rm_pidfile $PIDFILE_PCAP diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index 82d3a4f..0a13841 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -54,6 +54,8 @@ fi fi +exit + # Wait for up to 2 seconds if we keep receiving traffinc from packet dumper, # otherwise we might lose last packets from test. i=0 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36099?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: I6dfed05adb332c29404997ea7dc93ec3dabfc43a Gerrit-Change-Number: 36099 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples/stream-*: Support SCTP when called with "-s" argument

by laforge

Attention is currently required from: laforge, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35234?usp=email ) Change subject: examples/stream-*: Support SCTP when called with "-s" argument ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35234?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: I4137cdf1e21cb669b632fe5c126ec27475d98400 Gerrit-Change-Number: 35234 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 08:47:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples/stream-*: Add options, to set local/remote peer

by laforge

Attention is currently required from: jolly, laforge. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35927?usp=email ) Change subject: examples/stream-*: Add options, to set local/remote peer ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35927?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: Ie6da55ef248436e521c5d8f21f8053356c46a114 Gerrit-Change-Number: 35927 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 28 Feb 2024 08:47:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc/MSC_Tests.cfg: remove commented out testcase list

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36096?usp=email ) Change subject: msc/MSC_Tests.cfg: remove commented out testcase list ...................................................................... msc/MSC_Tests.cfg: remove commented out testcase list Change-Id: I573b55e235ebb093b1166c1fe78feaa4f296ce8c --- M msc/MSC_Tests.cfg 1 file changed, 9 insertions(+), 48 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg index ee36336..1676e70 100644 --- a/msc/MSC_Tests.cfg +++ b/msc/MSC_Tests.cfg @@ -18,51 +18,3 @@ MSC_Tests.control MSC_Tests_Iu.control MSC_Tests_ASCI.control -#MSC_Tests.TC_cr_before_reset -#MSC_Tests.TC_lu_imsi_noauth_tmsi -#MSC_Tests.TC_lu_imsi_noauth_notmsi -#MSC_Tests.TC_lu_imsi_reject -#MSC_Tests.TC_lu_imsi_timeout_gsup -#MSC_Tests.TC_lu_imsi_auth_tmsi -#MSC_Tests.TC_cmserv_imsi_unknown -#MSC_Tests.TC_lu_and_mo_call -#MSC_Tests.TC_lu_auth_sai_timeout -#MSC_Tests.TC_lu_auth_sai_err -#MSC_Tests.TC_lu_clear_request -#MSC_Tests.TC_lu_disconnect -#MSC_Tests.TC_lu_by_imei -#MSC_Tests.TC_lu_by_tmsi_noauth_unknown -#MSC_Tests.TC_imsi_detach_by_imsi -#MSC_Tests.TC_imsi_detach_by_tmsi -#MSC_Tests.TC_imsi_detach_by_imei -#MSC_Tests.TC_emerg_call_imei_reject -#MSC_Tests.TC_emerg_call_imsi -#MSC_Tests.TC_cm_serv_req_vgcs_reject -#MSC_Tests.TC_cm_serv_req_vbs_reject -#MSC_Tests.TC_cm_serv_req_lcs_reject -#MSC_Tests.TC_cm_reest_req_reject -#MSC_Tests.TC_lu_auth_2G_fail -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_13_13 -#MSC_Tests.TC_cl3_no_payload -#MSC_Tests.TC_cl3_rnd_payload -#MSC_Tests.TC_establish_and_nothing -#MSC_Tests.TC_mo_setup_and_nothing -#MSC_Tests.TC_mo_crcx_ran_timeout -#MSC_Tests.TC_mo_crcx_ran_reject -#MSC_Tests.TC_mt_crcx_ran_reject -#MSC_Tests.TC_mt_t310 -#MSC_Tests.TC_gsup_cancel -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_1_13 -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_3_13 -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_3_1 -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_3_1_no_cm -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_13_2 -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_013_2 -#MSC_Tests.TC_mo_release_timeout -#MSC_Tests.TC_lu_and_mt_call_no_dlcx_resp -#MSC_Tests.TC_reset_two -#MSC_Tests.TC_lu_and_mt_call -#MSC_Tests.TC_cipher_complete_with_invalid_cipher -#MSC_Tests.TC_cipher_complete_1_without_cipher -#MSC_Tests.TC_cipher_complete_3_without_cipher -#MSC_Tests.TC_cipher_complete_13_without_cipher -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36096?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: I573b55e235ebb093b1166c1fe78feaa4f296ce8c Gerrit-Change-Number: 36096 Gerrit-PatchSet: 1 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-MessageType: merged

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-trx[master]: ms: update osmocom-bb submodule

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36048?usp=email ) Change subject: ms: update osmocom-bb submodule ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36048?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0140f0a5333469f356c85a95660e10bbdd67cd25 Gerrit-Change-Number: 36048 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 08:44:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc/MSC_Tests.cfg: remove commented out testcase list

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36096?usp=email ) Change subject: msc/MSC_Tests.cfg: remove commented out testcase list ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36096?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: I573b55e235ebb093b1166c1fe78feaa4f296ce8c Gerrit-Change-Number: 36096 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 08:44:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: pcu_sock: forward PCU_VERSION only once

by laforge

Attention is currently required from: dexter, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email ) Change subject: pcu_sock: forward PCU_VERSION only once ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/36018/comment/92061cdd_f175c317 PS1, Line 10: is not active the PCU even sends the version number in regular > I'm still not following @pmaier@sysmocom.de. […] This entire thread and patch are bizarre. Why would the PCU send that information multiple times? We are using a connected socket, so the information cannot change ever since the socket has first connected. A connected unix domain socket cannot loose messages, so retransmissions are not useful, they just queue up and (if not processed) clog the socket buffer. So if the PCU has a bug in that regard, it shall be addressed in the PCU, rather than the BTS plastering over / hiding a PCU bug from the BSC. I also don't understand why the PCU would do this any different than any of the other many unix domain sockets we use in osmocom, like MNCC or L1CTRL, or more recently the socket between libosmo-e1d and osmo-e1d. I'm not aware that any of the implementations of such protocols would ever re-transmit any message for reasons described above. The only valid situation where I could imagine the PCU "re-transmitting" is when the PCU re-spawns all the time while the BTS keeps running. Then each time the PCU connects, it says "hello" and indicates its version. But then we might want to look at why it's re-spawning all the time and whether that's the intended situation. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id82fe0504d0cbdf71473c1e7dfe6125a3471bd85 Gerrit-Change-Number: 36018 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Feb 2024 08:42:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc/MSC_Tests.cfg: remove commented out testcase list

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36096?usp=email ) Change subject: msc/MSC_Tests.cfg: remove commented out testcase list ...................................................................... msc/MSC_Tests.cfg: remove commented out testcase list Change-Id: I573b55e235ebb093b1166c1fe78feaa4f296ce8c --- M msc/MSC_Tests.cfg 1 file changed, 9 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/36096/1 diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg index ee36336..1676e70 100644 --- a/msc/MSC_Tests.cfg +++ b/msc/MSC_Tests.cfg @@ -18,51 +18,3 @@ MSC_Tests.control MSC_Tests_Iu.control MSC_Tests_ASCI.control -#MSC_Tests.TC_cr_before_reset -#MSC_Tests.TC_lu_imsi_noauth_tmsi -#MSC_Tests.TC_lu_imsi_noauth_notmsi -#MSC_Tests.TC_lu_imsi_reject -#MSC_Tests.TC_lu_imsi_timeout_gsup -#MSC_Tests.TC_lu_imsi_auth_tmsi -#MSC_Tests.TC_cmserv_imsi_unknown -#MSC_Tests.TC_lu_and_mo_call -#MSC_Tests.TC_lu_auth_sai_timeout -#MSC_Tests.TC_lu_auth_sai_err -#MSC_Tests.TC_lu_clear_request -#MSC_Tests.TC_lu_disconnect -#MSC_Tests.TC_lu_by_imei -#MSC_Tests.TC_lu_by_tmsi_noauth_unknown -#MSC_Tests.TC_imsi_detach_by_imsi -#MSC_Tests.TC_imsi_detach_by_tmsi -#MSC_Tests.TC_imsi_detach_by_imei -#MSC_Tests.TC_emerg_call_imei_reject -#MSC_Tests.TC_emerg_call_imsi -#MSC_Tests.TC_cm_serv_req_vgcs_reject -#MSC_Tests.TC_cm_serv_req_vbs_reject -#MSC_Tests.TC_cm_serv_req_lcs_reject -#MSC_Tests.TC_cm_reest_req_reject -#MSC_Tests.TC_lu_auth_2G_fail -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_13_13 -#MSC_Tests.TC_cl3_no_payload -#MSC_Tests.TC_cl3_rnd_payload -#MSC_Tests.TC_establish_and_nothing -#MSC_Tests.TC_mo_setup_and_nothing -#MSC_Tests.TC_mo_crcx_ran_timeout -#MSC_Tests.TC_mo_crcx_ran_reject -#MSC_Tests.TC_mt_crcx_ran_reject -#MSC_Tests.TC_mt_t310 -#MSC_Tests.TC_gsup_cancel -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_1_13 -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_3_13 -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_3_1 -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_3_1_no_cm -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_13_2 -#MSC_Tests.TC_lu_imsi_auth_tmsi_encr_013_2 -#MSC_Tests.TC_mo_release_timeout -#MSC_Tests.TC_lu_and_mt_call_no_dlcx_resp -#MSC_Tests.TC_reset_two -#MSC_Tests.TC_lu_and_mt_call -#MSC_Tests.TC_cipher_complete_with_invalid_cipher -#MSC_Tests.TC_cipher_complete_1_without_cipher -#MSC_Tests.TC_cipher_complete_3_without_cipher -#MSC_Tests.TC_cipher_complete_13_without_cipher -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36096?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: I573b55e235ebb093b1166c1fe78feaa4f296ce8c Gerrit-Change-Number: 36096 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log February 2024