<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11338">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: osmux: allow enabling osmux only on correct activating state<br><br>State ACTIVATING is set once negotiation between the 2 parts went<br>successfuly.<br><br>Change-Id: I21eb30fa8d48f3d592ff197bd74e673fdac51c1d<br>---<br>M openbsc/src/libmgcp/mgcp_osmux.c<br>1 file changed, 3 insertions(+), 3 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 b46ea10..6be5eb2 100644</span><br><span>--- a/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>+++ b/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>@@ -452,9 +452,9 @@</span><br><span>   */</span><br><span>  static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (endp->osmux.state == OSMUX_STATE_DISABLED) {</span><br><span style="color: hsl(0, 100%, 40%);">-             LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x didn't request Osmux\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(120, 100%, 40%);">+  if (endp->osmux.state != OSMUX_STATE_ACTIVATING) {</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x didn't negotiate Osmux, state %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                  ENDPOINT_NUMBER(endp), endp->osmux.state);</span><br><span>           return -1;</span><br><span>   }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11338">change 11338</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/11338"/><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: I21eb30fa8d48f3d592ff197bd74e673fdac51c1d </div>
<div style="display:none"> Gerrit-Change-Number: 11338 </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>