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

[S] Change in osmo-ggsn[master]: Do not hard-code -g and -O2 in CFLAGS
by laforge 14 Mar '23

14 Mar '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31782 ) Change subject: Do not hard-code -g and -O2 in CFLAGS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I4b0b523b7dac4d67413bda37b546964262e5ea0d Gerrit-Change-Number: 31782 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 20:10:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: tests: use -no-install libtool flag to avoid ./lt-* scripts
by laforge 14 Mar '23

14 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31833 ) Change subject: tests: use -no-install libtool flag to avoid ./lt-* scripts ...................................................................... tests: use -no-install libtool flag to avoid ./lt-* scripts This option should be used for any executables which are used only for testing, or for generating other files and are consequently never installed. By specifying this option, we are telling Libtool that the executable it links will only ever be executed from where it is built in the build tree. Libtool is usually able to considerably speed up the link process for such executables. Change-Id: I06d3d5ab1dd21400a72f76eecc508886617ef4c6 --- M tests/agch/Makefile.am M tests/amr/Makefile.am M tests/cipher/Makefile.am M tests/handover/Makefile.am M tests/meas/Makefile.am M tests/misc/Makefile.am M tests/paging/Makefile.am M tests/power/Makefile.am M tests/sysmobts/Makefile.am M tests/ta_control/Makefile.am M tests/tx_power/Makefile.am 11 files changed, 27 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/agch/Makefile.am b/tests/agch/Makefile.am index ffc65fd..d05fc62 100644 --- a/tests/agch/Makefile.am +++ b/tests/agch/Makefile.am @@ -9,6 +9,7 @@ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ $(NULL) +AM_LDFLAGS = -no-install LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/amr/Makefile.am b/tests/amr/Makefile.am index a15c0c7..a857d17 100644 --- a/tests/amr/Makefile.am +++ b/tests/amr/Makefile.am @@ -8,6 +8,7 @@ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ $(NULL) +AM_LDFLAGS = -no-install LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/cipher/Makefile.am b/tests/cipher/Makefile.am index 13bface..c33b05e 100644 --- a/tests/cipher/Makefile.am +++ b/tests/cipher/Makefile.am @@ -9,6 +9,7 @@ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ $(NULL) +AM_LDFLAGS = -no-install LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 5197cb9..789696e 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -8,6 +8,7 @@ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ $(NULL) +AM_LDFLAGS = -no-install LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/meas/Makefile.am b/tests/meas/Makefile.am index 7a65d08..e80b406 100644 --- a/tests/meas/Makefile.am +++ b/tests/meas/Makefile.am @@ -8,6 +8,7 @@ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ $(NULL) +AM_LDFLAGS = -no-install LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index 6770be3..8b8beda 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -8,6 +8,7 @@ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ $(NULL) +AM_LDFLAGS = -no-install LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/paging/Makefile.am b/tests/paging/Makefile.am index 0c01e39..06cc35e 100644 --- a/tests/paging/Makefile.am +++ b/tests/paging/Makefile.am @@ -18,6 +18,7 @@ $(LIBOSMOTRAU_LIBS) \ $(LIBOSMONETIF_LIBS) \ $(NULL) +AM_LDFLAGS = -no-install check_PROGRAMS = paging_test EXTRA_DIST = paging_test.ok diff --git a/tests/power/Makefile.am b/tests/power/Makefile.am index c1abead..81f3f2a 100644 --- a/tests/power/Makefile.am +++ b/tests/power/Makefile.am @@ -8,6 +8,7 @@ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ $(NULL) +AM_LDFLAGS = -no-install LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOCODEC_LIBS) \ diff --git a/tests/sysmobts/Makefile.am b/tests/sysmobts/Makefile.am index ee7b82f..ff80fb3 100644 --- a/tests/sysmobts/Makefile.am +++ b/tests/sysmobts/Makefile.am @@ -14,6 +14,7 @@ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ $(NULL) +AM_LDFLAGS = -no-install LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOCODEC_LIBS) \ diff --git a/tests/ta_control/Makefile.am b/tests/ta_control/Makefile.am index f28ae1d..12c32ac 100644 --- a/tests/ta_control/Makefile.am +++ b/tests/ta_control/Makefile.am @@ -8,6 +8,7 @@ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ $(NULL) +AM_LDFLAGS = -no-install LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/tx_power/Makefile.am b/tests/tx_power/Makefile.am index 2e91fa0..8c3db1e 100644 --- a/tests/tx_power/Makefile.am +++ b/tests/tx_power/Makefile.am @@ -8,6 +8,7 @@ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ $(NULL) +AM_LDFLAGS = -no-install LDADD = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I06d3d5ab1dd21400a72f76eecc508886617ef4c6 Gerrit-Change-Number: 31833 Gerrit-PatchSet: 2 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-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bts[master]: tests: use -no-install libtool flag to avoid ./lt-* scripts
by laforge 14 Mar '23

14 Mar '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31833 ) Change subject: tests: use -no-install libtool flag to avoid ./lt-* scripts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I06d3d5ab1dd21400a72f76eecc508886617ef4c6 Gerrit-Change-Number: 31833 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-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 20:09:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: New osmo-gsmtap-logsend utility
by neels 14 Mar '23

14 Mar '23

Attention is currently required from: laforge, keith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31916 ) Change subject: New osmo-gsmtap-logsend utility ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File utils/gsmtap-logsend.c: https://gerrit.osmocom.org/c/libosmocore/+/31916/comment/bba1c8e4_74c1430a PS2, Line 18: #include <string.h> : #include <stdlib.h> : #include <string.h> : #include <fcntl.h> apparently these 4 #includes are not needed. (at least string.h is duplicated) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida96e87d84e0c349c5069edc67fec1c3cf19d1ab Gerrit-Change-Number: 31916 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Tue, 14 Mar 2023 20:06:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: New osmo-gsmtap-logsend utility
by keith 14 Mar '23

14 Mar '23

keith has uploaded a new patch set (#3) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/libosmocore/+/31916 ) Change subject: New osmo-gsmtap-logsend utility ...................................................................... New osmo-gsmtap-logsend utility This utility can be used to "pipe" stdin or some file as log lines via GSMTAP logging. Change-Id: Ida96e87d84e0c349c5069edc67fec1c3cf19d1ab --- M debian/libosmocore-utils.install M utils/Makefile.am A utils/gsmtap-logsend.c 3 files changed, 159 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/31916/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida96e87d84e0c349c5069edc67fec1c3cf19d1ab Gerrit-Change-Number: 31916 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmocore[master]: New osmo-gsmtap-logsend utility
by laforge 14 Mar '23

14 Mar '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/31916 to look at the new patch set (#2). Change subject: New osmo-gsmtap-logsend utility ...................................................................... New osmo-gsmtap-logsend utility This utility can be used to "pipe" stdin or some file as log lines via GSMTAP logging. Change-Id: Ida96e87d84e0c349c5069edc67fec1c3cf19d1ab --- M debian/libosmocore-utils.install M utils/Makefile.am A utils/gsmtap-logsend.c 3 files changed, 159 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/31916/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida96e87d84e0c349c5069edc67fec1c3cf19d1ab Gerrit-Change-Number: 31916 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-pfcp[master]: build: drop $(all_includes)
by neels 14 Mar '23

14 Mar '23

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31763 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: build: drop $(all_includes) ...................................................................... build: drop $(all_includes) Drop this mysterious empty variable. No idea where it came from, there is nothing here that would set it. Change-Id: I7f2736366b34e7a15f73fa81ef1d4659ed6e2361 --- M Makefile.am M src/libosmo-gtlv/Makefile.am M src/libosmo-pfcp/Makefile.am M tests/libosmo-gtlv/Makefile.am M tests/libosmo-gtlv/test_gtlv_gen/Makefile.am M tests/libosmo-gtlv/test_tliv/Makefile.am M tests/libosmo-pfcp/Makefile.am 7 files changed, 12 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index de0b643..626aaf4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,6 @@ ## remove line below when OE toolchain is updated to version which include those ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = \ - $(all_includes) \ -I$(top_srcdir)/include \ $(NULL) diff --git a/src/libosmo-gtlv/Makefile.am b/src/libosmo-gtlv/Makefile.am index ae77948..9b7b1ad 100644 --- a/src/libosmo-gtlv/Makefile.am +++ b/src/libosmo-gtlv/Makefile.am @@ -1,5 +1,4 @@ AM_CPPFLAGS = \ - $(all_includes) \ -I$(top_srcdir)/include \ -I$(top_builddir) \ -I$(builddir) \ diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am index fdc30e0..5af9bdb 100644 --- a/src/libosmo-pfcp/Makefile.am +++ b/src/libosmo-pfcp/Makefile.am @@ -1,5 +1,4 @@ AM_CPPFLAGS = \ - $(all_includes) \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_builddir) \ diff --git a/tests/libosmo-gtlv/Makefile.am b/tests/libosmo-gtlv/Makefile.am index d73f940..65e85d6 100644 --- a/tests/libosmo-gtlv/Makefile.am +++ b/tests/libosmo-gtlv/Makefile.am @@ -4,7 +4,6 @@ $(NULL) AM_CPPFLAGS = \ - $(all_includes) \ -I$(top_srcdir)/include \ $(NULL) diff --git a/tests/libosmo-gtlv/test_gtlv_gen/Makefile.am b/tests/libosmo-gtlv/test_gtlv_gen/Makefile.am index 9f791fe..c08b1f1 100644 --- a/tests/libosmo-gtlv/test_gtlv_gen/Makefile.am +++ b/tests/libosmo-gtlv/test_gtlv_gen/Makefile.am @@ -1,5 +1,4 @@ AM_CPPFLAGS = \ - $(all_includes) \ -I$(top_srcdir)/include \ -I$(bulddir) \ $(NULL) diff --git a/tests/libosmo-gtlv/test_tliv/Makefile.am b/tests/libosmo-gtlv/test_tliv/Makefile.am index 5b7dd7c..65e2aaa 100644 --- a/tests/libosmo-gtlv/test_tliv/Makefile.am +++ b/tests/libosmo-gtlv/test_tliv/Makefile.am @@ -1,5 +1,4 @@ AM_CPPFLAGS = \ - $(all_includes) \ -I$(top_srcdir)/include \ -I$(bulddir) \ $(NULL) diff --git a/tests/libosmo-pfcp/Makefile.am b/tests/libosmo-pfcp/Makefile.am index f4314f2..106def5 100644 --- a/tests/libosmo-pfcp/Makefile.am +++ b/tests/libosmo-pfcp/Makefile.am @@ -1,5 +1,4 @@ AM_CPPFLAGS = \ - $(all_includes) \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I7f2736366b34e7a15f73fa81ef1d4659ed6e2361 Gerrit-Change-Number: 31763 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in libosmocore[master]: New osmo-gsmtap-logsend utility
by laforge 14 Mar '23

14 Mar '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31916 ) Change subject: New osmo-gsmtap-logsend utility ...................................................................... New osmo-gsmtap-logsend utility This utility can be used to "pipe" stdin or some file as log lines via GSMTAP logging. Change-Id: Ida96e87d84e0c349c5069edc67fec1c3cf19d1ab --- M debian/libosmocore-utils.install M utils/Makefile.am A utils/gsmtap-logsend.c 3 files changed, 159 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/31916/1 diff --git a/debian/libosmocore-utils.install b/debian/libosmocore-utils.install index 9501bec..0e41197 100644 --- a/debian/libosmocore-utils.install +++ b/debian/libosmocore-utils.install @@ -2,3 +2,4 @@ usr/bin/osmo-auc-gen usr/bin/osmo-aka-verify usr/bin/osmo-config-merge +usr/bin/osmo-gsmtap-logsend diff --git a/utils/Makefile.am b/utils/Makefile.am index 8937ad9..3ec71ea 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -8,7 +8,7 @@ if ENABLE_UTILITIES EXTRA_DIST = conv_gen.py conv_codes_gsm.py -bin_PROGRAMS += osmo-arfcn osmo-auc-gen osmo-config-merge osmo-aka-verify +bin_PROGRAMS += osmo-arfcn osmo-auc-gen osmo-config-merge osmo-aka-verify osmo-gsmtap-logsend osmo_arfcn_SOURCES = osmo-arfcn.c @@ -16,6 +16,8 @@ osmo_aka_verify_SOURCES = osmo-aka-verify.c +osmo_gsmtap_logsend_SOURCES = gsmtap-logsend.c + osmo_config_merge_SOURCES = osmo-config-merge.c osmo_config_merge_LDADD = $(LDADD) $(TALLOC_LIBS) diff --git a/utils/gsmtap-logsend.c b/utils/gsmtap-logsend.c new file mode 100644 index 0000000..63e3ee1 --- /dev/null +++ b/utils/gsmtap-logsend.c @@ -0,0 +1,143 @@ +/* Small program to read an input file / stdin and send each line via GSMTAP logging */ +/* (C) 2023 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <string.h> +#include <fcntl.h> +#include <errno.h> +#include <sys/uio.h> +#include <getopt.h> + +#include <osmocom/core/byteswap.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/gsmtap.h> +#include <osmocom/core/gsmtap_util.h> + +static char *proc_name = "gsmtap-logend"; +static char *subsys_name = "unknown"; +static char *dest_host = "localhost"; +static int dest_port = GSMTAP_UDP_PORT; + +static void help(void) +{ + printf("osmo-gsmtap-logsend Usage:\n" + "\t[ -r DESTADDR ] [ -p PORTNR ] [ -n PROC_NAME ] [ -s SUBSYS ] [ INFILE ]\n" + "\n" + " -r --remote-address HOSTNAME Destination IP destination address (default: localhost)\n" + " -p --remote-port PORTNR Destination UDP Port number (default: 4729)\n" + " -n --process-name PROC_NAME Process name to include in GSMTAP LOG header\n" + " -s --subsys-name SUBSYS Subsystem name to include in GSMTAP LOG header\n" + " -h --help This help message\n" + ); +} + +int main(int argc, char **argv) +{ + char buf[1024]; + int gsmtap_fd; + FILE *infile; + char *line; + int rc; + + while (1) { + static const struct option long_options[] = { + { "remote-address", 1, 0, 'a' }, + { "remote-port", 1, 0, 'p' }, + { "process-name", 1, 0, 'n' }, + { "subsys-name", 1, 0, 's' }, + { "help", 0, 0, 'h' }, + { 0, 0, 0, 0 } + }; + int c, option_index; + + c = getopt_long(argc, argv, "a:p:n:s:h", long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 'a': + dest_host = optarg; + break; + case 'p': + dest_port = atoi(optarg); + break; + case 'n': + proc_name = optarg; + break; + case 's': + subsys_name = optarg; + break; + case 'h': + help(); + exit(0); + break; + default: + help(); + exit(1); + } + } + + if (argc <= optind) { + infile = stdin; + } else { + infile = fopen(argv[optind], "r"); + if (!infile) { + fprintf(stderr, "Unable to open %s: %s\n", argv[optind], strerror(errno)); + exit(2); + } + } + + gsmtap_fd = gsmtap_source_init_fd(dest_host, dest_port); + if (gsmtap_fd < 0) { + fprintf(stderr, "Unable to create GSMTAP soicket: %s\n", strerror(errno)); + exit(2); + } + + /* prepare all the data structures that don't change for each line */ + struct { + struct gsmtap_hdr gsmtap; + struct gsmtap_osmocore_log_hdr log; + } __attribute__ ((packed)) hdr; + struct timeval tv; + + memset(&hdr, 0, sizeof(hdr)); + hdr.gsmtap.version = GSMTAP_VERSION; + hdr.gsmtap.hdr_len = sizeof(hdr.gsmtap)/4; + hdr.gsmtap.type = GSMTAP_TYPE_OSMOCORE_LOG; + + OSMO_STRLCPY_ARRAY(hdr.log.proc_name, proc_name); + OSMO_STRLCPY_ARRAY(hdr.log.subsys, subsys_name); + hdr.log.level = LOGL_INFO; + + while ((line = fgets(buf, sizeof(buf), infile))) { + struct iovec iov[2] = { + { .iov_base = &hdr, .iov_len = sizeof(hdr) }, + { .iov_base = buf, .iov_len = strlen(line) + 1 }, + }; + osmo_gettimeofday(&tv, NULL); + hdr.log.ts.sec = osmo_htonl(tv.tv_sec); + hdr.log.ts.usec = osmo_htonl(tv.tv_usec); + + rc = writev(gsmtap_fd, iov, ARRAY_SIZE(iov)); + if (rc <= 0) { + fprintf(stderr, "Short write on GSMTAP socket: %d (%s)\n", rc, strerror(errno)); + exit(1); + } + } +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida96e87d84e0c349c5069edc67fec1c3cf19d1ab Gerrit-Change-Number: 31916 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-pfcp[master]: build: drop COVERAGE
by neels 14 Mar '23

14 Mar '23

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31761 ) Change subject: build: drop COVERAGE ...................................................................... build: drop COVERAGE There isn't even an --enable-coverage in the configure.ac, so drop the always empty COVERAGE_CFLAGS and COVERAGE_LDFLAGS. Change-Id: Ib256ce7d979aec5c368b19ac2c145f75a9dab0fc --- M src/libosmo-gtlv/Makefile.am M src/libosmo-pfcp/Makefile.am 2 files changed, 12 insertions(+), 5 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-gtlv/Makefile.am b/src/libosmo-gtlv/Makefile.am index 1c40386..ae77948 100644 --- a/src/libosmo-gtlv/Makefile.am +++ b/src/libosmo-gtlv/Makefile.am @@ -8,12 +8,10 @@ AM_CFLAGS = \ -Wall \ $(LIBOSMOCORE_CFLAGS) \ - $(COVERAGE_CFLAGS) \ $(NULL) AM_LDFLAGS = \ $(LIBOSMOCORE_LIBS) \ - $(COVERAGE_LDFLAGS) \ $(NULL) lib_LTLIBRARIES = \ diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am index 578ac0b..fdc30e0 100644 --- a/src/libosmo-pfcp/Makefile.am +++ b/src/libosmo-pfcp/Makefile.am @@ -11,14 +11,12 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ - $(COVERAGE_CFLAGS) \ $(NULL) AM_LDFLAGS = \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ - $(COVERAGE_LDFLAGS) \ $(NULL) lib_LTLIBRARIES = \ @@ -68,5 +66,4 @@ gen__pfcp_ies_auto_LDADD = \ $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ $(LIBOSMOCORE_LIBS) \ - $(COVERAGE_LDFLAGS) \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Ib256ce7d979aec5c368b19ac2c145f75a9dab0fc Gerrit-Change-Number: 31761 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-pfcp[master]: build: drop COVERAGE
by neels 14 Mar '23

14 Mar '23

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31761 ) Change subject: build: drop COVERAGE ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: re-add votes after trivial rebase modifications -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Ib256ce7d979aec5c368b19ac2c145f75a9dab0fc Gerrit-Change-Number: 31761 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 19:26:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0