<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14022">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: Allocate CID during CRCX<br><br>Change-Id: Ie0e1835ff7e99421de9a5741a5eb57a11c004f7e<br>---<br>M src/libosmo-mgcp/mgcp_msg.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>2 files changed, 15 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>index 5dae5a2..a31bff4 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_msg.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>@@ -354,21 +354,27 @@</span><br><span> </span><br><span> /*! Extract OSMUX CID from an MGCP parameter line (string).</span><br><span> * \param[in] line single parameter line from the MGCP message</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns OSMUX CID, -1 on error */</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns OSMUX CID, -1 wildcard, -2 on error */</span><br><span> int mgcp_parse_osmux_cid(const char *line)</span><br><span> {</span><br><span> int osmux_cid;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strstr(line + 2, "Osmux: *")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_DEBUG, "Parsed wilcard Osmux CID\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (sscanf(line + 2, "Osmux: %u", &osmux_cid) != 1) {</span><br><span> LOGP(DLMGCP, LOGL_ERROR, "Failed parsing Osmux in MGCP msg line: %s\n",</span><br><span> line);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -2;</span><br><span> }</span><br><span> </span><br><span> if (osmux_cid > OSMUX_CID_MAX) {</span><br><span> LOGP(DLMGCP, LOGL_ERROR, "Osmux ID too large: %u > %u\n",</span><br><span> osmux_cid, OSMUX_CID_MAX);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -2;</span><br><span> }</span><br><span> LOGP(DLMGCP, LOGL_DEBUG, "bsc-nat offered Osmux CID %u\n", osmux_cid);</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 807e34a..0ec9c78 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -783,7 +783,7 @@</span><br><span> const char *callid = NULL;</span><br><span> const char *mode = NULL;</span><br><span> char *line;</span><br><span style="color: hsl(0, 100%, 40%);">- int have_sdp = 0, osmux_cid = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int have_sdp = 0, osmux_cid = -2;</span><br><span> struct mgcp_conn_rtp *conn = NULL;</span><br><span> struct mgcp_conn *_conn = NULL;</span><br><span> char conn_name[512];</span><br><span>@@ -917,9 +917,12 @@</span><br><span> /* Annotate Osmux circuit ID and set it to negotiating state until this</span><br><span> * is fully set up from the dummy load. */</span><br><span> conn->osmux.state = OSMUX_STATE_DISABLED;</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmux_cid >= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- conn->osmux.cid = osmux_cid;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmux_cid >= -1) { /* -1 is wilcard, alloc next avail CID */</span><br><span> conn->osmux.state = OSMUX_STATE_NEGOTIATING;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn_osmux_allocate_cid(conn, osmux_cid) == -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_NO_OSMUX]);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto error2;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else if (endp->cfg->osmux == OSMUX_USAGE_ONLY) {</span><br><span> LOGPCONN(_conn, DLMGCP, LOGL_ERROR,</span><br><span> "CRCX: osmux only and no osmux offered\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14022">change 14022</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/14022"/><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: Ie0e1835ff7e99421de9a5741a5eb57a11c004f7e </div>
<div style="display:none"> Gerrit-Change-Number: 14022 </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>