<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11326">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp: 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>Change-Id: I15c3a1a6bdf2566b03d1d543d8d15e4117a53622<br>---<br>M openbsc/src/libmgcp/mgcp_osmux.c<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>index 69f1c66..0a4441c 100644</span><br><span>--- a/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>+++ b/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>@@ -447,10 +447,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(&endp->osmux.out,</span><br><span style="color: hsl(0, 100%, 40%);">-                        (endp->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>        endp->osmux.in = osmux_handle_lookup(endp->cfg, addr, port);</span><br><span>   if (!endp->osmux.in) {</span><br><span>            LOGP(DMGCP, LOGL_ERROR, "Cannot allocate input osmux handle\n");</span><br><span>@@ -463,6 +459,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(&endp->osmux.out,</span><br><span style="color: hsl(120, 100%, 40%);">+                              (endp->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>                   endp->type = MGCP_OSMUX_BSC_NAT;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11326">change 11326</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/11326"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I15c3a1a6bdf2566b03d1d543d8d15e4117a53622 </div>
<div style="display:none"> Gerrit-Change-Number: 11326 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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 (1000002) </div>