fix: ::1 and 127.0.0.0/8 are private range addresses

Author: jcnelson

stacks-common/src/types/net.rs

@@ -209,12 +209,14 @@ impl PeerAddress {
     /// Is this a private IP address?
     pub fn is_in_private_range(&self) -> bool {
         if self.is_ipv4() {
-            // 10.0.0.0/8, 172.16.0.0/12, or 192.168.0.0/16
+            // 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, or 127.0.0.0/8
             self.0[12] == 10
                 || (self.0[12] == 172 && self.0[13] >= 16 && self.0[13] <= 31)
                 || (self.0[12] == 192 && self.0[13] == 168)
+                || self.0[12] == 127
         } else {
-            self.0[0] >= 0xfc
+            // private address (fc00::/7) or localhost (::1)
+            self.0[0] >= 0xfc || (self.0[0..15] == [0u8; 15] && self.0[15] == 1)
         }
     }
 

stackslib/src/net/neighbors/walk.rs

@@ -673,7 +673,9 @@ impl<DB: NeighborWalkDB, NC: NeighborComms> NeighborWalk<DB, NC> {
         // just use the one we used to contact it.  This can happen if the
         // node is behind a load-balancer, or is doing port-forwarding,
         // etc.
-        if neighbor_from_handshake.addr.addrbytes.is_in_private_range() {
+        if neighbor_from_handshake.addr.addrbytes.is_in_private_range()
+            || neighbor_from_handshake.addr.addrbytes.is_anynet()
+        {
             debug!(
                 "{}: outbound neighbor gave private IP address {:?}; assuming it meant {:?}",
                 local_peer_str, &neighbor_from_handshake.addr, &self.cur_neighbor.addr

stackslib/src/net/stackerdb/sync.rs

@@ -85,7 +85,7 @@ impl<NC: NeighborComms> StackerDBSync<NC> {
         let mut found = HashSet::new();
         let mut min_age =
             get_epoch_time_secs().saturating_sub(network.get_connection_opts().max_neighbor_age);
-        while found.len() < self.max_neighbors && min_age != 0 {
+        while found.len() < self.max_neighbors {
             let peers_iter = PeerDB::find_stacker_db_replicas(
                 network.peerdb_conn(),
                 network.get_local_peer().network_id,
@@ -123,8 +123,7 @@ impl<NC: NeighborComms> StackerDBSync<NC> {
             // search for older neighbors
             if min_age > 1 {
                 min_age = 1;
-            } else if min_age == 1 {
-                min_age = 0;
+            } else if min_age <= 1 {
                 break;
             }
         }