liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

Update to NAT detection

Browse Source
This commit is contained in:
John Smith
2021-12-08 03:09:45 +00:00
parent 57e64413b5
commit fba3f5b5f3
25 changed files with 254 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
veilid-core/src/routing_table/bucket_entry.rs
View File

@@ -105,7 +105,7 @@ impl BucketEntry {
.collect()
}
pub fn public_dial_info(&self) -> Vec<DialInfo> {
pub fn global_dial_info(&self) -> Vec<DialInfo> {
self.dial_info_entries
.iter()
.filter_map(|e| {
@@ -118,7 +118,7 @@ impl BucketEntry {
.collect()
}
pub fn public_dial_info_for_protocol(&self, protocol_type: ProtocolType) -> Vec<DialInfo> {
pub fn global_dial_info_for_protocol(&self, protocol_type: ProtocolType) -> Vec<DialInfo> {
self.dial_info_entries
.iter()
.filter_map(|e| {
@@ -133,7 +133,7 @@ impl BucketEntry {
.collect()
}
pub fn private_dial_info(&self) -> Vec<DialInfo> {
pub fn local_dial_info(&self) -> Vec<DialInfo> {
self.dial_info_entries
.iter()
.filter_map(|e| {
@@ -146,7 +146,7 @@ impl BucketEntry {
.collect()
}
pub fn private_dial_info_for_protocol(&mut self, protocol_type: ProtocolType) -> Vec<DialInfo> {
pub fn local_dial_info_for_protocol(&mut self, protocol_type: ProtocolType) -> Vec<DialInfo> {
self.dial_info_entries
.iter_mut()
.filter_map(|e| {
@@ -166,8 +166,8 @@ impl BucketEntry {
node_id: NodeId::new(key),
dial_infos: match scope {
PeerScope::All => self.dial_info(),
PeerScope::Public => self.public_dial_info(),
PeerScope::Private => self.private_dial_info(),
PeerScope::Global => self.global_dial_info(),
PeerScope::Local => self.local_dial_info(),
},
}
}

4
veilid-core/src/routing_table/dial_info_entry.rs
View File

@@ -37,8 +37,8 @@ impl DialInfoEntry {
pub fn matches_peer_scope(&self, scope: PeerScope) -> bool {
match scope {
PeerScope::All => true,
PeerScope::Public => self.is_public(),
PeerScope::Private => self.is_private(),
PeerScope::Global => self.is_public(),
PeerScope::Local => self.is_private(),
}
}

8
veilid-core/src/routing_table/find_nodes.rs
View File

@@ -30,7 +30,7 @@ impl RoutingTable {
.dial_info_entries_as_ref()
.iter()
.find_map(|die| {
if die.matches_peer_scope(PeerScope::Public)
if die.matches_peer_scope(PeerScope::Global)
&& die.dial_info().protocol_address_type()
== protocol_address_type
{
@@ -63,13 +63,13 @@ impl RoutingTable {
pub fn get_own_peer_info(&self, scope: PeerScope) -> PeerInfo {
let dial_infos = match scope {
PeerScope::All => {
let mut divec = self.public_dial_info();
let mut divec = self.global_dial_info();
divec.append(&mut self.local_dial_info());
divec.dedup();
divec
}
PeerScope::Public => self.public_dial_info(),
PeerScope::Private => self.local_dial_info(),
PeerScope::Global => self.global_dial_info(),
PeerScope::Local => self.local_dial_info(),
};
PeerInfo {

28
veilid-core/src/routing_table/mod.rs
View File

@@ -44,7 +44,7 @@ struct RoutingTableInner {
node_id_secret: DHTKeySecret,
buckets: Vec<Bucket>,
local_dial_info: Vec<DialInfoDetail>,
public_dial_info: Vec<DialInfoDetail>,
global_dial_info: Vec<DialInfoDetail>,
bucket_entry_count: usize,
// Waiters
eventual_changed_dial_info: Eventual,
@@ -77,7 +77,7 @@ impl RoutingTable {
node_id_secret: DHTKeySecret::default(),
buckets: Vec::new(),
local_dial_info: Vec::new(),
public_dial_info: Vec::new(),
global_dial_info: Vec::new(),
bucket_entry_count: 0,
eventual_changed_dial_info: Eventual::new(),
stats_accounting: StatsAccounting::new(),
@@ -219,23 +219,23 @@ impl RoutingTable {
self.inner.lock().local_dial_info.clear();
}
pub fn has_public_dial_info(&self) -> bool {
pub fn has_global_dial_info(&self) -> bool {
let inner = self.inner.lock();
!inner.public_dial_info.is_empty()
!inner.global_dial_info.is_empty()
}
pub fn public_dial_info(&self) -> Vec<DialInfoDetail> {
pub fn global_dial_info(&self) -> Vec<DialInfoDetail> {
let inner = self.inner.lock();
inner.public_dial_info.clone()
inner.global_dial_info.clone()
}
pub fn public_dial_info_for_protocol(
pub fn global_dial_info_for_protocol(
&self,
protocol_type: ProtocolType,
) -> Vec<DialInfoDetail> {
let inner = self.inner.lock();
inner
.public_dial_info
.global_dial_info
.iter()
.filter_map(|di| {
if di.dial_info.protocol_type() != protocol_type {
@@ -246,13 +246,13 @@ impl RoutingTable {
})
.collect()
}
pub fn public_dial_info_for_protocol_address_type(
pub fn global_dial_info_for_protocol_address_type(
&self,
protocol_address_type: ProtocolAddressType,
) -> Vec<DialInfoDetail> {
let inner = self.inner.lock();
inner
.public_dial_info
.global_dial_info
.iter()
.filter_map(|di| {
if di.dial_info.protocol_address_type() != protocol_address_type {
@@ -264,7 +264,7 @@ impl RoutingTable {
.collect()
}
pub fn register_public_dial_info(
pub fn register_global_dial_info(
&self,
dial_info: DialInfo,
network_class: Option<NetworkClass>,
@@ -273,7 +273,7 @@ impl RoutingTable {
let ts = get_timestamp();
let mut inner = self.inner.lock();
inner.public_dial_info.push(DialInfoDetail {
inner.global_dial_info.push(DialInfoDetail {
dial_info: dial_info.clone(),
origin,
network_class,
@@ -292,8 +292,8 @@ impl RoutingTable {
);
}
pub fn clear_public_dial_info(&self) {
self.inner.lock().public_dial_info.clear();
pub fn clear_global_dial_info(&self) {
self.inner.lock().global_dial_info.clear();
}
pub async fn wait_changed_dial_info(&self) {