From dac8e75229ff69b7cdd426b7771147b2f871f8f5 Mon Sep 17 00:00:00 2001
From: Christien Rioux <chris@veilid.org>
Date: Mon, 4 Sep 2023 20:33:43 -0400
Subject: [PATCH] xfer

---
 .../network_manager/tasks/public_address_check.rs   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/veilid-core/src/network_manager/tasks/public_address_check.rs b/veilid-core/src/network_manager/tasks/public_address_check.rs
index ec084c99..e106af9f 100644
--- a/veilid-core/src/network_manager/tasks/public_address_check.rs
+++ b/veilid-core/src/network_manager/tasks/public_address_check.rs
@@ -77,7 +77,7 @@ impl NetworkManager {
         });
 
         // Get the ip(block) this report is coming from
-        let ipblock = ip_to_ipblock(
+        let reporting_ipblock = ip_to_ipblock(
             ip6_prefix_size,
             connection_descriptor.remote_address().to_ip_addr(),
         );
@@ -91,6 +91,13 @@ impl NetworkManager {
             return;
         }
 
+        // If the socket address reported is the same as the reporter, then this is coming through a relay
+        // or it should be ignored due to local proximity (nodes on the same network block should not be trusted as
+        // public ip address reporters, only disinterested parties)
+        if reporting_ipblock == ip_to_ipblock(ip6_prefix_size, socket_address.to_ip_addr()) {
+            return;
+        }
+
         // Check if the public address report is coming from a node/block that gives an 'inconsistent' location
         // meaning that the node may be not useful for public address detection
         // This is done on a per address/protocol basis
@@ -105,7 +112,7 @@ impl NetworkManager {
         if inner
             .public_address_inconsistencies_table
             .get(&addr_proto_type_key)
-            .map(|pait| pait.contains_key(&ipblock))
+            .map(|pait| pait.contains_key(&reporting_ipblock))
             .unwrap_or(false)
         {
             return;
@@ -117,7 +124,7 @@ impl NetworkManager {
             .public_address_check_cache
             .entry(addr_proto_type_key)
             .or_insert_with(|| LruCache::new(PUBLIC_ADDRESS_CHECK_CACHE_SIZE));
-        pacc.insert(ipblock, socket_address);
+        pacc.insert(reporting_ipblock, socket_address);
 
         // Determine if our external address has likely changed
         let mut bad_public_address_detection_punishment: Option<