Skip to content

Commit dfdb9a8

Browse files
committed
Add flag to check if internal address
1 parent a7ec37e commit dfdb9a8

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

src/interface.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ pub struct NetworkInterface {
2222
pub mac_addr: Option<String>,
2323
/// Interface's index
2424
pub index: u32,
25+
/// Is the interface a loopback or similar interface that is not remotely accessible
26+
pub internal: bool,
2527
}
2628

2729
/// Network interface address
@@ -65,6 +67,7 @@ impl NetworkInterface {
6567
netmask: Netmask<Ipv4Addr>,
6668
broadcast: Option<Ipv4Addr>,
6769
index: u32,
70+
internal: bool,
6871
) -> NetworkInterface {
6972
let ifaddr_v4 = V4IfAddr {
7073
ip: addr,
@@ -77,6 +80,7 @@ impl NetworkInterface {
7780
addr: vec![Addr::V4(ifaddr_v4)],
7881
mac_addr: None,
7982
index,
83+
internal,
8084
}
8185
}
8286

@@ -86,6 +90,7 @@ impl NetworkInterface {
8690
netmask: Netmask<Ipv6Addr>,
8791
broadcast: Option<Ipv6Addr>,
8892
index: u32,
93+
internal: bool,
8994
) -> NetworkInterface {
9095
let ifaddr_v6 = V6IfAddr {
9196
ip: addr,
@@ -98,6 +103,7 @@ impl NetworkInterface {
98103
addr: vec![Addr::V6(ifaddr_v6)],
99104
mac_addr: None,
100105
index,
106+
internal,
101107
}
102108
}
103109

src/target/linux.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ impl NetworkInterfaceConfig for NetworkInterface {
2222
unsafe { (*netifa_addr).sa_family as i32 }
2323
};
2424

25+
let internal = &netifa.ifa_flags & IFF_LOOPBACK as u32 != 0;
26+
2527
let mut network_interface = match netifa_family {
2628
AF_PACKET => {
2729
let name = make_netifa_name(&netifa)?;
@@ -32,6 +34,7 @@ impl NetworkInterfaceConfig for NetworkInterface {
3234
addr: Vec::new(),
3335
mac_addr: Some(mac),
3436
index,
37+
internal,
3538
}
3639
}
3740
AF_INET => {
@@ -42,7 +45,7 @@ impl NetworkInterfaceConfig for NetworkInterface {
4245
let netmask = make_ipv4_netmask(&netifa);
4346
let addr = ipv4_from_in_addr(&internet_address)?;
4447
let broadcast = make_ipv4_broadcast_addr(&netifa)?;
45-
NetworkInterface::new_afinet(name.as_str(), addr, netmask, broadcast, index)
48+
NetworkInterface::new_afinet(name.as_str(), addr, netmask, broadcast, index, internal)
4649
}
4750
AF_INET6 => {
4851
let socket_addr = netifa_addr as *mut sockaddr_in6;
@@ -52,7 +55,7 @@ impl NetworkInterfaceConfig for NetworkInterface {
5255
let netmask = make_ipv6_netmask(&netifa);
5356
let addr = ipv6_from_in6_addr(&internet_address)?;
5457
let broadcast = make_ipv6_broadcast_addr(&netifa)?;
55-
NetworkInterface::new_afinet6(name.as_str(), addr, netmask, broadcast, index)
58+
NetworkInterface::new_afinet6(name.as_str(), addr, netmask, broadcast, index, internal)
5659
}
5760
_ => continue,
5861
};

src/target/unix/mod.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::collections::HashMap;
55
use std::net::{Ipv4Addr, Ipv6Addr};
66
use std::slice::from_raw_parts;
77

8-
use libc::{AF_INET, AF_INET6, sockaddr_in, sockaddr_in6, strlen, AF_LINK, if_nametoindex};
8+
use libc::{AF_INET, AF_INET6, AF_LINK, IFF_LOOPBACK, if_nametoindex, sockaddr_in, sockaddr_in6, strlen};
99

1010
use crate::target::ffi::lladdr;
1111
use crate::target::getifaddrs;
@@ -24,6 +24,8 @@ impl NetworkInterfaceConfig for NetworkInterface {
2424
unsafe { (*netifa_addr).sa_family as i32 }
2525
};
2626

27+
let internal = &netifa.ifa_flags & IFF_LOOPBACK as u32 != 0;
28+
2729
let mut network_interface = match netifa_family {
2830
AF_LINK => {
2931
let name = make_netifa_name(&netifa)?;
@@ -34,6 +36,7 @@ impl NetworkInterfaceConfig for NetworkInterface {
3436
mac_addr: Some(mac),
3537
addr: Vec::new(),
3638
index,
39+
internal,
3740
}
3841
}
3942
AF_INET => {
@@ -44,7 +47,7 @@ impl NetworkInterfaceConfig for NetworkInterface {
4447
let netmask = make_ipv4_netmask(&netifa);
4548
let addr = ipv4_from_in_addr(&internet_address)?;
4649
let broadcast = make_ipv4_broadcast_addr(&netifa)?;
47-
NetworkInterface::new_afinet(name.as_str(), addr, netmask, broadcast, index)
50+
NetworkInterface::new_afinet(name.as_str(), addr, netmask, broadcast, index, internal)
4851
}
4952
AF_INET6 => {
5053
let socket_addr = netifa_addr as *mut sockaddr_in6;
@@ -54,7 +57,7 @@ impl NetworkInterfaceConfig for NetworkInterface {
5457
let netmask = make_ipv6_netmask(&netifa);
5558
let addr = ipv6_from_in6_addr(&internet_address)?;
5659
let broadcast = make_ipv6_broadcast_addr(&netifa)?;
57-
NetworkInterface::new_afinet6(name.as_str(), addr, netmask, broadcast, index)
60+
NetworkInterface::new_afinet6(name.as_str(), addr, netmask, broadcast, index, internal)
5861
}
5962
_ => continue,
6063
};

src/target/windows.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use std::iter::Iterator;
88
use std::marker::PhantomData;
99

1010
use libc::{free, malloc, wchar_t, wcslen};
11+
use winapi::shared::ipifcons::IF_TYPE_SOFTWARE_LOOPBACK;
1112
use winapi::{
1213
ctypes::c_ulong,
1314
shared::{
@@ -124,11 +125,13 @@ impl NetworkInterfaceConfig for NetworkInterface {
124125
let name = make_adapter_address_name(adapter_address)?;
125126
let index = get_adapter_address_index(adapter_address)?;
126127
let mac_addr = make_mac_address(adapter_address);
128+
let internal = adapter_address.IfType == IF_TYPE_SOFTWARE_LOOPBACK;
127129
let mut network_interface = NetworkInterface {
128130
name,
129131
addr: Vec::new(),
130132
mac_addr,
131133
index,
134+
internal,
132135
};
133136

134137
for current_unicast_address in

0 commit comments

Comments
 (0)