Determine MTU in TapInterface instead of hardcoding 1536.

whitequark · whitequark · commit d5610e7826a1 · 2017-07-23T04:40:35.000Z
diff --git a/src/phy/sys/tap_interface.rs b/src/phy/sys/tap_interface.rs
@@ -30,6 +30,16 @@ impl TapInterfaceDesc {
         ifreq_ioctl(self.lower, &mut self.ifreq, imp::TUNSETIFF).map(|_| ())
     }
 
+    pub fn interface_mtu(&mut self) -> io::Result<usize> {
+        let lower = unsafe {
+            let lower = libc::socket(libc::AF_INET, libc::SOCK_DGRAM, libc::IPPROTO_IP);
+            if lower == -1 { return Err(io::Error::last_os_error()) }
+            lower
+        };
+
+        ifreq_ioctl(lower, &mut self.ifreq, imp::SIOCGIFMTU).map(|mtu| mtu as usize)
+    }
+
     fn wait(&mut self, ms: u32) -> io::Result<bool> {
         unsafe {
             let mut readfds = mem::uninitialized::<libc::fd_set>();
diff --git a/src/phy/tap_interface.rs b/src/phy/tap_interface.rs
@@ -22,9 +22,10 @@ impl TapInterface {
     pub fn new(name: &str) -> io::Result<TapInterface> {
         let mut lower = sys::TapInterfaceDesc::new(name)?;
         lower.attach_interface()?;
+        let mtu = lower.interface_mtu()?;
         Ok(TapInterface {
             lower: Rc::new(RefCell::new(lower)),
-            mtu:   1536 // FIXME: get the real value somehow
+            mtu:   mtu
         })
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,10 @@ impl TapInterface {`
`22`	`22`	`pub fn new(name: &str) -> io::Result<TapInterface> {`
`23`	`23`	`let mut lower = sys::TapInterfaceDesc::new(name)?;`
`24`	`24`	`lower.attach_interface()?;`
	`25`	`+ let mtu = lower.interface_mtu()?;`
`25`	`26`	`Ok(TapInterface {`
`26`	`27`	`lower: Rc::new(RefCell::new(lower)),`
`27`		`- mtu: 1536 // FIXME: get the real value somehow`
	`28`	`+ mtu: mtu`
`28`	`29`	`})`
`29`	`30`	`}`
`30`	`31`	`}`