Skip to content

Commit 0c7aac7

Browse files
committed
s/is_local_broadcast/is_subnet_broadcast/g
1 parent ebe22ff commit 0c7aac7

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

src/iface/ethernet.rs

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ impl<'b, 'c, 'e> InterfaceInner<'b, 'c, 'e> {
972972
if !self.has_ip_addr(ipv4_repr.dst_addr) &&
973973
!ipv4_repr.dst_addr.is_broadcast() &&
974974
!self.has_multicast_group(ipv4_repr.dst_addr) &&
975-
!self.is_local_broadcast(IpAddress::Ipv4(ipv4_repr.dst_addr)) {
975+
!self.is_subnet_broadcast(IpAddress::Ipv4(ipv4_repr.dst_addr)) {
976976

977977
// Ignore IP packets not directed at us, or broadcast, or any of the multicast groups.
978978
// If AnyIP is enabled, also check if the packet is routed locally.
@@ -1019,8 +1019,9 @@ impl<'b, 'c, 'e> InterfaceInner<'b, 'c, 'e> {
10191019
}
10201020
}
10211021

1022-
/// Checks if an incoming packet had a subnet local broadcast address
1023-
fn is_local_broadcast(&self, address: IpAddress) -> bool {
1022+
/// Checks if an incoming packet has a broadcast address for the interfaces
1023+
/// first ip address
1024+
fn is_subnet_broadcast(&self, address: IpAddress) -> bool {
10241025
match address {
10251026
#[cfg(feature = "proto-ipv4")]
10261027
IpAddress::Ipv4(addr) => {
@@ -1950,28 +1951,28 @@ mod test {
19501951
});
19511952
});
19521953

1953-
assert_eq!(iface.inner.is_local_broadcast(IpAddress::Ipv4(Ipv4Address([192, 168, 1, 255]))), true);
1954-
assert_eq!(iface.inner.is_local_broadcast(IpAddress::Ipv4(Ipv4Address([192, 168, 1, 254]))), false);
1954+
assert_eq!(iface.inner.is_subnet_broadcast(IpAddress::Ipv4(Ipv4Address([192, 168, 1, 255]))), true);
1955+
assert_eq!(iface.inner.is_subnet_broadcast(IpAddress::Ipv4(Ipv4Address([192, 168, 1, 254]))), false);
19551956

19561957
iface.update_ip_addrs(|addrs| {
19571958
addrs.iter_mut().nth(0).map(|addr| {
19581959
*addr = IpCidr::Ipv4(Ipv4Cidr::new(Ipv4Address([192, 168, 23, 24]), 16));
19591960
});
19601961
});
1961-
assert_eq!(iface.inner.is_local_broadcast(IpAddress::Ipv4(Ipv4Address([192, 168, 23, 255]))), false);
1962-
assert_eq!(iface.inner.is_local_broadcast(IpAddress::Ipv4(Ipv4Address([192, 168, 23, 254]))), false);
1963-
assert_eq!(iface.inner.is_local_broadcast(IpAddress::Ipv4(Ipv4Address([192, 168, 255, 254]))), false);
1964-
assert_eq!(iface.inner.is_local_broadcast(IpAddress::Ipv4(Ipv4Address([192, 168, 255, 255]))), true);
1962+
assert_eq!(iface.inner.is_subnet_broadcast(IpAddress::Ipv4(Ipv4Address([192, 168, 23, 255]))), false);
1963+
assert_eq!(iface.inner.is_subnet_broadcast(IpAddress::Ipv4(Ipv4Address([192, 168, 23, 254]))), false);
1964+
assert_eq!(iface.inner.is_subnet_broadcast(IpAddress::Ipv4(Ipv4Address([192, 168, 255, 254]))), false);
1965+
assert_eq!(iface.inner.is_subnet_broadcast(IpAddress::Ipv4(Ipv4Address([192, 168, 255, 255]))), true);
19651966

19661967
iface.update_ip_addrs(|addrs| {
19671968
addrs.iter_mut().nth(0).map(|addr| {
19681969
*addr = IpCidr::Ipv4(Ipv4Cidr::new(Ipv4Address([192, 168, 23, 24]), 8));
19691970
});
19701971
});
1971-
assert_eq!(iface.inner.is_local_broadcast(IpAddress::Ipv4(Ipv4Address([192, 23, 1, 255]))), false);
1972-
assert_eq!(iface.inner.is_local_broadcast(IpAddress::Ipv4(Ipv4Address([192, 23, 1, 254]))), false);
1973-
assert_eq!(iface.inner.is_local_broadcast(IpAddress::Ipv4(Ipv4Address([192, 255, 255, 254]))), false);
1974-
assert_eq!(iface.inner.is_local_broadcast(IpAddress::Ipv4(Ipv4Address([192, 255, 255, 255]))), true);
1972+
assert_eq!(iface.inner.is_subnet_broadcast(IpAddress::Ipv4(Ipv4Address([192, 23, 1, 255]))), false);
1973+
assert_eq!(iface.inner.is_subnet_broadcast(IpAddress::Ipv4(Ipv4Address([192, 23, 1, 254]))), false);
1974+
assert_eq!(iface.inner.is_subnet_broadcast(IpAddress::Ipv4(Ipv4Address([192, 255, 255, 254]))), false);
1975+
assert_eq!(iface.inner.is_subnet_broadcast(IpAddress::Ipv4(Ipv4Address([192, 255, 255, 255]))), true);
19751976
}
19761977

19771978
#[test]

0 commit comments

Comments
 (0)