<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9215">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Neels Hofmeyr: Looks good to me, but someone else must approve
  dexter: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat<br><br>This commit actually doesn't fix the entire code, since anyway osmux<br>conns are not supported and mgcp_conn_get_rtp() will return NULL.<br>However, it makes the code more logical and easier to understand once<br>somebody refactors the code to make it work again.<br><br>Change-Id: Ib57e12e5a36b5842c40673c236907bbcbfc390f3<br>---<br>M src/libosmo-mgcp/mgcp_osmux.c<br>1 file changed, 6 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 1d3cab3..bdc285b 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -326,7 +326,7 @@</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 style="color: hsl(0, 100%, 40%);">-   struct mgcp_conn_rtp *conn_net = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+        struct mgcp_conn_rtp *conn_bts = NULL;</span><br><span> </span><br><span>   msg = osmux_recv(ofd, &addr);</span><br><span>    if (!msg)</span><br><span>@@ -345,8 +345,8 @@</span><br><span>                                     &addr.sin_addr, MGCP_DEST_NET);</span><br><span> </span><br><span>               /* FIXME: Get rid of CONN_ID_XXX! */</span><br><span style="color: hsl(0, 100%, 40%);">-            conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET);</span><br><span style="color: hsl(0, 100%, 40%);">-                if (!conn_net)</span><br><span style="color: hsl(120, 100%, 40%);">+                conn_bts = mgcp_conn_get_rtp(endp, CONN_ID_BTS);</span><br><span style="color: hsl(120, 100%, 40%);">+              if (!conn_bts)</span><br><span>                       goto out;</span><br><span> </span><br><span>                if (!endp) {</span><br><span>@@ -355,11 +355,11 @@</span><br><span>                              osmuxh->circuit_id);</span><br><span>                         goto out;</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-               conn_net->osmux.stats.octets += osmux_chunk_length(msg, rem);</span><br><span style="color: hsl(0, 100%, 40%);">-                conn_net->osmux.stats.chunks++;</span><br><span style="color: hsl(120, 100%, 40%);">+            conn_bts->osmux.stats.octets += osmux_chunk_length(msg, rem);</span><br><span style="color: hsl(120, 100%, 40%);">+              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_net->osmux.out, &list);</span><br><span style="color: hsl(120, 100%, 40%);">+            osmux_xfrm_output(osmuxh, &conn_bts->osmux.out, &list);</span><br><span>           osmux_tx_sched(&list, scheduled_tx_bts_cb, endp);</span><br><span>        }</span><br><span> out:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9215">change 9215</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/9215"/><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: Ib57e12e5a36b5842c40673c236907bbcbfc390f3 </div>
<div style="display:none"> Gerrit-Change-Number: 9215 </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: Harald Welte <laforge@gnumonks.org> </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>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>