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

debugging

Browse Source
This commit is contained in:
John Smith
2021-12-14 09:48:33 -05:00
parent 8fe99f6090
commit c4b66aad36
23 changed files with 411 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
veilid-core/src/intf/native/network/mod.rs
View File

@@ -586,10 +586,7 @@ impl Network {
// Return local dial infos we listen on
for ldi_addr in ldi_addrs {
out.push(DialInfo::udp(
Address::from_socket_addr(ldi_addr),
ldi_addr.port(),
));
out.push(DialInfo::udp_from_socketaddr(ldi_addr));
}
}
}
@@ -748,7 +745,7 @@ impl Network {
.await
.map_err(|_| "failed to send message to UDP dial info".to_owned());
} else {
return Err("no appropriate udp protocol handler for dial_info".to_owned());
return Err("no appropriate UDP protocol handler for dial_info".to_owned());
}
}
DialInfo::TCP(_) => {
@@ -987,7 +984,7 @@ impl Network {
let mut dial_infos: Vec<DialInfo> = Vec::new();
for (a, p) in addresses {
let di = DialInfo::tcp(a, p);
let di = DialInfo::tcp(a.to_canonical(), p);
dial_infos.push(di.clone());
routing_table.register_local_dial_info(di, DialInfoOrigin::Static);
}

4
veilid-core/src/intf/native/network/protocol/tcp.rs
View File

@@ -135,7 +135,7 @@ impl RawTcpProtocolHandler {
let conn = NetworkConnection::RawTcp(RawTcpNetworkConnection::new(stream));
let peer_addr = PeerAddress::new(
Address::from_socket_addr(socket_addr),
Address::from_socket_addr(socket_addr).to_canonical(),
socket_addr.port(),
ProtocolType::TCP,
);
@@ -199,7 +199,7 @@ impl RawTcpProtocolHandler {
.map_err(|e| format!("couldn't get local address for tcp socket: {}", e))?;
let ps = AsyncPeekStream::new(ts);
let peer_addr = PeerAddress::new(
Address::from_socket_addr(remote_socket_addr),
Address::from_socket_addr(remote_socket_addr).to_canonical(),
remote_socket_addr.port(),
ProtocolType::TCP,
);

3
veilid-core/src/intf/native/protected_store.rs
View File

@@ -31,8 +31,7 @@ pub async fn save_user_secret_string(
let krname = keyring_name(namespace);
let kr = get_keyring(krname.as_str(), key);
let existed = kr.get_password().is_ok();
let _ = kr
.set_password(value)
kr.set_password(value)
.map_err(|e| format!("Failed to save user secret: {}", e))?;
Ok(existed)
}