<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14030">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmux: Drop unneeded OSMUX_STATE_NEGOTIATING<br><br>Change-Id: I94e7df3287d037975adc16c5ada05adf94269ead<br>---<br>M include/osmocom/mgcp/osmux.h<br>M src/libosmo-mgcp/mgcp_protocol.c<br>2 files changed, 1 insertion(+), 3 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/30/14030/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h</span><br><span>index c080c85..eb05610 100644</span><br><span>--- a/include/osmocom/mgcp/osmux.h</span><br><span>+++ b/include/osmocom/mgcp/osmux.h</span><br><span>@@ -28,7 +28,6 @@</span><br><span> </span><br><span> enum osmux_state {</span><br><span>     OSMUX_STATE_DISABLED = 0, /* Osmux not being currently used by endp */</span><br><span style="color: hsl(0, 100%, 40%);">-  OSMUX_STATE_NEGOTIATING,  /* Osmux was locally requested in MGCP CRCX */</span><br><span>     OSMUX_STATE_ACTIVATING,   /* Osmux was accepted in MGCP CRCX ACK. It can now be enabled by \ref osmux_enable_endpoint. */</span><br><span>    OSMUX_STATE_ENABLED,      /* Osmux was initialized by \ref osmux_enable_endpoint and can process frames */</span><br><span> };</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index 0c809cb..4b0be07 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -327,7 +327,6 @@</span><br><span>          rc = msgb_printf(sdp, "X-Osmux: %u\r\n", conn->osmux.cid);</span><br><span>              if (rc < 0)</span><br><span>                       goto error;</span><br><span style="color: hsl(0, 100%, 40%);">-             conn->osmux.state = OSMUX_STATE_ACTIVATING;</span><br><span>       }</span><br><span> </span><br><span>        /* Attach line break to separate the parameters from the SDP block */</span><br><span>@@ -918,7 +917,7 @@</span><br><span>   * is fully set up from the dummy load. */</span><br><span>   conn->osmux.state = OSMUX_STATE_DISABLED;</span><br><span>         if (osmux_cid >= -1) { /* -1 is wilcard, alloc next avail CID */</span><br><span style="color: hsl(0, 100%, 40%);">-             conn->osmux.state = OSMUX_STATE_NEGOTIATING;</span><br><span style="color: hsl(120, 100%, 40%);">+               conn->osmux.state = OSMUX_STATE_ACTIVATING;</span><br><span>               if (conn_osmux_allocate_cid(conn, osmux_cid) == -1) {</span><br><span>                        rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_NO_OSMUX]);</span><br><span>                       goto error2;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14030">change 14030</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/14030"/><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: I94e7df3287d037975adc16c5ada05adf94269ead </div>
<div style="display:none"> Gerrit-Change-Number: 14030 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>