Commit Graph

184 Commits

Author SHA1 Message Date
Harald Welte b22bcd2059 Fix stats exporter
We called osmo_stats_vty_add_cmds() but we didn't call
osmo_stats_init(), resulting in the user being able to configure stats
reporting, but osmo-e1d would simply never generate the related UDP
packets :(

With this commit, osmo-e1d starts to generate the related packets.

Change-Id: Ic373d3056d044af797664215b08ba0880675ae53
2022-04-18 19:31:36 +02:00
Harald Welte 6d51f79931 Set rate_ctr_group name for each line
"Counters for each line in e1d 256" is not very useful unless you
know that it's "(intf_nr << 8) | line_nr" and 256 == I1/L0.

Let's set the name string explicitly.

Change-Id: I200e068f1bbc495fb806402877551924beea214e
2022-04-17 12:57:29 +02:00
Harald Welte 973ce5c507 Make use of libosmcoore cpu_sched_vty
osmo-e1d automatically uses SCHED_RR already, but for consistency it
actually makes sense to add this, so people can configure the scheduler
priority and/or the cpu affinity this way.

The existing call to SCHED_RR is left in place for backwards
compatibility.  The new VTY commands can just override that, if needed.

Change-Id: I1b8021e6dc864af6e301fced427e24c8bb21ca2f
2022-04-17 12:57:24 +02:00
Harald Welte 1ed219a191 octo: give rate_ctr / stat_items meaningful identifiers
We don't want useless identifiers like 'E1oIP line 5518' but something
that we can understand, like the user account name, or in absence
of that, at least the IP/port.

Change-Id: Ibd98b9606a1d9d5b76d63be83eb3df9e431ab3ad
2022-04-17 12:16:56 +02:00
Harald Welte db59c3f4b9 OCTOI: re-implement LINE_STAT_E1oIP_E1T_FIFO
There use to be a stat_item for the depth of the E1-terminated FIFO, as
in a FIFO this is very easy to determine.  When we switched to RIFO, it
was lost.  Let's re-introduce it with the approximate depth of the RIFO.

Change-Id: I960cbf196ae930b1b72745b8bfe9c2a21fd53325
2022-04-17 11:37:29 +02:00
Sylvain Munaut 2c0af2fa98 RIFO: Add a test for bounds checking
This tests exactly one frame before and one frame after what
should be accepted to make sure those are rejected

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: I048e1b8c2b918f7ca4b4327b89bf04430a2838bc
2022-04-14 20:17:14 +00:00
Sylvain Munaut 712d234ca4 RIFO: Fix issue in frame number bounds checking
You can't have a 'min' and 'max' FN because of the wrap
around this needs to be checked "all at once".

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: Ie9024f84f79b458248786bca2343a1f8bffb9994
2022-04-14 20:16:32 +00:00
Sylvain Munaut d74c51cda2 RIFO: Fix operator precedence issue in the math for bucket_for_fn
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: Iff91cfe93e8c7b53998b1b4dd73684292c105cc8
2022-04-14 20:15:12 +00:00
Sylvain Munaut 1cc564d81a RIFO: Minor typo/comment fixes
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: I9b6181f9136b7963681c472b017d005022d27e6e
2022-04-14 20:13:59 +00:00
Harald Welte 97b15ae397 vty: Print only applicable information during 'show line'
If the line is in channelized mode, only print per-TS information.
If the line is in superchannel mode, only print SC information.

This avoids printing information that is not applicable to the line
mode.

Change-Id: I7b55ae8a5e1d352f90e14342d7f7e82e4848118a
2022-04-10 17:35:15 +02:00
Harald Welte 9f3498681a fix segfault on 'show octoi-server' if no server configured
Change-Id: I23697f858337948555456b71539b9afe8c3730b9
2022-04-10 17:35:13 +02:00
Manawyrm c72f38feac RIFO: add more thorough tests and a vetted test.ok file
This commit adds 2 new tests:
 - too old frames (which should get dropped)
 - already correct frames (which shouldn't be touched)

In addition, every test will now be run twice.
Once at frame number 0 and once very close to the wrap-around of
the internal frame counter in order to observe the behaviour.

Change-Id: I930b4361924b2e8bcb566eb7ee64f36e06bc7745
2022-04-09 13:21:52 +02:00
Manawyrm 480d989d62 RIFO: fix frame_rifo_in check on frame number wrap-around
frame_rifo_in would previously return -ERANGE when a frame was written
which was at the edge of the wrap-around of the frame number (because
the maximum value was already across the boundary)

Also: fixed some typos
Change-Id: I88abfc77543d5c64b01f40944b2914e03e57d08f
2022-04-09 13:21:52 +02:00
Harald Welte 38b1c5d3f0 RIFO (random in, first out) for IP->E1 direction
In the past, we used a FIFO structure (first in, first out) - which
obviously cannot deal with packet re-ordering on the IP side.

This patch introduces a new "RIFO" as a replacement for the FIFO.

The RIFO is able to reconstruct E1 frame ordering by using the
reduced frame number from the TDMoIP messages, at least as long
as the related frame number range is within the current RIFO depth.

Change-Id: I22256870114cb85e4e10932554478be7061e086b
2022-04-09 13:21:49 +02:00
Harald Welte 322fbc4901 add example config files for octoi-server and octoi-client
Change-Id: Ia427eb62bbfecea12c31584996a57cb82aa097a0
2022-04-05 22:00:36 +02:00
Harald Welte e324507676 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
2022-03-28 12:26:09 +02:00
Harald Welte 8ec461ebe8 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
2022-03-28 12:13:08 +02:00
Harald Welte 16403fce90 mux_demux.c: Use %zu for size_t
This avoids compiler warnings on 32bit ARM builds

Change-Id: Ice43fb7c4514d364a3ae305847f28197a4f6cb2d
2022-03-28 12:13:08 +02:00
Harald Welte 0e194d4cd7 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
2022-03-28 12:13:08 +02:00
Harald Welte 620d7d3586 cosmetic: curly braces around multi-line blocks
This reflects our general coding style.

Change-Id: Ibf8ebe4c9fdde2bd66ce6239c8eca833e71fc815
2022-03-28 12:13:08 +02:00
Harald Welte 2819d3fb79 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
2022-03-28 12:13:08 +02:00
Harald Welte 591249a3c2 cosmetic: Remove extra empty newlines from end of intf_line.c
Change-Id: Ie1e193c3d851871c9c96394eb19f5b99c09913f9
2022-03-28 12:13:08 +02:00
Harald Welte 42c443f42d e1d.h: add #pragma once
all other header files already have it in place.

Change-Id: Ia7a7856563c2c9d422b73fdc431e0ea4d456f9aa
2022-03-28 12:13:08 +02:00
Harald Welte f18dcc706f 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
2022-03-27 17:14:49 +02:00
Harald Welte 8e3924db25 Proper libusb error reporting in all error paths
... using libusb_strerror().

Change-Id: Id205f1cf1bbccd83b789f8ab31fe1d5d4e1fb8a9
2022-02-07 18:38:08 +01:00
Harald Welte 7bc8404f63 GPS-DO support for icE1usb hardware
This adds support for monitoring the GPS-DO that is built-in to the
icE1usb device.  It assumes a very recent firmware with GPS-DO control
moved to a separate USB interface, i.e. after osmo-e1-hardware.git
Change-Id Icd6555a14896c38626fb147b78af44ff719f2254 is merged.

Change-Id: If5e2a6b2dae0290ce3186009e68f618049ebf5ff
2022-02-07 18:38:08 +01:00
Harald Welte f5362e9217 Allow configuration of interfaces/lines via VTY
So far, osmo-e1d automatically opened all compatible icE1usb devices
and all E1 lines on those interfaces.  Let's allow for 'interface' and
'line' configuration in the VTY.  USB devices can be identified by
their serial number string.

If a given device (== E1 interface)  has a VTY configuration, then only
those E1 lines with VTY configuration opened.

For each Line (icE1usb or vpair), the mode (channelized/superchannel)
can also be set via VTY.

Change-Id: I89b57b688b68901f87d9683ab9294772ee747d77
Closes: OS#5400
2022-02-01 17:17:31 +00:00
Harald Welte ef69fd1a63 e1_{intf,line}_new: Allow caller to specify the numeric identifier
This will be used by the upcoming VTY interface changes.

Change-Id: I9ff80831a3e3e3cb6dae178f8b438a9f3f4747df
2022-01-31 19:51:14 +01:00
Harald Welte 9d6dab8992 update copyright statement
Change-Id: I1b4817207369e572a2b070443475289cc527c317
2022-01-31 14:49:31 +00:00
Harald Welte 3fd3df13b5 make rate_counters work
if we don't call rate_ctr_init(), the rate counter internal timer will
not tick,a nd we will never get the per-s/per-m/per-h averages.

Change-Id: Ib5b66c72079330ac161756bcf562d27536d7ce44
2022-01-31 14:49:26 +00:00
Oliver Smith e53eed98ea checkpatch.conf: new file
Related: OS#5399
Change-Id: I4bd109009cbe16f313e19ab78bd5fbcb13b0f656
2022-01-18 09:44:03 +01:00
Harald Welte c6246b654b usb: Use libusb_status_str when logging INT EP error
Change-Id: I3a3cd88ba35796740dbd399eb618617941dae54a
2022-01-10 11:00:06 +01:00
Harald Welte a3ff181a82 usb: Print failed USB isochronous packets
Change-Id: Ib6fcf46be40d47817632ccae4e742d6cf7340cda
2022-01-10 11:00:03 +01:00
Harald Welte 3fff68cbf8 cosmetic: Adhere osmocom coding style in for-loops
We either have to bring osmo-e1d in line with other osmocom projects,
or we'd have to disable the linter in jenkins.

Change-Id: I74ab20b22118d471dcdb60d1b9681ab62eb13d51
2022-01-09 23:39:42 +01:00
Sylvain Munaut 7cc8a7b806 contrib/e1-prbs-test: Delay the TX pipe fill data until first RX
There is non negligible time between the moment init_timeslot is
called and the moment when we get the first RX (which is when
we start sending out data at the same rate we RX it). And those
1024 byte were borderline not enough to not underflow.

By delaying the 1024 byte pre-fill until we get the first RX,
we ensure the time that pre-fill covers is more consistant and
less dependend on whatever the app/scheduling does during the
init phase.

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: Ic1c93fd138073a75830dc16bb41c4541e68eef90
2022-01-09 15:09:11 +01:00
Sylvain Munaut 3729f8f90e mux_demux: In RAW mode, fill with dummy until first TX
Until the remote side sends the first byte, we send fill
data since it can take it some time after the mode change
and the file descriptor is open for data to show up.

Previously due to a bug, the warning about short read was
not printed, but now that it's fixed, you get a bunch of
fairly "useless" warning at the beginning of the timeslot.

This fixes that since reported data by _e1_tx_raw is "faked"
until the pipe is active. (Fill data is actually added upstream)

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: Iaa6268e9b4a7bce5ea3027a29c48c147499373be
2022-01-09 15:09:11 +01:00
Sylvain Munaut e945a897f7 mux_demux: Shuffle functions around for consistency
No functional changes, just making things a bit more organized
for the next patch adding an _e1_tx_raw.

The order after the patch is :

_e1_tx_hdlcfs
_e1_ts_read
_e1_line_mux_out_channelized
_e1_line_mux_out_superchan
e1_line_mux_out

_e1_rx_raw
_e1_rx_hdlcfs
_e1_ts_write
_e1_line_demux_in_channelized
_e1_line_demux_in_superchan
_e1_line_demux_in_ts0
e1_line_demux_in

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: I2ced3a5ba3cf3cc1f212d8f3e46cfefa15e4af0c
2022-01-09 15:09:11 +01:00
Sylvain Munaut 0d2a42bc12 usb: Add warning for error during interrupt transfers
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: Id4d2c95a2d934700f817e971aa4ce29e4bd85675
2022-01-09 11:43:03 +01:00
Sylvain Munaut 73d7184088 Fix a bunch of warning raised by the new build warning options
A lot of them are related to signedness or type range limitation.
A lot are not actual issues and work find in practice, but a few
lead to actual bad behavior.

This makes all the conversion explicit to mark intent.

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: I992b9bc51659e85966651b1146091501b8f149f5
2022-01-09 11:43:01 +01:00
Sylvain Munaut 35a9cf0b99 build: Increase warnings
Go with -Wextra but removing some of the obnoxious options it brings with
it.

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: Iaafd35ba39e272d5900b31b14d2651e0ecb8a84a
2022-01-09 11:42:41 +01:00
Sylvain Munaut 3bea0bcedc e1d/usb: Use wMaxPacketSize to know maximum number of frames to send
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: I9595cba39377e45303d41a06753861bf72d5a93a
2022-01-06 16:10:28 +01:00
Sylvain Munaut 4b1226f5ac e1d/usb: Limit feedback EP transfer size to 3
Newer descriptors have the max packet size set to 3 to save on
isochronous bandwidth.

By specs, the feed back endpoints transfer are 24 bits anyway,
so no point is using anything larger.

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: I09e259db539e62571fd17fc16ffaa317564ba257
2022-01-06 16:10:26 +01:00
Harald Welte d1d6d93f2e Add support for icE1usb RAI interrupt error flag
In osmo-e1-hardware.git Change-Id Ic4f57cf79bd32cf75f81ef3073cb8d4a2d1857d8
we added support for passing RAI (remote alarm indication) as a flag via
the USB interrupt messages; let's add support for this here.

osmo-e1d already internally parses TS0 to determine the same
information, and we have to keep this for backwards-compatibility with
older firmware builds.  But maybe at some future point we can remove
our own TS0 scanning code here and rely on the USB device to inform
us about remote alarms.

Change-Id: Ie1994968e792c37f9272b9854547db95a41cab5b
2022-01-02 13:04:09 +01:00
Harald Welte fb1293ccea Use the error counters for remote alarm + remote CRC error
Some time ago we added various error counters, but for two of them
we missed to actually ever increment them at all.

Change-Id: Ieb83a2e2e83e334c543bee83726f04f83b19227a
2022-01-02 13:02:37 +01:00
Harald Welte d7aae90890 Bump version: 0.2.2 → 0.3.0
Tag a new version due to the 'EOF detection' and
'HDLC overflow' fixes committed sicne 0.2.2.

Change-Id: Icedc836a345f22ab7b1ccd274d57867a7018c08e
2022-01-01 15:42:20 +01:00
Harald Welte 890e153170 update ice1usb_proto.h to current master
Copy from firmware source code repo at
https://git.osmocom.org/osmo-e1-hardware/tree/firmware/ice40-riscv/icE1usb/ice1usb_proto.h
as of d376b2e852fbf26a60ac4d6f66e54bb85f0b7204

Change-Id: I8f7b9462482421993e3516aa9d0794bb8076b65b
2021-12-31 20:35:19 +01:00
Harald Welte 8ddb22f8c6 e1d: Add watchdog timer to detect dead lines / USB devices
We just found a bug in icE1usb (likely firmware) which was hard to find
as there was zero notification from osmo-e1d that it actually never
received any data from the icE1usb hardware/firmware anymore.

Change-Id: Id22e4110b9067f50b1818eb12295b2d4eb9cdc12
2021-12-31 17:20:32 +01:00
Harald Welte d4700da1e8 e1d-ts-pipe: Don't write more HDLC bytes than e1d supports
This avoids truncation and the following error message when operating
in HDLC-FCS mode:

<0001> mux_demux.c:91 (I0:L0:T16) Truncated message: Client tried to send 320 bytes but our buffer is limited to 264

Change-Id: I836d8b98ce5b831b0498c4650263ec3b3d4f2c45
2021-12-31 16:47:15 +01:00
Harald Welte 50b121cfc4 Introduce a #define for the maximum HDLC buffer size (264)
The purpose of turning the magic number into a #define is to allow
clients to use it.

Change-Id: I9281a4cd85d79823d06860ffaaa09b6d67bc0de3
2021-12-31 16:47:12 +01:00
Harald Welte 383782396f e1d: reliably detect EOF (HDLC-FCS mode)
This patch makes e1d reliably detect EOF on client sockets while in
HDLC-FCS mode.

Change-Id: I0260360643f723f7c721ae67c47dce8df7778694
2021-12-31 16:46:06 +01:00