Merge 70e62a029c into c8214782fb

src/p2p/net_node.inl

@@ -1385,6 +1385,9 @@ namespace nodetool
     }
 
 
+    if (!m_use_ipv6 && na.get_type_id() == epee::net_utils::ipv6_network_address::get_type_id())
+      return false;
+
     MDEBUG("Connecting to " << na.str() << "(peer_type=" << peer_type << ", last_seen: "
         << (last_seen_stamp ? epee::misc_utils::get_time_interval_string(time(NULL) - last_seen_stamp):"never")
         << ")...");
@@ -1630,6 +1633,9 @@ namespace nodetool
             }
           }
 
+          if (!skip && !m_use_ipv6 && pe.adr.get_type_id() == epee::net_utils::ipv6_network_address::get_type_id())
+            skip = true;
+
           // consider each host once, to avoid giving undue inflence to hosts running several nodes
           if (!skip)
           {
@@ -2916,6 +2922,8 @@ namespace nodetool
       peerlist_entry pe{};
       if (!zone.second.m_peerlist.get_random_gray_peer(pe))
         continue;
+      if (!m_use_ipv6 && pe.adr.get_type_id() == epee::net_utils::ipv6_network_address::get_type_id())
+        continue;
 
       if (!check_connection_and_handshake_with_peer(pe.adr, pe.last_seen))
       {