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

Change in osmo-mgw[master]: osmux: Fix memleak on error code path

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29312 ) Change subject: osmux: Fix memleak on error code path ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib84f78a53293799b925b645156513e129c32c705 Gerrit-Change-Number: 29312 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 Sep 2022 10:25:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Log refcounting of osmux_handle_list

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29310 ) Change subject: osmux: Log refcounting of osmux_handle_list ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia873e3021078976748762baaf406865149b2a090 Gerrit-Change-Number: 29310 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 Sep 2022 10:25:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-bts[master]: Introduce Osmux support

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/29285 to look at the new patch set (#4). Change subject: Introduce Osmux support ...................................................................... Introduce Osmux support Related: SYS#5987 Requires: libosmo-netif.git Change-Id I632654221826340423e1e97b0f8ed9a2baf6c6c3 Change-Id: Ib80be434c06d07b3611bd18ae25dff8b14a7aad9 --- M TODO-RELEASE M configure.ac A doc/manuals/chapters/osmux_bts.adoc M doc/manuals/osmobts-usermanual.adoc M include/osmo-bts/Makefile.am M include/osmo-bts/bts.h M include/osmo-bts/l1sap.h M include/osmo-bts/lchan.h M include/osmo-bts/logging.h A include/osmo-bts/osmux.h M include/osmo-bts/vty.h M src/common/Makefile.am M src/common/bts.c M src/common/l1sap.c M src/common/lchan.c M src/common/logging.c M src/common/main.c A src/common/osmux.c M src/common/rsl.c M src/common/vty.c 20 files changed, 881 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/29285/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib80be434c06d07b3611bd18ae25dff8b14a7aad9 Gerrit-Change-Number: 29285 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 9 months

1
0
0 0

Change in osmo-bts[master]: tests/*/Makefile.am: Fix typo in LIBOSMO_NETIF_CFLAGS

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/29322 ) Change subject: tests/*/Makefile.am: Fix typo in LIBOSMO_NETIF_CFLAGS ...................................................................... tests/*/Makefile.am: Fix typo in LIBOSMO_NETIF_CFLAGS Change-Id: I29d52bdacdebc0495d11425399e796fa7aef3ac4 --- M tests/agch/Makefile.am M tests/handover/Makefile.am M tests/meas/Makefile.am M tests/misc/Makefile.am M tests/power/Makefile.am M tests/sysmobts/Makefile.am M tests/tx_power/Makefile.am 7 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/22/29322/1 diff --git a/tests/agch/Makefile.am b/tests/agch/Makefile.am index f77341a..ffc65fd 100644 --- a/tests/agch/Makefile.am +++ b/tests/agch/Makefile.am @@ -7,7 +7,7 @@ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ - $(LIBOSMONETIF_CFAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index beebaed..5197cb9 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -6,7 +6,7 @@ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ - $(LIBOSMONETIF_CFAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ diff --git a/tests/meas/Makefile.am b/tests/meas/Makefile.am index 0af192f..7a65d08 100644 --- a/tests/meas/Makefile.am +++ b/tests/meas/Makefile.am @@ -6,7 +6,7 @@ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ - $(LIBOSMONETIF_CFAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index fd6ebf3..6770be3 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -6,7 +6,7 @@ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ - $(LIBOSMONETIF_CFAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ diff --git a/tests/power/Makefile.am b/tests/power/Makefile.am index 7b9ae27..c1abead 100644 --- a/tests/power/Makefile.am +++ b/tests/power/Makefile.am @@ -6,7 +6,7 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ - $(LIBOSMONETIF_CFAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ diff --git a/tests/sysmobts/Makefile.am b/tests/sysmobts/Makefile.am index 2796136..ee7b82f 100644 --- a/tests/sysmobts/Makefile.am +++ b/tests/sysmobts/Makefile.am @@ -12,7 +12,7 @@ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ - $(LIBOSMONETIF_CFAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ diff --git a/tests/tx_power/Makefile.am b/tests/tx_power/Makefile.am index ae57a40..2e91fa0 100644 --- a/tests/tx_power/Makefile.am +++ b/tests/tx_power/Makefile.am @@ -6,7 +6,7 @@ $(LIBOSMOCODEC_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ - $(LIBOSMONETIF_CFAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(NULL) LDADD = \ $(LIBOSMOCORE_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29d52bdacdebc0495d11425399e796fa7aef3ac4 Gerrit-Change-Number: 29322 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-mgw[master]: osmux: don't store conn ptr inside shared osmux_handle

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29318 ) Change subject: osmux: don't store conn ptr inside shared osmux_handle ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie739b556e9eb7d3133e798831a09728c7cc87135 Gerrit-Change-Number: 29318 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: Mon, 12 Sep 2022 10:13:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Fix memleak on error code path

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29312 ) Change subject: osmux: Fix memleak on error code path ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib84f78a53293799b925b645156513e129c32c705 Gerrit-Change-Number: 29312 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: Mon, 12 Sep 2022 10:11:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Log refcounting of osmux_handle_list

by osmith

Attention is currently required from: osmith. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29310 ) Change subject: osmux: Log refcounting of osmux_handle_list ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia873e3021078976748762baaf406865149b2a090 Gerrit-Change-Number: 29310 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 Sep 2022 10:10: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: osmux_xfrm_input_close_circuit(): Log circuit not found

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29301 ) Change subject: osmux: osmux_xfrm_input_close_circuit(): Log circuit not found ...................................................................... osmux: osmux_xfrm_input_close_circuit(): Log circuit not found Change-Id: I486b81d15b4d9d6abd08fbd73ca460bae22586a9 --- M src/osmux.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, approved diff --git a/src/osmux.c b/src/osmux.c index 71afe5c..5515e88 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -843,8 +843,11 @@ struct osmux_circuit *circuit; circuit = osmux_batch_find_circuit(batch, ccid); - if (circuit == NULL) + if (circuit == NULL) { + LOGP(DLMUX, LOGL_NOTICE, "Unable to close circuit %d: Not found\n", + ccid); return; + } osmux_batch_del_circuit(batch, circuit); } 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/+/29301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I486b81d15b4d9d6abd08fbd73ca460bae22586a9 Gerrit-Change-Number: 29301 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Allow the user to alloc msgbs used to provide generated RTP pa...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29260 ) Change subject: osmux: Allow the user to alloc msgbs used to provide generated RTP packets ...................................................................... osmux: Allow the user to alloc msgbs used to provide generated RTP packets This is useful for users of the API which need to keep forwarding the msgb to lower layers which may need prepending a new header to the msgb, like osmo-bts with l1sap. Related: SYS#5987 Change-Id: I632654221826340423e1e97b0f8ed9a2baf6c6c3 --- M include/osmocom/netif/osmux.h M src/osmux.c 2 files changed, 27 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h index 8742797..c663c1b 100644 --- a/include/osmocom/netif/osmux.h +++ b/include/osmocom/netif/osmux.h @@ -75,6 +75,8 @@ #define OSMUX_MAX_CONCURRENT_CALLS 8 +typedef struct msgb *(*rtp_msgb_alloc_cb_t)(void *rtp_msgb_alloc_priv_data, + unsigned int msg_len); /* one per OSmux circuit_id, ie. one per RTP flow. */ struct osmux_out_handle { uint16_t rtp_seq; @@ -86,6 +88,8 @@ struct llist_head list; void (*tx_cb)(struct msgb *msg, void *data); /* Used defined rtp tx callback */ void *data; /* User defined opaque data structure */ + rtp_msgb_alloc_cb_t rtp_msgb_alloc_cb; /* User defined msgb alloc function for generated RTP pkts */ + void *rtp_msgb_alloc_cb_data; /* Opaque data pointer set by user and passed in rtp_msgb_alloc_cb() */ }; static inline uint8_t *osmux_get_payload(struct osmux_hdr *osmuxh) @@ -113,6 +117,7 @@ void osmux_xfrm_output_set_rtp_ssrc(struct osmux_out_handle *h, uint32_t rtp_ssrc); void osmux_xfrm_output_set_rtp_pl_type(struct osmux_out_handle *h, uint32_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); +void osmux_xfrm_output_set_rtp_msgb_alloc_cb(struct osmux_out_handle *h, rtp_msgb_alloc_cb_t cb, void *cb_data); 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); diff --git a/src/osmux.c b/src/osmux.c index 63342fa..71afe5c 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -127,11 +127,15 @@ struct rtp_hdr *rtph; struct amr_hdr *amrh; struct timespec delta = { .tv_sec = 0, .tv_nsec = DELTA_RTP_MSG*1000 }; + unsigned int msg_len = sizeof(struct rtp_hdr) + + sizeof(struct amr_hdr) + + payload_len; - out_msg = msgb_alloc(sizeof(struct rtp_hdr) + - sizeof(struct amr_hdr) + - osmo_amr_bytes(osmuxh->amr_ft), - "OSMUX test"); + if (h->rtp_msgb_alloc_cb) { + out_msg = h->rtp_msgb_alloc_cb(h->rtp_msgb_alloc_cb_data, msg_len); + } else { + out_msg = msgb_alloc(msg_len, "osmux-rtp"); + } if (out_msg == NULL) return NULL; @@ -932,6 +936,20 @@ h->data = data; } +/*! \brief Set callback to call when an RTP packet to be generated is to be allocated + * \param[in] h the osmux out handle handling a specific CID + * \param[in] cb User defined msgb alloc function for generated RTP pkts + * \param[in] cb_data Opaque data pointer set by user and passed in \ref cb + * \return msgb structure to be used to fill in generated RTP pkt content + */ +void osmux_xfrm_output_set_rtp_msgb_alloc_cb(struct osmux_out_handle *h, + rtp_msgb_alloc_cb_t cb, + void *cb_data) +{ + h->rtp_msgb_alloc_cb = cb; + h->rtp_msgb_alloc_cb_data = cb_data; +} + /*! \brief Set SSRC of generated RTP packets from Osmux frames * \param[in] h the osmux out handle handling a specific CID * \param[in] rtp_ssrc the RTP SSRC to set -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I632654221826340423e1e97b0f8ed9a2baf6c6c3 Gerrit-Change-Number: 29260 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Allow the user to alloc msgbs used to provide generated RTP pa...

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29260 ) Change subject: osmux: Allow the user to alloc msgbs used to provide generated RTP packets ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I632654221826340423e1e97b0f8ed9a2baf6c6c3 Gerrit-Change-Number: 29260 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 Sep 2022 10:09:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022