v1.1

switch/src/tun_device/mac.rs

@@ -1,7 +1,9 @@
 use std::net::Ipv4Addr;
 use std::process::Command;
-
+use std::io;
 use tun::Device;
+use parking_lot::Mutex;
+use std::sync::Arc;
 
 use crate::tun_device::{TunReader, TunWriter};
 
@@ -20,33 +22,7 @@ pub fn create_tun(
         .up();
 
     let dev = tun::create(&config).unwrap();
-    let up_eth_str: String = format!("ifconfig {} {:?} {:?} up ", dev.name(), address, gateway);
-    let route_add_str: String = format!(
-        "sudo route -n add -net {:?} -netmask {:?} {:?}",
-        address, netmask, gateway
-    );
-    let up_eth_out = Command::new("sh")
-        .arg("-c")
-        .arg(up_eth_str)
-        .output()
-        .expect("sh exec error!");
-    if !up_eth_out.status.success() {
-        return Err(crate::error::Error::Stop(format!(
-            "设置地址失败:{:?}",
-            up_eth_out
-        )));
-    }
-    let if_config_out = Command::new("sh")
-        .arg("-c")
-        .arg(route_add_str)
-        .output()
-        .expect("sh exec error!");
-    if !if_config_out.status.success() {
-        return Err(crate::error::Error::Stop(format!(
-            "设置路由失败:{:?}",
-            if_config_out
-        )));
-    }
+    config_ip(dev.name(), address, netmask, gateway)?;
     // println!("{:?}", if_config_out);
     // let cmd_str: String = " ifconfig|grep  flags=8051|awk -F ':' '{print $1}'|tail -1".to_string();
     //
@@ -60,9 +36,36 @@ pub fn create_tun(
     // }
     // println!("{:?}", cmd_str_out);
     let packet_information = dev.has_packet_information();
-    let (reader, writer) = dev.split();
+    let queue = dev.queue(0).unwrap();
+    let reader = queue.reader();
+    let writer = queue.writer();
     Ok((
-        TunWriter(writer, packet_information),
+        TunWriter(writer, packet_information, Arc::new(Mutex::new(dev))),
         TunReader(reader, packet_information),
     ))
 }
+
+pub(crate) fn config_ip(name: &str, address: Ipv4Addr, netmask: Ipv4Addr, gateway: Ipv4Addr) -> io::Result<()> {
+    let up_eth_str: String = format!("ifconfig {} {:?} {:?} up ", name, address, gateway);
+    let route_add_str: String = format!(
+        "sudo route -n add -net {:?} -netmask {:?} {:?}",
+        address, netmask, gateway
+    );
+    let up_eth_out = Command::new("sh")
+        .arg("-c")
+        .arg(up_eth_str)
+        .output()
+        .expect("sh exec error!");
+    if !up_eth_out.status.success() {
+        return Err(io::Error::new(io::ErrorKind::Other, format!("设置网络地址失败: {:?}", up_eth_out)));
+    }
+    let if_config_out = Command::new("sh")
+        .arg("-c")
+        .arg(route_add_str)
+        .output()
+        .expect("sh exec error!");
+    if !if_config_out.status.success() {
+        return Err(io::Error::new(io::ErrorKind::Other, format!("添加路由失败: {:?}", if_config_out)));
+    }
+    Ok(())
+}