- gerrit-log - lists.osmocom.org

Change in osmo-cbc[master]: Improve example osmo-cbc.cfg file
by pespin 20 Jul '22

20 Jul '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28687 ) Change subject: Improve example osmo-cbc.cfg file ...................................................................... Improve example osmo-cbc.cfg file Change-Id: I585ef7a6195891df36751999ee91ded799612c66 --- M doc/examples/osmo-cbc/osmo-cbc.cfg 1 file changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/87/28687/1 diff --git a/doc/examples/osmo-cbc/osmo-cbc.cfg b/doc/examples/osmo-cbc/osmo-cbc.cfg index b2bce58..dc33b09 100644 --- a/doc/examples/osmo-cbc/osmo-cbc.cfg +++ b/doc/examples/osmo-cbc/osmo-cbc.cfg @@ -1,15 +1,25 @@ - log stderr - logging level cbsp debug + logging level rest notice + logging level cbsp notice + logging level sbcap notice cbc unknown-peers reject - cbsp - local-ip 127.0.0.1 - local-port 48049 ecbe local-ip 127.0.0.1 local-port 12345 + cbsp + local-ip 127.0.0.1 + local-port 48049 sbcap local-ip 127.0.0.1 local-ip ::1 - local-port 6789 + local-port 29168 + peer example-bsc + protocol cbsp + remote-ip 127.0.0.2 + remote-port 48049 + peer example-mme + protocol sbcap + remote-ip 127.0.0.2 + remote-ip ::2 + remote-port 29168 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I585ef7a6195891df36751999ee91ded799612c66 Gerrit-Change-Number: 28687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-upf[master]: add cmdline --mockup-gtp for VTY tests
by neels 20 Jul '22

20 Jul '22

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/28686 ) Change subject: add cmdline --mockup-gtp for VTY tests ...................................................................... add cmdline --mockup-gtp for VTY tests To avoid actions that require cap_net_admin permissions on build servers, add this cmdline option to "dry run" all kernel GTP / NFT actions. On startup, osmo-upf opens sockets to GTP kernel module / NFT ctx. However, on build servers, this would require giving cap_net_admin permissions just to run the VTY tests. Related: SYS#5599 Change-Id: I3b9c796186307fd8562abcff3f0ccfab0e88b6c8 --- M include/osmocom/upf/upf.h M src/osmo-upf/osmo_upf_main.c M src/osmo-upf/up_gtp_action.c M src/osmo-upf/upf_gtp.c M tests/Makefile.am 5 files changed, 37 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/86/28686/1 diff --git a/include/osmocom/upf/upf.h b/include/osmocom/upf/upf.h index b8065dd..449e253 100644 --- a/include/osmocom/upf/upf.h +++ b/include/osmocom/upf/upf.h @@ -73,6 +73,9 @@ struct up_endpoint *ep; } pfcp; struct { + /* --mockup-gtp cmdline option */ + bool mockup; + /* GTP devices as in osmo-upf.cfg */ struct gtp_vty_cfg vty_cfg; diff --git a/src/osmo-upf/osmo_upf_main.c b/src/osmo-upf/osmo_upf_main.c index 302d957..883f827 100644 --- a/src/osmo-upf/osmo_upf_main.c +++ b/src/osmo-upf/osmo_upf_main.c @@ -64,6 +64,7 @@ const char *config_file; int daemonize; enum vty_ref_gen_mode vty_ref_gen_mode; + bool mockup_gtp; } upf_cmdline_config = { .config_file = "osmo-upf.cfg", .vty_ref_gen_mode = VTY_REF_GEN_MODE_DEFAULT, @@ -87,6 +88,9 @@ printf("\nVTY reference generation:\n"); printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); printf(" --vty-ref-mode MODE Mode for --vty-ref-xml:\n"); + + printf("\nTesting:\n"); + printf(" --mockup-gtp Do not use GTP kernel features, just ack.\n"); /* List all VTY ref gen modes */ for (vty_ref_gen_mode_name = vty_ref_gen_mode_names; vty_ref_gen_mode_name->str; vty_ref_gen_mode_name++) printf(" %s: %s\n", @@ -110,6 +114,9 @@ get_value_string(vty_ref_gen_mode_desc, upf_cmdline_config.vty_ref_gen_mode)); vty_dump_xml_ref_mode(stdout, upf_cmdline_config.vty_ref_gen_mode); exit(0); + case 3: + upf_cmdline_config.mockup_gtp = true; + break; default: fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); exit(2); @@ -128,6 +135,7 @@ {"version", 0, 0, 'V' }, {"vty-ref-mode", 1, &long_option, 1}, {"vty-ref-xml", 0, &long_option, 2}, + {"mockup-gtp", 0, &long_option, 3}, {0, 0, 0, 0} }; @@ -289,6 +297,7 @@ /* Parse options */ handle_options(argc, argv); + g_upf->gtp.mockup = upf_cmdline_config.mockup_gtp; rc = vty_read_config_file(upf_cmdline_config.config_file, NULL); if (rc < 0) { diff --git a/src/osmo-upf/up_gtp_action.c b/src/osmo-upf/up_gtp_action.c index 47aa3ac..1f2d96c 100644 --- a/src/osmo-upf/up_gtp_action.c +++ b/src/osmo-upf/up_gtp_action.c @@ -81,6 +81,12 @@ struct upf_gtp_dev *gtp_dev; int rc; + if (g_upf->gtp.mockup) { + LOG_UP_GTP_ACTION(a, LOGL_ERROR, "--mockup-gtp active, skipping GTP action %s\n", + enable ? "enable" : "disable"); + return 0; + } + switch (a->kind) { case UP_GTP_U_ENDECAPS: /* use the first available GTP device. diff --git a/src/osmo-upf/upf_gtp.c b/src/osmo-upf/upf_gtp.c index e3435a9..d4065ef 100644 --- a/src/osmo-upf/upf_gtp.c +++ b/src/osmo-upf/upf_gtp.c @@ -95,6 +95,8 @@ static int upf_gtp_dev_destruct(struct upf_gtp_dev *dev); +/* Allocate state for one GTP device, add to g_upf->gtp.devs and return the created device. If state for the device of + * that name already exists, do nothing and return NULL. */ static struct upf_gtp_dev *upf_gtp_dev_alloc(const char *name, const char *local_addr) { struct upf_gtp_dev *dev = upf_gtp_dev_find_by_name(name); @@ -157,7 +159,7 @@ int upf_gtp_dev_open(const char *name, bool create_gtp_dev, const char *local_addr, bool listen_for_gtpv0, bool sgsn_mode) { - struct osmo_sockaddr any = { + const struct osmo_sockaddr any = { .u.sin = { .sin_family = AF_INET, .sin_port = 0, @@ -167,7 +169,14 @@ }, }; int rc; - struct upf_gtp_dev *dev = upf_gtp_dev_alloc(name, local_addr); + struct upf_gtp_dev *dev; + + if (g_upf->gtp.mockup) { + LOGP(DGTP, LOGL_NOTICE, "--mockup-gtp active: not opening GTP device '%s'\n", name); + return 0; + } + + dev = upf_gtp_dev_alloc(name, local_addr); if (!dev) return -EIO; @@ -245,9 +254,16 @@ /* Open an MNL socket which allows to create and remove GTP devices (requires CAP_NET_ADMIN). */ int upf_gtp_genl_open() { + if (g_upf->gtp.mockup) { + LOGP(DGTP, LOGL_NOTICE, "--mockup-gtp active: not opening mnl_socket\n"); + return 0; + } + + /* Already open? */ if (g_upf->gtp.nl && g_upf->gtp.genl_id >= 0) return 0; + /* sanity / paranoia: if re-opening, make sure the previous socket is closed */ if (g_upf->gtp.nl) upf_gtp_genl_close(); diff --git a/tests/Makefile.am b/tests/Makefile.am index 66510f0..ab14ed3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -48,7 +48,7 @@ vty-test: osmo_verify_transcript_vty.py -v \ -n OsmoUPF -p 4275 \ - -r "$(top_builddir)/src/osmo-upf/osmo-upf -c $(top_srcdir)/doc/examples/osmo-upf/osmo-upf.cfg" \ + -r "$(top_builddir)/src/osmo-upf/osmo-upf --mockup-gtp -c $(top_srcdir)/doc/examples/osmo-upf/osmo-upf.cfg" \ $(U) $(srcdir)/$(VTY_TEST) check-local: atconfig $(TESTSUITE) -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I3b9c796186307fd8562abcff3f0ccfab0e88b6c8 Gerrit-Change-Number: 28686 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-upf[master]: implement GTP tunnel mapping via netfilter
by neels 20 Jul '22

20 Jul '22

Attention is currently required from: neels, laforge. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-upf/+/28309 to look at the new patch set (#6). Change subject: implement GTP tunnel mapping via netfilter ...................................................................... implement GTP tunnel mapping via netfilter Implement support for PFCP rulesets that ask for mapping a GTP tunnel: forwarding GTP payload between two GTP tunnels. For a GTP tunnel mapping, dispatch netfilter rules that detect GTP packets with a given source address and TEID, and replace the TEID and destination address according to the PFCP ruleset. The netfilter implementation is chosen to effect the packet rewriting and forwarding to take place directly in the kernel, for high throughput of GTP packets. Related: SYS#5599 Change-Id: Ic0d319eb4f98cd51a5999c804c4203ab0bdda650 --- M include/osmocom/upf/upf.h M include/osmocom/upf/upf_nft.h M src/osmo-upf/Makefile.am M src/osmo-upf/osmo_upf_main.c M src/osmo-upf/up_gtp_action.c M src/osmo-upf/up_session.c M src/osmo-upf/upf.c A src/osmo-upf/upf_nft.c M src/osmo-upf/upf_vty.c 9 files changed, 422 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/09/28309/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ic0d319eb4f98cd51a5999c804c4203ab0bdda650 Gerrit-Change-Number: 28309 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

Change in osmocom-bb[master]: trxcon: tune hard-coded logging parameters (filename)
by fixeria 20 Jul '22

20 Jul '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28679 ) Change subject: trxcon: tune hard-coded logging parameters (filename) ...................................................................... trxcon: tune hard-coded logging parameters (filename) Change-Id: I241cff113a513799d3da0c9991354ea9ea889bb6 --- M src/host/trxcon/src/trxcon.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 5a7f7a4..d18ae0b 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -455,6 +455,9 @@ log_set_print_category(osmo_stderr_target, 1); log_set_print_level(osmo_stderr_target, 1); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME); + log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); + /* Optional GSMTAP */ if (app_data.gsmtap_ip != NULL) { app_data.gsmtap = gsmtap_source_init(app_data.gsmtap_ip, GSMTAP_UDP_PORT, 1); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I241cff113a513799d3da0c9991354ea9ea889bb6 Gerrit-Change-Number: 28679 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmocom-bb[master]: trxcon: tune hard-coded logging parameters (filename)
by fixeria 20 Jul '22

20 Jul '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28679 ) Change subject: trxcon: tune hard-coded logging parameters (filename) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I241cff113a513799d3da0c9991354ea9ea889bb6 Gerrit-Change-Number: 28679 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 13:51:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmocom-bb[master]: trxcon: tune hard-coded logging parameters (filename)
by fixeria 20 Jul '22

20 Jul '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28679 ) Change subject: trxcon: tune hard-coded logging parameters (filename) ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/trxcon.c: https://gerrit.osmocom.org/c/osmocom-bb/+/28679/comment/08cbec06_76b3e6f7 PS1, Line 543: log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME); > What about adding a VTY instead :) There is a ticket about that: https://osmocom.org/issues/3666. For not it's not really needed (other than for logging configuration). The old plan was to define trxcon instances via the VTY, but I implemented another approach: allocate them on demand when a L1CTL accept()s a new client connection. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I241cff113a513799d3da0c9991354ea9ea889bb6 Gerrit-Change-Number: 28679 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 13:48:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: osmo-cbc-master: Fix missing ldconfig
by pespin 20 Jul '22

20 Jul '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28685 ) Change subject: osmo-cbc-master: Fix missing ldconfig ...................................................................... osmo-cbc-master: Fix missing ldconfig osmo-cbc installs now libosmo-sbcap.so.0, so ldconfig must be run. Related: OS#4945 Change-Id: Ia02323639af57ed76cf7106934ace1fa4a0c2c77 --- M osmo-cbc-master/Dockerfile 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved dexter: Looks good to me, but someone else must approve diff --git a/osmo-cbc-master/Dockerfile b/osmo-cbc-master/Dockerfile index 7b2811f..a4ec904 100644 --- a/osmo-cbc-master/Dockerfile +++ b/osmo-cbc-master/Dockerfile @@ -38,7 +38,8 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make "-j$(nproc)" install + make "-j$(nproc)" install && \ + ldconfig VOLUME /data -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia02323639af57ed76cf7106934ace1fa4a0c2c77 Gerrit-Change-Number: 28685 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in pysim[master]: Never use Bytes without any 'Adapter'
by dexter 20 Jul '22

20 Jul '22

Attention is currently required from: laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28683 ) Change subject: Never use Bytes without any 'Adapter' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia3e7c4791d11bd4e3719a43d58e11e05ec986d1f Gerrit-Change-Number: 28683 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 20 Jul 2022 13:17:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmocom-bb[master]: trxcon: fix trx_if_close(): delete TRXC timer if it's pending
by dexter 20 Jul '22

20 Jul '22

Attention is currently required from: fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28677 ) Change subject: trxcon: fix trx_if_close(): delete TRXC timer if it's pending ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I669355ec03f67de437df2d3b822ed0a728b405d5 Gerrit-Change-Number: 28677 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 13:10:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: osmo-cbc-master: Fix missing ldconfig
by dexter 20 Jul '22

20 Jul '22

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28685 ) Change subject: osmo-cbc-master: Fix missing ldconfig ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia02323639af57ed76cf7106934ace1fa4a0c2c77 Gerrit-Change-Number: 28685 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 13:09:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log