- gerrit-log - lists.osmocom.org

Change in libosmo-netif[master]: osmux: Fix osmux seqnum incremented globally instead of per circuit
by pespin 28 Sep '22

28 Sep '22

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/29518 to look at the new patch set (#2). Change subject: osmux: Fix osmux seqnum incremented globally instead of per circuit ...................................................................... osmux: Fix osmux seqnum incremented globally instead of per circuit There's no real use in having a global seqnum. The seqnum, as specified by the osmux protocol specification, relates to that of the RTP seq+timestamp, hence it is per circuit. Having it per circuit allows detecting gaps and lost batches on the receiver side, applying the Marker bit on the re-assembled RTP packets. As a resut of the fix, tests/osmux/osmux_test part validating Marker bit started failing. It failed because it was wrongly written to start with, since it used only one osmux_out_handle for the 4 CIDs in use, which was wrong, since each CID must have its own osmux_out_handle as state is kept there per circuit. Related: SYS#5987 Change-Id: I562de6a871d8a35475c314ca107c2a12b55d6683 --- M src/osmux.c M tests/osmux/osmux_test.c M tests/osmux/osmux_test.ok 3 files changed, 589 insertions(+), 587 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/18/29518/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I562de6a871d8a35475c314ca107c2a12b55d6683 Gerrit-Change-Number: 29518 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in libosmo-netif[master]: osmux: Print osmux_hdr rtp_m field in osmux_snprintf()
by fixeria 28 Sep '22

28 Sep '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29510 ) Change subject: osmux: Print osmux_hdr rtp_m field in osmux_snprintf() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Idfe530b944ac5dfd5ce6b5150421c2d4daee8788 Gerrit-Change-Number: 29510 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Sep 2022 17:06:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmo-netif[master]: tests/osmux_test2: Document unit tests
by fixeria 28 Sep '22

28 Sep '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29504 ) Change subject: tests/osmux_test2: Document unit tests ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I56f27af52b6a8d798879c70d68a9a3b9e512867d Gerrit-Change-Number: 29504 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Sep 2022 17:06:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmo-netif[master]: tests: rename test osmux_test2 -> osmux_output_test
by fixeria 28 Sep '22

28 Sep '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29506 ) Change subject: tests: rename test osmux_test2 -> osmux_output_test ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e6eda1e2e676673771bc6a7c3682d07ac1d344e Gerrit-Change-Number: 29506 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Sep 2022 17:06:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmocore[master]: include: use '#pragma once' everywhere
by pespin 28 Sep '22

28 Sep '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29509 ) Change subject: include: use '#pragma once' everywhere ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iecc1754caae401aca28444d3e3d0cca04b398f26 Gerrit-Change-Number: 29509 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 28 Sep 2022 17:06:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmo-netif[master]: osmux: Fix osmux seqnum incremented globally instead of per circuit
by Jenkins Builder 28 Sep '22

28 Sep '22

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29518 ) Change subject: osmux: Fix osmux seqnum incremented globally instead of per circuit ...................................................................... Patch Set 1: (1 comment) File tests/osmux/osmux_test.c: Robot Comment from checkpatch (run ID jenkins-gerrit-libosmo-netif-lint-93): https://gerrit.osmocom.org/c/libosmo-netif/+/29518/comment/02568156_4cc8d8db PS1, Line 135: static void osmux_test_marker(int num_ccid) { open brace '{' following function definitions go on the next line -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I562de6a871d8a35475c314ca107c2a12b55d6683 Gerrit-Change-Number: 29518 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 28 Sep 2022 17:05:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in libosmo-netif[master]: osmux: Fix AMR F,Q,CMR fields not properly encoded in osmux header
by Jenkins Builder 28 Sep '22

28 Sep '22

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29514 ) Change subject: osmux: Fix AMR F,Q,CMR fields not properly encoded in osmux header ...................................................................... Patch Set 1: (2 comments) File src/osmux.c: Robot Comment from checkpatch (run ID jenkins-gerrit-libosmo-netif-lint-90): https://gerrit.osmocom.org/c/libosmo-netif/+/29514/comment/cecd1dcc_125a1cc6 PS1, Line 392: batch->osmuxh->amr_q= state->amrh->q; spaces required around that '=' (ctx:VxW) File tests/osmux/osmux_input_test.c: Robot Comment from checkpatch (run ID jenkins-gerrit-libosmo-netif-lint-90): https://gerrit.osmocom.org/c/libosmo-netif/+/29514/comment/6114d874_78f7c830 PS1, Line 289: printf("===%s===\n", __FUNCTION__); __func__ should be used instead of gcc specific __FUNCTION__ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I06f3d07a05181d938c22bbd0da7172b5dad6659a Gerrit-Change-Number: 29514 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 28 Sep 2022 17:05:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in libosmo-netif[master]: tests/osmux: Add new osmux_input_test to validate AMR FT changes
by Jenkins Builder 28 Sep '22

28 Sep '22

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29513 ) Change subject: tests/osmux: Add new osmux_input_test to validate AMR FT changes ...................................................................... Patch Set 1: (2 comments) File tests/osmux/osmux_input_test.c: Robot Comment from checkpatch (run ID jenkins-gerrit-libosmo-netif-lint-88): https://gerrit.osmocom.org/c/libosmo-netif/+/29513/comment/38ce7bdc_25d51360 PS1, Line 117: } while(0) space required before the open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-libosmo-netif-lint-88): https://gerrit.osmocom.org/c/libosmo-netif/+/29513/comment/ae1f9c12_b94f33d1 PS1, Line 197: printf("===%s===\n", __FUNCTION__); __func__ should be used instead of gcc specific __FUNCTION__ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I105466fc8a4d92341f34886ee81ef0ca04014514 Gerrit-Change-Number: 29513 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 28 Sep 2022 17:05:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in libosmo-netif[master]: tests/osmux: Properly flush and free out_handle in osmux_test
by pespin 28 Sep '22

28 Sep '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29519 ) Change subject: tests/osmux: Properly flush and free out_handle in osmux_test ...................................................................... tests/osmux: Properly flush and free out_handle in osmux_test Change-Id: Ia86e4324e21ccc4bd4b138fa5b2b748df23b0aed --- M tests/osmux/osmux_test.c M tests/osmux/osmux_test.ok 2 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/19/29519/1 diff --git a/tests/osmux/osmux_test.c b/tests/osmux/osmux_test.c index bd38e66..2e1aee0 100644 --- a/tests/osmux/osmux_test.c +++ b/tests/osmux/osmux_test.c @@ -319,6 +319,15 @@ osmux_xfrm_input_fini(&h_input); + for (i = 0; i < 4; i++) { + clock_debug("Flushing CID %u\n", i); + osmux_xfrm_output_flush(h_output[i]); + } + + for (i = 0; i < 4; i++) { + TALLOC_FREE(h_output[i]); + } + clock_debug("OK: Test passed\n"); return EXIT_SUCCESS; } diff --git a/tests/osmux/osmux_test.ok b/tests/osmux/osmux_test.ok index 81f1928..3a5f321 100644 --- a/tests/osmux/osmux_test.ok +++ b/tests/osmux/osmux_test.ok @@ -1077,4 +1077,10 @@ sys={28.604242}, mono={5.180000}: extracted packet: RTP ver=2 ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=9316 timestamp=1681718057 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ] sys={28.604242}, mono={5.180000}: extracted packet: RTP ver=2 ssrc=117440513 type=98 marker=0 ext=0 csrc_count=0 sequence=9316 timestamp=1681718057 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ] sys={28.624242}, mono={5.200000}: clock_override_add +sys={28.624242}, mono={5.200000}: Flushing CID 0 +sys={28.624242}, mono={5.200000}: extracted packet: RTP ver=2 ssrc=117440512 type=98 marker=0 ext=0 csrc_count=0 sequence=9317 timestamp=1681718217 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ] +sys={28.624242}, mono={5.200000}: Flushing CID 1 +sys={28.624242}, mono={5.200000}: extracted packet: RTP ver=2 ssrc=117440513 type=98 marker=0 ext=0 csrc_count=0 sequence=9317 timestamp=1681718217 [20 14 ff d4 f9 ff fb e7 eb f9 9f f8 f2 26 33 65 54 ] +sys={28.624242}, mono={5.200000}: Flushing CID 2 +sys={28.624242}, mono={5.200000}: Flushing CID 3 sys={28.624242}, mono={5.200000}: OK: Test passed -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia86e4324e21ccc4bd4b138fa5b2b748df23b0aed Gerrit-Change-Number: 29519 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in libosmo-netif[master]: tests/osmux: Test rx of osmux seqnum wrap around
by pespin 28 Sep '22

28 Sep '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29520 ) Change subject: tests/osmux: Test rx of osmux seqnum wrap around ...................................................................... tests/osmux: Test rx of osmux seqnum wrap around This test shows that there's a bug where the first RTP packet extracted from the received osmux batch with seqnum=0 has the M bit marked for no good reason. Related: SYS#5987 Change-Id: Ida658c681e84878f209ab4965d8aa821a570a580 --- M tests/osmux/osmux_output_test.c M tests/osmux/osmux_output_test.ok 2 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/20/29520/1 diff --git a/tests/osmux/osmux_output_test.c b/tests/osmux/osmux_output_test.c index 46065fe..94d6a5b 100644 --- a/tests/osmux/osmux_output_test.c +++ b/tests/osmux/osmux_output_test.c @@ -390,6 +390,36 @@ talloc_free(h_output); } +/* Test how the osmux_out_handle behaves when seqnum 0xff->0x00 is received */ +static void test_output_seqnum_wraparound(void) +{ + struct osmux_out_handle *h_output; + + printf("===test_output_seqnum_wraparound===\n"); + + clock_override_enable(true); + clock_override_set(0, 0); + osmux_init(0xff); + + h_output = osmux_xfrm_output_alloc(NULL); + osmux_xfrm_output_set_rtp_ssrc(h_output, 0x7000000); + osmux_xfrm_output_set_rtp_pl_type(h_output, 98); + osmux_xfrm_output_set_tx_cb(h_output, tx_cb, h_output); + h_output->rtp_seq = (uint16_t)50; + h_output->rtp_timestamp = (uint32_t)500; + h_output->osmux_seq_ack = 0xff; + + clock_debug("Sending osmux frame with seqnum=0"); + PULL_NEXT(h_output); + clock_override_add(0, 2*TIME_RTP_PKT_MS*1000); + osmo_select_main(0); + + clock_debug("flushing other RTP packets"); + osmux_xfrm_output_flush(h_output); + + talloc_free(h_output); +} + int main(int argc, char **argv) { @@ -412,6 +442,7 @@ test_output_2together(); test_output_frame_lost(); test_output_flush(); + test_output_seqnum_wraparound(); fprintf(stdout, "OK: Test passed\n"); return EXIT_SUCCESS; diff --git a/tests/osmux/osmux_output_test.ok b/tests/osmux/osmux_output_test.ok index 53ab67d..f69c0a9 100644 --- a/tests/osmux/osmux_output_test.ok +++ b/tests/osmux/osmux_output_test.ok @@ -105,4 +105,15 @@ sys={0.040000}, mono={0.040000}: dequeue: seq=59 ts=1940 enqueued=2 sys={0.040000}, mono={0.040000}: dequeue: seq=60 ts=2100 enqueued=1 sys={0.040000}, mono={0.040000}: dequeue: seq=61 ts=2260 enqueued=0 +===test_output_seqnum_wraparound=== +sys={0.000000}, mono={0.000000}: clock_override_set +sys={0.000000}, mono={0.000000}: Sending osmux frame with seqnum=0 +sys={0.000000}, mono={0.000000}: dequeue: seq=50 ts=500 M enqueued=5 +sys={0.040000}, mono={0.040000}: clock_override_add +sys={0.040000}, mono={0.040000}: dequeue: seq=51 ts=660 enqueued=4 +sys={0.040000}, mono={0.040000}: dequeue: seq=52 ts=820 enqueued=3 +sys={0.040000}, mono={0.040000}: flushing other RTP packets +sys={0.040000}, mono={0.040000}: dequeue: seq=53 ts=980 enqueued=2 +sys={0.040000}, mono={0.040000}: dequeue: seq=54 ts=1140 enqueued=1 +sys={0.040000}, mono={0.040000}: dequeue: seq=55 ts=1300 enqueued=0 OK: Test passed -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ida658c681e84878f209ab4965d8aa821a570a580 Gerrit-Change-Number: 29520 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log