From 360691276c3385e05db6e807b5a61b6b7e16ebdc Mon Sep 17 00:00:00 2001 From: "Sijie.Sun" Date: Sun, 2 Jun 2024 14:07:21 +0800 Subject: [PATCH] support win7 and reduce win mem usage (#128) --- Cargo.lock | 3 +-- easytier/Cargo.toml | 2 +- easytier/src/instance/virtual_nic.rs | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f482b3..5cd54e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5491,8 +5491,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tun" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0adb9992bbd5ca76f3847ed579ad4ee8defb2ec2eea918cceef17ccc66fa4fd4" +source = "git+https://github.com/EasyTier/rust-tun.git?rev=e4fd1cd#e4fd1cdd5321ac1ad6f19954e982194688b95aff" dependencies = [ "byteorder", "bytes", diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml index e488de3..b0d03b7 100644 --- a/easytier/Cargo.toml +++ b/easytier/Cargo.toml @@ -85,7 +85,7 @@ http = { version = "1", default-features = false, features = [ tokio-rustls = { version = "0.26", default-features = false, optional = true } # for tap device -tun = { version = "0.6.1", features = ["async"] } +tun = { git = "https://github.com/EasyTier/rust-tun.git", features = ["async"], rev = "e4fd1cd" } # for net ns nix = { version = "0.27", features = ["sched", "socket", "ioctl"] } diff --git a/easytier/src/instance/virtual_nic.rs b/easytier/src/instance/virtual_nic.rs index 34143ad..7f5ed4c 100644 --- a/easytier/src/instance/virtual_nic.rs +++ b/easytier/src/instance/virtual_nic.rs @@ -289,6 +289,12 @@ impl VirtualNic { config.name(format!("et{}_{}_{}", self.dev_name, c, s)); // set a temporary address config.address(format!("172.0.{}.3", c).parse::().unwrap()); + + config.platform(|config| { + config.skip_config(true); + config.guid(None); + config.ring_cap(Some(config.min_ring_cap() * 2)); + }); } if self.queue_num != 1 {