- gerrit-log - lists.osmocom.org

Change in libosmo-netif[master]: osmux: Split input and output code into separate files
by pespin 03 Oct '22

03 Oct '22

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/29524 to look at the new patch set (#2). Change subject: osmux: Split input and output code into separate files ...................................................................... osmux: Split input and output code into separate files The output and input paths are totally independent, they share no code or structures holding state. They can be operated totally independently. Hence, let's split the code into separate file since when someone looks at the osmux code one is really looking specifically at Tx or Rx side, but not at both sides. Moreover, the "input" and "output" concepts have always been a bit difficult to understand (would have been better calling them "src" and "sink" instead), which adds more confusion when trying to find the relevant part of code. Change-Id: Ia72995092a36ca50147611e617cb88c4dcf231d5 --- M src/Makefile.am M src/osmux.c A src/osmux_input.c A src/osmux_output.c 4 files changed, 1,065 insertions(+), 959 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/24/29524/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia72995092a36ca50147611e617cb88c4dcf231d5 Gerrit-Change-Number: 29524 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in libosmo-netif[master]: tests/osmo-pcap/osmux: Replace deprecated API osmux_xfrm_output_init2()
by pespin 03 Oct '22

03 Oct '22

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/29527 to look at the new patch set (#2). Change subject: tests/osmo-pcap/osmux: Replace deprecated API osmux_xfrm_output_init2() ...................................................................... tests/osmo-pcap/osmux: Replace deprecated API osmux_xfrm_output_init2() Replacing this one with the newer API was missed a few commits ago when this API was marked as deprectated. Do it now. Change-Id: Ia0958dfae951d82feafe427eff2112d327d3b0a4 --- M tests/osmo-pcap-test/osmux_test.c 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/27/29527/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia0958dfae951d82feafe427eff2112d327d3b0a4 Gerrit-Change-Number: 29527 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in libosmo-netif[master]: osmux: Take into account configured osmux_in_handle->osmux_seq field
by pespin 03 Oct '22

03 Oct '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29517 ) Change subject: osmux: Take into account configured osmux_in_handle->osmux_seq field ...................................................................... osmux: Take into account configured osmux_in_handle->osmux_seq field It was not being used anywhere, yet older applications used to set it (always to 0, which was the default value applied internally). Let's make use of it and apply it as first seqnum to be used on a circuit. This value is applied upon call to osmux_xfrm_input_open_circuit(), hence it can be set independently for every new circuit. Change-Id: Ia26fcba5d7364a5744b2d64d0542a2b3880eee34 --- M include/osmocom/netif/osmux.h M src/osmux.c M tests/osmux/osmux_input_test.c M tests/osmux/osmux_input_test.ok 4 files changed, 78 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h index c663c1b..6e200cc 100644 --- a/include/osmocom/netif/osmux.h +++ b/include/osmocom/netif/osmux.h @@ -57,6 +57,7 @@ /* one to handle all existing RTP flows */ struct osmux_in_handle { + /* Initial Osmux seqnum for each circuit, set during osmux_xfrm_input_open_circuit() */ uint8_t osmux_seq; uint8_t batch_factor; uint16_t batch_size; diff --git a/src/osmux.c b/src/osmux.c index 30661d2..e51e212 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -859,6 +859,7 @@ } circuit->ccid = ccid; + circuit->seq = h->osmux_seq; INIT_LLIST_HEAD(&circuit->msg_list); llist_add_tail(&circuit->head, &batch->circuit_list); diff --git a/tests/osmux/osmux_input_test.c b/tests/osmux/osmux_input_test.c index ff5379a..5a311c8 100644 --- a/tests/osmux/osmux_input_test.c +++ b/tests/osmux/osmux_input_test.c @@ -346,6 +346,74 @@ osmux_xfrm_input_fini(&h_input); } +static void test_initial_osmux_seqnum_osmux_deliver_cb(struct msgb *batch_msg, void *data) +{ + struct osmux_hdr *osmuxh; + char buf[2048]; + bool *osmux_transmitted = (bool *)data; + + osmux_snprintf(buf, sizeof(buf), batch_msg); + clock_debug("OSMUX message (len=%d): %s\n", batch_msg->len, buf); + + /* We expect 1 batch: */ + osmuxh = osmux_xfrm_output_pull(batch_msg); + /* Check seqnum is the one configured beforehand: */ + OSMO_ASSERT(osmuxh->seq == 123); + + osmuxh = osmux_xfrm_output_pull(batch_msg); + OSMO_ASSERT(osmuxh == NULL); + + msgb_free(batch_msg); + + *osmux_transmitted = true; +} +/* Test that the first transmitted osmux header is set according to what has been configured. */ +static void test_initial_osmux_seqnum(void) +{ + struct msgb *msg; + int rc; + const uint8_t cid = 33; + bool osmux_transmitted = false; + struct amr_hdr *amrh; + + printf("===%s===\n", __func__); + + + + clock_override_enable(true); + clock_override_set(0, 0); + rtp_init(0, 0); + + struct osmux_in_handle h_input = { + .osmux_seq = 123, /* sequence number to start OSmux message from */ + .batch_factor = 1, /* batch up to 1 RTP messages */ + .deliver = test_initial_osmux_seqnum_osmux_deliver_cb, + .data = &osmux_transmitted, + }; + + osmux_xfrm_input_init(&h_input); + osmux_xfrm_input_open_circuit(&h_input, cid, false); + + /* First RTP frame at t=0 */ + msg = rtp_next(); + amrh = rtp_append_amr(msg, AMR_FT_2); + amrh->f = 1; + amrh->q = 1; + amrh->cmr = 0; + rc = osmux_xfrm_input(&h_input, msg, cid); + OSMO_ASSERT(rc == 0); + + /* t=20, osmux batch is scheduled to be transmitted: */ + clock_debug("Submit 2nd RTP packet, CMR changes"); + clock_override_add(0, TIME_RTP_PKT_MS*1000); + osmo_select_main(0); + OSMO_ASSERT(osmux_transmitted == true); + + clock_debug("Closing circuit"); + osmux_xfrm_input_close_circuit(&h_input, cid); + osmux_xfrm_input_fini(&h_input); +} + int main(int argc, char **argv) { @@ -365,6 +433,7 @@ test_amr_ft_change_middle_batch(); test_last_amr_cmr_f_q_used(); + test_initial_osmux_seqnum(); fprintf(stdout, "OK: Test passed\n"); return EXIT_SUCCESS; diff --git a/tests/osmux/osmux_input_test.ok b/tests/osmux/osmux_input_test.ok index 0464fd4..60daf26 100644 --- a/tests/osmux/osmux_input_test.ok +++ b/tests/osmux/osmux_input_test.ok @@ -21,4 +21,11 @@ sys={0.060000}, mono={0.060000}: OSMUX message (len=49): OSMUX seq=000 ccid=032 ft=1 rtp_m=0 ctr=2 amr_f=0 amr_q=0 amr_ft=02 amr_cmr=02 [ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ] sys={0.060000}, mono={0.060000}: Closing circuit +===test_initial_osmux_seqnum=== +sys={0.000000}, mono={0.000000}: clock_override_set +sys={0.000000}, mono={0.000000}: Submit 2nd RTP packet, CMR changes +sys={0.020000}, mono={0.020000}: clock_override_add +sys={0.020000}, mono={0.020000}: OSMUX message (len=19): OSMUX seq=123 ccid=033 ft=1 rtp_m=0 ctr=0 amr_f=1 amr_q=1 amr_ft=02 amr_cmr=00 [ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ] + +sys={0.020000}, mono={0.020000}: Closing circuit OK: Test passed -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia26fcba5d7364a5744b2d64d0542a2b3880eee34 Gerrit-Change-Number: 29517 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in libosmo-netif[master]: osmux: join osmux_xfrm_input_open_circuit() and osmux_batch_add_circu...
by pespin 03 Oct '22

03 Oct '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29523 ) Change subject: osmux: join osmux_xfrm_input_open_circuit() and osmux_batch_add_circuit() ...................................................................... osmux: join osmux_xfrm_input_open_circuit() and osmux_batch_add_circuit() There's no real use in having it split, it just makes it more difficult to extend since extra prams must be passed over 2 functions. In fact, the duplicity of "struct osmux_in_handle" and "struct osmux_batch" as its ->internal_data should go away in the future. Change-Id: Ie4c6b55827ac27bcdfbe1b14fb238f5873243000 --- M src/osmux.c 1 file changed, 25 insertions(+), 33 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmux.c b/src/osmux.c index ec5712d..30661d2 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -645,38 +645,6 @@ return NULL; } -static struct osmux_circuit * -osmux_batch_add_circuit(struct osmux_batch *batch, int ccid, int dummy, - uint8_t batch_factor) -{ - struct osmux_circuit *circuit; - - circuit = osmux_batch_find_circuit(batch, ccid); - if (circuit != NULL) { - LOGP(DLMUX, LOGL_ERROR, "circuit %u already exists!\n", ccid); - return NULL; - } - - circuit = talloc_zero(osmux_ctx, struct osmux_circuit); - if (circuit == NULL) { - LOGP(DLMUX, LOGL_ERROR, "OOM on circuit %u\n", ccid); - return NULL; - } - - circuit->ccid = ccid; - INIT_LLIST_HEAD(&circuit->msg_list); - llist_add_tail(&circuit->head, &batch->circuit_list); - - if (dummy) { - circuit->dummy = dummy; - batch->ndummy++; - if (!osmo_timer_pending(&batch->timer)) - osmo_timer_schedule(&batch->timer, 0, - batch_factor * DELTA_RTP_MSG); - } - return circuit; -} - static void osmux_batch_del_circuit(struct osmux_batch *batch, struct osmux_circuit *circuit) { if (circuit->dummy) @@ -876,8 +844,32 @@ int dummy) { struct osmux_batch *batch = (struct osmux_batch *)h->internal_data; + struct osmux_circuit *circuit; - return osmux_batch_add_circuit(batch, ccid, dummy, h->batch_factor) ? 0 : -1; + circuit = osmux_batch_find_circuit(batch, ccid); + if (circuit != NULL) { + LOGP(DLMUX, LOGL_ERROR, "circuit %u already exists!\n", ccid); + return -1; + } + + circuit = talloc_zero(osmux_ctx, struct osmux_circuit); + if (circuit == NULL) { + LOGP(DLMUX, LOGL_ERROR, "OOM on circuit %u\n", ccid); + return -1; + } + + circuit->ccid = ccid; + INIT_LLIST_HEAD(&circuit->msg_list); + llist_add_tail(&circuit->head, &batch->circuit_list); + + if (dummy) { + circuit->dummy = dummy; + batch->ndummy++; + if (!osmo_timer_pending(&batch->timer)) + osmo_timer_schedule(&batch->timer, 0, + h->batch_factor * DELTA_RTP_MSG); + } + return 0; } void osmux_xfrm_input_close_circuit(struct osmux_in_handle *h, int ccid) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie4c6b55827ac27bcdfbe1b14fb238f5873243000 Gerrit-Change-Number: 29523 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in libosmo-netif[master]: osmux: Take into account configured osmux_in_handle->osmux_seq field
by pespin 03 Oct '22

03 Oct '22

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29517 ) Change subject: osmux: Take into account configured osmux_in_handle->osmux_seq field ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia26fcba5d7364a5744b2d64d0542a2b3880eee34 Gerrit-Change-Number: 29517 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Oct 2022 09:29:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-msc[master]: mncc: cosmetic: fix coding style in mncc_prim_check_sign()
by pespin 03 Oct '22

03 Oct '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29563 ) Change subject: mncc: cosmetic: fix coding style in mncc_prim_check_sign() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I94d9cba7aca19f28c906e05dd86bfe3020abd5b1 Gerrit-Change-Number: 29563 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: Mon, 03 Oct 2022 09:27:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-msc[master]: mncc: move MNCC_F_ALL from mncc.c to mncc.h
by pespin 03 Oct '22

03 Oct '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29562 ) Change subject: mncc: move MNCC_F_ALL from mncc.c to mncc.h ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/29562/comment/dbb9de2d_4a27eb07 PS1, Line 7: mncc: move MNCC_F_ALL from mncc.c to mncc.h great move. Please describe it better ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If1a12a696b87184c9eee14f475594c317927427b Gerrit-Change-Number: 29562 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: Mon, 03 Oct 2022 09:27:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-msc[master]: Update MNCC field validation mask.
by pespin 03 Oct '22

03 Oct '22

Attention is currently required from: fixeria, keith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29559 ) Change subject: Update MNCC field validation mask. ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9e7d224e7f2d6d2824b2466752b6e8c994ac5a3d Gerrit-Change-Number: 29559 Gerrit-PatchSet: 2 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 03 Oct 2022 09:27:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-msc[master]: Update MNCC field validation mask.
by fixeria 03 Oct '22

03 Oct '22

Attention is currently required from: keith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29559 ) Change subject: Update MNCC field validation mask. ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/29559/comment/f8cb161f_9835b74e PS1, Line 13: #OS5282 > OS#5282 Done File src/libmsc/mncc.c: https://gerrit.osmocom.org/c/osmo-msc/+/29559/comment/06d76d01_b7ca3787 PS1, Line 113: 0x7fff > Good catch. […] Done here: https://gerrit.osmocom.org/c/osmo-msc/+/29562. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9e7d224e7f2d6d2824b2466752b6e8c994ac5a3d Gerrit-Change-Number: 29559 Gerrit-PatchSet: 2 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 03 Oct 2022 09:22:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-sip-connector[master]: mncc: fix MNCC_SETUP_REQ: set MNCC_F_GCR if GCR is present
by pespin 03 Oct '22

03 Oct '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/29561 ) Change subject: mncc: fix MNCC_SETUP_REQ: set MNCC_F_GCR if GCR is present ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Haven't i seen this patch already somewhere else? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/29561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9dd22caef78e37543dac8a6b31a6ee349e7e5aa8 Gerrit-Change-Number: 29561 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Oct 2022 09:21:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log