January 2022 - gerrit-log - lists.osmocom.org

Change in osmo-e1d[master]: e1_{intf,line}_new: Allow caller to specify the numeric identifier

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27015 ) Change subject: e1_{intf,line}_new: Allow caller to specify the numeric identifier ...................................................................... e1_{intf,line}_new: Allow caller to specify the numeric identifier This will be used by the upcoming VTY interface changes. Change-Id: I9ff80831a3e3e3cb6dae178f8b438a9f3f4747df --- M src/e1d.h M src/intf_line.c M src/usb.c M src/vpair.c 4 files changed, 37 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/15/27015/1 diff --git a/src/e1d.h b/src/e1d.h index a0c8ceb..b76df7a 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -166,7 +166,7 @@ e1_intf_find_line(struct e1_intf *intf, uint8_t id); struct e1_intf * -e1_intf_new(struct e1_daemon *e1d, void *drv_data); +e1_intf_new(struct e1_daemon *e1d, int intf_id, void *drv_data); struct e1_intf * e1d_find_intf(struct e1_daemon *e1d, uint8_t id); @@ -179,7 +179,7 @@ e1_intf_find_line(struct e1_intf *intf, uint8_t id); struct e1_line * -e1_line_new(struct e1_intf *intf, void *drv_data); +e1_line_new(struct e1_intf *intf, int line_id, void *drv_data); void e1_line_destroy(struct e1_line *line); diff --git a/src/intf_line.c b/src/intf_line.c index 1f833fb..86b0356 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -107,11 +107,18 @@ return NULL; } +/* intf_id can be specified as '-1' to mean "auto-allocate intf->id" */ struct e1_intf * -e1_intf_new(struct e1_daemon *e1d, void *drv_data) +e1_intf_new(struct e1_daemon *e1d, int intf_id, void *drv_data) { struct e1_intf *intf; + if (intf_id != -1) { + /* ensure non-duplicate interface number */ + if (e1d_find_intf(e1d, intf_id)) + return NULL; + } + intf = talloc_zero(e1d->ctx, struct e1_intf); OSMO_ASSERT(intf); @@ -121,10 +128,14 @@ INIT_LLIST_HEAD(&intf->list); INIT_LLIST_HEAD(&intf->lines); - if (!llist_empty(&e1d->interfaces)) { - struct e1_intf *f = llist_last_entry(&e1d->interfaces, struct e1_intf, list); - intf->id = f->id + 1; - } + if (intf_id == -1) { + if (!llist_empty(&e1d->interfaces)) { + struct e1_intf *f = llist_last_entry(&e1d->interfaces, struct e1_intf, list); + intf->id = f->id + 1; + } else + intf->id = 0; + } else + intf->id = intf_id; llist_add_tail(&intf->list, &e1d->interfaces); @@ -180,11 +191,17 @@ ts->fd = -1; } +/* line_id can be specified as '-1' to mean "auto-allocate intf->id" */ struct e1_line * -e1_line_new(struct e1_intf *intf, void *drv_data) +e1_line_new(struct e1_intf *intf, int line_id, void *drv_data) { struct e1_line *line; + if (line_id != -1) { + if (e1_intf_find_line(intf, line_id)) + return NULL; + } + line = talloc_zero(intf->e1d->ctx, struct e1_line); OSMO_ASSERT(line); @@ -198,10 +215,14 @@ INIT_LLIST_HEAD(&line->list); - if (!llist_empty(&intf->lines)) { - struct e1_line *l = llist_last_entry(&intf->lines, struct e1_line, list); - line->id = l->id + 1; - } + if (line_id == -1) { + if (!llist_empty(&intf->lines)) { + struct e1_line *l = llist_last_entry(&intf->lines, struct e1_line, list); + line->id = l->id + 1; + } else + line->id = 0; + } else + line->id = line_id; line->ctrs = rate_ctr_group_alloc(line, &line_ctrg_desc, line->id); OSMO_ASSERT(line->ctrs); diff --git a/src/usb.c b/src/usb.c index 0c0afe4..0100c31 100644 --- a/src/usb.c +++ b/src/usb.c @@ -543,7 +543,7 @@ intf_data = talloc_zero(e1d->ctx, struct e1_usb_intf_data); intf_data->devh = devh; - intf = e1_intf_new(e1d, intf_data); + intf = e1_intf_new(e1d, -1, intf_data); intf->drv = E1_DRIVER_USB; ret = libusb_get_active_config_descriptor(dev, &cd); @@ -608,7 +608,7 @@ return -EINVAL; } - line = e1_line_new(intf, line_data); + line = e1_line_new(intf, -1, line_data); line_data->flow_in = e1uf_create(line, e1_usb_xfer_in, line_data->ep_in, 4, line_data->pkt_size, 4); line_data->flow_out = e1uf_create(line, e1_usb_xfer_out, line_data->ep_out, 4, line_data->pkt_size, 4); diff --git a/src/vpair.c b/src/vpair.c index 8484be0..524f998 100644 --- a/src/vpair.c +++ b/src/vpair.c @@ -67,14 +67,14 @@ intf_data = talloc_zero(e1d->ctx, struct ve1_intf_data); - intf = e1_intf_new(e1d, intf_data); + intf = e1_intf_new(e1d, -1, intf_data); intf->drv = E1_DRIVER_VPAIR; for (i = 0; i < num_lines; i++) { struct ve1_line_data *line_data; line_data = talloc_zero(e1d->ctx, struct ve1_line_data); - e1_line_new(intf, line_data); + e1_line_new(intf, -1, line_data); } return intf; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9ff80831a3e3e3cb6dae178f8b438a9f3f4747df Gerrit-Change-Number: 27015 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: Doc Update - Build process for DAHDI on Debian 11

by laforge

Attention is currently required from: nickvsnetworking. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27014 ) Change subject: Doc Update - Build process for DAHDI on Debian 11 ...................................................................... Patch Set 1: Code-Review+1 (2 comments) File doc/manuals/chapters/host-software.adoc: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27014/comment/4241e351_70be… PS1, Line 53: $ sudo apt-get install -y linux-headers-`uname -r` git dfu-util make gcc autoconf libtool I think it should include 'libnewt-dev' as otherwise dahdi_tool will not be built, and I think it is the mots useful part of the dahdi-tools collection. https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27014/comment/7dd8d98f_6ccd… PS1, Line 67: At this point you can plug in the icE1usb, and scan for it with `sudo dahdi_scan` which should list the two E1 ports on the iCE1usb. it might make sense to expand a bit more, showing examle "dmesg" output, as well as stating that files in /proc/dahdi and /dev/dahdi/* should appear. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I0679bd14702b7b3d05c3346ce10358f45fef0301 Gerrit-Change-Number: 27014 Gerrit-PatchSet: 1 Gerrit-Owner: nickvsnetworking <nick(a)nickvsnetworking.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: nickvsnetworking <nick(a)nickvsnetworking.com> Gerrit-Comment-Date: Sun, 30 Jan 2022 11:19:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: Doc Update - Build process for DAHDI on Debian 11

by nickvsnetworking

nickvsnetworking has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27014 ) Change subject: Doc Update - Build process for DAHDI on Debian 11 ...................................................................... Doc Update - Build process for DAHDI on Debian 11 Change-Id: I0679bd14702b7b3d05c3346ce10358f45fef0301 --- M doc/manuals/chapters/host-software.adoc 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/14/27014/1 diff --git a/doc/manuals/chapters/host-software.adoc b/doc/manuals/chapters/host-software.adoc index 4c8578e..28ce7b9 100644 --- a/doc/manuals/chapters/host-software.adoc +++ b/doc/manuals/chapters/host-software.adoc @@ -44,6 +44,29 @@ When using that DAHDI Linux kernel driver, there is no need for osmo-e1d. The USB interface is directly managed inside the kernel. + +==== Installing DAHDI driver +Example installation steps, tested on Debian 11, for installing DAHDI Linux & DAHDI Tools. +Note: Plugging in the device prior to installing may lead to issues. + +---- +$ sudo apt-get install -y linux-headers-`uname -r` git dfu-util make gcc autoconf libtool +$ git clone https://git.osmocom.org/dahdi-linux/ +$ git clone https://github.com/asterisk/dahdi-tools +$ cd dahdi-linux +$ sudo make install +$ cd ../dahdi-tools +$ sudo autoreconf -i +$ ./configure +$ sudo make install +$ sudo make install-config +$ sudo modprobe icE1usb +$ sudo /etc/init.d/dahdi start +---- + +At this point you can plug in the icE1usb, and scan for it with `sudo dahdi_scan` which should list the two E1 ports on the iCE1usb. + + === Other software you can interface 3rd party applications with osmo-e1d in the following -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I0679bd14702b7b3d05c3346ce10358f45fef0301 Gerrit-Change-Number: 27014 Gerrit-PatchSet: 1 Gerrit-Owner: nickvsnetworking <nick(a)nickvsnetworking.com> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: tests/logging: ensure both stream and wqueue modes are tested

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27009 to look at the new patch set (#2). Change subject: tests/logging: ensure both stream and wqueue modes are tested ...................................................................... tests/logging: ensure both stream and wqueue modes are tested Change-Id: I37e789b5b287d72c443f50fd99a5284bc7296c0b --- M tests/Makefile.am M tests/logging/logging_test.c R tests/logging/logging_test_stream.err C tests/logging/logging_test_wqueue.err M tests/testsuite.at 5 files changed, 24 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/27009/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I37e789b5b287d72c443f50fd99a5284bc7296c0b Gerrit-Change-Number: 27009 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: tests/logging: merge both logging_test_{stream,wqueue}.err

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27013 to look at the new patch set (#3). Change subject: tests/logging: merge both logging_test_{stream,wqueue}.err ...................................................................... tests/logging: merge both logging_test_{stream,wqueue}.err Change-Id: I0ff0a6e0d22575047cc00dd822bc94d696171076 --- M tests/Makefile.am R tests/logging/logging_test.err D tests/logging/logging_test_wqueue.err M tests/testsuite.at 4 files changed, 5 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/27013/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ff0a6e0d22575047cc00dd822bc94d696171076 Gerrit-Change-Number: 27013 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: tests/logging: also test printing the filename information

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27010 to look at the new patch set (#2). Change subject: tests/logging: also test printing the filename information ...................................................................... tests/logging: also test printing the filename information This commit demonstrates a bug introduced in [1], which can be observed when the logging is configured to print the filename *after* the logging message (LOG_FILENAME_POS_HEADER_END): logging print file 1 last In this mode, the code in _output_buf() overwrites the '\n' sybmol contained in the logging messate itself by shifting the 'offset' backwards, and appends the nipped '\n' after the filename info. The problem is that the 'len' variable is not updated in this case, so the resulting length includes +1 character - '\0', which gets printed at the end of every logging line. Change-Id: I54bf5e5c036efb1908232fe3d8e8e2989715fbb3 Related: [1] I393907b3c9e0cc1145e102328adad0a83ee13a9f --- M tests/logging/logging_test.c M tests/logging/logging_test_stream.err M tests/logging/logging_test_wqueue.err 3 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/27010/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I54bf5e5c036efb1908232fe3d8e8e2989715fbb3 Gerrit-Change-Number: 27010 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: logging: fix coding style issues in _output_buf()

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27011 to look at the new patch set (#2). Change subject: logging: fix coding style issues in _output_buf() ...................................................................... logging: fix coding style issues in _output_buf() Change-Id: Ia794dbf51045361ee40815f708344c88abe87a96 --- M src/logging.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/27011/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia794dbf51045361ee40815f708344c88abe87a96 Gerrit-Change-Number: 27011 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: logging: fix printing of '\0' when filename printed last

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27012 to look at the new patch set (#2). Change subject: logging: fix printing of '\0' when filename printed last ...................................................................... logging: fix printing of '\0' when filename printed last As was demonstrated in I54bf5e5c036efb1908232fe3d8e8e2989715fbb3, when the logging is configured to print the filename *after* the logging message, each logging line contains an artifact - '\0'. The problem is that the 'len' variable is not updated. Fix this. Change-Id: I5c920a0d5c1cf45bcdd327b39e33d63346b4f51c Fixes: I393907b3c9e0cc1145e102328adad0a83ee13a9f --- M src/logging.c M tests/logging/logging_test_wqueue.err 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/27012/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5c920a0d5c1cf45bcdd327b39e33d63346b4f51c Gerrit-Change-Number: 27012 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: tests/logging: merge both logging_test_{stream,wqueue}.err

by fixeria

fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/27013 ) Change subject: tests/logging: merge both logging_test_{stream,wqueue}.err ...................................................................... tests/logging: merge both logging_test_{stream,wqueue}.err Change-Id: I0ff0a6e0d22575047cc00dd822bc94d696171076 --- R tests/logging/logging_test.err D tests/logging/logging_test_wqueue.err M tests/testsuite.at 3 files changed, 2 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/27013/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ff0a6e0d22575047cc00dd822bc94d696171076 Gerrit-Change-Number: 27013 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: logging: fix printing of '\0' when filename printed last

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27012 ) Change subject: logging: fix printing of '\0' when filename printed last ...................................................................... logging: fix printing of '\0' when filename printed last As was demonstrated in I54bf5e5c036efb1908232fe3d8e8e2989715fbb3, when the logging is configured to print the filename *after* the logging message, each logging line contains an artifact - '\0'. The problem is that the 'len' variable is not updated. Fix this. Change-Id: I5c920a0d5c1cf45bcdd327b39e33d63346b4f51c Fixes: I393907b3c9e0cc1145e102328adad0a83ee13a9f --- M src/logging.c M tests/logging/logging_test_wqueue.err 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/27012/1 diff --git a/src/logging.c b/src/logging.c index 5336e53..1a0abc2 100644 --- a/src/logging.c +++ b/src/logging.c @@ -586,6 +586,7 @@ break; case LOG_FILENAME_PATH: offset--; + len--; ret = snprintf(buf + offset, rem, " (%s:%d)\n", file, line); if (ret < 0) goto err; @@ -593,6 +594,7 @@ break; case LOG_FILENAME_BASENAME: offset--; + len--; ret = snprintf(buf + offset, rem, " (%s:%d)\n", const_basename(file), line); if (ret < 0) goto err; diff --git a/tests/logging/logging_test_wqueue.err b/tests/logging/logging_test_wqueue.err index 3e2008b..01ab878 100644 --- a/tests/logging/logging_test_wqueue.err +++ b/tests/logging/logging_test_wqueue.err Binary files differ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5c920a0d5c1cf45bcdd327b39e33d63346b4f51c Gerrit-Change-Number: 27012 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: tests/logging: merge both logging_test_{stream,wqueue}.err

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27013 ) Change subject: tests/logging: merge both logging_test_{stream,wqueue}.err ...................................................................... tests/logging: merge both logging_test_{stream,wqueue}.err Change-Id: I0ff0a6e0d22575047cc00dd822bc94d696171076 --- R tests/logging/logging_test.err D tests/logging/logging_test_wqueue.err M tests/testsuite.at 3 files changed, 2 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/27013/1 diff --git a/tests/logging/logging_test_stream.err b/tests/logging/logging_test.err similarity index 100% rename from tests/logging/logging_test_stream.err rename to tests/logging/logging_test.err diff --git a/tests/logging/logging_test_wqueue.err b/tests/logging/logging_test_wqueue.err deleted file mode 100644 index 01ab878..0000000 --- a/tests/logging/logging_test_wqueue.err +++ /dev/null @@ -1,11 +0,0 @@ -DRLL You should see this -DCC You should see this -DRLL You should see this -DLGLOBAL You should see this on DLGLOBAL (a) -DLGLOBAL You should see this on DLGLOBAL (b) -DLGLOBAL You should see this on DLGLOBAL (c) -DLGLOBAL You should see this on DLGLOBAL (d) -DLGLOBAL You should see this on DLGLOBAL (e) -DLGLOBAL You should see this (DLGLOBAL on DEBUG) -DLGLOBAL logging_test.c:137 A message with source info printed first -DLGLOBAL A message with source info printed last (logging_test.c:139) diff --git a/tests/testsuite.at b/tests/testsuite.at index 5da08e5..ca133bb 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -171,14 +171,14 @@ AT_SETUP([logging_stream]) AT_KEYWORDS([logging_stream]) cat $abs_srcdir/logging/logging_test.ok > expout -cat $abs_srcdir/logging/logging_test_stream.err > experr +cat $abs_srcdir/logging/logging_test.err > experr AT_CHECK([$abs_top_builddir/tests/logging/logging_test stream], [0], [expout], [experr]) AT_CLEANUP AT_SETUP([logging_wqueue]) AT_KEYWORDS([logging_wqueue]) cat $abs_srcdir/logging/logging_test.ok > expout -cat $abs_srcdir/logging/logging_test_wqueue.err > experr +cat $abs_srcdir/logging/logging_test.err > experr AT_CHECK([$abs_top_builddir/tests/logging/logging_test wqueue], [0], [expout], [experr]) AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ff0a6e0d22575047cc00dd822bc94d696171076 Gerrit-Change-Number: 27013 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: tests/logging: also test printing the filename information

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27010 ) Change subject: tests/logging: also test printing the filename information ...................................................................... tests/logging: also test printing the filename information This commit demonstrates a bug introduced in [1], which can be observed when the logging is configured to print the filename *after* the logging message (LOG_FILENAME_POS_HEADER_END): logging print file 1 last In this mode, the code in _output_buf() overwrites the '\n' sybmol contained in the logging messate itself by shifting the 'offset' backwards, and appends the nipped '\n' after the filename info. The problem is that the 'len' variable is not updated in this case, so the resulting length includes +1 character - '\0', which gets printed at the end of every logging line. Change-Id: I54bf5e5c036efb1908232fe3d8e8e2989715fbb3 --- M tests/logging/logging_test.c M tests/logging/logging_test_stream.err M tests/logging/logging_test_wqueue.err 3 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/27010/1 diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c index 12a7374..3548b1d 100644 --- a/tests/logging/logging_test.c +++ b/tests/logging/logging_test.c @@ -130,5 +130,13 @@ log_set_category_filter(stderr_target, DLGLOBAL, 1, LOGL_DEBUG); DEBUGP(DLGLOBAL, "You should see this (DLGLOBAL on DEBUG)\n"); + /* Test printing of the filename */ + log_set_print_filename2(stderr_target, LOG_FILENAME_BASENAME); + + log_set_print_filename_pos(stderr_target, LOG_FILENAME_POS_HEADER_END); + DEBUGP(DLGLOBAL, "A message with source info printed first\n"); + log_set_print_filename_pos(stderr_target, LOG_FILENAME_POS_LINE_END); + DEBUGP(DLGLOBAL, "A message with source info printed last\n"); + return 0; } diff --git a/tests/logging/logging_test_stream.err b/tests/logging/logging_test_stream.err index 17b3cad..01ab878 100644 --- a/tests/logging/logging_test_stream.err +++ b/tests/logging/logging_test_stream.err @@ -7,3 +7,5 @@ DLGLOBAL You should see this on DLGLOBAL (d) DLGLOBAL You should see this on DLGLOBAL (e) DLGLOBAL You should see this (DLGLOBAL on DEBUG) +DLGLOBAL logging_test.c:137 A message with source info printed first +DLGLOBAL A message with source info printed last (logging_test.c:139) diff --git a/tests/logging/logging_test_wqueue.err b/tests/logging/logging_test_wqueue.err index 17b3cad..3e2008b 100644 --- a/tests/logging/logging_test_wqueue.err +++ b/tests/logging/logging_test_wqueue.err Binary files differ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I54bf5e5c036efb1908232fe3d8e8e2989715fbb3 Gerrit-Change-Number: 27010 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: logging: fix coding style issues in _output_buf()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27011 ) Change subject: logging: fix coding style issues in _output_buf() ...................................................................... logging: fix coding style issues in _output_buf() Change-Id: Ia794dbf51045361ee40815f708344c88abe87a96 --- M src/logging.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/27011/1 diff --git a/src/logging.c b/src/logging.c index 148bb27..5336e53 100644 --- a/src/logging.c +++ b/src/logging.c @@ -580,19 +580,19 @@ * message in '\n'. If so, nip the last '\n' away, insert the source file info and re-append an * '\n'. All this to allow LOGP("start..."); LOGPC("...end\n") constructs. */ if (target->print_filename_pos == LOG_FILENAME_POS_LINE_END - && offset > 0 && buf[offset-1] == '\n') { + && offset > 0 && buf[offset - 1] == '\n') { switch (target->print_filename2) { case LOG_FILENAME_NONE: break; case LOG_FILENAME_PATH: - offset --; + offset--; ret = snprintf(buf + offset, rem, " (%s:%d)\n", file, line); if (ret < 0) goto err; OSMO_SNPRINTF_RET(ret, rem, offset, len); break; case LOG_FILENAME_BASENAME: - offset --; + offset--; ret = snprintf(buf + offset, rem, " (%s:%d)\n", const_basename(file), line); if (ret < 0) goto err; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia794dbf51045361ee40815f708344c88abe87a96 Gerrit-Change-Number: 27011 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: tests/logging: ensure both stream and wqueue modes are tested

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27009 ) Change subject: tests/logging: ensure both stream and wqueue modes are tested ...................................................................... tests/logging: ensure both stream and wqueue modes are tested Change-Id: I37e789b5b287d72c443f50fd99a5284bc7296c0b --- M tests/logging/logging_test.c R tests/logging/logging_test_stream.err C tests/logging/logging_test_wqueue.err M tests/testsuite.at 4 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/27009/1 diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c index ac6fc52..12a7374 100644 --- a/tests/logging/logging_test.c +++ b/tests/logging/logging_test.c @@ -78,6 +78,11 @@ log_set_print_category(stderr_target, 1); log_set_use_color(stderr_target, 0); + if (argc > 1 && !strcmp(argv[1], "wqueue")) + log_target_file_switch_to_wqueue(stderr_target); + else + log_target_file_switch_to_stream(stderr_target); + log_parse_category_mask(stderr_target, "DRLL:DCC"); log_parse_category_mask(stderr_target, "DRLL"); diff --git a/tests/logging/logging_test.err b/tests/logging/logging_test_stream.err similarity index 100% rename from tests/logging/logging_test.err rename to tests/logging/logging_test_stream.err diff --git a/tests/logging/logging_test.err b/tests/logging/logging_test_wqueue.err similarity index 100% copy from tests/logging/logging_test.err copy to tests/logging/logging_test_wqueue.err diff --git a/tests/testsuite.at b/tests/testsuite.at index 882203e..5da08e5 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -168,11 +168,18 @@ AT_CHECK([$abs_top_builddir/tests/gprs/gprs_test], [0], [expout], [ignore]) AT_CLEANUP -AT_SETUP([logging]) -AT_KEYWORDS([logging]) +AT_SETUP([logging_stream]) +AT_KEYWORDS([logging_stream]) cat $abs_srcdir/logging/logging_test.ok > expout -cat $abs_srcdir/logging/logging_test.err > experr -AT_CHECK([$abs_top_builddir/tests/logging/logging_test], [0], [expout], [experr]) +cat $abs_srcdir/logging/logging_test_stream.err > experr +AT_CHECK([$abs_top_builddir/tests/logging/logging_test stream], [0], [expout], [experr]) +AT_CLEANUP + +AT_SETUP([logging_wqueue]) +AT_KEYWORDS([logging_wqueue]) +cat $abs_srcdir/logging/logging_test.ok > expout +cat $abs_srcdir/logging/logging_test_wqueue.err > experr +AT_CHECK([$abs_top_builddir/tests/logging/logging_test wqueue], [0], [expout], [experr]) AT_CLEANUP AT_SETUP([codec]) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I37e789b5b287d72c443f50fd99a5284bc7296c0b Gerrit-Change-Number: 27009 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27008 ) Change subject: ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax ...................................................................... ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax On some systems /bin/sh is a symbolic link to bash, so everything works fine. On systems where /bin/sh is a real sh, copy fails: cp: cannot access 'open5gs-{smf,upf,nrf}.yaml': No such file or directory Change-Id: I64e9ddefdb6deb21b3bce3bc1af875a92919e6c9 Related: SYS#5602 --- M ttcn3-pgw-test/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved; Verified diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh index 0f6ee5d..662e49b 100755 --- a/ttcn3-pgw-test/jenkins.sh +++ b/ttcn3-pgw-test/jenkins.sh @@ -15,7 +15,7 @@ mkdir $VOL_BASE_DIR/pgw cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/ -cp open5gs-{smf,upf,nrf}.yaml $VOL_BASE_DIR/pgw/ +cp open5gs-*.yaml $VOL_BASE_DIR/pgw/ SUBNET=18 network_create $SUBNET -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I64e9ddefdb6deb21b3bce3bc1af875a92919e6c9 Gerrit-Change-Number: 27008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27008 ) Change subject: ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I64e9ddefdb6deb21b3bce3bc1af875a92919e6c9 Gerrit-Change-Number: 27008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jan 2022 12:56:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27008 ) Change subject: ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax ...................................................................... ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax On some systems /bin/sh is a symbolic link to bash, so everything works fine. On systems where /bin/sh is a real sh, copy fails: cp: cannot access 'open5gs-{smf,upf,nrf}.yaml': No such file or directory Change-Id: I64e9ddefdb6deb21b3bce3bc1af875a92919e6c9 Related: SYS#5602 --- M ttcn3-pgw-test/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/08/27008/1 diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh index 0f6ee5d..662e49b 100755 --- a/ttcn3-pgw-test/jenkins.sh +++ b/ttcn3-pgw-test/jenkins.sh @@ -15,7 +15,7 @@ mkdir $VOL_BASE_DIR/pgw cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/ -cp open5gs-{smf,upf,nrf}.yaml $VOL_BASE_DIR/pgw/ +cp open5gs-*.yaml $VOL_BASE_DIR/pgw/ SUBNET=18 network_create $SUBNET -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I64e9ddefdb6deb21b3bce3bc1af875a92919e6c9 Gerrit-Change-Number: 27008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bsc-test-sccplite: set OSMO_SUT_{HOST,PORT}

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27007 ) Change subject: ttcn3-bsc-test-sccplite: set OSMO_SUT_{HOST,PORT} ...................................................................... ttcn3-bsc-test-sccplite: set OSMO_SUT_{HOST,PORT} This enables the test suite to obtain talloc reports between the test case executions, which get stored together with the PCAP files. Change-Id: I4e5474e8fc51d2ba8a0baca68e11df1346d7d4ab --- M ttcn3-bsc-test/jenkins-sccplite.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/07/27007/1 diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index 7565a8d..0a3c073 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -48,6 +48,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4242" \ -v $VOL_BASE_DIR/bsc-tester:/data \ --name ${BUILD_TAG}-ttcn3-bsc-test \ $DOCKER_ARGS \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4e5474e8fc51d2ba8a0baca68e11df1346d7d4ab Gerrit-Change-Number: 27007 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bsc-test-vamos: set OSMO_SUT_{HOST,PORT}

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27006 ) Change subject: ttcn3-bsc-test-vamos: set OSMO_SUT_{HOST,PORT} ...................................................................... ttcn3-bsc-test-vamos: set OSMO_SUT_{HOST,PORT} This enables the test suite to obtain talloc reports between the test case executions, which get stored together with the PCAP files. Change-Id: Ia9525778fcecc60177be651624e2b2cf9bc75422 --- M ttcn3-bsc-test-vamos/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/06/27006/1 diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index e8ec34d..f37711f 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -62,6 +62,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4242" \ -v $VOL_BASE_DIR/bsc-tester:/data \ --name ${BUILD_TAG}-ttcn3-bsc-test \ $DOCKER_ARGS \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9525778fcecc60177be651624e2b2cf9bc75422 Gerrit-Change-Number: 27006 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26955 ) Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... Patch Set 5: (6 comments) Patchset: PS5: Mostly cosmetic notes, not a merge blocker. File include/osmocom/ranap/ranap_common.h: https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/27b84377_1802f520 PS5, Line 599: funktions Tippfehler: functions File src/ranap_common_ran.c: https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/7030b23e_7396dc5d PS5, Line 90: unsuccessfulOutcome successfulOutcome? I think it's not critical, given that 'procedureCode' is present in all union members at the same position. But still may be confusing. https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/da00cf9b_8956d22e PS5, Line 102: unsuccessfulOutcome outcome? I think it's not critical, given that 'procedureCode' is present in all union members at the same position. But still may be confusing. https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/2ef5a507_79f42b5f PS5, Line 124: unsuccessful copy-paste: successful https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/0b68a617_a523c973 PS5, Line 132: unsuccessful Neither unsuccessful not successful, so this word should be removed. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jan 2022 10:16:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_cn: add functions for direct access to decoder

by fixeria

Attention is currently required from: neels, daniel, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/27002 ) Change subject: ranap_common_cn: add functions for direct access to decoder ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/27002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I14d2ed8e597a5d12024a6a6c72ff011dbeb2549d Gerrit-Change-Number: 27002 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jan 2022 09:50:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: gsm_7bit_encode_n(): use regular malloc() instead of calloc()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22543 ) Change subject: gsm_7bit_encode_n(): use regular malloc() instead of calloc() ...................................................................... Patch Set 2: (1 comment) File src/gsm/gsm_utils.c: https://gerrit.osmocom.org/c/libosmocore/+/22543/comment/dd46e343_896a80a9 PS1, Line 332: uint8_t *data = malloc(septet_len + 1); > I was thinking about alloca() too, we already use it in src/conv.c. […] I suggest to stay with the heap allocation for now. alloca() is nice, but it's a more radical change compared to calloc() -> malloc(). I am not confident enough that using the stack here is does not introduce non-obvious pitfalls. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6956cbd83b2999dbcf8e2d210134b0a166c33efb Gerrit-Change-Number: 22543 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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-Comment-Date: Fri, 28 Jan 2022 20:12:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: gsm_utils: use talloc API in gsm_7bit_encode_n()

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27005 ) Change subject: gsm_utils: use talloc API in gsm_7bit_encode_n() ...................................................................... Abandoned In favor of I6956cbd83b2999dbcf8e2d210134b0a166c33efb. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8a38c493eff25b4f16af1740a1bcecb5098673d9 Gerrit-Change-Number: 27005 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: gsm_utils: get rid of calloc() / free() in gsm_septets2octets()

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27004 ) Change subject: gsm_utils: get rid of calloc() / free() in gsm_septets2octets() ...................................................................... Abandoned This patch predates Ib1aac538afeb0a5c76a1df472d555139a496e12e, which changes typeof(septet_len) to size_t. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id2bb31b4d00bb91d3dcc302910e5d2da95be9a25 Gerrit-Change-Number: 27004 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: gsm_utils: use talloc API in gsm_7bit_encode_n()

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27005 to look at the new patch set (#2). Change subject: gsm_utils: use talloc API in gsm_7bit_encode_n() ...................................................................... gsm_utils: use talloc API in gsm_7bit_encode_n() Unfortunately, in this case we cannot make any assumptions on the maximum size of the input string, so we cannot allocate the buffer on the stack. Let's at least use talloc API. Change-Id: I8a38c493eff25b4f16af1740a1bcecb5098673d9 --- M src/gsm/gsm_utils.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/27005/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8a38c493eff25b4f16af1740a1bcecb5098673d9 Gerrit-Change-Number: 27005 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: gsm_utils: use talloc API in gsm_7bit_encode_n()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27005 ) Change subject: gsm_utils: use talloc API in gsm_7bit_encode_n() ...................................................................... gsm_utils: use talloc API in gsm_7bit_encode_n() Unfortunately, in this case we cannot make any assumptions on the maximum size of the input string, so we cannot allocate the buffer on the stack. Let's at least use talloc API. Change-Id: I8a38c493eff25b4f16af1740a1bcecb5098673d9 --- M src/gsm/gsm_utils.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/27005/1 diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index ba24291..511de79 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -382,7 +382,7 @@ size_t max_septets = n * 8 / 7; /* prepare for the worst case, every character expanding to two bytes */ - uint8_t *rdata = calloc(strlen(data) * 2, sizeof(uint8_t)); + uint8_t *rdata = talloc_zero(OTC_GLOBAL, strlen(data) * 2); y = gsm_septet_encode(rdata, data); if (y > max_septets) { @@ -398,7 +398,7 @@ if (octets) *octets = o; - free(rdata); + talloc_free(rdata); /* * We don't care about the number of octets, because they are not -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8a38c493eff25b4f16af1740a1bcecb5098673d9 Gerrit-Change-Number: 27005 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: gsm_utils: get rid of calloc() / free() in gsm_septets2octets()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27004 ) Change subject: gsm_utils: get rid of calloc() / free() in gsm_septets2octets() ...................................................................... gsm_utils: get rid of calloc() / free() in gsm_septets2octets() Given that 'septet_len' is of type 'uint8_t', plus one optional padding octet, the maximum buffer size is 256. No need to use the heap for that, a buffer on the stack is enough in this case. Change-Id: Id2bb31b4d00bb91d3dcc302910e5d2da95be9a25 --- M src/gsm/gsm_utils.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/27004/1 diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index f8bb58e..ba24291 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -322,10 +322,10 @@ * \returns number of bytes used in \a result */ int gsm_septet_pack(uint8_t *result, const uint8_t *rdata, size_t septet_len, uint8_t padding) { + uint8_t data[UINT8_MAX + 1] = { 0 }; int i = 0, z = 0; uint8_t cb, nb; int shift = 0; - uint8_t *data = calloc(septet_len + 1, sizeof(uint8_t)); if (padding) { shift = 7 - padding; @@ -360,8 +360,6 @@ shift++; } - free(data); - return z; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id2bb31b4d00bb91d3dcc302910e5d2da95be9a25 Gerrit-Change-Number: 27004 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26955 ) Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jan 2022 16:58:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_cn: add functions for direct access to decoder

by laforge

Attention is currently required from: neels, daniel, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/27002 ) Change subject: ranap_common_cn: add functions for direct access to decoder ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/27002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I14d2ed8e597a5d12024a6a6c72ff011dbeb2549d Gerrit-Change-Number: 27002 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jan 2022 16:58:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-uecups[master]: daemon: enable multithread logging in main()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27003 ) Change subject: daemon: enable multithread logging in main() ...................................................................... daemon: enable multithread logging in main() It may happen that multiple threads trying to log at the same time, and the msgb containing a logging message gets corrupted in libosmocore's _file_wq_write_cb(): msgb(0x7f5ca2a38150): msgb too small to pull 240 (len 120) Aborted (core dumped) ''' rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); if (rc < 0) return rc; if (rc != msgb_length(msg)) { // 240 != 120 /* pull the number of bytes we have already written */ msgb_pull(msg, rc); // <-- we abort() here /* ask write_queue to re-insert the msgb at the head of the queue */ return -EAGAIN; } ''' The return value of write() cannot be greater than the given length. Most likely, the msgb gets corrupted during the write() system call. Enabling multithread logging in libosmocore solves the problem. Change-Id: Ib14d0e36e8cd72465bfe55d19b68dbe3423f7f05 Related: SYS#5602 Fixes: OS#5424 --- M daemon/main.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/daemon/main.c b/daemon/main.c index fec6f84..788ed70 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -726,6 +726,7 @@ osmo_init_ignore_signals(); osmo_init_logging2(g_tall_ctx, &log_info); + log_enable_multithread(); g_daemon = gtp_daemon_alloc(g_tall_ctx); OSMO_ASSERT(g_daemon); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ib14d0e36e8cd72465bfe55d19b68dbe3423f7f05 Gerrit-Change-Number: 27003 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-uecups[master]: daemon: enable multithread logging in main()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27003 ) Change subject: daemon: enable multithread logging in main() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ib14d0e36e8cd72465bfe55d19b68dbe3423f7f05 Gerrit-Change-Number: 27003 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: Fri, 28 Jan 2022 16:39:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-uecups[master]: daemon: enable multithread logging in main()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27003 ) Change subject: daemon: enable multithread logging in main() ...................................................................... daemon: enable multithread logging in main() It may happen that multiple threads trying to log at the same time, and the msgb containing a logging message gets corrupted in libosmocore's _file_wq_write_cb(): msgb(0x7f5ca2a38150): msgb too small to pull 240 (len 120) Aborted (core dumped) ''' rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); if (rc < 0) return rc; if (rc != msgb_length(msg)) { // 240 != 120 /* pull the number of bytes we have already written */ msgb_pull(msg, rc); // <-- we abort() here /* ask write_queue to re-insert the msgb at the head of the queue */ return -EAGAIN; } ''' The return value of write() cannot be greater than the given length. Most likely, the msgb gets corrupted during the write() system call. Enabling multithread logging in libosmocore solves the problem. Change-Id: Ib14d0e36e8cd72465bfe55d19b68dbe3423f7f05 Related: SYS#5602 Fixes: OS#5424 --- M daemon/main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/03/27003/1 diff --git a/daemon/main.c b/daemon/main.c index fec6f84..788ed70 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -726,6 +726,7 @@ osmo_init_ignore_signals(); osmo_init_logging2(g_tall_ctx, &log_info); + log_enable_multithread(); g_daemon = gtp_daemon_alloc(g_tall_ctx); OSMO_ASSERT(g_daemon); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ib14d0e36e8cd72465bfe55d19b68dbe3423f7f05 Gerrit-Change-Number: 27003 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_cn: add functions for direct access to decoder

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/27002 ) Change subject: ranap_common_cn: add functions for direct access to decoder ...................................................................... ranap_common_cn: add functions for direct access to decoder The message encoder functions that decode a message to a struct ranap_message are only accessible via a callback function that is passed to ranap_cn_rx_cx The decoded ranap_message only lives inside the callback since it is freed by ranap_cn_rx_cx when the callback is done. In some situations this might make using the decoder incredibly difficult since it is not possible to keep the decoding results for an extended amount of time. Lets put the decoding into a separate function and use this function in ranap_cn_rx_cx. Then lets make the decoder and the free function public so that the decoder can be used in a more open way. Change-Id: I14d2ed8e597a5d12024a6a6c72ff011dbeb2549d Related: OS#5152 --- M include/osmocom/ranap/ranap_common_cn.h M src/ranap_common_cn.c 2 files changed, 58 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/02/27002/1 diff --git a/include/osmocom/ranap/ranap_common_cn.h b/include/osmocom/ranap/ranap_common_cn.h index dfce358..90ff6da 100644 --- a/include/osmocom/ranap/ranap_common_cn.h +++ b/include/osmocom/ranap/ranap_common_cn.h @@ -7,8 +7,20 @@ typedef void (*ranap_handle_cb)(void *ctx, ranap_message *ranap_msg); +/* free a decoded connection-less RANAP message */ +void ranap_cn_rx_cl_free(ranap_message *message); + +/* decode a connection-less RANAP message */ +int ranap_cn_rx_cl_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len); + /* receive a connection-less RANAP message */ int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); +/* free a decoded connection-oriented RANAP message */ +void ranap_cn_rx_co_free(ranap_message *message); + +/* decode a connection-oriented RANAP message */ +int ranap_cn_rx_co_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len); + /* receive a connection-oriented RANAP message */ int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); diff --git a/src/ranap_common_cn.c b/src/ranap_common_cn.c index 03ce9ea..e7b8339 100644 --- a/src/ranap_common_cn.c +++ b/src/ranap_common_cn.c @@ -257,7 +257,8 @@ return rc; } -static void _cn_ranap_free_co(ranap_message *message) +/* free a decoded connection-oriented RANAP message */ +void ranap_cn_rx_co_free(ranap_message *message) { switch (message->direction) { case RANAP_RANAP_PDU_PR_initiatingMessage: @@ -281,27 +282,38 @@ } } -/* receive a connection-oriented RANAP message and call - * cn_ranap_handle_co() with the resulting ranap_message struct */ -int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) +/* decode a connection-oriented RANAP message */ +int ranap_cn_rx_co_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len) { RANAP_RANAP_PDU_t *pdu = NULL; - ranap_message message; asn_dec_rval_t dec_ret; int rc; - memset(&message, 0, sizeof(message)); + memset(message, 0, sizeof(*message)); - dec_ret = aper_decode(NULL,&asn_DEF_RANAP_RANAP_PDU, (void **) &pdu, - data, len, 0, 0); + dec_ret = aper_decode(NULL, &asn_DEF_RANAP_RANAP_PDU, (void **)&pdu, data, len, 0, 0); if (dec_ret.code != RC_OK) { LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); return -1; } - message.direction = pdu->present; + message->direction = pdu->present; - rc = _cn_ranap_rx_co(ctx, pdu, &message); + rc = _cn_ranap_rx_co(ctx, pdu, message); + + ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu); + + return rc; +} + +/* receive a connection-oriented RANAP message and call + * cn_ranap_handle_co() with the resulting ranap_message struct */ +int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) +{ + ranap_message message; + int rc; + + rc = ranap_cn_rx_co_decode(ctx, &message, data, len); if (rc == 0) (*cb)(ctx, &message); @@ -309,9 +321,7 @@ LOGP(DRANAP, LOGL_ERROR, "Not calling cn_ranap_handle_co() due to rc=%d\n", rc); /* Free the asn1 structs in message */ - _cn_ranap_free_co(&message); - - ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu); + ranap_cn_rx_co_free(&message); return rc; } @@ -496,7 +506,8 @@ return rc; } -static void _cn_ranap_free_cl(ranap_message *message) +/* free a decoded connection-less RANAP message */ +void ranap_cn_rx_cl_free(ranap_message *message) { switch (message->direction) { case RANAP_RANAP_PDU_PR_initiatingMessage: @@ -516,27 +527,38 @@ } } -/* receive a connection-less RANAP message and call - * cn_ranap_handle_co() with the resulting ranap_message struct */ -int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) +/* decode a connection-less RANAP message */ +int ranap_cn_rx_cl_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len) { RANAP_RANAP_PDU_t *pdu = NULL; - ranap_message message; asn_dec_rval_t dec_ret; int rc; - memset(&message, 0, sizeof(message)); + memset(message, 0, sizeof(*message)); - dec_ret = aper_decode(NULL,&asn_DEF_RANAP_RANAP_PDU, (void **) &pdu, - data, len, 0, 0); + dec_ret = aper_decode(NULL, &asn_DEF_RANAP_RANAP_PDU, (void **)&pdu, data, len, 0, 0); if (dec_ret.code != RC_OK) { LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); return -1; } - message.direction = pdu->present; + message->direction = pdu->present; - rc = _cn_ranap_rx_cl(ctx, pdu, &message); + rc = _cn_ranap_rx_cl(ctx, pdu, message); + + ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu); + + return rc; +} + +/* receive a connection-less RANAP message and call + * cn_ranap_handle_co() with the resulting ranap_message struct */ +int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) +{ + ranap_message message; + int rc; + + rc = ranap_cn_rx_cl_decode(ctx, &message, data, len); if (rc == 0) (*cb)(ctx, &message); @@ -544,9 +566,7 @@ LOGP(DRANAP, LOGL_ERROR, "Not calling cn_ranap_handle_cl() due to rc=%d\n", rc); /* Free the asn1 structs in message */ - _cn_ranap_free_cl(&message); - - ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu); + ranap_cn_rx_cl_free(&message); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/27002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I14d2ed8e597a5d12024a6a6c72ff011dbeb2549d Gerrit-Change-Number: 27002 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by dexter

Attention is currently required from: laforge, dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 to look at the new patch set (#5). Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... ranap_common_ran: add decoder for RAN/RNC originated messages Lets add a counterpart for ranap_common_cn that works the same, but decodes RAN/RNC originated messages. Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Related: OS#5152 --- M include/osmocom/ranap/Makefile.am M include/osmocom/ranap/ranap_common.h M include/osmocom/ranap/ranap_common_cn.h A include/osmocom/ranap/ranap_common_ran.h M src/Makefile.am A src/ranap_common_ran.c 6 files changed, 204 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/26955/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by dexter

Attention is currently required from: laforge, dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 to look at the new patch set (#4). Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... ranap_common_ran: add decoder for RAN/RNC originated messages Lets add a counterpart for ranap_common_cn that works the same, but decodes RAN/RNC originated messages. Related: OS#515 Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 --- M include/osmocom/ranap/Makefile.am M include/osmocom/ranap/ranap_common.h M include/osmocom/ranap/ranap_common_cn.h A include/osmocom/ranap/ranap_common_ran.h M src/Makefile.am A src/ranap_common_ran.c 6 files changed, 187 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/26955/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by dexter

Attention is currently required from: laforge, dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 to look at the new patch set (#3). Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... ranap_common_ran: add decoder for RAN/RNC originated messages Lets add a counterpart for ranap_common_cn that works the same, but decodes RAN/RNC originated messages. Related: OS#515 Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 --- M include/osmocom/ranap/Makefile.am M include/osmocom/ranap/ranap_common.h M include/osmocom/ranap/ranap_common_cn.h A include/osmocom/ranap/ranap_common_ran.h M src/Makefile.am A src/ranap_common_ran.c 6 files changed, 283 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/26955/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by dexter

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 to look at the new patch set (#2). Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... ranap_common_ran: add decoder for RAN/RNC originated messages Lets add a counterpart for ranap_common_cn that works the same, but decodes RAN/RNC originated messages. Related: OS#515 Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 --- M include/osmocom/ranap/Makefile.am M include/osmocom/ranap/ranap_common.h M include/osmocom/ranap/ranap_common_cn.h A include/osmocom/ranap/ranap_common_ran.h M src/Makefile.am A src/ranap_common_ran.c 6 files changed, 283 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/26955/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26955 ) Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... Patch Set 2: (1 comment) File src/ranap_common_ran.c: https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/51a90d1d_c5776867 PS1, Line 3: / > I didn't write this, right? I guess it should be (C) sysmocom Author: pmaier Done -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 27 Jan 2022 15:19:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: osmo-uecups-master/Dockerfile: do not pass command line options

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26982 ) Change subject: osmo-uecups-master/Dockerfile: do not pass command line options ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > spelling: command liNe, not liKe (in script and commit message) Done. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9b220e4cfbc89b800fafdd153bd63d6d95799e2 Gerrit-Change-Number: 26982 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 26 Jan 2022 19:08:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: osmo-uecups-master/Dockerfile: do not pass command line options

by fixeria

Attention is currently required from: fixeria. fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/26982 ) Change subject: osmo-uecups-master/Dockerfile: do not pass command line options ...................................................................... osmo-uecups-master/Dockerfile: do not pass command line options Change-Id: Ia9b220e4cfbc89b800fafdd153bd63d6d95799e2 Related: SYS#5602 --- M osmo-uecups-master/Dockerfile 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/82/26982/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9b220e4cfbc89b800fafdd153bd63d6d95799e2 Gerrit-Change-Number: 26982 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in simtrace2[master]: simtrace2-cardem-pcsc: Detect card power-up without RESET

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/27001 ) Change subject: simtrace2-cardem-pcsc: Detect card power-up without RESET ...................................................................... simtrace2-cardem-pcsc: Detect card power-up without RESET In some readers (at least CardMan 3121), the simtrace2-cardem firmware claims there are power-up sequences where RESET is released before VCC becomes active. Let's detect such spec-incompliant power-up sequences and use them to trigger a cold reset of the card. Change-Id: I682ac3d0c2b98749a6ed44f9a73e4b39354a4284 Closes: OS#5421 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 23 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/01/27001/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 807df72..c684868 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -74,22 +74,40 @@ static uint32_t last_status_flags = 0; +#define NO_RESET 0 +#define COLD_RESET 1 +#define WARM_RESET 2 + static void update_status_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags) { struct osim_card_hdl *card = ci->chan->card; + int reset = NO_RESET; + /* check if card is _now_ operational: VCC+CLK present, RST absent */ if ((flags & CEMU_STATUS_F_VCC_PRESENT) && (flags & CEMU_STATUS_F_CLK_ACTIVE) && !(flags & CEMU_STATUS_F_RESET_ACTIVE)) { if (last_status_flags & CEMU_STATUS_F_RESET_ACTIVE) { /* a reset has just ended, forward it to the real card */ - bool cold_reset = true; if (last_status_flags & CEMU_STATUS_F_VCC_PRESENT) - cold_reset = false; - LOGCI(ci, LOGL_NOTICE, "%s Resetting card in reader...\n", - cold_reset ? "Cold" : "Warm"); - osim_card_reset(card, cold_reset); + reset = WARM_RESET; + else + reset = COLD_RESET; + } else if (!(last_status_flags & CEMU_STATUS_F_VCC_PRESENT)) { + /* power-up has just happened, perform cold reset */ + reset = COLD_RESET; } + } else if (flags == CEMU_STATUS_F_VCC_PRESENT && + !(last_status_flags & CEMU_STATUS_F_VCC_PRESENT)) { + /* improper power-up: Only power enabled, but no reset active. */ + reset = COLD_RESET; } + + if (reset) { + LOGCI(ci, LOGL_NOTICE, "%s Resetting card in reader...\n", + reset == COLD_RESET ? "Cold" : "Warm"); + osim_card_reset(card, reset == COLD_RESET ? true : false); + } + last_status_flags = flags; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I682ac3d0c2b98749a6ed44f9a73e4b39354a4284 Gerrit-Change-Number: 27001 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in simtrace2[master]: simtrace2-cardem-pcsc: Move all logging into libosmocore

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/27000 ) Change subject: simtrace2-cardem-pcsc: Move all logging into libosmocore ...................................................................... simtrace2-cardem-pcsc: Move all logging into libosmocore * drop log statements that are already in libosmo-simtrace2 * don't printf directly, but go via LOGCI * make LOGCI use libosmocore logging * configure libosmocore logging in a 'convenient' way Change-Id: I6fa0da966e6d8e723c187404c17e90cfb3f3dd9f --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/00/27000/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 19ed94e..807df72 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -1,7 +1,7 @@ /* simtrace2-cardem-pcsc - main program for the host PC to provide a remote SIM * using the SIMtrace 2 firmware in card emulation mode * - * (C) 2016-2021 by Harald Welte <hwelte(a)hmw-consulting.de> + * (C) 2016-2022 by Harald Welte <hwelte(a)hmw-consulting.de> * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon(a)sysmocom.de> * * This program is free software; you can redistribute it and/or @@ -49,7 +49,7 @@ #include <osmocom/sim/class_tables.h> #include <osmocom/sim/sim.h> -#define LOGCI(ci, lvl, fmt, args ...) printf(fmt, ## args) +#define LOGCI(ci, lvl, fmt, args ...) LOGP(DLGLOBAL, lvl, fmt, ## args) static void atr_update_csum(uint8_t *atr, unsigned int atr_len) { @@ -93,6 +93,17 @@ last_status_flags = flags; } +static const char *cemu_data_flags2str(uint32_t flags) +{ + static char out[64]; + snprintf(out, sizeof(out), "%s%s%s%s", + flags & CEMU_DATA_F_TPDU_HDR ? "HDR " : "", + flags & CEMU_DATA_F_FINAL ? "FINAL " : "", + flags & CEMU_DATA_F_PB_AND_TX ? "PB_AND_TX " : "", + flags & CEMU_DATA_F_PB_AND_RX ? "PB_AND_RX" : ""); + return out; +} + /*********************************************************************** * Incoming Messages ***********************************************************************/ @@ -104,7 +115,7 @@ char fbuf[80]; cemu_status_flags2str(fbuf, sizeof(fbuf), status->flags); - printf("=> STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", + LOGCI(ci, LOGL_NOTICE, "=> STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", status->flags, status->fi, status->di, status->wi, status->waiting_time, fbuf); @@ -119,7 +130,7 @@ struct cardemu_usb_msg_pts_info *pts; pts = (struct cardemu_usb_msg_pts_info *) buf; - printf("=> PTS req: %s\n", osmo_hexdump(pts->req, sizeof(pts->req))); + LOGCI(ci, LOGL_NOTICE, "=> PTS req: %s\n", osmo_hexdump(pts->req, pts->pts_len)); return 0; } @@ -133,8 +144,8 @@ data = (struct cardemu_usb_msg_rx_data *) buf; - printf("=> DATA: flags=%x, %s: ", data->flags, - osmo_hexdump(data->data, data->data_len)); + LOGCI(ci, LOGL_INFO, "=> DATA: flags=0x%02x (%s), %s\n ", data->flags, + cemu_data_flags2str(data->flags), osmo_hexdump(data->data, data->data_len)); rc = osmo_apdu_segment_in(&ac, data->data, data->data_len, data->flags & CEMU_DATA_F_TPDU_HDR); @@ -163,7 +174,6 @@ msgb_apdu_sw(tmsg) = msgb_get_u16(tmsg); ac.sw[0] = msgb_apdu_sw(tmsg) >> 8; ac.sw[1] = msgb_apdu_sw(tmsg) & 0xff; - printf("SW=0x%04x, len_rx=%d\n", msgb_apdu_sw(tmsg), msgb_l3len(tmsg)); if (msgb_l3len(tmsg)) osmo_st2_cardem_request_pb_and_tx(ci, ac.hdr.ins, tmsg->l3h, msgb_l3len(tmsg)); osmo_st2_cardem_request_sw_tx(ci, ac.sw); @@ -179,8 +189,6 @@ struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *)buf; int rc; - printf("-> %s\n", osmo_hexdump(buf, len)); - buf += sizeof(*sh); switch (sh->msg_type) { @@ -213,7 +221,7 @@ char fbuf[80]; cemu_status_flags2str(fbuf, sizeof(fbuf), status->flags); - LOGCI(ci, LOGL_INFO, "=> IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", + LOGCI(ci, LOGL_NOTICE, "=> IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", status->flags, status->fi, status->di, status->wi, status->waiting_time, fbuf); @@ -227,8 +235,6 @@ struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *)buf; int rc; - LOGCI(ci, LOGL_INFO, "SIMtrace IRQ %s\n", osmo_hexdump(buf, len)); - buf += sizeof(*sh); switch (sh->msg_type) { @@ -351,7 +357,7 @@ static void print_welcome(void) { printf("simtrace2-cardem-pcsc - Using PC/SC reader as SIM\n" - "(C) 2010-2020, Harald Welte <laforge(a)gnumonks.org>\n" + "(C) 2010-2022, Harald Welte <laforge(a)gnumonks.org>\n" "(C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon(a)sysmocom.de>\n\n"); } @@ -454,6 +460,13 @@ } osmo_init_logging2(NULL, &log_info); + log_set_print_category_hex(osmo_stderr_target, false); + log_set_print_category(osmo_stderr_target, true); + log_set_print_level(osmo_stderr_target, true); + log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_category_filter(osmo_stderr_target, DLINP, 1, LOGL_DEBUG); + log_set_category_filter(osmo_stderr_target, DLGLOBAL, 1, LOGL_DEBUG); while (1) { int option_index = 0; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I6fa0da966e6d8e723c187404c17e90cfb3f3dd9f Gerrit-Change-Number: 27000 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in simtrace2[master]: fw/qmod: enable modem RESET by default at boot

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26998 ) Change subject: fw/qmod: enable modem RESET by default at boot ...................................................................... fw/qmod: enable modem RESET by default at boot When the uC firmware starts, assert the (high-active) _RESET GPIOs, which will cause the transistors to drive the mPCIe slot !PERST low. There is of course a short instance of time between the uC reset until it executes wwan_perst_init(). To avoid this, a hardware pull-up would have to be re-worked onto the _RESET[1..4] signals on the PCBA Change-Id: I8742fefa4bf02e728e34d5d8cbc0fda771e78ffb --- M firmware/libboard/qmod/include/board.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/98/26998/1 diff --git a/firmware/libboard/qmod/include/board.h b/firmware/libboard/qmod/include/board.h index 7ea5bd7..56d0d21 100644 --- a/firmware/libboard/qmod/include/board.h +++ b/firmware/libboard/qmod/include/board.h @@ -89,8 +89,8 @@ #define PINS_WWAN_IN { PIN_WWAN1, PIN_WWAN2 } /* outputs controlling RESET input of modems */ -#define PIN_PERST1 {PIO_PA25, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_PULLUP} -#define PIN_PERST2 {PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_PULLUP} +#define PIN_PERST1 {PIO_PA25, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_PULLUP} +#define PIN_PERST2 {PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_PULLUP} #define PINS_PERST { PIN_PERST1, PIN_PERST2 } #define PIN_VERSION_DET {PIO_PA19, PIOA, ID_PIOA, PIO_PERIPH_D, PIO_DEFAULT} -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I8742fefa4bf02e728e34d5d8cbc0fda771e78ffb Gerrit-Change-Number: 26998 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in simtrace2[master]: simtrace2-cardem-pcsc: rename 'flags' to 'status_flags'

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26999 ) Change subject: simtrace2-cardem-pcsc: rename 'flags' to 'status_flags' ...................................................................... simtrace2-cardem-pcsc: rename 'flags' to 'status_flags' there are other flags in the simtrace/cardem protocol... Change-Id: I6362936c642e7abf4c501b4526a1654a25afedfe --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/99/26999/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 8b08f36..19ed94e 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -62,7 +62,7 @@ atr[atr_len-1] = csum; } -static void cemu_flags2str(char *out, unsigned int out_len, uint32_t flags) +static void cemu_status_flags2str(char *out, unsigned int out_len, uint32_t flags) { snprintf(out, out_len, "%s%s%s%s%s", flags & CEMU_STATUS_F_RESET_ACTIVE ? "RESET " : "", @@ -72,25 +72,25 @@ flags & CEMU_STATUS_F_RCEMU_ACTIVE ? "RCEMU " : ""); } -static uint32_t last_flags = 0; +static uint32_t last_status_flags = 0; -static void update_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags) +static void update_status_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags) { struct osim_card_hdl *card = ci->chan->card; if ((flags & CEMU_STATUS_F_VCC_PRESENT) && (flags & CEMU_STATUS_F_CLK_ACTIVE) && !(flags & CEMU_STATUS_F_RESET_ACTIVE)) { - if (last_flags & CEMU_STATUS_F_RESET_ACTIVE) { + if (last_status_flags & CEMU_STATUS_F_RESET_ACTIVE) { /* a reset has just ended, forward it to the real card */ bool cold_reset = true; - if (last_flags & CEMU_STATUS_F_VCC_PRESENT) + if (last_status_flags & CEMU_STATUS_F_VCC_PRESENT) cold_reset = false; LOGCI(ci, LOGL_NOTICE, "%s Resetting card in reader...\n", cold_reset ? "Cold" : "Warm"); osim_card_reset(card, cold_reset); } } - last_flags = flags; + last_status_flags = flags; } /*********************************************************************** @@ -103,12 +103,12 @@ struct cardemu_usb_msg_status *status = (struct cardemu_usb_msg_status *) buf; char fbuf[80]; - cemu_flags2str(fbuf, sizeof(fbuf), status->flags); + cemu_status_flags2str(fbuf, sizeof(fbuf), status->flags); printf("=> STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", status->flags, status->fi, status->di, status->wi, status->waiting_time, fbuf); - update_flags(ci, status->flags); + update_status_flags(ci, status->flags); return 0; } @@ -212,12 +212,12 @@ const struct cardemu_usb_msg_status *status = (struct cardemu_usb_msg_status *) buf; char fbuf[80]; - cemu_flags2str(fbuf, sizeof(fbuf), status->flags); - LOGCI(ci, LOGL_INFO, "SIMtrace IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", + cemu_status_flags2str(fbuf, sizeof(fbuf), status->flags); + LOGCI(ci, LOGL_INFO, "=> IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u (%s)\n", status->flags, status->fi, status->di, status->wi, status->waiting_time, fbuf); - update_flags(ci, status->flags); + update_status_flags(ci, status->flags); return 0; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I6362936c642e7abf4c501b4526a1654a25afedfe Gerrit-Change-Number: 26999 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26955 ) Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... Patch Set 1: (2 comments) Patchset: PS1: I agree with the linter, and the copyright statement needs updating. Apart from that: LGTM! File src/ranap_common_ran.c: https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/2081160c_21731956 PS1, Line 3: / I didn't write this, right? I guess it should be (C) sysmocom Author: pmaier -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jan 2022 16:47:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bsc-test/jenkins.sh: fix '--ulimit core=-1' set twice

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26987 ) Change subject: ttcn3-bsc-test/jenkins.sh: fix '--ulimit core=-1' set twice ...................................................................... ttcn3-bsc-test/jenkins.sh: fix '--ulimit core=-1' set twice Change-Id: I3223f8f4cc09797de44971215a94fc62ad8d263b --- M ttcn3-bsc-test/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 7f05c5e..fd9046c 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -32,7 +32,6 @@ --ulimit core=-1 \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp -d \ - --ulimit core=-1 \ $DOCKER_ARGS \ $REPO_USER/osmo-stp-$IMAGE_SUFFIX -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3223f8f4cc09797de44971215a94fc62ad8d263b Gerrit-Change-Number: 26987 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bsc-test/jenkins.sh: fix '--ulimit core=-1' set twice

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26987 ) Change subject: ttcn3-bsc-test/jenkins.sh: fix '--ulimit core=-1' set twice ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3223f8f4cc09797de44971215a94fc62ad8d263b Gerrit-Change-Number: 26987 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jan 2022 16:43:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: osmo-uecups-master: add more complete osmo-uecups-daemon.cfg

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26983 ) Change subject: osmo-uecups-master: add more complete osmo-uecups-daemon.cfg ...................................................................... osmo-uecups-master: add more complete osmo-uecups-daemon.cfg Change-Id: I16e3f60485039efd3b965009608982c27511b680 Related: SYS#5602 --- M osmo-uecups-master/osmo-uecups-daemon.cfg 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/osmo-uecups-master/osmo-uecups-daemon.cfg b/osmo-uecups-master/osmo-uecups-daemon.cfg index e69de29..9f63bb7 100644 --- a/osmo-uecups-master/osmo-uecups-daemon.cfg +++ b/osmo-uecups-master/osmo-uecups-daemon.cfg @@ -0,0 +1,15 @@ +log stderr + logging filter all 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 timestamp 1 + logging color 0 +! + logging level set-all info +line vty + bind 0.0.0.0 +uecups + local-ip 0.0.0.0 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I16e3f60485039efd3b965009608982c27511b680 Gerrit-Change-Number: 26983 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: osmo-uecups-master: add more complete osmo-uecups-daemon.cfg

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26983 ) Change subject: osmo-uecups-master: add more complete osmo-uecups-daemon.cfg ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I16e3f60485039efd3b965009608982c27511b680 Gerrit-Change-Number: 26983 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jan 2022 16:43:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: osmo-uecups-master: add more complete osmo-uecups-daemon.cfg

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26983 ) Change subject: osmo-uecups-master: add more complete osmo-uecups-daemon.cfg ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I16e3f60485039efd3b965009608982c27511b680 Gerrit-Change-Number: 26983 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jan 2022 16:43:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

2024

2023

2022

gerrit-log January 2022