renet
/
renet
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not fill neighbor cache with IPs not on the same network as us. 

This is pointless (`route` doesn't even check the cache in that case)
and wastes cache space.
v0.7.x
whitequark 2017-12-18 11:06:08 +00:00
parent 8dd9bdeaad
commit 19f52bd46c
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/iface/ethernet.rs
View File

@ -401,9 +401,10 @@ impl<'b, 'c> InterfaceInner<'b, 'c> {
if eth_frame.src_addr().is_unicast() {
// Fill the neighbor cache from IP header of unicast frames.
self.neighbor_cache.fill(IpAddress::Ipv4(ipv4_repr.src_addr),
eth_frame.src_addr(),
timestamp);
let ip_addr = IpAddress::Ipv4(ipv4_repr.src_addr);
if self.in_same_network(&ip_addr) {
self.neighbor_cache.fill(ip_addr, eth_frame.src_addr(), timestamp);
}
}
let ip_repr = IpRepr::Ipv4(ipv4_repr);
@ -692,20 +693,24 @@ impl<'b, 'c> InterfaceInner<'b, 'c> {
})
}
fn route(&self, addr: &IpAddress) -> Result<IpAddress> {
fn in_same_network(&self, addr: &IpAddress) -> bool {
self.ip_addrs
.iter()
.find(|cidr| cidr.contains_addr(addr))
.map(|_cidr| Ok(addr.clone())) // route directly
.unwrap_or_else(|| {
match (addr, self.ipv4_gateway) {
// route via a gateway
(&IpAddress::Ipv4(_), Some(gateway)) =>
Ok(gateway.into()),
// unroutable
_ => Err(Error::Unaddressable)
}
})
.is_some()
}
fn route(&self, addr: &IpAddress) -> Result<IpAddress> {
// Send directly.
if self.in_same_network(addr) {
return Ok(addr.clone())
}
// Route via a gateway.
match (addr, self.ipv4_gateway) {
(&IpAddress::Ipv4(_), Some(gateway)) => Ok(gateway.into()),
_ => Err(Error::Unaddressable)
}
}
fn has_neighbor<'a>(&self, addr: &'a IpAddress, timestamp: u64) -> bool {