Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-12-17 19:54:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

xfer

Browse Source
This commit is contained in:
Christien Rioux 2023-09-04 20:33:43 -04:00
parent 3dfb612e6f
commit dac8e75229
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
veilid-core/src/network_manager/tasks/public_address_check.rs
View File

@ -77,7 +77,7 @@ impl NetworkManager {
}); });
// Get the ip(block) this report is coming from // Get the ip(block) this report is coming from
let ipblock = ip_to_ipblock( let reporting_ipblock = ip_to_ipblock(
ip6_prefix_size, ip6_prefix_size,
connection_descriptor.remote_address().to_ip_addr(), connection_descriptor.remote_address().to_ip_addr(),
); );
@ -91,6 +91,13 @@ impl NetworkManager {
return; 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 // 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 // meaning that the node may be not useful for public address detection
// This is done on a per address/protocol basis // This is done on a per address/protocol basis
@ -105,7 +112,7 @@ impl NetworkManager {
if inner if inner
.public_address_inconsistencies_table .public_address_inconsistencies_table
.get(&addr_proto_type_key) .get(&addr_proto_type_key)
.map(|pait| pait.contains_key(&ipblock)) .map(|pait| pait.contains_key(&reporting_ipblock))
.unwrap_or(false) .unwrap_or(false)
{ {
return; return;
@ -117,7 +124,7 @@ impl NetworkManager {
.public_address_check_cache .public_address_check_cache
.entry(addr_proto_type_key) .entry(addr_proto_type_key)
.or_insert_with(|| LruCache::new(PUBLIC_ADDRESS_CHECK_CACHE_SIZE)); .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 // Determine if our external address has likely changed
let mut bad_public_address_detection_punishment: Option< let mut bad_public_address_detection_punishment: Option<