<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/25423">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libosmo-mgcp: do not use the default msgb talloc context<br><br>Trunk is safe, since it will not disappear sooner than the endpoints or<br>connections.<br><br>osmux still missing!<br><br>Change-Id: I15b01085f31e9a10a1ad381713ca2275356ca20c<br>---<br>M src/libosmo-mgcp/mgcp_e1.c<br>M src/libosmo-mgcp/mgcp_network.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>3 files changed, 21 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/23/25423/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_e1.c b/src/libosmo-mgcp/mgcp_e1.c</span><br><span>index effbe77..e88b8c5 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_e1.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_e1.c</span><br><span>@@ -192,7 +192,7 @@</span><br><span> {</span><br><span> struct mgcp_endpoint *endp = user_data;</span><br><span> struct rate_ctr_group *rate_ctrs = endp->trunk->ratectr.e1_stats;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_alloc(E1_TRAU_BITS_MSGB, "E1-I.460-IDLE-TX-TRAU-frame");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = msgb_alloc_c(endp->trunk, E1_TRAU_BITS_MSGB, "E1-I.460-IDLE-TX-TRAU-frame");</span><br><span> uint8_t *ptr;</span><br><span> const uint8_t *ptr_ft;</span><br><span> enum osmo_trau_frame_type ft;</span><br><span>@@ -238,9 +238,9 @@</span><br><span> * (the resulting frame will be prepended with an all-zero (12-byte) rtp header) */</span><br><span> static void sync_frame_out_cb(void *user_data, const ubit_t *bits, unsigned int num_bits)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_alloc(RTP_BUF_SIZE, "RTP-rx-from-E1");</span><br><span> unsigned int rtp_hdr_len = sizeof(struct rtp_hdr);</span><br><span> struct mgcp_endpoint *endp = user_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = msgb_alloc_c(endp->trunk, RTP_BUF_SIZE, "RTP-rx-from-E1");</span><br><span> struct rate_ctr_group *rate_ctrs = endp->trunk->ratectr.e1_stats;</span><br><span> struct mgcp_conn *conn_dst;</span><br><span> struct osmo_trau_frame fr;</span><br><span>@@ -312,7 +312,7 @@</span><br><span> /* Function to handle outgoing E1 traffic */</span><br><span> static void e1_send(struct e1inp_ts *ts, struct mgcp_trunk *trunk)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_alloc(E1_TS_BYTES, "E1-TX-timeslot-bytes");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = msgb_alloc_c(trunk, E1_TS_BYTES, "E1-TX-timeslot-bytes");</span><br><span> uint8_t *ptr;</span><br><span> </span><br><span> /* Get E1 frame from I.460 multiplexer */</span><br><span>@@ -622,7 +622,7 @@</span><br><span> * \returns 0 on success, -1 on ERROR. */</span><br><span> int mgcp_e1_send_rtp(struct mgcp_endpoint *endp, struct mgcp_rtp_codec *codec, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg_tf = msgb_alloc(E1_TRAU_BITS_MSGB, "E1-I.460-TX-TRAU-frame");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg_tf = msgb_alloc_c(endp->trunk, E1_TRAU_BITS_MSGB, "E1-I.460-TX-TRAU-frame");</span><br><span> struct rate_ctr_group *rate_ctrs = endp->trunk->ratectr.e1_stats;</span><br><span> unsigned int rtp_hdr_len = sizeof(struct rtp_hdr);</span><br><span> struct osmo_trau_frame tf;</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index cb82137..86b0d06 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -1448,13 +1448,14 @@</span><br><span> int ret;</span><br><span> enum rtp_proto proto;</span><br><span> struct osmo_rtp_msg_ctx *mc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_alloc(RTP_BUF_SIZE, "RTP-rx");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span> int rc;</span><br><span> </span><br><span> conn_src = (struct mgcp_conn_rtp *)fd->data;</span><br><span> OSMO_ASSERT(conn_src);</span><br><span> endp = conn_src->conn->endp;</span><br><span> OSMO_ASSERT(endp);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = msgb_alloc_c(endp->trunk, RTP_BUF_SIZE, "RTP-rx");</span><br><span> </span><br><span> proto = (fd == &conn_src->end.rtp)? MGCP_PROTO_RTP : MGCP_PROTO_RTCP;</span><br><span> </span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index ba80d7d..a8e1813 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -172,12 +172,18 @@</span><br><span> }</span><br><span> </span><br><span> /* Helper function to allocate some memory for responses and retransmissions */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct msgb *mgcp_msgb_alloc(void)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct msgb *mgcp_msgb_alloc(void* ctx)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span style="color: hsl(0, 100%, 40%);">- msg = msgb_alloc_headroom(4096, 128, "MGCP msg");</span><br><span style="color: hsl(0, 100%, 40%);">- if (!msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = msgb_alloc_c(ctx, 4096, "MGCP msg");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msg) {</span><br><span> LOGP(DLMGCP, LOGL_ERROR, "Failed to msgb for MGCP data.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* headroom */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_reserve(msg, 128);</span><br><span> </span><br><span> return msg;</span><br><span> }</span><br><span>@@ -185,7 +191,7 @@</span><br><span> /* Helper function for do_retransmission() and create_resp() */</span><br><span> static struct msgb *create_retransmission_response(const struct mgcp_endpoint *endp)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = mgcp_msgb_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = mgcp_msgb_alloc(endp->trunk);</span><br><span> if (!msg)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -203,7 +209,7 @@</span><br><span> int len;</span><br><span> struct msgb *res;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- res = mgcp_msgb_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ res = mgcp_msgb_alloc(endp->trunk);</span><br><span> if (!res)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -277,10 +283,13 @@</span><br><span> int rc;</span><br><span> struct msgb *result;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sdp = msgb_alloc_headroom(4096, 128, "sdp record");</span><br><span style="color: hsl(120, 100%, 40%);">+ sdp = msgb_alloc_c(endp->trunk, 4096, "sdp record");</span><br><span> if (!sdp)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* headroom */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_reserve(sdp, 128);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Attach optional endpoint name */</span><br><span> if (add_epname) {</span><br><span> rc = msgb_printf(sdp, "Z: %s\r\n", endp->name);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/25423">change 25423</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-mgw/+/25423"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I15b01085f31e9a10a1ad381713ca2275356ca20c </div>
<div style="display:none"> Gerrit-Change-Number: 25423 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>