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

Change in libosmo-netif[master]: osmux: Move osmux_xfrm_output_set_tx_cb() further down to the xfrm_ou...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29257 ) Change subject: osmux: Move osmux_xfrm_output_set_tx_cb() further down to the xfrm_output section ...................................................................... osmux: Move osmux_xfrm_output_set_tx_cb() further down to the xfrm_output section Change-Id: I46628d1f712e9c5c56c306e27c34ff45731c0172 --- M src/osmux.c 1 file changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/57/29257/1 diff --git a/src/osmux.c b/src/osmux.c index 990216e..7d26fe8 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -831,22 +831,6 @@ LOGP(DLMUX, LOGL_DEBUG, "initialized osmux input converter\n"); } -/*! \brief Set transmission callback to call when a generated RTP packet is to be transmitted - * \param[in] h the osmux out handle handling a specific CID - * \param[in] osmuxh Buffer pointing to osmux frame header structure and AMR payload - * \return Number of generated RTP packets - * - * This Function sets the callback called by the interal timer set by - * osmux_xfrm_out_sched function. - */ -void osmux_xfrm_output_set_tx_cb(struct osmux_out_handle *h, - void (*tx_cb)(struct msgb *msg, void *data), - void *data) -{ - h->tx_cb = tx_cb; - h->data = data; -} - int osmux_xfrm_input_open_circuit(struct osmux_in_handle *h, int ccid, int dummy) { @@ -903,6 +887,22 @@ osmux_xfrm_output_init2(h, rtp_ssrc, 98); } +/*! \brief Set transmission callback to call when a generated RTP packet is to be transmitted + * \param[in] h the osmux out handle handling a specific CID + * \param[in] osmuxh Buffer pointing to osmux frame header structure and AMR payload + * \return Number of generated RTP packets + * + * This Function sets the callback called by the interal timer set by + * osmux_xfrm_out_sched function. + */ +void osmux_xfrm_output_set_tx_cb(struct osmux_out_handle *h, + void (*tx_cb)(struct msgb *msg, void *data), + void *data) +{ + h->tx_cb = tx_cb; + h->data = data; +} + #define SNPRINTF_BUFFER_SIZE(ret, remain, offset) \ if (ret < 0) \ ret = 0; \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I46628d1f712e9c5c56c306e27c34ff45731c0172 Gerrit-Change-Number: 29257 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-netif[master]: examples/osmux-test-output: Avoid using deprecated Osmux API

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29255 ) Change subject: examples/osmux-test-output: Avoid using deprecated Osmux API ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I408bfc84b9c1740df946fa29191f0e286f5b46e1 Gerrit-Change-Number: 29255 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, 31 Aug 2022 14:47:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: Discontinue the use of git://

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29254 ) Change subject: debian-bullseye-titan: Discontinue the use of git:// ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I188a04dd6ecae3c92186d5cbf6cd002ad518efc3 Gerrit-Change-Number: 29254 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 31 Aug 2022 14:46:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Drop long time deprecated APIs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29256 ) Change subject: osmux: Drop long time deprecated APIs ...................................................................... osmux: Drop long time deprecated APIs Those APIs where deprecated 4 years ago (end of Aug 2018), and they have been used since around that time. Hence it can be considered safe to drop them, since they only make the whole code more complex to understand. API osmux_xfrm_output_init() is left since openbsc.git is still using it. Related: OS#5987 Change-Id: Icbdd364a8161a8113dbf1406716946f684d0a853 --- M include/osmocom/netif/osmux.h M src/osmux.c 2 files changed, 0 insertions(+), 116 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/56/29256/1 diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h index ff537c0..8d39344 100644 --- a/include/osmocom/netif/osmux.h +++ b/include/osmocom/netif/osmux.h @@ -110,13 +110,9 @@ void osmux_xfrm_output_init(struct osmux_out_handle *h, uint32_t rtp_ssrc) OSMO_DEPRECATED("Use osmux_xfrm_output_init2() instead"); void osmux_xfrm_output_init2(struct osmux_out_handle *h, uint32_t rtp_ssrc, uint8_t rtp_payload_type); void osmux_xfrm_output_set_tx_cb(struct osmux_out_handle *h, void (*tx_cb)(struct msgb *msg, void *data), void *data); -int osmux_xfrm_output(struct osmux_hdr *osmuxh, struct osmux_out_handle *h, struct llist_head *list) OSMO_DEPRECATED("Use osmux_xfrm_output_sched() instead"); int osmux_xfrm_output_sched(struct osmux_out_handle *h, struct osmux_hdr *osmuxh); void osmux_xfrm_output_flush(struct osmux_out_handle *h); struct osmux_hdr *osmux_xfrm_output_pull(struct msgb *msg); - -void osmux_tx_sched(struct llist_head *list, void (*tx_cb)(struct msgb *msg, void *data), void *data) OSMO_DEPRECATED("Use osmux_xfrm_output_set_tx_cb() instead"); - /*! @} */ #endif diff --git a/src/osmux.c b/src/osmux.c index c43c3eb..990216e 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -191,46 +191,6 @@ return out_msg; } -int osmux_xfrm_output(struct osmux_hdr *osmuxh, struct osmux_out_handle *h, - struct llist_head *list) -{ - struct msgb *msg; - int i; - - INIT_LLIST_HEAD(list); - - for (i=0; i<osmuxh->ctr+1; i++) { - struct rtp_hdr *rtph; - - msg = osmux_rebuild_rtp(h, osmuxh, - osmux_get_payload(osmuxh) + - i * osmo_amr_bytes(osmuxh->amr_ft), - osmo_amr_bytes(osmuxh->amr_ft), !i); - if (msg == NULL) - continue; - - rtph = osmo_rtp_get_hdr(msg); - if (rtph == NULL) - continue; - -#ifdef DEBUG_MSG - { - char buf[4096]; - - osmo_rtp_snprintf(buf, sizeof(buf), msg); - buf[sizeof(buf)-1] = '\0'; - LOGP(DLMUX, LOGL_DEBUG, "to BTS: %s\n", buf); - } -#endif - llist_add_tail(&msg->list, list); - } - - /* Update last seen seq number: */ - h->osmux_seq_ack = osmuxh->seq; - - return i; -} - static void osmux_xfrm_output_trigger(void *data) { struct osmux_out_handle *h = data; @@ -924,80 +884,8 @@ struct msgb *msg; void (*tx_cb)(struct msgb *msg, void *data); void *data; -#ifdef DEBUG_TIMING - struct timeval start; - struct timeval when; -#endif }; -static void osmux_tx_cb(void *data) -{ - struct osmux_tx_handle *h = data; -#ifdef DEBUG_TIMING - struct timeval now, diff; - - osmo_gettimeofday(&now, NULL); - timersub(&now, &h->start, &diff); - timersub(&diff,&h->when, &diff); - LOGP(DLMUX, LOGL_DEBUG, "we are lagging %lu.%.6lu in scheduled " - "transmissions\n", diff.tv_sec, diff.tv_usec); -#endif - - h->tx_cb(h->msg, h->data); - - talloc_free(h); -} - -static void -osmux_tx(struct msgb *msg, struct timeval *when, - void (*tx_cb)(struct msgb *msg, void *data), void *data) -{ - struct osmux_tx_handle *h; - - h = talloc_zero(osmux_ctx, struct osmux_tx_handle); - if (h == NULL) - return; - - h->msg = msg; - h->tx_cb = tx_cb; - h->data = data; - osmo_timer_setup(&h->timer, osmux_tx_cb, h); - -#ifdef DEBUG_TIMING - osmo_gettimeofday(&h->start, NULL); - h->when.tv_sec = when->tv_sec; - h->when.tv_usec = when->tv_usec; -#endif - /* send it now */ - if (when->tv_sec == 0 && when->tv_usec == 0) { - osmux_tx_cb(h); - return; - } - osmo_timer_schedule(&h->timer, when->tv_sec, when->tv_usec); -} - -void -osmux_tx_sched(struct llist_head *list, - void (*tx_cb)(struct msgb *msg, void *data), void *data) -{ - struct msgb *cur, *tmp; - struct timeval delta = { .tv_sec = 0, .tv_usec = DELTA_RTP_MSG }; - struct timeval when; - - timerclear(&when); - - llist_for_each_entry_safe(cur, tmp, list, list) { - -#ifdef DEBUG_MSG - LOGP(DLMUX, LOGL_DEBUG, "scheduled transmision in %lu.%6lu " - "seconds, msg=%p\n", when.tv_sec, when.tv_usec, cur); -#endif - llist_del(&cur->list); - osmux_tx(cur, &when, tx_cb, data); - timeradd(&when, &delta, &when); - } -} - void osmux_xfrm_output_init2(struct osmux_out_handle *h, uint32_t rtp_ssrc, uint8_t rtp_payload_type) { memset(h, 0, sizeof(*h)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Icbdd364a8161a8113dbf1406716946f684d0a853 Gerrit-Change-Number: 29256 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-netif[master]: examples/osmux-test-output: Avoid using deprecated Osmux API

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29255 ) Change subject: examples/osmux-test-output: Avoid using deprecated Osmux API ...................................................................... examples/osmux-test-output: Avoid using deprecated Osmux API Change-Id: I408bfc84b9c1740df946fa29191f0e286f5b46e1 --- M examples/osmux-test-output.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/55/29255/1 diff --git a/examples/osmux-test-output.c b/examples/osmux-test-output.c index 0ab03a7..d39277b 100644 --- a/examples/osmux-test-output.c +++ b/examples/osmux-test-output.c @@ -155,7 +155,7 @@ /* * initialize OSMUX handlers. */ - osmux_xfrm_output_init(&h_output, random()); + osmux_xfrm_output_init2(&h_output, random(), 98); osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, NULL); /* * initialize datagram server. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I408bfc84b9c1740df946fa29191f0e286f5b46e1 Gerrit-Change-Number: 29255 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IPA_Emulation: add TEIs for four VAMOS shadow TRXes

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24410 ) Change subject: IPA_Emulation: add TEIs for four VAMOS shadow TRXes ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24410 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: I7c647603e0f91df0d1cfd2dde29f6ab3ca609a06 Gerrit-Change-Number: 24410 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: Discontinue the use of git://

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29254 ) Change subject: debian-bullseye-titan: Discontinue the use of git:// ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I188a04dd6ecae3c92186d5cbf6cd002ad518efc3 Gerrit-Change-Number: 29254 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 31 Aug 2022 11:16:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: Discontinue the use of git://

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29254 ) Change subject: debian-bullseye-titan: Discontinue the use of git:// ...................................................................... debian-bullseye-titan: Discontinue the use of git:// Change-Id: I188a04dd6ecae3c92186d5cbf6cd002ad518efc3 --- M debian-bullseye-titan/Dockerfile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/54/29254/1 diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 342cc08..f636003 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -37,7 +37,7 @@ apt-get clean # This is required for obtaining talloc reports from the SUT -RUN pip3 install git+git://git.osmocom.org/python/osmo-python-tests +RUN pip3 install git+https://gitea.osmocom.org/cellular-infrastructure/osmo-python-tests # somehow Debian folks updated the gcc version but not titan :/ RUN sed -i 's/^#error/\/\/#error/' /usr/include/titan/cversion.h @@ -57,7 +57,7 @@ git config --global user.name "Dock Er" # clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ +RUN git clone https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks && \ make -j8 -C /osmo-ttcn3-hacks deps ADD https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks/raw/branch/master/deps/Mak… /tmp/deps-Makefile RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I188a04dd6ecae3c92186d5cbf6cd002ad518efc3 Gerrit-Change-Number: 29254 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: Use gitea, not obsolete cgit

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29253 ) Change subject: debian-bullseye-titan: Use gitea, not obsolete cgit ...................................................................... debian-bullseye-titan: Use gitea, not obsolete cgit When downloading the deps/Makefile, use gitea instead of the obsolete and now defunct cgit deep-link Change-Id: Ifbcb992e70a1faefc3829df28f8bf4dfaf2143e1 Related: OS#5670 --- M debian-bullseye-titan/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved; Verified diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 68c27ee..342cc08 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -59,7 +59,7 @@ # clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ make -j8 -C /osmo-ttcn3-hacks deps -ADD https://git.osmocom.org/osmo-ttcn3-hacks/plain/deps/Makefile /tmp/deps-Makefile +ADD https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks/raw/branch/master/deps/Mak… /tmp/deps-Makefile RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ cd /osmo-ttcn3-hacks && \ git pull && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifbcb992e70a1faefc3829df28f8bf4dfaf2143e1 Gerrit-Change-Number: 29253 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: Use gitea, not obsolete cgit

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29253 ) Change subject: debian-bullseye-titan: Use gitea, not obsolete cgit ...................................................................... Patch Set 1: Verified+1 Code-Review+2 (1 comment) Patchset: PS1: worked locally in a 'docker build'. fast-tracking to avoid further build failures -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifbcb992e70a1faefc3829df28f8bf4dfaf2143e1 Gerrit-Change-Number: 29253 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 31 Aug 2022 11:01:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022