<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19945">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  dexter: Looks good to me, but someone else must approve; Verified
  pespin: Looks good to me, approved
  laforge: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands<br><br>Change-Id: Ie97675f173dc3a223f6c2ced913906d760ffb732<br>---<br>M src/libosmo-mgcp-client/mgcp_client_fsm.c<br>1 file changed, 8 insertions(+), 5 deletions(-)<br><br></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 e38a4ba..2505ff2 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>@@ -25,6 +25,7 @@</span><br><span> #include <osmocom/core/byteswap.h></span><br><span> #include <arpa/inet.h></span><br><span> #include <osmocom/core/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/sockaddr_str.h></span><br><span> </span><br><span> /* Context information, this is attached to the priv pointer of the FSM and</span><br><span>  * is also handed back when dispatcheing events to the parent FSM. This is</span><br><span>@@ -607,14 +608,16 @@</span><br><span> {</span><br><span>         struct mgcp_ctx *mgcp_ctx;</span><br><span>   struct osmo_fsm_inst *fi;</span><br><span style="color: hsl(0, 100%, 40%);">-       struct in_addr ip_test;</span><br><span style="color: hsl(120, 100%, 40%);">+       struct in6_addr ip_test;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span>       OSMO_ASSERT(parent_fi);</span><br><span>      OSMO_ASSERT(mgcp);</span><br><span>   OSMO_ASSERT(conn_peer);</span><br><span> </span><br><span>  /* Check if IP/Port information in conn info makes sense */</span><br><span style="color: hsl(0, 100%, 40%);">-     if (conn_peer->port && inet_aton(conn_peer->addr, &ip_test) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+   if (conn_peer->port && inet_pton(osmo_ip_str_type(conn_peer->addr),</span><br><span style="color: hsl(120, 100%, 40%);">+                                      conn_peer->addr, &ip_test) != 1)</span><br><span>             return NULL;</span><br><span> </span><br><span>     /* Allocate and configure a new fsm instance */</span><br><span>@@ -644,7 +647,7 @@</span><br><span> {</span><br><span>   OSMO_ASSERT(fi);</span><br><span>     struct mgcp_ctx *mgcp_ctx = fi->priv;</span><br><span style="color: hsl(0, 100%, 40%);">-        struct in_addr ip_test;</span><br><span style="color: hsl(120, 100%, 40%);">+       struct in6_addr ip_test;</span><br><span> </span><br><span>         OSMO_ASSERT(mgcp_ctx);</span><br><span>       OSMO_ASSERT(conn_peer);</span><br><span>@@ -668,8 +671,8 @@</span><br><span>                LOGPFSML(fi, LOGL_ERROR, "Cannot MDCX, port == 0\n");</span><br><span>              return -EINVAL;</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-       if (inet_aton(conn_peer->addr, &ip_test) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-         LOGPFSML(fi, LOGL_ERROR, "Cannot MDCX, IP address == 0.0.0.0\n");</span><br><span style="color: hsl(120, 100%, 40%);">+   if (inet_pton(osmo_ip_str_type(conn_peer->addr), conn_peer->addr, &ip_test) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGPFSML(fi, LOGL_ERROR, "Cannot MDCX, IP address %s\n", conn_peer->addr);</span><br><span>              return -EINVAL;</span><br><span>      }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19945">change 19945</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/+/19945"/><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: Ie97675f173dc3a223f6c2ced913906d760ffb732 </div>
<div style="display:none"> Gerrit-Change-Number: 19945 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Assignee: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>