<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24174">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_network: fix implicit address loopback<br><br>A call agent may send a CRCX to create a connection in LOOPBACK mode but<br>without specifiying the destination address. In those cases the MGW<br>should deduct the destination address from the first incoming RTP<br>packet.<br><br>Unfortunately this is currently blocked by an OSMO_ASSERT that checks the<br>current sa_familiy against the sa_family from the incoming packet. This<br>makes no sense since the current sa_family is still uninitalized, which<br>is expected and not an error since the code that follows will initalize<br>it.<br><br>It also makes sense not to access the osmo_sockaddr struct members<br>individually but rather copy the address as a wohle.<br><br>Since the event only happens once and since it is also somewhat special<br>it makes sense to log the event as well.<br><br>Change-Id: I2dbd6f62170a7f62e5287d04a4ee6716b8786c26<br>Related: OS#5123<br>---<br>M src/libosmo-mgcp/mgcp_network.c<br>1 file changed, 14 insertions(+), 6 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/74/24174/1</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 6a30165..abe01c9 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -1251,6 +1251,7 @@</span><br><span> struct mgcp_conn *conn = conn_src->conn;</span><br><span> struct mgcp_conn *conn_dst;</span><br><span> struct osmo_sockaddr *from_addr = mc->from_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ char ipbuf[INET6_ADDRSTRLEN];</span><br><span> </span><br><span> /*! NOTE: This callback function implements the endpoint specific</span><br><span> * dispatch behaviour of an rtp bridge/proxy endpoint. It is assumed</span><br><span>@@ -1269,19 +1270,22 @@</span><br><span> * address data from the UDP packet header to patch the</span><br><span> * outgoing address in connection on the fly */</span><br><span> if (conn->u.rtp.end.rtp_port == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(conn->u.rtp.end.addr.u.sa.sa_family == from_addr->u.sa.sa_family);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&conn->u.rtp.end.addr, from_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(conn->u.rtp.end.addr));</span><br><span> switch (from_addr->u.sa.sa_family) {</span><br><span> case AF_INET:</span><br><span style="color: hsl(0, 100%, 40%);">- conn->u.rtp.end.addr.u.sin.sin_addr = from_addr->u.sin.sin_addr;</span><br><span> conn->u.rtp.end.rtp_port = from_addr->u.sin.sin_port;</span><br><span> break;</span><br><span> case AF_INET6:</span><br><span style="color: hsl(0, 100%, 40%);">- conn->u.rtp.end.addr.u.sin6.sin6_addr = from_addr->u.sin6.sin6_addr;</span><br><span> conn->u.rtp.end.rtp_port = from_addr->u.sin6.sin6_port;</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_CONN_RTP(conn_src, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "loopback mode: implicitly using source address (%s:%u) as destination address\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_ntop(&from_addr->u.sa, ipbuf),</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->u.rtp.end.rtp_port);</span><br><span> }</span><br><span> return mgcp_send_rtp(conn_src, msg);</span><br><span> }</span><br><span>@@ -1331,6 +1335,7 @@</span><br><span> struct mgcp_conn_rtp *conn_src = mc->conn_src;</span><br><span> struct mgcp_conn *conn = conn_src->conn;</span><br><span> struct osmo_sockaddr *from_addr = mc->from_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ char ipbuf[INET6_ADDRSTRLEN];</span><br><span> </span><br><span> /* Check if the connection is in loopback mode, if yes, just send the</span><br><span> * incoming data back to the origin */</span><br><span>@@ -1340,19 +1345,22 @@</span><br><span> * address data from the UDP packet header to patch the</span><br><span> * outgoing address in connection on the fly */</span><br><span> if (conn->u.rtp.end.rtp_port == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(conn->u.rtp.end.addr.u.sa.sa_family == from_addr->u.sa.sa_family);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&conn->u.rtp.end.addr, from_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(conn->u.rtp.end.addr));</span><br><span> switch (from_addr->u.sa.sa_family) {</span><br><span> case AF_INET:</span><br><span style="color: hsl(0, 100%, 40%);">- conn->u.rtp.end.addr.u.sin.sin_addr = from_addr->u.sin.sin_addr;</span><br><span> conn->u.rtp.end.rtp_port = from_addr->u.sin.sin_port;</span><br><span> break;</span><br><span> case AF_INET6:</span><br><span style="color: hsl(0, 100%, 40%);">- conn->u.rtp.end.addr.u.sin6.sin6_addr = from_addr->u.sin6.sin6_addr;</span><br><span> conn->u.rtp.end.rtp_port = from_addr->u.sin6.sin6_port;</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_CONN_RTP(conn_src, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "loopback mode: implicitly using source address (%s:%u) as destination address\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_ntop(&from_addr->u.sa, ipbuf),</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->u.rtp.end.rtp_port);</span><br><span> }</span><br><span> return mgcp_send_rtp(conn_src, msg);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24174">change 24174</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/c/osmo-mgw/+/24174"/><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-Change-Id: I2dbd6f62170a7f62e5287d04a4ee6716b8786c26 </div>
<div style="display:none"> Gerrit-Change-Number: 24174 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>