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

tcp/ws work

Browse Source
This commit is contained in:
John Smith 2022-08-04 21:40:37 -04:00
parent b7a9085f73
commit 8287675278
1 changed files with 54 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
veilid-core/src/network_manager/native/network_class_discovery.rs
View File

@ -491,6 +491,15 @@ impl Network {
assert_eq!(old_network_class, None); assert_eq!(old_network_class, None);
let protocol_config = self.inner.lock().protocol_config.unwrap_or_default(); let protocol_config = self.inner.lock().protocol_config.unwrap_or_default();
let tcp_same_port = if protocol_config.inbound.contains(ProtocolType::TCP)
&& protocol_config.inbound.contains(ProtocolType::WS)
{
let inner = self.inner.lock();
inner.tcp_port == inner.ws_port
} else {
false
};
let mut unord = FuturesUnordered::new(); let mut unord = FuturesUnordered::new();
// Do UDPv4+v6 at the same time as everything else // Do UDPv4+v6 at the same time as everything else
@ -536,11 +545,10 @@ impl Network {
// Do TCPv4 + WSv4 in series because they may use the same connection 5-tuple // Do TCPv4 + WSv4 in series because they may use the same connection 5-tuple
if protocol_config.family_global.contains(AddressType::IPV4) { if protocol_config.family_global.contains(AddressType::IPV4) {
if protocol_config.inbound.contains(ProtocolType::TCP) {
unord.push( unord.push(
async { async {
// TCPv4 // TCPv4
let mut out = Vec::<DiscoveryContext>::new();
if protocol_config.inbound.contains(ProtocolType::TCP) {
let tcpv4_context = let tcpv4_context =
DiscoveryContext::new(self.routing_table(), self.clone()); DiscoveryContext::new(self.routing_table(), self.clone());
if let Err(e) = self if let Err(e) = self
@ -550,11 +558,16 @@ impl Network {
log_net!(debug "Failed TCPv4 dialinfo discovery: {}", e); log_net!(debug "Failed TCPv4 dialinfo discovery: {}", e);
return None; return None;
} }
out.push(tcpv4_context); Some(vec![tcpv4_context])
}
.boxed(),
);
} }
if protocol_config.inbound.contains(ProtocolType::WS) && !tcp_same_port {
unord.push(
async {
// WSv4 // WSv4
if protocol_config.inbound.contains(ProtocolType::WS) {
let wsv4_context = let wsv4_context =
DiscoveryContext::new(self.routing_table(), self.clone()); DiscoveryContext::new(self.routing_table(), self.clone());
if let Err(e) = self if let Err(e) = self
@ -564,21 +577,19 @@ impl Network {
log_net!(debug "Failed WSv4 dialinfo discovery: {}", e); log_net!(debug "Failed WSv4 dialinfo discovery: {}", e);
return None; return None;
} }
out.push(wsv4_context); Some(vec![wsv4_context])
}
Some(out)
} }
.boxed(), .boxed(),
); );
} }
}
// Do TCPv6 + WSv6 in series because they may use the same connection 5-tuple // Do TCPv6 + WSv6 in series because they may use the same connection 5-tuple
if protocol_config.family_global.contains(AddressType::IPV6) { if protocol_config.family_global.contains(AddressType::IPV6) {
if protocol_config.inbound.contains(ProtocolType::TCP) {
unord.push( unord.push(
async { async {
// TCPv6 // TCPv6
let mut out = Vec::<DiscoveryContext>::new();
if protocol_config.inbound.contains(ProtocolType::TCP) {
let tcpv6_context = let tcpv6_context =
DiscoveryContext::new(self.routing_table(), self.clone()); DiscoveryContext::new(self.routing_table(), self.clone());
if let Err(e) = self if let Err(e) = self
@ -588,11 +599,16 @@ impl Network {
log_net!(debug "Failed TCPv6 dialinfo discovery: {}", e); log_net!(debug "Failed TCPv6 dialinfo discovery: {}", e);
return None; return None;
} }
out.push(tcpv6_context); Some(vec![tcpv6_context])
}
.boxed(),
);
} }
// WSv6 // WSv6
if protocol_config.inbound.contains(ProtocolType::WS) { if protocol_config.inbound.contains(ProtocolType::WS) && !tcp_same_port {
unord.push(
async {
let wsv6_context = let wsv6_context =
DiscoveryContext::new(self.routing_table(), self.clone()); DiscoveryContext::new(self.routing_table(), self.clone());
if let Err(e) = self if let Err(e) = self
@ -602,13 +618,12 @@ impl Network {
log_net!(debug "Failed WSv6 dialinfo discovery: {}", e); log_net!(debug "Failed WSv6 dialinfo discovery: {}", e);
return None; return None;
} }
out.push(wsv6_context); Some(vec![wsv6_context])
}
Some(out)
} }
.boxed(), .boxed(),
); );
} }
}
// Wait for all discovery futures to complete and collect contexts // Wait for all discovery futures to complete and collect contexts
let mut contexts = Vec::<DiscoveryContext>::new(); let mut contexts = Vec::<DiscoveryContext>::new();
@ -659,6 +674,19 @@ impl Network {
) { ) {
log_net!(warn "Failed to register detected public dial info: {}", e); log_net!(warn "Failed to register detected public dial info: {}", e);
} }
// duplicate for same port
if tcp_same_port && pdi.dial_info.protocol_type() == ProtocolType::TCP {
let ws_dial_info =
ctx.make_dial_info(pdi.dial_info.socket_address(), ProtocolType::WS);
if let Err(e) = routing_table.register_dial_info(
RoutingDomain::PublicInternet,
ws_dial_info,
pdi.class,
) {
log_net!(warn "Failed to register detected public dial info: {}", e);
}
}
} }
} }
// Update network class // Update network class