source/bandwhich
1
0
Fork 0
mirror of https://github.com/imsnif/bandwhich.git synced 2026-02-09 01:59:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle IPv4-mapped IPv6 addresses when resolving connection owner

Browse Source
This commit is contained in:
cyqsimon
2023-10-12 19:40:23 +08:00
parent ea3e0d675f
commit 76956cfade
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/display/ui_state.rs
View File

@@ -98,22 +98,31 @@ impl UIState {
connections_to_procs: &'a HashMap<LocalSocket, String>,
local_socket: &LocalSocket,
) -> Option<&'a String> {
let &LocalSocket { port, protocol, .. } = local_socket;
let name = connections_to_procs
// direct match
.get(local_socket)
// IPv4-mapped IPv6 addresses
.or_else(|| {
let swapped: IpAddr = match local_socket.ip {
IpAddr::V4(v4) => v4.to_ipv6_mapped().into(),
IpAddr::V6(v6) => v6.to_ipv4_mapped()?.into(),
};
connections_to_procs.get(&LocalSocket {
ip: swapped,
..*local_socket
})
})
// address unspecified
.or_else(|| {
connections_to_procs.get(&LocalSocket {
ip: Ipv4Addr::UNSPECIFIED.into(),
port,
protocol,
..*local_socket
})
})
.or_else(|| {
connections_to_procs.get(&LocalSocket {
ip: Ipv6Addr::UNSPECIFIED.into(),
port,
protocol,
..*local_socket
})
});
@@ -121,8 +130,9 @@ impl UIState {
if name.is_none() && self.known_orphan_sockets.borrow_mut().insert(*local_socket) {
match connections_to_procs
.iter()
.find(|(socket, _)| socket.port == port && socket.protocol == protocol)
{
.find(|(&LocalSocket { port, protocol, .. }, _)| {
port == local_socket.port && protocol == local_socket.protocol
}) {
Some((lookalike, name)) => {
warn!(
r#""{name}" owns a similar looking connection, but its local ip doesn't match."#