<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11374">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmux: Avoid initing output without enabling osmux<br><br>Otherwise we end up in a weird state where we have timers set up but<br>osmux is still flagged as not enabled.<br><br>Cherry-picked from openbsc cad739d2386640a68c24e3d470ddacdcaf377561.<br>Change-Id: I0a334842463d311bc80a980e60fb702a0a9ad610<br>---<br>M src/libosmo-mgcp/mgcp_osmux.c<br>1 file changed, 5 insertions(+), 5 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/74/11374/1</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 f842232..9ae82cd 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -284,7 +284,7 @@</span><br><span>        };</span><br><span> </span><br><span>       rate_ctr_inc(&conn_net->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR]);</span><br><span style="color: hsl(0, 100%, 40%);">-     rate_ctr_add(&conn_net->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], msg->len); </span><br><span style="color: hsl(120, 100%, 40%);">+      rate_ctr_add(&conn_net->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], msg->len);</span><br><span> </span><br><span>  /* Send RTP data to BTS */</span><br><span>   /* FIXME: Get rid of conn_bts and conn_net! */</span><br><span>@@ -530,10 +530,6 @@</span><br><span>                return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   osmux_xfrm_output_init(&conn->osmux.out,</span><br><span style="color: hsl(0, 100%, 40%);">-                        (conn->osmux.cid * rtp_ssrc_winlen) +</span><br><span style="color: hsl(0, 100%, 40%);">-                        (random() % rtp_ssrc_winlen));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>        conn->osmux.in = osmux_handle_lookup(endp->cfg, addr, port);</span><br><span>   if (!conn->osmux.in) {</span><br><span>            LOGP(DLMGCP, LOGL_ERROR, "Cannot allocate input osmux handle for conn:%s\n",</span><br><span>@@ -546,6 +542,10 @@</span><br><span>                return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_init(&conn->osmux.out,</span><br><span style="color: hsl(120, 100%, 40%);">+                              (conn->osmux.cid * rtp_ssrc_winlen) +</span><br><span style="color: hsl(120, 100%, 40%);">+                              (random() % rtp_ssrc_winlen));</span><br><span style="color: hsl(120, 100%, 40%);">+</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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11374">change 11374</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/11374"/><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: I0a334842463d311bc80a980e60fb702a0a9ad610 </div>
<div style="display:none"> Gerrit-Change-Number: 11374 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>