Spiri/xbnet
4
0
Fork 0
mirror of https://github.com/jgoerzen/xbnet.git synced 2025-03-13 11:34:00 -03:00
Code Issues Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
John Goerzen 2020-09-24 22:24:53 -05:00
parent e48a3985fb
commit f4a71fd32c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tun.rs
View File

@ -74,18 +74,25 @@ impl XBTun {
}
pub fn get_xb_dest_mac(&self, ipaddr: &IpAddr) -> u64 {
trace!("Looking up destination for {}", ipaddr);
if self.broadcast_everything {
trace!("broadcast_everything is on, so broadcast");
return XB_BROADCAST;
}
match self.dests.lock().unwrap().get(ipaddr) {
// Broadcast if we don't know it
None => XB_BROADCAST,
None => {
trace!("Destination not in map");
XB_BROADCAST
},
Some((dest, expiration)) => {
if Instant::now() >= *expiration {
// Broadcast it if the cache entry has expired
trace!("Destination expired");
XB_BROADCAST
} else {
trace!("Destination {} found", dest);
*dest
}
}
@ -146,7 +153,7 @@ impl XBTun {
match SlicedPacket::from_ip(&payload) {
Err(x) => {
warn!(
"Packet from XBee wasn't valid IPv4 or IPv6; continueing anyhow: {:?}",
"Packet from XBee wasn't valid IPv4 or IPv6; continuing anyhow: {:?}",
x
);
}
@ -156,7 +163,7 @@ impl XBTun {
trace!("SERIN: Packet is {} -> {}", source, destination);
if !self.broadcast_everything {
self.dests.lock().unwrap().insert(
destination,
source,
(
fromu64,
Instant::now().checked_add(self.max_ip_cache).unwrap(),