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

[S] Change in osmo-msc[master]: rtp_stream: Update id after modifying fields upon Tx of MGCP msg
by neels 15 Mar '23

15 Mar '23

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31921 ) Change subject: rtp_stream: Update id after modifying fields upon Tx of MGCP msg ...................................................................... rtp_stream: Update id after modifying fields upon Tx of MGCP msg Change-Id: Ifbcab2d07df96d2a826e8235306b18df9573802c --- M src/libmsc/rtp_stream.c 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/src/libmsc/rtp_stream.c b/src/libmsc/rtp_stream.c index 61b5ea9..f977cdd 100644 --- a/src/libmsc/rtp_stream.c +++ b/src/libmsc/rtp_stream.c @@ -324,6 +324,7 @@ verb_info.port = rtps->remote.port; rtps->remote_sent_to_mgw = true; } + rtp_stream_update_id(rtps); osmo_mgcpc_ep_ci_request(rtps->ci, verb, &verb_info, rtps->fi, ok_event, fail_event, NULL); return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifbcab2d07df96d2a826e8235306b18df9573802c Gerrit-Change-Number: 31921 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-msc[master]: rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true
by neels 15 Mar '23

15 Mar '23

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31922 ) Change subject: rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true ...................................................................... rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true Change-Id: I978c78976470a6c5a36da8611a203f96c9a1b2a5 --- M src/libmsc/rtp_stream.c 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/src/libmsc/rtp_stream.c b/src/libmsc/rtp_stream.c index f977cdd..b7e7381 100644 --- a/src/libmsc/rtp_stream.c +++ b/src/libmsc/rtp_stream.c @@ -324,6 +324,8 @@ verb_info.port = rtps->remote.port; rtps->remote_sent_to_mgw = true; } + if (rtps->use_osmux && rtps->remote_osmux_cid >= 0) + rtps->remote_osmux_cid_sent_to_mgw = true; rtp_stream_update_id(rtps); osmo_mgcpc_ep_ci_request(rtps->ci, verb, &verb_info, rtps->fi, ok_event, fail_event, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I978c78976470a6c5a36da8611a203f96c9a1b2a5 Gerrit-Change-Number: 31922 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-msc[master]: rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true
by neels 15 Mar '23

15 Mar '23

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31922 ) Change subject: rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I978c78976470a6c5a36da8611a203f96c9a1b2a5 Gerrit-Change-Number: 31922 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Mar 2023 13:14:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: rtp_stream: Update id after modifying fields upon Tx of MGCP msg
by neels 15 Mar '23

15 Mar '23

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31921 ) Change subject: rtp_stream: Update id after modifying fields upon Tx of MGCP msg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifbcab2d07df96d2a826e8235306b18df9573802c Gerrit-Change-Number: 31921 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Mar 2023 13:11:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: rtp_stream: Update id after modifying fields upon Tx of MGCP msg
by laforge 15 Mar '23

15 Mar '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31921 ) Change subject: rtp_stream: Update id after modifying fields upon Tx of MGCP msg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifbcab2d07df96d2a826e8235306b18df9573802c Gerrit-Change-Number: 31921 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Mar 2023 12:47:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true
by laforge 15 Mar '23

15 Mar '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31922 ) Change subject: rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I978c78976470a6c5a36da8611a203f96c9a1b2a5 Gerrit-Change-Number: 31922 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Mar 2023 12:47:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true
by pespin 15 Mar '23

15 Mar '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/31922 to look at the new patch set (#2). Change subject: rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true ...................................................................... rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true Change-Id: I978c78976470a6c5a36da8611a203f96c9a1b2a5 --- M src/libmsc/rtp_stream.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/31922/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I978c78976470a6c5a36da8611a203f96c9a1b2a5 Gerrit-Change-Number: 31922 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-msc[master]: rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true
by pespin 15 Mar '23

15 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/31922 ) Change subject: rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true ...................................................................... rtp_stream: Fix remote_osmux_cid_sent_to_mgw never set to true Change-Id: I978c78976470a6c5a36da8611a203f96c9a1b2a5 --- M src/libmsc/rtp_stream.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/31922/1 diff --git a/src/libmsc/rtp_stream.c b/src/libmsc/rtp_stream.c index f977cdd..c345a23 100644 --- a/src/libmsc/rtp_stream.c +++ b/src/libmsc/rtp_stream.c @@ -324,6 +324,8 @@ verb_info.port = rtps->remote.port; rtps->remote_sent_to_mgw = true; } + if (rtps->use_osmux) + rtps->remote_osmux_cid_sent_to_mgw = true; rtp_stream_update_id(rtps); osmo_mgcpc_ep_ci_request(rtps->ci, verb, &verb_info, rtps->fi, ok_event, fail_event, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I978c78976470a6c5a36da8611a203f96c9a1b2a5 Gerrit-Change-Number: 31922 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: rtp_stream: Update id after modifying fields upon Tx of MGCP msg
by pespin 15 Mar '23

15 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/31921 ) Change subject: rtp_stream: Update id after modifying fields upon Tx of MGCP msg ...................................................................... rtp_stream: Update id after modifying fields upon Tx of MGCP msg Change-Id: Ifbcab2d07df96d2a826e8235306b18df9573802c --- M src/libmsc/rtp_stream.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/21/31921/1 diff --git a/src/libmsc/rtp_stream.c b/src/libmsc/rtp_stream.c index 61b5ea9..f977cdd 100644 --- a/src/libmsc/rtp_stream.c +++ b/src/libmsc/rtp_stream.c @@ -324,6 +324,7 @@ verb_info.port = rtps->remote.port; rtps->remote_sent_to_mgw = true; } + rtp_stream_update_id(rtps); osmo_mgcpc_ep_ci_request(rtps->ci, verb, &verb_info, rtps->fi, ok_event, fail_event, NULL); return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifbcab2d07df96d2a826e8235306b18df9573802c Gerrit-Change-Number: 31921 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

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

15 Mar '23

laforge has submitted this change. ( 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 .gitignore M debian/libosmocore-utils.install M utils/Makefile.am A utils/gsmtap-logsend.c 4 files changed, 156 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 167d1e2..d900138 100644 --- a/.gitignore +++ b/.gitignore @@ -72,6 +72,7 @@ utils/osmo-arfcn utils/osmo-auc-gen utils/osmo-config-merge +utils/osmo-gsmtap-logsend utils/osmo-sim-test utils/osmo-aka-verify 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..97a838b --- /dev/null +++ b/utils/gsmtap-logsend.c @@ -0,0 +1,139 @@ +/* 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 <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-logsend"; +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" + " -a --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: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> 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