<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9216">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Neels Hofmeyr: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp: switch to new osmux output APIs<br><br>Older ones are being deprecated as they may generate interleaved<br>packets.<br><br>Change-Id: I0705aa4dc4b02eaff4d6030795243e6720f7fddf<br>---<br>M src/libosmo-mgcp/mgcp_osmux.c<br>1 file changed, 11 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>index bdc285b..281595c 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -322,7 +322,6 @@</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span> struct osmux_hdr *osmuxh;</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head list;</span><br><span> struct sockaddr_in addr;</span><br><span> struct mgcp_config *cfg = ofd->data;</span><br><span> uint32_t rem;</span><br><span>@@ -359,8 +358,7 @@</span><br><span> conn_bts->osmux.stats.chunks++;</span><br><span> rem = msg->len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmux_xfrm_output(osmuxh, &conn_bts->osmux.out, &list);</span><br><span style="color: hsl(0, 100%, 40%);">- osmux_tx_sched(&list, scheduled_tx_bts_cb, endp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_sched(&conn_bts->osmux.out, osmuxh);</span><br><span> }</span><br><span> out:</span><br><span> msgb_free(msg);</span><br><span>@@ -426,7 +424,6 @@</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span> struct osmux_hdr *osmuxh;</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head list;</span><br><span> struct sockaddr_in addr;</span><br><span> struct mgcp_config *cfg = ofd->data;</span><br><span> uint32_t rem;</span><br><span>@@ -463,8 +460,7 @@</span><br><span> conn_net->osmux.stats.chunks++;</span><br><span> rem = msg->len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmux_xfrm_output(osmuxh, &conn_net->osmux.out, &list);</span><br><span style="color: hsl(0, 100%, 40%);">- osmux_tx_sched(&list, scheduled_tx_net_cb, endp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_sched(&conn_net->osmux.out, osmuxh);</span><br><span> }</span><br><span> out:</span><br><span> msgb_free(msg);</span><br><span>@@ -553,9 +549,13 @@</span><br><span> switch (endp->cfg->role) {</span><br><span> case MGCP_BSC_NAT:</span><br><span> conn->type = MGCP_OSMUX_BSC_NAT;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_set_tx_cb(&conn->osmux.out,</span><br><span style="color: hsl(120, 100%, 40%);">+ scheduled_tx_net_cb, endp);</span><br><span> break;</span><br><span> case MGCP_BSC:</span><br><span> conn->type = MGCP_OSMUX_BSC;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_set_tx_cb(&conn->osmux.out,</span><br><span style="color: hsl(120, 100%, 40%);">+ scheduled_tx_bts_cb, endp);</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span>@@ -576,6 +576,11 @@</span><br><span> </span><br><span> LOGP(DLMGCP, LOGL_INFO, "Releasing connection %s using Osmux CID %u\n",</span><br><span> conn->conn->id, conn->osmux.cid);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We are closing, we don't need pending RTP packets to be transmitted */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_set_tx_cb(&conn->osmux.out, NULL, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_flush(&conn->osmux.out);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> osmux_xfrm_input_close_circuit(conn->osmux.in, conn->osmux.cid);</span><br><span> conn->osmux.state = OSMUX_STATE_DISABLED;</span><br><span> conn->osmux.cid = -1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9216">change 9216</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/9216"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I0705aa4dc4b02eaff4d6030795243e6720f7fddf </div>
<div style="display:none"> Gerrit-Change-Number: 9216 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>