Spiri
/
xbnet
mirror of https://github.com/jgoerzen/xbnet.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compiles

This commit is contained in:
John Goerzen 2020-09-24 22:00:25 -05:00
parent ecc7d66962
commit adb2c18b12
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tun.rs
View File

@ -56,7 +56,7 @@ impl XBTun {
broadcast_everything: bool,
iface_name_requested: String,
max_ip_cache: Duration,
) -> io::Result<XBTap> {
) -> io::Result<XBTun> {
let tun = Iface::without_packet_info(&iface_name_requested, Mode::Tun)?;
let name = tun.name();
@ -153,9 +153,9 @@ impl XBTun {
trace!("SERIN: Packet dest is -> {}", toinsert);
if !self.broadcast_everything {
self.dests.lock().unwrap().insert(
header.source().try_into().unwrap(),
toinsert,
(
toinsert,
fromu64,
Instant::now().checked_add(self.max_ip_cache).unwrap(),
),
);
@ -177,7 +177,7 @@ pub fn showmac(mac: &[u8; 6]) -> String {
}
pub fn extract_ip<'a>(packet: &SlicedPacket<'a>) -> Option<IpAddr> {
match packet.ip {
match &packet.ip {
Some(InternetSlice::Ipv4(header)) => Some(IpAddr::V4(header.destination_addr())),
Some(InternetSlice::Ipv6(header, _)) => Some(IpAddr::V6(header.destination_addr())),
_ => None,