- gerrit-log - lists.osmocom.org

Change in osmo-e1d[master]: mux_demux.c: Use %zu for size_t
by laforge 28 Mar '22

28 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27586 ) Change subject: mux_demux.c: Use %zu for size_t ...................................................................... mux_demux.c: Use %zu for size_t This avoids compiler warnings on 32bit ARM builds Change-Id: Ice43fb7c4514d364a3ae305847f28197a4f6cb2d --- M src/mux_demux.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve diff --git a/src/mux_demux.c b/src/mux_demux.c index 6a7b326..3d72f7f 100644 --- a/src/mux_demux.c +++ b/src/mux_demux.c @@ -76,7 +76,7 @@ if (rv > 0) { if (rv > (int)sizeof(ts->hdlc.tx_buf)) { LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to " - "send %d bytes but our buffer is limited to %lu\n", + "send %d bytes but our buffer is limited to %zu\n", rv, sizeof(ts->hdlc.tx_buf)); rv = sizeof(ts->hdlc.tx_buf); } 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ice43fb7c4514d364a3ae305847f28197a4f6cb2d Gerrit-Change-Number: 27586 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 0

Change in osmo-e1d[master]: vty.c: Fix re-reading of config file after 'write file'
by laforge 28 Mar '22

28 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27587 ) Change subject: vty.c: Fix re-reading of config file after 'write file' ...................................................................... vty.c: Fix re-reading of config file after 'write file' When writing the timeslot mode, we must write it in lower-case, as the VTY parser reading the config file only supports that. Change-Id: Ic60449a0ba64117a5cf5e4a8e76484e9c955f09f --- M src/vty.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve diff --git a/src/vty.c b/src/vty.c index 9d518d4..bdd0457 100644 --- a/src/vty.c +++ b/src/vty.c @@ -126,9 +126,9 @@ } const struct value_string e1_ts_mode_names[] = { - { E1_TS_MODE_OFF, "OFF" }, - { E1_TS_MODE_RAW, "RAW" }, - { E1_TS_MODE_HDLCFCS, "HDLC-FCS" }, + { E1_TS_MODE_OFF, "off" }, + { E1_TS_MODE_RAW, "raw" }, + { E1_TS_MODE_HDLCFCS, "hdlc-fcs" }, { 0, NULL } }; 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic60449a0ba64117a5cf5e4a8e76484e9c955f09f Gerrit-Change-Number: 27587 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 0

Change in osmo-e1d[master]: cosmetic: Remove extra empty newlines from end of intf_line.c
by laforge 28 Mar '22

28 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27582 ) Change subject: cosmetic: Remove extra empty newlines from end of intf_line.c ...................................................................... cosmetic: Remove extra empty newlines from end of intf_line.c Change-Id: Ie1e193c3d851871c9c96394eb19f5b99c09913f9 --- M src/intf_line.c 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve diff --git a/src/intf_line.c b/src/intf_line.c index 3fb9c9d..0ff3942 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -275,6 +275,3 @@ talloc_free(line); } - - - 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ie1e193c3d851871c9c96394eb19f5b99c09913f9 Gerrit-Change-Number: 27582 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 0

Change in osmo-e1d[master]: intf_line.c: Make e1d_find_intf_by_usb_serial safe for empty string
by laforge 28 Mar '22

28 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27583 ) Change subject: intf_line.c: Make e1d_find_intf_by_usb_serial safe for empty string ...................................................................... intf_line.c: Make e1d_find_intf_by_usb_serial safe for empty string Avoid segfault in case the empty string is passed as serial_str. Change-Id: Ia69912cb714441415d8decd68890d1b97b77132d --- M src/intf_line.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve diff --git a/src/intf_line.c b/src/intf_line.c index 0ff3942..c9011a8 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -100,6 +100,9 @@ { struct e1_intf *intf; + if (!serial_str) + return NULL; + llist_for_each_entry(intf, &e1d->interfaces, list) if (intf->usb.serial_str && !strcmp(intf->usb.serial_str, serial_str)) return intf; 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ia69912cb714441415d8decd68890d1b97b77132d Gerrit-Change-Number: 27583 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 0

Change in osmo-e1d[master]: cosmetic: curly braces around multi-line blocks
by laforge 28 Mar '22

28 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27584 ) Change subject: cosmetic: curly braces around multi-line blocks ...................................................................... cosmetic: curly braces around multi-line blocks This reflects our general coding style. Change-Id: Ibf8ebe4c9fdde2bd66ce6239c8eca833e71fc815 --- M src/intf_line.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve diff --git a/src/intf_line.c b/src/intf_line.c index c9011a8..9146368 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -103,9 +103,10 @@ if (!serial_str) return NULL; - llist_for_each_entry(intf, &e1d->interfaces, list) + llist_for_each_entry(intf, &e1d->interfaces, list) { if (intf->usb.serial_str && !strcmp(intf->usb.serial_str, serial_str)) return intf; + } return NULL; } @@ -115,9 +116,10 @@ { struct e1_line *line; - llist_for_each_entry(line, &intf->lines, list) + llist_for_each_entry(line, &intf->lines, list) { if (line->id == id) return line; + } return NULL; } 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ibf8ebe4c9fdde2bd66ce6239c8eca833e71fc815 Gerrit-Change-Number: 27584 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 0

Change in osmo-e1d[master]: e1d.h: add #pragma once
by laforge 28 Mar '22

28 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27581 ) Change subject: e1d.h: add #pragma once ...................................................................... e1d.h: add #pragma once all other header files already have it in place. Change-Id: Ia7a7856563c2c9d422b73fdc431e0ea4d456f9aa --- M src/e1d.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve diff --git a/src/e1d.h b/src/e1d.h index 5d24c5a..dbcc047 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -21,6 +21,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#pragma once #include <stdint.h> 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ia7a7856563c2c9d422b73fdc431e0ea4d456f9aa Gerrit-Change-Number: 27581 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 0

Change in libosmocore[master]: libosmovty: Link libosmovty against libpthread
by laforge 28 Mar '22

28 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27580 ) Change subject: libosmovty: Link libosmovty against libpthread ...................................................................... libosmovty: Link libosmovty against libpthread Ever since Change-Id If76a4bd2cc7b3c7adf5d84790a944d78be70e10a in 2020 (part of libosmocore >= 1.4.0) we have introduced cpu_sched_vty.c, which directly uses libpthread. As a result, libosmovty should be using pthread compiler flags and link against libpthread. This missing dependency is causing osmocom applications to fail to link on OpenWRT (at leats for ath79-generic). Change-Id: I7febbf88cbe61eacd05f46a9316e773b5c148e77 Related: SYS#4986 --- M src/vty/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index c73dbb2..37faad6 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -4,7 +4,7 @@ LIBVERSION=10:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -AM_CFLAGS = -Wall $(TALLOC_CFLAGS) +AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) if ENABLE_VTY lib_LTLIBRARIES = libosmovty.la @@ -14,5 +14,5 @@ fsm_vty.c talloc_ctx_vty.c \ cpu_sched_vty.c tdef_vty.c libosmovty_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -libosmovty_la_LIBADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS) +libosmovty_la_LIBADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS) endif -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7febbf88cbe61eacd05f46a9316e773b5c148e77 Gerrit-Change-Number: 27580 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-e1d[master]: usb: rename 'size' to 'len' in callback functions
by laforge 28 Mar '22

28 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27577 ) Change subject: usb: rename 'size' to 'len' in callback functions ...................................................................... usb: rename 'size' to 'len' in callback functions What we are passing is not the [underlying] size of the buffer, but the length of the valid data in them. Change-Id: I8ce91527351a56c103bd077c9565be2a81d175ac --- M src/usb.c 1 file changed, 11 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/usb.c b/src/usb.c index 747b9c5..40518d8 100644 --- a/src/usb.c +++ b/src/usb.c @@ -104,7 +104,7 @@ struct libusb_transfer *xfr; }; -typedef int (*xfer_cb_t)(struct e1_usb_flow *flow, uint8_t *buf, int size); +typedef int (*xfer_cb_t)(struct e1_usb_flow *flow, uint8_t *buf, int len); struct e1_usb_flow { struct e1_line *line; @@ -124,22 +124,22 @@ // --------------------------------------------------------------------------- static int -e1_usb_xfer_in(struct e1_usb_flow *flow, uint8_t *buf, int size) +e1_usb_xfer_in(struct e1_usb_flow *flow, uint8_t *buf, int len) { - if (size == 0) + if (len == 0) return 0; - return e1_line_demux_in(flow->line, buf + 4, size - 4, buf[3] & 0xf); + return e1_line_demux_in(flow->line, buf + 4, len - 4, buf[3] & 0xf); } static int -e1_usb_xfer_out(struct e1_usb_flow *flow, uint8_t *buf, int size) +e1_usb_xfer_out(struct e1_usb_flow *flow, uint8_t *buf, int len) { struct e1_line *line = flow->line; struct e1_usb_line_data *ld = (struct e1_usb_line_data *) line->drv_data; int fm, fts; - if (size <= 0) { - LOGPLI(line, DXFR, LOGL_ERROR, "OUT ERROR: %d\n", size); + if (len <= 0) { + LOGPLI(line, DXFR, LOGL_ERROR, "OUT ERROR: %d\n", len); return -1; } @@ -161,15 +161,15 @@ } static int -e1_usb_xfer_fb(struct e1_usb_flow *flow, uint8_t *buf, int size) +e1_usb_xfer_fb(struct e1_usb_flow *flow, uint8_t *buf, int len) { struct e1_usb_line_data *ld = (struct e1_usb_line_data *) flow->line->drv_data; - if (size < 0) { + if (len < 0) { LOGPLI(flow->line, DE1D, LOGL_ERROR, "Feedback transfer error\n"); return 0; - } else if (size != 3) { - LOGPLI(flow->line, DE1D, LOGL_ERROR, "Feedback packet invalid size (%d)\n", size); + } else if (len != 3) { + LOGPLI(flow->line, DE1D, LOGL_ERROR, "Feedback packet invalid len (%d)\n", len); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I8ce91527351a56c103bd077c9565be2a81d175ac Gerrit-Change-Number: 27577 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 0

Change in meta-telephony[laforge/nightly]: libosmocore: depend on lksctp-tools
by laforge 28 Mar '22

28 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/27589 ) Change subject: libosmocore: depend on lksctp-tools ...................................................................... libosmocore: depend on lksctp-tools Make lksctp-tools a dependency of libosmocore, as it is required since libosmocore I2ab1fe8e4bbfc120b471d6c9f2312a89dbc7d42b. Fix for: | checking for LIBOSMOCORE... no | configure: error: Package requirements (libosmocore >= 1.5.0) were not met: | | Package 'libsctp', required by 'libosmocore', not found Fixes: SYS#5907 Change-Id: Ife02efc7efc8f55745ea868fd9e3919bc779da28 --- M recipes-osmocom/libosmocore/libosmocore.inc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index ed1caa0..ce44f34 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "libtalloc" +DEPENDS = "libtalloc lksctp-tools" PACKAGECONFIG ??= "\ gnutls \ -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/27589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: Ife02efc7efc8f55745ea868fd9e3919bc779da28 Gerrit-Change-Number: 27589 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in meta-telephony[laforge/nightly]: libosmocore: depend on lksctp-tools
by laforge 28 Mar '22

28 Mar '22

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/27589 ) Change subject: libosmocore: depend on lksctp-tools ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/27589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: Ife02efc7efc8f55745ea868fd9e3919bc779da28 Gerrit-Change-Number: 27589 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Mar 2022 10:12:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log