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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix default ASP local addr if remote addr contains only IPv4<br><br>Otherwise it would end up attempting to connect "::" -> "1.2.3.4" which<br>would fail during osmo_sock_init2_multiaddr(). If local address is unset<br>(default), but only IPv4 addresses are set on the remote, then one must<br>use "0.0.0.0" instead.<br><br>Change-Id: I33faf1291e9105bba2e816c01a6b4854cf13d5e0<br>---<br>M src/osmo_ss7_vty.c<br>1 file changed, 14 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c</span><br><span>index 109b94a..08e650e 100644</span><br><span>--- a/src/osmo_ss7_vty.c</span><br><span>+++ b/src/osmo_ss7_vty.c</span><br><span>@@ -29,6 +29,8 @@</span><br><span> #include <netdb.h></span><br><span> #include <arpa/inet.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/sockaddr_str.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/vty/vty.h></span><br><span> #include <osmocom/vty/command.h></span><br><span> #include <osmocom/vty/logging.h></span><br><span>@@ -1842,8 +1844,18 @@</span><br><span>                asp = vty->index;</span><br><span>                 /* If no local addr was set */</span><br><span>               if (!asp->cfg.local.host_cnt) {</span><br><span style="color: hsl(0, 100%, 40%);">-                      /* "::" Covers both IPv4 and IPv6 */</span><br><span style="color: hsl(0, 100%, 40%);">-                  if (ipv6_sctp_supported("::", true))</span><br><span style="color: hsl(120, 100%, 40%);">+                        bool rem_has_v4 = false, rem_has_v6 = false;</span><br><span style="color: hsl(120, 100%, 40%);">+                  int i;</span><br><span style="color: hsl(120, 100%, 40%);">+                        for (i = 0; i < asp->cfg.remote.host_cnt; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                if (osmo_ip_str_type(asp->cfg.remote.host[i]) == AF_INET6)</span><br><span style="color: hsl(120, 100%, 40%);">+                                 rem_has_v6 = true;</span><br><span style="color: hsl(120, 100%, 40%);">+                            else</span><br><span style="color: hsl(120, 100%, 40%);">+                                  rem_has_v4 = true;</span><br><span style="color: hsl(120, 100%, 40%);">+                    }</span><br><span style="color: hsl(120, 100%, 40%);">+                     /* "::" Covers both IPv4 and IPv6, but if only IPv4</span><br><span style="color: hsl(120, 100%, 40%);">+                  * address are set on the remote side, IPv4 on the local</span><br><span style="color: hsl(120, 100%, 40%);">+                       * side must be set too */</span><br><span style="color: hsl(120, 100%, 40%);">+                    if (ipv6_sctp_supported("::", true) && !(rem_has_v4 && !rem_has_v6))</span><br><span>                               osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "::");</span><br><span>                     else</span><br><span>                                 osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "0.0.0.0");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/19932">change 19932</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/libosmo-sccp/+/19932"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I33faf1291e9105bba2e816c01a6b4854cf13d5e0 </div>
<div style="display:none"> Gerrit-Change-Number: 19932 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>