October 2022 - gerrit-log - lists.osmocom.org

Change in osmo-mgw[master]: Allocate struct osmux_in_handle through new libosmo-netif APIs

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29526 ) Change subject: Allocate struct osmux_in_handle through new libosmo-netif APIs ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I013c99d1f915279684ce278648e9c69e39b94266 Gerrit-Change-Number: 29526 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 10:04:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Introduce API osmux_xfrm_input_get_deliver_cb_data()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29569 ) Change subject: osmux: Introduce API osmux_xfrm_input_get_deliver_cb_data() ...................................................................... osmux: Introduce API osmux_xfrm_input_get_deliver_cb_data() This API allows retrieving back the private pointer set previously by osmux_xfrm_input_set_deliver_cb(). Change-Id: I95433b18802f73fa70e758f4aa02128eee940d88 --- M include/osmocom/netif/osmux.h M src/osmux_input.c 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h index e02c5cd..f7a5fd5 100644 --- a/include/osmocom/netif/osmux.h +++ b/include/osmocom/netif/osmux.h @@ -110,6 +110,7 @@ void osmux_xfrm_input_set_batch_size(struct osmux_in_handle *h, uint16_t batch_size); void osmux_xfrm_input_set_initial_seqnum(struct osmux_in_handle *h, uint8_t osmux_seqnum); void osmux_xfrm_input_set_deliver_cb(struct osmux_in_handle *h, void (*deliver_cb)(struct msgb *msg, void *data), void *data); +void *osmux_xfrm_input_get_deliver_cb_data(struct osmux_in_handle *h); int osmux_xfrm_input_open_circuit(struct osmux_in_handle *h, int ccid, int dummy); void osmux_xfrm_input_close_circuit(struct osmux_in_handle *h, int ccid); diff --git a/src/osmux_input.c b/src/osmux_input.c index f177ea9..2c18b20 100644 --- a/src/osmux_input.c +++ b/src/osmux_input.c @@ -686,6 +686,11 @@ h->data = data; } +void *osmux_xfrm_input_get_deliver_cb_data(struct osmux_in_handle *h) +{ + return h->data; +} + int osmux_xfrm_input_open_circuit(struct osmux_in_handle *h, int ccid, int dummy) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I95433b18802f73fa70e758f4aa02128eee940d88 Gerrit-Change-Number: 29569 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Allocate struct osmux_out_handle through API

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29528 ) Change subject: osmux: Allocate struct osmux_out_handle through API ...................................................................... osmux: Allocate struct osmux_out_handle through API Until now, the osmux_in_handle was allocated by the client, and passed to the API to initialize it. This makes it really hard to improve the implementation without breaking the ABI. Let's break the ABI now one last time (hopefully) by allocating the struct through an API. With only this change, the already built users (osmo-mgw, openbsci, osmo-bts) can still work fine, since there's no change on the struct osmux_in_handle. However, they will somehow break next time thestruct is changed until they are ported to the same API (easy to do). Change-Id: I752ab031f935f04731bb1a354333f1682a1aa5bd Related: SYS#5987 --- M TODO-RELEASE M include/osmocom/netif/osmux.h M src/osmux_input.c 3 files changed, 88 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index 52a8c49..e7fab50 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmo-netif osmux new osmux_xfrm_output_* APIs +libosmo-netif osmux new osmux_xfrm_input_* APIs diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h index 6e200cc..e02c5cd 100644 --- a/include/osmocom/netif/osmux.h +++ b/include/osmocom/netif/osmux.h @@ -103,8 +103,13 @@ /* 1500 - sizeof(iphdr) = 20 bytes - sizeof(udphdr) = 8 bytes. */ #define OSMUX_BATCH_DEFAULT_MAX 1472 -void osmux_xfrm_input_init(struct osmux_in_handle *h); -void osmux_xfrm_input_fini(struct osmux_in_handle *h); +struct osmux_in_handle *osmux_xfrm_input_alloc(void *ctx); +void osmux_xfrm_input_init(struct osmux_in_handle *h) OSMO_DEPRECATED("Use osmux_xfrm_input_alloc() instead"); +void osmux_xfrm_input_fini(struct osmux_in_handle *h) OSMO_DEPRECATED("Use talloc_free() instead"); +int osmux_xfrm_input_set_batch_factor(struct osmux_in_handle *h, uint8_t batch_factor); +void osmux_xfrm_input_set_batch_size(struct osmux_in_handle *h, uint16_t batch_size); +void osmux_xfrm_input_set_initial_seqnum(struct osmux_in_handle *h, uint8_t osmux_seqnum); +void osmux_xfrm_input_set_deliver_cb(struct osmux_in_handle *h, void (*deliver_cb)(struct msgb *msg, void *data), void *data); int osmux_xfrm_input_open_circuit(struct osmux_in_handle *h, int ccid, int dummy); void osmux_xfrm_input_close_circuit(struct osmux_in_handle *h, int ccid); diff --git a/src/osmux_input.c b/src/osmux_input.c index 2706b11..f177ea9 100644 --- a/src/osmux_input.c +++ b/src/osmux_input.c @@ -587,6 +587,56 @@ return ret; } +static int osmux_xfrm_input_talloc_destructor(struct osmux_in_handle *h) +{ + struct osmux_batch *batch = (struct osmux_batch *)h->internal_data; + struct osmux_circuit *circuit, *next; + + llist_for_each_entry_safe(circuit, next, &batch->circuit_list, head) + osmux_batch_del_circuit(batch, circuit); + + osmo_timer_del(&batch->timer); + talloc_free(batch); + return 0; +} + +/*! \brief Allocate a new osmux in handle (osmux source, tx side) + * \param[in] ctx talloc context to use when allocating the returned struct + * \return Allocated osmux in handle + * + * This object contains configuration and state to handle a group of circuits (trunk), + * receiving RTP packets from the upper layer (API user) and sending batched & + * trunked Osmux messages containing all the data of those circuits down the + * stack outgoing network Osmux messages. + * Returned pointer can be freed with regular talloc_free, all pending messages + * in queue and all internal data will be freed. */ +struct osmux_in_handle *osmux_xfrm_input_alloc(void *ctx) +{ + struct osmux_in_handle *h; + + h = talloc_zero(ctx, struct osmux_in_handle); + OSMO_ASSERT(h); + + struct osmux_batch *batch; + + h->batch_size = OSMUX_BATCH_DEFAULT_MAX; + + batch = talloc_zero(h, struct osmux_batch); + OSMO_ASSERT(batch); + + INIT_LLIST_HEAD(&batch->circuit_list); + batch->remaining_bytes = h->batch_size; + osmo_timer_setup(&batch->timer, osmux_batch_timer_expired, h); + + h->internal_data = (void *)batch; + + LOGP(DLMUX, LOGL_DEBUG, "initialized osmux input converter\n"); + + talloc_set_destructor(h, osmux_xfrm_input_talloc_destructor); + return h; +} + +/* DEPRECATED: Use osmux_xfrm_input_alloc() instead */ void osmux_xfrm_input_init(struct osmux_in_handle *h) { struct osmux_batch *batch; @@ -608,6 +658,34 @@ LOGP(DLMUX, LOGL_DEBUG, "initialized osmux input converter\n"); } +int osmux_xfrm_input_set_batch_factor(struct osmux_in_handle *h, uint8_t batch_factor) +{ + if (batch_factor > 8) + return -1; + h->batch_factor = batch_factor; + return 0; +} + +void osmux_xfrm_input_set_batch_size(struct osmux_in_handle *h, uint16_t batch_size) +{ + if (batch_size == 0) + h->batch_size = OSMUX_BATCH_DEFAULT_MAX; + else + h->batch_size = batch_size; +} + +void osmux_xfrm_input_set_initial_seqnum(struct osmux_in_handle *h, uint8_t osmux_seqnum) +{ + h->osmux_seq = osmux_seqnum; +} + +void osmux_xfrm_input_set_deliver_cb(struct osmux_in_handle *h, + void (*deliver_cb)(struct msgb *msg, void *data), void *data) +{ + h->deliver = deliver_cb; + h->data = data; +} + int osmux_xfrm_input_open_circuit(struct osmux_in_handle *h, int ccid, int dummy) { @@ -656,16 +734,10 @@ osmux_batch_del_circuit(batch, circuit); } +/* DEPRECATED: Use talloc_free() instead (will call osmux_xfrm_input_talloc_destructor()) */ void osmux_xfrm_input_fini(struct osmux_in_handle *h) { - struct osmux_batch *batch = (struct osmux_batch *)h->internal_data; - struct osmux_circuit *circuit, *next; - - llist_for_each_entry_safe(circuit, next, &batch->circuit_list, head) - osmux_batch_del_circuit(batch, circuit); - - osmo_timer_del(&batch->timer); - talloc_free(batch); + (void)osmux_xfrm_input_talloc_destructor(h); } /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I752ab031f935f04731bb1a354333f1682a1aa5bd Gerrit-Change-Number: 29528 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

2 years, 8 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Replace deprecated osmux_xfrm_input_* APIs in examples & tests

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29529 ) Change subject: osmux: Replace deprecated osmux_xfrm_input_* APIs in examples & tests ...................................................................... osmux: Replace deprecated osmux_xfrm_input_* APIs in examples & tests Change-Id: I7f3f8d40f89ffdd135a73316ee60fd429ba2a5b0 --- M examples/osmux-test-input.c M tests/osmo-pcap-test/osmux_test.c M tests/osmux/osmux_input_test.c M tests/osmux/osmux_test.c 4 files changed, 81 insertions(+), 81 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/examples/osmux-test-input.c b/examples/osmux-test-input.c index 57e199c..d91ee15 100644 --- a/examples/osmux-test-input.c +++ b/examples/osmux-test-input.c @@ -83,11 +83,7 @@ * This is the input handle for osmux. It stores the last osmux sequence that * has been used and the deliver function that sends the osmux batch. */ -struct osmux_in_handle h_input = { - .osmux_seq = 0, /* sequence number to start OSmux message from */ - .batch_factor = 4, /* batch up to 4 RTP messages */ - .deliver = osmux_deliver, -}; +struct osmux_in_handle *h_input; #define MAX_CONCURRENT_CALLS 8 @@ -165,9 +161,9 @@ if (ccid < 0) register_ccid(rtph->ssrc); - while ((ret = osmux_xfrm_input(&h_input, msg, ccid)) > 0) { + while ((ret = osmux_xfrm_input(h_input, msg, ccid)) > 0) { /* batch full, deliver it */ - osmux_xfrm_input_deliver(&h_input); + osmux_xfrm_input_deliver(h_input); } if (ret == -1) printf("something is wrong\n"); @@ -217,7 +213,10 @@ /* * initialize OSMUX handlers. */ - osmux_xfrm_input_init(&h_input); + h_input = osmux_xfrm_input_alloc(tall_test); + osmux_xfrm_input_set_initial_seqnum(h_input, 0); + osmux_xfrm_input_set_batch_factor(h_input, 4); + osmux_xfrm_input_set_deliver_cb(h_input, osmux_deliver, NULL); /* * initialize datagram server. diff --git a/tests/osmo-pcap-test/osmux_test.c b/tests/osmo-pcap-test/osmux_test.c index bbb395c..891743a 100644 --- a/tests/osmo-pcap-test/osmux_test.c +++ b/tests/osmo-pcap-test/osmux_test.c @@ -65,11 +65,7 @@ * This is the input handle for osmux. It stores the last osmux sequence that * has been used and the deliver function that sends the osmux batch. */ -struct osmux_in_handle h_input = { - .osmux_seq = 0, /* sequence number to start OSmux message from */ - .batch_factor = 4, /* batch up to 4 RTP messages */ - .deliver = deliver, -}; +struct osmux_in_handle *h_input; #define MAX_CONCURRENT_CALLS 8 @@ -124,9 +120,9 @@ if (ccid < 0) register_ccid(rtph->ssrc); - while ((ret = osmux_xfrm_input(&h_input, msg, ccid)) > 0) { + while ((ret = osmux_xfrm_input(h_input, msg, ccid)) > 0) { /* batch full, deliver it */ - osmux_xfrm_input_deliver(&h_input); + osmux_xfrm_input_deliver(h_input); } if (ret == -1) printf("something is wrong\n"); @@ -189,7 +185,10 @@ osmo_pcap.timer.cb = osmo_pcap_pkt_timer_cb; - osmux_xfrm_input_init(&h_input); + h_input = osmux_xfrm_input_alloc(tall_test); + osmux_xfrm_input_set_initial_seqnum(h_input, 0); + osmux_xfrm_input_set_batch_factor(h_input, 4); + osmux_xfrm_input_set_deliver_cb(h_input, deliver, NULL); h_output = osmux_xfrm_output_alloc(tall_test); osmux_xfrm_output_set_rtp_ssrc(h_output, 0); diff --git a/tests/osmux/osmux_input_test.c b/tests/osmux/osmux_input_test.c index 5a311c8..8645929 100644 --- a/tests/osmux/osmux_input_test.c +++ b/tests/osmux/osmux_input_test.c @@ -33,6 +33,8 @@ static uint16_t rtp_next_seq; static uint16_t rtp_next_ts; +void *tall_ctx; + #define TIME_RTP_PKT_MS 20 #define BATCH_FACTOR 6 /* ----------------------------- */ @@ -194,6 +196,7 @@ int rc; const uint8_t cid = 30; bool osmux_transmitted = false; + struct osmux_in_handle *h_input; printf("===%s===\n", __func__); @@ -202,27 +205,25 @@ clock_override_set(0, 0); rtp_init(0, 0); - struct osmux_in_handle h_input = { - .osmux_seq = 0, /* sequence number to start OSmux message from */ - .batch_factor = 4, /* batch up to 4 RTP messages */ - .deliver = test_amr_ft_change_middle_batch_osmux_deliver_cb, - .data = &osmux_transmitted, - }; - - osmux_xfrm_input_init(&h_input); - osmux_xfrm_input_open_circuit(&h_input, cid, false); + h_input = osmux_xfrm_input_alloc(tall_ctx); + osmux_xfrm_input_set_initial_seqnum(h_input, 0); + osmux_xfrm_input_set_batch_factor(h_input, 4); + osmux_xfrm_input_set_deliver_cb(h_input, + test_amr_ft_change_middle_batch_osmux_deliver_cb, + &osmux_transmitted); + osmux_xfrm_input_open_circuit(h_input, cid, false); /* First RTP frame at t=0 */ msg = rtp_next(); rtp_append_amr(msg, AMR_FT_2); - rc = osmux_xfrm_input(&h_input, msg, cid); + rc = osmux_xfrm_input(h_input, msg, cid); OSMO_ASSERT(rc == 0); /* Second RTP frame at t=20 */ clock_override_add(0, TIME_RTP_PKT_MS*1000); msg = rtp_next(); rtp_append_amr(msg, AMR_FT_2); - rc = osmux_xfrm_input(&h_input, msg, cid); + rc = osmux_xfrm_input(h_input, msg, cid); OSMO_ASSERT(rc == 0); /* Third RTP frame at t=40, AMR FT changes: */ @@ -230,7 +231,7 @@ clock_override_add(0, TIME_RTP_PKT_MS*1000); msg = rtp_next(); rtp_append_amr(msg, AMR_FT_6); - rc = osmux_xfrm_input(&h_input, msg, cid); + rc = osmux_xfrm_input(h_input, msg, cid); OSMO_ASSERT(rc == 0); /* Forth RTP frame at t=60, AMR FT changes again: */ @@ -238,7 +239,7 @@ clock_override_add(0, TIME_RTP_PKT_MS*1000); msg = rtp_next(); rtp_append_amr(msg, AMR_FT_1); - rc = osmux_xfrm_input(&h_input, msg, cid); + rc = osmux_xfrm_input(h_input, msg, cid); OSMO_ASSERT(rc == 0); /* t=80, osmux batch is scheduled to be transmitted: */ @@ -248,8 +249,8 @@ OSMO_ASSERT(osmux_transmitted == true); clock_debug("Closing circuit"); - osmux_xfrm_input_close_circuit(&h_input, cid); - osmux_xfrm_input_fini(&h_input); + osmux_xfrm_input_close_circuit(h_input, cid); + talloc_free(h_input); } static void test_last_amr_cmr_f_q_used_osmux_deliver_cb(struct msgb *batch_msg, void *data) @@ -285,6 +286,7 @@ const uint8_t cid = 32; bool osmux_transmitted = false; struct amr_hdr *amrh; + struct osmux_in_handle *h_input; printf("===%s===\n", __func__); @@ -294,15 +296,13 @@ clock_override_set(0, 0); rtp_init(0, 0); - struct osmux_in_handle h_input = { - .osmux_seq = 0, /* sequence number to start OSmux message from */ - .batch_factor = 3, /* batch up to 3 RTP messages */ - .deliver = test_last_amr_cmr_f_q_used_osmux_deliver_cb, - .data = &osmux_transmitted, - }; - - osmux_xfrm_input_init(&h_input); - osmux_xfrm_input_open_circuit(&h_input, cid, false); + h_input = osmux_xfrm_input_alloc(tall_ctx); + osmux_xfrm_input_set_initial_seqnum(h_input, 0); + osmux_xfrm_input_set_batch_factor(h_input, 3); + osmux_xfrm_input_set_deliver_cb(h_input, + test_last_amr_cmr_f_q_used_osmux_deliver_cb, + &osmux_transmitted); + osmux_xfrm_input_open_circuit(h_input, cid, false); /* First RTP frame at t=0 */ msg = rtp_next(); @@ -310,7 +310,7 @@ amrh->f = 1; amrh->q = 1; amrh->cmr = 0; - rc = osmux_xfrm_input(&h_input, msg, cid); + rc = osmux_xfrm_input(h_input, msg, cid); OSMO_ASSERT(rc == 0); /* Second RTP frame at t=20, CMR changes 0->1 */ @@ -321,7 +321,7 @@ amrh->f = 1; amrh->q = 1; amrh->cmr = 1; - rc = osmux_xfrm_input(&h_input, msg, cid); + rc = osmux_xfrm_input(h_input, msg, cid); OSMO_ASSERT(rc == 0); /* Third RTP frame at t=40, q changes 1->0, CMR changes 1->2: */ @@ -332,7 +332,7 @@ amrh->f = 0; amrh->q = 0; amrh->cmr = 2; - rc = osmux_xfrm_input(&h_input, msg, cid); + rc = osmux_xfrm_input(h_input, msg, cid); OSMO_ASSERT(rc == 0); /* t=60, osmux batch is scheduled to be transmitted: */ @@ -342,8 +342,8 @@ OSMO_ASSERT(osmux_transmitted == true); clock_debug("Closing circuit"); - osmux_xfrm_input_close_circuit(&h_input, cid); - osmux_xfrm_input_fini(&h_input); + osmux_xfrm_input_close_circuit(h_input, cid); + talloc_free(h_input); } static void test_initial_osmux_seqnum_osmux_deliver_cb(struct msgb *batch_msg, void *data) @@ -375,6 +375,7 @@ const uint8_t cid = 33; bool osmux_transmitted = false; struct amr_hdr *amrh; + struct osmux_in_handle *h_input; printf("===%s===\n", __func__); @@ -384,15 +385,13 @@ 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); + h_input = osmux_xfrm_input_alloc(tall_ctx); + osmux_xfrm_input_set_initial_seqnum(h_input, 123); + osmux_xfrm_input_set_batch_factor(h_input, 1); + osmux_xfrm_input_set_deliver_cb(h_input, + test_initial_osmux_seqnum_osmux_deliver_cb, + &osmux_transmitted); + osmux_xfrm_input_open_circuit(h_input, cid, false); /* First RTP frame at t=0 */ msg = rtp_next(); @@ -400,7 +399,7 @@ amrh->f = 1; amrh->q = 1; amrh->cmr = 0; - rc = osmux_xfrm_input(&h_input, msg, cid); + rc = osmux_xfrm_input(h_input, msg, cid); OSMO_ASSERT(rc == 0); /* t=20, osmux batch is scheduled to be transmitted: */ @@ -410,8 +409,8 @@ OSMO_ASSERT(osmux_transmitted == true); clock_debug("Closing circuit"); - osmux_xfrm_input_close_circuit(&h_input, cid); - osmux_xfrm_input_fini(&h_input); + osmux_xfrm_input_close_circuit(h_input, cid); + talloc_free(h_input); } int main(int argc, char **argv) @@ -422,7 +421,7 @@ exit(EXIT_FAILURE); } - void *tall_ctx = talloc_named_const(NULL, 1, "Root context"); + tall_ctx = talloc_named_const(NULL, 1, "Root context"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); diff --git a/tests/osmux/osmux_test.c b/tests/osmux/osmux_test.c index d6b7040..8edb3fd 100644 --- a/tests/osmux/osmux_test.c +++ b/tests/osmux/osmux_test.c @@ -120,11 +120,7 @@ msgb_free(batch_msg); } -struct osmux_in_handle h_input = { - .osmux_seq = 0, /* sequence number to start OSmux message from */ - .batch_factor = 4, /* batch up to 4 RTP messages */ - .deliver = osmux_deliver, -}; +struct osmux_in_handle *h_input; static void sigalarm_handler(int foo) { @@ -161,8 +157,8 @@ } rtp_pkts++; - while (osmux_xfrm_input(&h_input, msg, j) > 0) { - osmux_xfrm_input_deliver(&h_input); + while (osmux_xfrm_input(h_input, msg, j) > 0) { + osmux_xfrm_input_deliver(h_input); } } clock_override_add(0, PKT_TIME_USEC); @@ -215,13 +211,13 @@ * gaps between two messages to test the osmux replaying * feature. */ - osmux_xfrm_input(&h_input, msg, (i % 2) + ccid); + osmux_xfrm_input(h_input, msg, (i % 2) + ccid); if (i % 4 == 0) { /* After four RTP messages, squash them into the OSMUX * batch and call the routine to deliver it. */ - osmux_xfrm_input_deliver(&h_input); + osmux_xfrm_input_deliver(h_input); /* The first two RTP message (one per circuit ID batch) * are delivered immediately, wait until the three RTP @@ -280,22 +276,29 @@ alarm(10); /* Check if marker bit features work correctly */ - osmux_xfrm_input_init(&h_input); + h_input = osmux_xfrm_input_alloc(tall_ctx); + osmux_xfrm_input_set_initial_seqnum(h_input, 0); + osmux_xfrm_input_set_batch_factor(h_input, 4); + osmux_xfrm_input_set_deliver_cb(h_input, osmux_deliver, NULL); + for (i = 0; i < 4; i++) - osmux_xfrm_input_open_circuit(&h_input, i, 0); + osmux_xfrm_input_open_circuit(h_input, i, 0); osmux_test_marker(4); for (i = 0; i < 4; i++) - osmux_xfrm_input_close_circuit(&h_input, i); - osmux_xfrm_input_fini(&h_input); + osmux_xfrm_input_close_circuit(h_input, i); + TALLOC_FREE(h_input); - osmux_xfrm_input_init(&h_input); + h_input = osmux_xfrm_input_alloc(tall_ctx); + osmux_xfrm_input_set_initial_seqnum(h_input, 0); + osmux_xfrm_input_set_batch_factor(h_input, 4); + osmux_xfrm_input_set_deliver_cb(h_input, osmux_deliver, NULL); for (i = 0; i < 2; i++) - osmux_xfrm_input_open_circuit(&h_input, i, 0); + osmux_xfrm_input_open_circuit(h_input, i, 0); /* Add two circuits with dummy padding */ - osmux_xfrm_input_open_circuit(&h_input, 2, 1); - osmux_xfrm_input_open_circuit(&h_input, 3, 1); + osmux_xfrm_input_open_circuit(h_input, 2, 1); + osmux_xfrm_input_open_circuit(h_input, 3, 1); /* Wait 10 times to make sure dummy padding timer works fine */ for (i = 0; i < 10; i++) @@ -309,16 +312,16 @@ osmux_test_loop(2); for (i = 0; i < 4; i++) - osmux_xfrm_input_close_circuit(&h_input, i); + osmux_xfrm_input_close_circuit(h_input, i); /* Reopen with two circuits and retest */ - osmux_xfrm_input_open_circuit(&h_input, 0, 0); - osmux_xfrm_input_open_circuit(&h_input, 1, 1); + osmux_xfrm_input_open_circuit(h_input, 0, 0); + osmux_xfrm_input_open_circuit(h_input, 1, 1); osmux_test_loop(0); - osmux_xfrm_input_close_circuit(&h_input, 0); - osmux_xfrm_input_close_circuit(&h_input, 1); + osmux_xfrm_input_close_circuit(h_input, 0); + osmux_xfrm_input_close_circuit(h_input, 1); - osmux_xfrm_input_fini(&h_input); + TALLOC_FREE(h_input); for (i = 0; i < ARRAY_SIZE(h_output); i++) { clock_debug("Flushing CID %u\n", i); 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/libosmo-netif/+/29529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7f3f8d40f89ffdd135a73316ee60fd429ba2a5b0 Gerrit-Change-Number: 29529 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-MessageType: merged

2 years, 8 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Allocate struct osmux_out_handle through API

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29528 ) Change subject: osmux: Allocate struct osmux_out_handle through API ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I752ab031f935f04731bb1a354333f1682a1aa5bd Gerrit-Change-Number: 29528 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 09:42:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Allocate struct osmux_out_handle through API

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29528 ) Change subject: osmux: Allocate struct osmux_out_handle through API ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/osmux_input.c: https://gerrit.osmocom.org/c/libosmo-netif/+/29528/comment/c0549b4c_80e70a05 PS1, Line 737: /* DEPRECATED: Use talloc_free() instead (will call osmux_xfrm_input_talloc_destructor()) */ > I chose to use a talloc destructor because it makes it easier to destroy the object when the parent […] Pau's reasoning makes sense to me here. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I752ab031f935f04731bb1a354333f1682a1aa5bd Gerrit-Change-Number: 29528 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 09:33:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: Log unexpected RSL message

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29582 ) Change subject: bts: Log unexpected RSL message ...................................................................... bts: Log unexpected RSL message This is useful when doing first look at failed tests in jenkins. Change-Id: I6cdc53ff038858211b09c0a8eeec19603107ffe4 --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/29582/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index c6ce115..108041f 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -779,6 +779,9 @@ [not ignore_other] as_meas_res(); [not ignore_other] as_l1_dcch_loop(); [not ignore_other] as_l1_tch_loop(); + [not ignore_other] RSL.receive(RSL_Message:?) -> value rx { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected RSL message received: ", rx)); + } [not ignore_other] RSL.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected RSL message received"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6cdc53ff038858211b09c0a8eeec19603107ffe4 Gerrit-Change-Number: 29582 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: WIP: TODO

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28911 ) Change subject: WIP: TODO ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibecc128677d25f7d19a47f8a8a8a80a62b3c707a Gerrit-Change-Number: 28911 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

2 years, 8 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: rx_rach_fn(): properly detect handover RACH

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29577 ) Change subject: osmo-bts-trx: rx_rach_fn(): properly detect handover RACH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ice1674fd4fed8c54d605ff19d568f6e46b4c5783 Gerrit-Change-Number: 29577 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 08:27:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-pcu[master]: Make linter happy: fix coding style issues

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29581 ) Change subject: Make linter happy: fix coding style issues ...................................................................... Make linter happy: fix coding style issues Change-Id: I6672fcd13d9617f054ab295232cfe486f5f17035 --- M src/gprs_rlcmac_sched.cpp M src/pdch_ul_controller.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 8b5227f..f5a01e9 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -474,7 +474,7 @@ /* Prio 1: select control message */ if ((msg = sched_select_ctrl_msg(pdch, fn, block_nr, &tbf_cand))) { - gsmtap_cat = PCU_GSMTAP_C_DL_CTRL; + gsmtap_cat = PCU_GSMTAP_C_DL_CTRL; } /* Prio 2: select data message for downlink */ else if((msg = sched_select_dl_data_msg(bts, pdch, fn, block_nr, req_mcs_kind, &tx_is_egprs))) { diff --git a/src/pdch_ul_controller.c b/src/pdch_ul_controller.c index 7fbbc51..1cdbb98 100644 --- a/src/pdch_ul_controller.c +++ b/src/pdch_ul_controller.c @@ -299,7 +299,7 @@ int res; struct rb_node *first; - while((first = rb_first(&ulc->tree_root))) { + while ((first = rb_first(&ulc->tree_root))) { item = container_of(first, struct pdch_ulc_node, node); res = fn_cmp(item->fn, fn); if (res > 0) /* item->fn AFTER fn */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6672fcd13d9617f054ab295232cfe486f5f17035 Gerrit-Change-Number: 29581 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022