Attention is currently required from: manawyrm, laforge, tnt.
Hello Jenkins Builder, manawyrm, tnt,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-e1d/+/27588
to look at the new patch set (#5).
Change subject: OCTOI: initial support for E1oIP forwarding
......................................................................
OCTOI: initial support for E1oIP forwarding
This introduces initial support for operation as OCTOI (Osmocom
Community TDMoIP) server and client operation.
Various features are still absent (user authentication, support for
re-ordered packets), but this version is already able to provide
services to clients with dynamic IP addresses as well as servers.
The bulk of the OCTOI / E1oIP code is implemented as a shared library,
to facilitate the development of other servers and clients in the
future, and also to minimize the impact on the existing osmo-e1d code
base.
More information is available at https://osmocom.org/projects/octoi/wiki
Change-Id: I05f5ff697ca8f7dccdcf89660f12089babfcc92e
---
M Makefile.am
M configure.ac
M debian/control
A debian/libosmo-octoi-dev.install
A debian/libosmo-octoi0.install
M include/Makefile.am
M include/osmocom/e1d/proto.h
A include/osmocom/octoi/e1oip_proto.h
A include/osmocom/octoi/octoi.h
A libosmo-octoi.pc.in
M src/Makefile.am
M src/ctl.c
M src/e1d.h
A src/e1oip.c
M src/intf_line.c
M src/mux_demux.c
A src/octoi/Makefile.am
A src/octoi/e1oip.c
A src/octoi/e1oip.h
A src/octoi/frame_fifo.c
A src/octoi/frame_fifo.h
A src/octoi/libosmo-octoi.map
A src/octoi/octoi.c
A src/octoi/octoi.h
A src/octoi/octoi_clnt_fsm.c
A src/octoi/octoi_clnt_vty.c
A src/octoi/octoi_fsm.c
A src/octoi/octoi_fsm.h
A src/octoi/octoi_sock.c
A src/octoi/octoi_sock.h
A src/octoi/octoi_srv_fsm.c
A src/octoi/octoi_srv_vty.c
A src/octoi/octoi_vty.h
M src/osmo-e1d.c
M src/usb.c
M src/vty.c
36 files changed, 3,427 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/88/27588/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27588
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I05f5ff697ca8f7dccdcf89660f12089babfcc92e
Gerrit-Change-Number: 27588
Gerrit-PatchSet: 5
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: tnt <tnt(a)246tNt.com>
Gerrit-MessageType: newpatchset
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27585 )
Change subject: intf_line: Ensure unique rate counter group indexes
......................................................................
intf_line: Ensure unique rate counter group indexes
When we have multiple interfaces, we cannot simply use the line->id
as rate counter group index, but should use a combination of interface
id and line id.
Change-Id: I515c1f39285489845f88c3403ebf16835571e154
---
M src/intf_line.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/intf_line.c b/src/intf_line.c
index 9146368..bd7a393 100644
--- a/src/intf_line.c
+++ b/src/intf_line.c
@@ -247,7 +247,7 @@
} else
line->id = line_id;
- line->ctrs = rate_ctr_group_alloc(line, &line_ctrg_desc, line->id);
+ line->ctrs = rate_ctr_group_alloc(line, &line_ctrg_desc, intf->id << 8 | line->id);
OSMO_ASSERT(line->ctrs);
osmo_timer_setup(&line->ts0.timer, _ts0_tmr_cb, 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/+/27585
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I515c1f39285489845f88c3403ebf16835571e154
Gerrit-Change-Number: 27585
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
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
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
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
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