Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2025-01-13 00:09:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix inbound protocol map for discovery

Browse Source
This commit is contained in:
Christien Rioux 2024-04-26 19:56:33 -04:00
parent 4bd2ee51b7
commit 4d9ad5fac0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,8 @@ impl Network {
// Allow network to be cleared if external addresses change // Allow network to be cleared if external addresses change
inner.network_already_cleared = false; inner.network_already_cleared = false;
let mut inbound_protocol_map = HashMap::<(AddressType, u16), Vec<ProtocolType>>::new(); let mut inbound_protocol_map =
HashMap::<(AddressType, LowLevelProtocolType, u16), Vec<ProtocolType>>::new();
for at in protocol_config.family_global { for at in protocol_config.family_global {
for pt in protocol_config.inbound { for pt in protocol_config.inbound {
let key = (pt, at); let key = (pt, at);
@ -122,7 +123,8 @@ impl Network {
} }
if let Some(pla) = inner.preferred_local_addresses.get(&key) { if let Some(pla) = inner.preferred_local_addresses.get(&key) {
let itmkey = (at, pla.port()); let llpt = pt.low_level_protocol_type();
let itmkey = (at, llpt, pla.port());
inbound_protocol_map inbound_protocol_map
.entry(itmkey) .entry(itmkey)
.and_modify(|x| x.push(pt)) .and_modify(|x| x.push(pt))
@ -181,7 +183,7 @@ impl Network {
// Process all protocol and address combinations // Process all protocol and address combinations
let mut unord = FuturesUnordered::new(); let mut unord = FuturesUnordered::new();
for ((at, port), protocols) in &inbound_protocol_map { for ((at, _llpt, port), protocols) in &inbound_protocol_map {
let first_pt = protocols.first().unwrap(); let first_pt = protocols.first().unwrap();
let discovery_context = DiscoveryContext::new( let discovery_context = DiscoveryContext::new(
@ -208,7 +210,11 @@ impl Network {
// Add additional dialinfo for protocols on the same port // Add additional dialinfo for protocols on the same port
if let DetectedDialInfo::Detected(did) = &dr.ddi { if let DetectedDialInfo::Detected(did) = &dr.ddi {
let ipmkey = (did.dial_info.address_type(), dr.local_port); let ipmkey = (
did.dial_info.address_type(),
did.dial_info.protocol_type().low_level_protocol_type(),
dr.local_port,
);
for additional_pt in for additional_pt in
inbound_protocol_map.get(&ipmkey).unwrap().iter().skip(1) inbound_protocol_map.get(&ipmkey).unwrap().iter().skip(1)
{ {