<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14029">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp-cli: Parse X-Osmux on MDCX response<br><br>During MDCX state is already changed to ACTIVATING but we still want to<br>send the local CID back to announce that we still use same local CID.<br><br>Change-Id: If182a48743ebe03f97caf9034e49b9947014bdf9<br>---<br>M src/libosmo-mgcp-client/mgcp_client_fsm.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>2 files changed, 7 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/29/14029/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c</span><br><span>index 0bbe24b..95594f1 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client_fsm.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c</span><br><span>@@ -404,6 +404,12 @@</span><br><span>     }</span><br><span>    LOGPFSML(fi, LOGL_DEBUG, "MGW/MDCX: MGW responded with address %s:%u\n", r->audio_ip, r->audio_port);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+     if(r->head.x_osmo_osmux_use) {</span><br><span style="color: hsl(120, 100%, 40%);">+             LOGPFSML(fi, LOGL_DEBUG, "MGW/CRCX: MGW responded using Osmux %u\n", r->head.x_osmo_osmux_cid);</span><br><span style="color: hsl(120, 100%, 40%);">+          mgcp_ctx->conn_peer_remote.x_osmo_osmux_use = true;</span><br><span style="color: hsl(120, 100%, 40%);">+                mgcp_ctx->conn_peer_remote.x_osmo_osmux_cid = r->head.x_osmo_osmux_cid;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  osmo_strlcpy(mgcp_ctx->conn_peer_remote.addr, r->audio_ip, sizeof(mgcp_ctx->conn_peer_remote.addr));</span><br><span>        mgcp_ctx->conn_peer_remote.port = r->audio_port;</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 35141f8..0c809cb 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -323,7 +323,7 @@</span><br><span>        }</span><br><span> </span><br><span>        /* Attach optional OSMUX parameters */</span><br><span style="color: hsl(0, 100%, 40%);">-  if (conn->osmux.state == OSMUX_STATE_NEGOTIATING) {</span><br><span style="color: hsl(120, 100%, 40%);">+        if(mgcp_conn_rtp_is_osmux(conn)) {</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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14029">change 14029</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/14029"/><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: If182a48743ebe03f97caf9034e49b9947014bdf9 </div>
<div style="display:none"> Gerrit-Change-Number: 14029 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>