Commit Graph

705 Commits

Author SHA1 Message Date
Daniel Willmann 6aa4b6961c ipa-stream-server: Return -EBADF in read_cb after osmo_stream_srv_destroy()
This fixes a potential heap-use-after-free error.
When there is still data to be written the osmo_stream_srv_cb() will
call osmo_stream_srv_write() which will try to dereference conn even
though it has already been freed.

Change-Id: I5ac1920b8d4ce3b0205f00d253e7ed878fb745e3
2023-05-31 12:11:15 +02:00
Daniel Willmann 68dc5218ca stream: (typo) Change callback param name of struct osmo_stream_cli from srv to cli
Change-Id: I742db401165477f85e66bb428f156ecbbd5d6665
2023-05-17 17:38:21 +02:00
Daniel Willmann 9117ed32da stream: Introduce and use osmo_stream_cli_fd() to get the fd
This will become useful once osmo_io can be used as a backend.

Change-Id: I7e964dea0adee8edbb9b75d2d17e7d0c5d8917d5
2023-05-17 17:38:21 +02:00
Oliver Smith ee17c3890a debian: set compat level to 10
Related: OS#5958
Change-Id: Icfdbea7cbe4681cd3b286471032fd6dd7226888f
2023-04-25 16:48:18 +02:00
Vadim Yanitskiy 9e6542641a src/Makefile.am: do not overwrite AM_LDFLAGS
Change-Id: I7b656c167cceb0657c0362b1237f846b7f3e9770
2023-03-13 04:46:02 +07:00
Vadim Yanitskiy 761f42b31e tests/Makefile.am: clean up AM_* variables
* -I is a preprocessor flag, so it should be in AM_CPPFLAGS
* $(LIBOSMOCORE_LDFLAGS) is not defined here, remove it

Change-Id: Ice892f848e06b601e67b06a4e1e25c11fb7c4128
2023-03-13 04:46:02 +07:00
Vadim Yanitskiy c8620bf275 {utils,tests}/Makefile.am: reorder libraries in LDADD
Otherwise the linker may pick system-installed libs instead.

Change-Id: Ia639b1c5460ad9391d2c311b4978ca9374789f7a
2023-03-13 04:45:51 +07:00
Oliver Smith 605fb80c08 rtp.h: add RTP_PT_CSDATA
Related: OS#4393
Change-Id: I2ea378ba4d17e977da25ef9e6e86b3de2ccd0ad7
2023-02-27 08:29:51 +00:00
Neels Hofmeyr 4a2f3e9490 fix msgb leak on OSMO_STREAM_SRV_F_FLUSH_DESTROY
In osmo_stream_srv_send(), call msgb_free() if the msgb is not enqueued.

Before this, osmo_stream_srv_send() enqueues a msgb, assuming the queue
will free it. But if OSMO_STREAM_SRV_F_FLUSH_DESTROY is set, it just
returns and drops the msgb. There is no rc, so the caller cannot know.

Change-Id: I994c5e06a9030cfbf4fca8ab42588c61f7121cee
2023-02-20 14:17:00 +00:00
Oliver Smith 1d129ae24b Run struct_endianness.py
Ensure there is no diff to prepare to run this in CI.

Related: OS#5884
Change-Id: Ib3459ebb2414dd1798dfda6d3c585232ceff741b
2023-02-20 09:49:45 +01:00
Max 50d4a66e34 Add osmo_stream_srv_link_is_opened()
We use file descriptor of -1 as an indicator for unopened link internally.
However, since all the structs of libosmo-netif are opaque, using it from external
applications looks like a leaky abstraction.

Let's remedy this by adding function which properly check this for the library user.

Related: OS#5568
Change-Id: I91aa7da5f09ec4e8e2d21c827b45ed92e6b0e3d9
2023-02-10 11:43:26 +00:00
Max 30b6d6134d osmo_stream_srv_link_close(): properly handle NULL input
Related: OS#5568
Change-Id: Ie15bb3dc99bfe18065e03fde68d517b0d389b7ad
2023-02-10 11:43:20 +00:00
Pau Espin e63329eb1f Bump version: 1.2.0.114-3804-dirty → 1.3.0
Change-Id: Id67541378193f22f924409f02301f0063aab639e
2023-02-07 13:28:19 +01:00
Pau Espin 38047fd20a osmo-amr-inspect: Improve robustness reading from stdin
Fixes printing hexbuf which might not have been null-terminated.

Related: SYS#6161
Fixes: Coverity CID#302068
Change-Id: I460f1deb7455b3b6a85a090bdcad8e21a883db68
2023-01-03 11:41:17 +01:00
Pau Espin a1c9fbfabc Introduce utils/osmo-amr-inspect program
This program allows inspecting a list of AMR PDUs in hexstring format
present in a text file.
This allows easily finding out the properties of the PDU as well as
finding potential errors on the data.
It also allows forcing decode in different formats (octet-aligned,
bandwidth-efficient) in order to detect which may be the correct one.

Related: SYS#6161
Change-Id: Iffa6cc2e5391b77e3097d4c3b8d3f5211427dbe2
2022-12-22 13:56:26 +01:00
Pau Espin c0691ad3fd amr: osmo_amr_bwe_to_oa(): validate input data is long enough
Change-Id: I2d11ce71c29ae046c2feab1e59045d97dc3e5099
2022-12-21 21:35:06 +01:00
Pau Espin 16d9d5dba8 amr: use OSMO_BYTES_FOR_BITS()
Change-Id: Ib92856ede3f493615c24d883954989e952c51157
2022-12-21 21:33:48 +01:00
Pau Espin 99e5470ece amr: Clarify size of AMR BWE header and ToC
Change-Id: I34c76b18ee45e12dba92864715e8ef91e6de3b01
2022-12-21 21:32:25 +01:00
Pau Espin 550aaa28dc amr: use struct bwe_hdr in osmo_amr_bwe_to_oa()
The header conversion is now much clearer. Take the chance to delay the
memset(buf) after the checks.

Change-Id: I5042dc628ac70eca62b4980f4acae991dd976528
2022-12-21 18:37:45 +01:00
Pau Espin 26a02deb12 amr: constify input buffer in osmo_amr_is_oa()
Change-Id: I72ef6fc700f628ea158ea888a5f1e9dc8776ab7e
2022-12-21 18:37:45 +01:00
Pau Espin 17b1142959 amr: Add missing header stdbool.h
Change-Id: I84e447960c4912147d2f3a6170393370d354625b
2022-12-21 18:37:45 +01:00
Pau Espin 8ede0098b8 amr.h: Fix AMR_FT_{GSM,TDMA,PDC}_EFR_SID_LEN
Fixes: 678c7fc8fe
Change-Id: I63c8082bec12bf81760330d1fc0b13de23ac6a24
2022-12-21 18:37:45 +01:00
Pau Espin 1c076ec867 stream: Fix tx data dropped upon show socket write
On some  stream socket types like TCP it is expected that the send()
syscall may return a short write, ie not all bytes being copied to the
socket. In that case we need to keep the bytes not copied and attempt to
submit them later.

Related: OS#5836
Change-Id: I3755aada02ceb186fb990604e3496126fe47e1fb
2022-12-20 15:40:52 +01:00
Pau Espin 5df412519b stream: Avoid useless polling if tx_queue becomes empty
Before this patch, the WRITE poll flag was being left ON and waited to
be polled again by the kernel in order to disable it.
Let's spate that extra polling cycle which only creates more polling
triggers, context switches, etc.

Change-Id: I1dd2145249a7322ad95e49be588fd472f00734e1
2022-12-20 15:23:00 +01:00
Pau Espin be6a895ede stream: Log error on short send
This is clearly a problem on TCP streams which needs to be addressed in
the future.

Related: OS#5836
Change-Id: I9bd257b80a378b779df84e204673f8e394eca5b6
2022-12-20 15:22:44 +01:00
Pau Espin c02ee5e8d9 stream: osmo_stream_*_write: Unifiy way to get data and length
Change-Id: I5b5d6f7a5a1722bd01c13d32557c21d8a0889966
2022-12-20 15:12:48 +01:00
Pau Espin 8792432351 stream: Log read/write flags
Change-Id: I57b064fa0498be76579ae9597ab9217d659aae41
2022-12-20 14:52:36 +01:00
Pau Espin a6f4ff0806 osmux: Allow forwarding AMR NO_DATA frames
Related: SYS#6161
Change-Id: If8baebc532090ba9808af7f3dd0afec86f40a7d6
2022-12-19 19:44:20 +01:00
Pau Espin 678c7fc8fe amr: Support all SID and NO_DATA amr formats
Related: SYS#6161
Change-Id: I0e766b3231f03ea87d89fad6ecdce3bd14769054
2022-12-19 19:44:16 +01:00
Pau Espin c2228b7674 tests/amr: Add test case for unused FT=14
FT=15 will be accepted in follow-up patch, so keep a tests checking the
invalid FT code path.

Change-Id: I5872921f5d4a909261e770ddecf048329200724b
2022-12-19 17:38:40 +01:00
Pau Espin 8997fe8251 amr: Add struct definition for AMR BWE header
Change-Id: I4b44257605bc5967d862ee29076ea6260d9a6bd8
2022-12-19 17:38:35 +01:00
Pau Espin 09e62cc563 amr: osmo_amr_bwe_to_oa() define variable as unsigned
There's no need to have the variable as signed anymore since the loop
was modified in the previous patch. osmo_amr_bytes() returns a size_t
(unsigned).

Change-Id: I8aa6b5f6d3334e152a62b7c28aac3f881f027894
2022-12-19 14:52:44 +01:00
Pau Espin a7af7ecf0b amr: osmo_amr_bwe_to_oa(): Modify loop to allow osmo_amr_bytes()=0 (NO_DATA)
oa_payload_len can be 2 if osmo_amr_bytes() returns 0 (it will return 0
when FT NO_DATA is supported). In tha case, the loop condition
(oa_payload_len - 3) (signed) is compared against unsigned i which ends
up accessing i=256.

Change-Id: I1e513f493d7883a03acbfa3d9744ec63657810b3
2022-12-19 14:52:44 +01:00
Pau Espin c7f7090abd amr.h: Fix missing include dependencies
Needed for size_t uint8_t, etc.

Change-Id: Ia808c2b6c426de79db5c88784dd7bce6096179aa
2022-12-19 14:52:44 +01:00
Pau Espin 9336eacff9 osmux_output: Refactor init code to avoid calling deprecated APIs internally
Current internal use of APIs marked as deprecated seems to be causing
issues when building on debian unstable.

Simply rearrange the init code to an internal helper function to avoid
code duplication while still keeping the old deprecated APIs working as
they used to, without getting deprecation warnings at buildtime.

Related: OS#5677
Change-Id: Ie8e168740c0421edd96013620256aab0306dc6c5
2022-11-24 12:49:48 +01:00
Max a6db89089e Add assert for link check to osmo_stream_srv_create()
We implicitly rely on conn->srv availability in several functions.
Let's ensure it's available in function creating conn.

Change-Id: If494eac5dcce6c5ae30e928b92e57067d5681a42
2022-11-22 09:38:06 +00:00
Pau Espin 3d13c2bb42 osmux: Refactor osmux_xfrm_output_pull() to simplify code flow
Change-Id: I0da1d7875bd32f6c1022676b64f9f0d14bad3144
2022-11-21 10:56:52 +01:00
Pau Espin 81201880b8 osmux: Check received osmuxh->amr_ft is correct before using it
Fixes: Coverity CID#283432
Change-Id: Iab525c5b7eb1e455a8229fb39e96897aac53298c
2022-11-21 10:56:52 +01:00
Pau Espin f5001d4148 amr: Guard against incorrect AMR FT passed to osmo_amr_{bits,bytes}()
Fixes: Coverity CID#283433
Change-Id: Ib11d4b64c6df19a85c4374fde89e1b56f410e438
2022-11-21 10:56:52 +01:00
Pau Espin 8eeb8220e1 tests/osmux: Add extra asserts to validate osmux header is pulled correctly
Change-Id: Ie2ccc22c53c33025c477236166ea97972c21ec3e
2022-11-21 10:56:52 +01:00
Pau Espin fbce10e286 osmux: Improve logging of osmux_xfrm_input
This allows easily identifying and following state and lifecycle of
CIDs when looking at logs.

Related: SYS#6161
Change-Id: I6a3113dfaef0adbb20162985e3b7d57c46dbc016
2022-11-21 10:56:47 +01:00
Pau Espin 22b4e8159d osmux: Introduce API osmux_xfrm_input_set_name()
This will be used internally by osmux code to print more meaningful
lines.

Related: SYS#6161
Change-Id: Ibbcfdb23a6015ce45840bb64b2b560c2806f7ff6
2022-11-18 17:37:46 +01:00
Pau Espin c798429cb0 osmux: Support recreating lost RTP packets at start of the batch
Previously, if RTP jumps were detected in the incoming RTP stream and
osmux state for that circuit was to start the next batch, the hole would
not been filled during queueing time and instead the encoder would have
set the M bit in the osmuxhdr to announce a sync point.
For small holes (eg less than the batch factor) it makes sense to start
filling the batch with crafted RTP packets in order to avoid the encoder
later on setting the M bit and hence avoid the peer receiving the Osmux
frame having to start a new syncrhonization point.

Related: SYS#6161
Change-Id: I9596501adf5b7b91983618c92c7b1792ee9461a3
2022-11-18 16:46:00 +01:00
Pau Espin b8ef4a0853 osmux: Set M bit in osmuxhdr if seqnum hole found encoding RTP pkts
So far only small intra-batch seqnum jumps are filled in with forged RTP
packets when storing the incoming RTP packets.
Under some conditions, holes may still exist in the queue of RTP packets
for a stream:
* Seqnum detected when first incoming RTP in batch is queued (this can
  be improved in the future).
* Big seqnum jumps > batch_factor or simply filling out of bounds for currently
  enqueued batch.

Specially the second case can come from long network dropouts, or simply
due to a bug in the RTP being feed to osmux layer (be it from local code
or peer). In that case (long jumps) we don't want to generate tons of
packets filling in several entire batches (potentially incredibly big
amount of batches).
Instead, in these scenarios, simply let the osmux peer know there was a
jump by setting the M bit on the next osmux header for that circuit
after the seq jump has been detected.

Related: SYS#6161
Change-Id: I05b1eae400cb60d1f4e927f853619d5ff470163f
2022-11-16 19:54:16 +01:00
Pau Espin 8e4f8574d1 osmux: Avoid filling in seqnum holes upon rx of RTP pkt with M bit set
Change-Id: I561fb836989d31f43a15b193ed9bec4103ea0f2b
2022-11-16 19:53:31 +01:00
Pau Espin e6306faebd osmux: Use better rationale when limiting amount of lost & forged RTP incoming packets
Related: SYS#6161
Change-Id: I4ea700dbbf469498befc939a844324259bbe332a
2022-11-16 19:53:28 +01:00
Pau Espin 348229a37c osmux: Obey current batch_size restrictions when creating forged RTP packets to fill holes
osmux_link_add() is renamed to osmux_link_handle_rtp_req(), and the last
part of it is split out and kept as osmux_link_add().
hence osmux_link_handle_rtp_req() does proper input checking (like
duplicates, holes, etc.) while osmux_link_add() expects all that to be
sorted out.
Reuse osmux_link_add() in osmux_replay_lost_packets() to properly update
the link state of the to-be-transmitted packet, circuit state, etc.

Change-Id: I4ea435bfb2490a375ad3e5068ee926e48b53cf5c
2022-11-16 19:49:42 +01:00
Pau Espin 95bd0ecd82 tests/osmux: Test big seqnum holes (>batch_factor) in incoming RTP stream
This test shows that there's 2 bugs in the osmux_input code:
* It should be transmitting 2 osmux frames instead of 1
* Once it is fixed to transmitt 2 osmux frames, it should set the M bit of the 2nd
generated osmux header after the seqnum jump in order to announce a jump in the
stream to the peer receiving osmux.

The bugs are fixed in follow-up patches.

Related: SYS#6161
Change-Id: I521c2e97a739e8a824b16f06ec2a578333388247
2022-11-16 19:46:30 +01:00
Pau Espin a9c1c5d61c tests/osmux: Test incoming RTP stream with seqnum jumps during wraparound
Related: SYS#6161
Change-Id: Idd3a609452767f9c480c7c5ba9fc2a3e0a499968
2022-11-16 18:00:54 +01:00
Pau Espin ecb6de4117 tests/osmux: Test replay of one lost RTP packet when generating osmux batches
Change-Id: I913c2ccfc3ad4e7ed801344d64e33e166a0817cf
2022-11-16 18:00:08 +01:00