<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9213">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">legacy-mgcp: switch to new osmux output APIs<br><br>Older ones are being deprecated as they may generate interleaved<br>packets.<br><br>This commit is a forward-port of openbsc.git Change-Id<br>I189564fc63139c15314db8975afd423c7153ea32.<br><br>Change-Id: I9b8a19e5b8d62deaa9bbb92d49d99e8c33b7e345<br>---<br>M src/libosmo-legacy-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;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/13/9213/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-legacy-mgcp/mgcp_osmux.c b/src/libosmo-legacy-mgcp/mgcp_osmux.c</span><br><span>index 743d3f9..b53e2b5 100644</span><br><span>--- a/src/libosmo-legacy-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-legacy-mgcp/mgcp_osmux.c</span><br><span>@@ -267,7 +267,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>@@ -297,8 +296,7 @@</span><br><span>          endp->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, &endp->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(&endp->osmux.out, osmuxh);</span><br><span>    }</span><br><span> out:</span><br><span>    msgb_free(msg);</span><br><span>@@ -359,7 +357,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>@@ -389,8 +386,7 @@</span><br><span>          endp->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, &endp->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(&endp->osmux.out, osmuxh);</span><br><span>    }</span><br><span> out:</span><br><span>    msgb_free(msg);</span><br><span>@@ -470,9 +466,13 @@</span><br><span>       switch (endp->cfg->role) {</span><br><span>             case MGCP_BSC_NAT:</span><br><span>                   endp->type = MGCP_OSMUX_BSC_NAT;</span><br><span style="color: hsl(120, 100%, 40%);">+                   osmux_xfrm_output_set_tx_cb(&endp->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>                       endp->type = MGCP_OSMUX_BSC;</span><br><span style="color: hsl(120, 100%, 40%);">+                       osmux_xfrm_output_set_tx_cb(&endp->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>    endp->osmux.state = OSMUX_STATE_ENABLED;</span><br><span>@@ -484,6 +484,11 @@</span><br><span> {</span><br><span>      LOGP(DLMGCP, LOGL_INFO, "Releasing endpoint %u using Osmux CID %u\n",</span><br><span>           ENDPOINT_NUMBER(endp), endp->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(&endp->osmux.out, NULL, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+     osmux_xfrm_output_flush(&endp->osmux.out);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  osmux_xfrm_input_close_circuit(endp->osmux.in, endp->osmux.cid);</span><br><span>       endp->osmux.state = OSMUX_STATE_DISABLED;</span><br><span>         endp->osmux.cid = -1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9213">change 9213</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/9213"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I9b8a19e5b8d62deaa9bbb92d49d99e8c33b7e345 </div>
<div style="display:none"> Gerrit-Change-Number: 9213 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>