<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11380">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;">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>Port from openbsc 96bd7b075a59eb051079152241b127ca944b0781.<br>Change-Id: Ic56eda1251be41369d869e687a1cf955df2c6d61<br>---<br>M src/libosmo-mgcp/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/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>index 38cd3bd..2828d83 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -536,9 +536,9 @@</span><br><span>  uint16_t osmux_dummy = endp->cfg->osmux_dummy;</span><br><span> </span><br><span>     /* Check if osmux is enabled for the specified connection */</span><br><span style="color: hsl(0, 100%, 40%);">-    if (conn->osmux.state == OSMUX_STATE_DISABLED) {</span><br><span style="color: hsl(0, 100%, 40%);">-             LOGP(DLMGCP, LOGL_ERROR, "OSMUX not enabled for conn:%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                mgcp_conn_dump(conn->conn));</span><br><span style="color: hsl(120, 100%, 40%);">+  if (conn->osmux.state != OSMUX_STATE_ACTIVATING) {</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGP(DLMGCP, LOGL_ERROR, "conn:%s didn't negotiate Osmux, state %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+               mgcp_conn_dump(conn->conn), conn->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/11380">change 11380</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/11380"/><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: Ic56eda1251be41369d869e687a1cf955df2c6d61 </div>
<div style="display:none"> Gerrit-Change-Number: 11380 </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>