<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14032">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: Provide correct local port during mgcp resp<br><br>Also document some possible future improvements for local addr.<br><br>Change-Id: I12c8fcdc8b772b9f92a70774406d4662f44bd9a9<br>---<br>M src/libosmo-mgcp/mgcp_network.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>M src/libosmo-mgcp/mgcp_sdp.c<br>3 files changed, 10 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index dbed156..650d4c0 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -86,7 +86,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Select from preconfigured IP-Addresses */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Select from preconfigured IP-Addresses. We don't have bind_addr for Osmux (yet?). */</span><br><span> if (endp->cfg->net_ports.bind_addr) {</span><br><span> /* Check there is a bind IP for the RTP traffic configured,</span><br><span> * if so, use that IP-Address */</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index 609b5fb..0831abb 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -300,6 +300,9 @@</span><br><span> const char *trans_id,</span><br><span> bool add_conn_params)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: we may want to define another local_ip_osmux var to us for</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMUX connections. Perhaps adding a new internal API to get it based</span><br><span style="color: hsl(120, 100%, 40%);">+ on conn type */</span><br><span> const char *addr = endp->cfg->local_ip;</span><br><span> struct msgb *sdp;</span><br><span> int rc;</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c</span><br><span>index 6b41f50..99e764b 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_sdp.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_sdp.c</span><br><span>@@ -512,6 +512,7 @@</span><br><span> struct sdp_fmtp_param fmtp_param;</span><br><span> int rc;</span><br><span> int payload_types[1];</span><br><span style="color: hsl(120, 100%, 40%);">+ int local_port;</span><br><span> struct sdp_fmtp_param fmtp_params[1];</span><br><span> unsigned int fmtp_params_len = 0;</span><br><span> </span><br><span>@@ -541,7 +542,11 @@</span><br><span> if (payload_type >= 0) {</span><br><span> </span><br><span> payload_types[0] = payload_type;</span><br><span style="color: hsl(0, 100%, 40%);">- rc = add_audio(sdp, payload_types, 1, conn->end.local_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mgcp_conn_rtp_is_osmux(conn))</span><br><span style="color: hsl(120, 100%, 40%);">+ local_port = endp->cfg->osmux_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ local_port = conn->end.local_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = add_audio(sdp, payload_types, 1, local_port);</span><br><span> if (rc < 0)</span><br><span> goto buffer_too_small;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14032">change 14032</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/14032"/><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: I12c8fcdc8b772b9f92a70774406d4662f44bd9a9 </div>
<div style="display:none"> Gerrit-Change-Number: 14032 </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>