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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">create_response_with_sdp: Fix inclusion of X-Osmux<br><br>In previous code, 2 blocks were handling osmux inclusion one after the<br>other under same osmux.state. However, first block changes osmux.state<br>so second block can never be true and X-Osmux is never added.<br><br>Change-Id: Iceee8b64978651f1fe6bb883923561b081f73d9b<br>---<br>M src/libosmo-mgcp/mgcp_protocol.c<br>1 file changed, 2 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index be161ad..bfb88bc 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -304,7 +304,6 @@</span><br><span>    struct msgb *sdp;</span><br><span>    int rc;</span><br><span>      struct msgb *result;</span><br><span style="color: hsl(0, 100%, 40%);">-    char osmux_extension[strlen("X-Osmux: 255") + 1];</span><br><span>  char local_ip_addr[INET_ADDRSTRLEN];</span><br><span> </span><br><span>     sdp = msgb_alloc_headroom(4096, 128, "sdp record");</span><br><span>@@ -316,13 +315,6 @@</span><br><span>                 addr = local_ip_addr;</span><br><span>        }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (conn->osmux.state == OSMUX_STATE_NEGOTIATING) {</span><br><span style="color: hsl(0, 100%, 40%);">-          sprintf(osmux_extension, "X-Osmux: %u", conn->osmux.cid);</span><br><span style="color: hsl(0, 100%, 40%);">-          conn->osmux.state = OSMUX_STATE_ACTIVATING;</span><br><span style="color: hsl(0, 100%, 40%);">-  } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                osmux_extension[0] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">-      }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>    /* Attach optional connection parameters */</span><br><span>  if (add_conn_params) {</span><br><span>               rc = add_params(sdp, endp, conn);</span><br><span>@@ -332,9 +324,10 @@</span><br><span> </span><br><span>         /* Attach optional OSMUX parameters */</span><br><span>       if (conn->osmux.state == OSMUX_STATE_NEGOTIATING) {</span><br><span style="color: hsl(0, 100%, 40%);">-          rc = msgb_printf(sdp, "%s\r\n", osmux_extension);</span><br><span style="color: hsl(120, 100%, 40%);">+           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(120, 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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13775">change 13775</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/13775"/><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: Iceee8b64978651f1fe6bb883923561b081f73d9b </div>
<div style="display:none"> Gerrit-Change-Number: 13775 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>