From 0498b55d39edbdc697f18f29454f2650b050c619 Mon Sep 17 00:00:00 2001
From: m1m1sha <18262227804@163.com>
Date: Wed, 8 May 2024 14:47:22 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E2=9C=A8=20feat:=20custom=20hostname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.lock                             |  3 ++-
 easytier-gui/locales/cn.yml            |  1 +
 easytier-gui/locales/en.yml            |  1 +
 easytier-gui/src-tauri/src/main.rs     |  2 ++
 easytier-gui/src/components/Config.vue | 20 ++++++++++++++++++
 easytier-gui/src/types/network.ts      |  1 +
 easytier/Cargo.toml                    |  2 ++
 easytier/src/common/config.rs          | 17 +++++++++++++++
 easytier/src/common/global_ctx.rs      | 29 +++++++++++++++++++-------
 easytier/src/easytier-core.rs          | 23 ++++++++++++++++++++
 10 files changed, 91 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3dc6e30..5bb95a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -387,7 +387,7 @@ dependencies = [
 [[package]]
 name = "boringtun"
 version = "0.6.0"
-source = "git+https://github.com/KKRainbow/boringtun.git#449204c3eca736dc23b075d81426527a357e2f2a"
+source = "git+https://github.com/EasyTier/boringtun.git#449204c3eca736dc23b075d81426527a357e2f2a"
 dependencies = [
  "aead",
  "atomic-shim",
@@ -1309,6 +1309,7 @@ dependencies = [
  "quinn",
  "rand 0.8.5",
  "rcgen",
+ "regex",
  "reqwest",
  "ring 0.17.8",
  "rstest",
diff --git a/easytier-gui/locales/cn.yml b/easytier-gui/locales/cn.yml
index 4e6be22..aa2ce02 100644
--- a/easytier-gui/locales/cn.yml
+++ b/easytier-gui/locales/cn.yml
@@ -32,6 +32,7 @@ settings: 设置
 exchange_language: Switch to English
 exit: 退出
 chips_placeholder: 例如： {0}, 按回车添加
+hostname_placeholder: 留空默认为设备名称 
 off_text: 点击关闭
 on_text: 点击开启
 show_config: 显示配置
diff --git a/easytier-gui/locales/en.yml b/easytier-gui/locales/en.yml
index 6c80c27..7221c0e 100644
--- a/easytier-gui/locales/en.yml
+++ b/easytier-gui/locales/en.yml
@@ -33,6 +33,7 @@ exchange_language: 切换中文
 exit: Exit
 
 chips_placeholder: 'e.g: {0}, press Enter to add'
+hostname_placeholder: Leave blank and default to device name
 off_text: Press to disable
 on_text: Press to enable
 show_config: Show Config
diff --git a/easytier-gui/src-tauri/src/main.rs b/easytier-gui/src-tauri/src/main.rs
index ad4a472..6124ee5 100644
--- a/easytier-gui/src-tauri/src/main.rs
+++ b/easytier-gui/src-tauri/src/main.rs
@@ -42,6 +42,7 @@ struct NetworkConfig {
     instance_id: String,
 
     virtual_ipv4: String,
+    hostname: Option<String>,
     network_name: String,
     network_secret: String,
     networking_method: NetworkingMethod,
@@ -70,6 +71,7 @@ impl NetworkConfig {
                 .parse()
                 .with_context(|| format!("failed to parse instance id: {}", self.instance_id))?,
         );
+        cfg.set_hostname(self.hostname.clone());
         cfg.set_inst_name(self.network_name.clone());
         cfg.set_network_identity(NetworkIdentity::new(
             self.network_name.clone(),
diff --git a/easytier-gui/src/components/Config.vue b/easytier-gui/src/components/Config.vue
index 947a1a8..0a65ca3 100644
--- a/easytier-gui/src/components/Config.vue
+++ b/easytier-gui/src/components/Config.vue
@@ -32,6 +32,18 @@ const curNetwork = computed(() => {
 const presetPublicServers = [
   'tcp://easytier.public.kkrainbow.top:11010',
 ]
+
+function validateHostname() {
+  if (curNetwork.value.hostname) {
+    // eslint no-useless-escape
+    let name = curNetwork.value.hostname!.replaceAll(/[^\u4E00-\u9FA5a-zA-Z0-9\-]*/g, '')
+    if (name.length > 32)
+      name = name.substring(0, 32)
+
+    if (curNetwork.value.hostname !== name)
+      curNetwork.value.hostname = name
+  }
+}
 </script>
 
 <template>
@@ -151,6 +163,14 @@ const presetPublicServers = [
                 />
               </div>
             </div>
+            <div class="flex flex-row gap-x-9 flex-wrap">
+              <div class="flex flex-column gap-2 basis-5/12 grow">
+                <label for="hostname">{{ $t('hostname') }}</label>
+                <InputText
+                  id="hostname" v-model="curNetwork.hostname" aria-describedby="hostname-help" :format="true" @blur="validateHostname"
+                />
+              </div>
+            </div>
           </div>
         </Panel>
 
diff --git a/easytier-gui/src/types/network.ts b/easytier-gui/src/types/network.ts
index 4785c97..9b66490 100644
--- a/easytier-gui/src/types/network.ts
+++ b/easytier-gui/src/types/network.ts
@@ -10,6 +10,7 @@ export interface NetworkConfig {
   instance_id: string
 
   virtual_ipv4: string
+  hostname?: string
   network_name: string
   network_secret: string
 
diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml
index 7382266..e78fca7 100644
--- a/easytier/Cargo.toml
+++ b/easytier/Cargo.toml
@@ -58,6 +58,8 @@ async-trait = "0.1.74"
 dashmap = "5.5.3"
 timedmap = "=1.0.1"
 
+regex = "1"
+
 # for full-path zero-copy
 zerocopy = { version = "0.7.32", features = ["derive", "simd"] }
 bytes = "1.5.0"
diff --git a/easytier/src/common/config.rs b/easytier/src/common/config.rs
index 5564a95..92ea475 100644
--- a/easytier/src/common/config.rs
+++ b/easytier/src/common/config.rs
@@ -14,6 +14,9 @@ pub trait ConfigLoader: Send + Sync {
     fn get_id(&self) -> uuid::Uuid;
     fn set_id(&self, id: uuid::Uuid);
 
+    fn get_hostname(&self) -> String;
+    fn set_hostname(&self, name: Option<String>);
+
     fn get_inst_name(&self) -> String;
     fn set_inst_name(&self, name: String);
 
@@ -152,6 +155,7 @@ pub struct Flags {
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 struct Config {
     netns: Option<String>,
+    hostname: Option<String>,
     instance_name: Option<String>,
     instance_id: Option<uuid::Uuid>,
     ipv4: Option<String>,
@@ -216,6 +220,19 @@ impl ConfigLoader for TomlConfigLoader {
         self.config.lock().unwrap().instance_name = Some(name);
     }
 
+    fn get_hostname(&self) -> String {
+        self.config
+            .lock()
+            .unwrap()
+            .hostname
+            .clone()
+            .unwrap_or(gethostname::gethostname().to_string_lossy().to_string())
+    }
+
+    fn set_hostname(&self, name: Option<String>) {
+        self.config.lock().unwrap().hostname = name;
+    }
+
     fn get_netns(&self) -> Option<String> {
         self.config.lock().unwrap().netns.clone()
     }
diff --git a/easytier/src/common/global_ctx.rs b/easytier/src/common/global_ctx.rs
index 9a71f10..969988c 100644
--- a/easytier/src/common/global_ctx.rs
+++ b/easytier/src/common/global_ctx.rs
@@ -54,7 +54,7 @@ pub struct GlobalCtx {
 
     ip_collector: Arc<IPCollector>,
 
-    hotname: AtomicCell<Option<String>>,
+    hostname: AtomicCell<Option<String>>,
 
     stun_info_collection: Box<dyn StunInfoCollectorTrait>,
 
@@ -80,6 +80,7 @@ impl GlobalCtx {
         let id = config_fs.get_id();
         let network = config_fs.get_network_identity();
         let net_ns = NetNS::new(config_fs.get_netns());
+        let hostname = config_fs.get_hostname();
 
         let (event_bus, _) = tokio::sync::broadcast::channel(100);
 
@@ -96,7 +97,7 @@ impl GlobalCtx {
 
             ip_collector: Arc::new(IPCollector::new(net_ns)),
 
-            hotname: AtomicCell::new(None),
+            hostname: AtomicCell::new(Some(hostname)),
 
             stun_info_collection: Box::new(StunInfoCollector::new_with_default_servers()),
 
@@ -166,13 +167,27 @@ impl GlobalCtx {
     }
 
     pub fn get_hostname(&self) -> Option<String> {
-        if let Some(hostname) = self.hotname.take() {
-            self.hotname.store(Some(hostname.clone()));
-            return Some(hostname);
+        let hostname = gethostname::gethostname().to_string_lossy().to_string();
+
+        let hostname = match self.hostname.take() {
+            Some(name) => {
+                // when allowing custom hostname, there may be empty
+                if name.is_empty() {
+                    hostname
+                } else {
+                    name
+                }
+            },
+            None => hostname,
+        };
+
+        let re = regex::Regex::new(r"[^\u4E00-\u9FA5a-zA-Z0-9\-]*").unwrap();
+        let mut hostname = re.replace_all(&hostname, "").to_string();
+        if hostname.len() > 32 {
+            hostname = hostname.chars().take(32).collect::<String>();
         }
 
-        let hostname = gethostname::gethostname().to_string_lossy().to_string();
-        self.hotname.store(Some(hostname.clone()));
+        self.hostname.store(Some(hostname.clone()));
         return Some(hostname);
     }
 
diff --git a/easytier/src/easytier-core.rs b/easytier/src/easytier-core.rs
index 3bbc25f..ec67338 100644
--- a/easytier/src/easytier-core.rs
+++ b/easytier/src/easytier-core.rs
@@ -111,6 +111,9 @@ struct Cli {
     #[arg(long, help = "directory to store log files")]
     file_log_dir: Option<String>,
 
+    #[arg(long, help = "host name to identify this device")]
+    hostname: Option<String>,
+
     #[arg(
         short = 'm',
         long,
@@ -177,6 +180,26 @@ impl From<Cli> for TomlConfigLoader {
         let cfg = TomlConfigLoader::default();
 
         cfg.set_inst_name(cli.instance_name.clone());
+
+        let hostname = gethostname::gethostname().to_string_lossy().to_string();
+        let hostname = match cli.hostname {
+            Some(name) => {
+                // when allowing custom hostname, there may be empty
+                if name.is_empty() {
+                    hostname
+                } else {
+                    name
+                }
+            }
+            None => hostname,
+        };
+        let re = regex::Regex::new(r"[^\u4E00-\u9FA5a-zA-Z0-9\-]*").unwrap();
+        let mut hostname = re.replace_all(&hostname, "").to_string();
+        if hostname.len() > 32 {
+            hostname = hostname.chars().take(32).collect::<String>();
+        }
+        cfg.set_hostname(Some(hostname));
+
         cfg.set_network_identity(NetworkIdentity::new(
             cli.network_name.clone(),
             cli.network_secret.clone(),

From 6448955e05c150421a2a3332c6eb8c7e7353cbab Mon Sep 17 00:00:00 2001
From: m1m1sha <18262227804@163.com>
Date: Wed, 8 May 2024 14:48:23 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=F0=9F=8C=88=20style:=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E8=A1=A8=E6=A0=BC=E6=8A=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 easytier-gui/src/components/Status.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/easytier-gui/src/components/Status.vue b/easytier-gui/src/components/Status.vue
index c172644..fb80166 100644
--- a/easytier-gui/src/components/Status.vue
+++ b/easytier-gui/src/components/Status.vue
@@ -348,14 +348,14 @@ function showEventLogs() {
         {{ $t('peer_info') }}
       </template>
       <template #content>
-        <DataTable :value="peerRouteInfos" table-style="min-width: 50rem">
-          <Column field="route.ipv4_addr" :header="$t('virtual_ipv4')" />
-          <Column field="route.hostname" :header="$t('hostname')" />
-          <Column :field="routeCost" :header="$t('route_cost')" />
-          <Column :field="latencyMs" :header="$t('latency')" />
-          <Column :field="txBytes" :header="$t('upload_bytes')" />
-          <Column :field="rxBytes" :header="$t('download_bytes')" />
-          <Column :field="lossRate" :header="$t('loss_rate')" />
+        <DataTable :value="peerRouteInfos" column-resize-mode="fit" table-style="width: 100%">
+          <Column field="route.ipv4_addr" style="width: 100px;" :header="$t('virtual_ipv4')" />
+          <Column field="route.hostname" style="max-width: 250px;" :header="$t('hostname')" />
+          <Column :field="routeCost" style="width: 60px;" :header="$t('route_cost')" />
+          <Column :field="latencyMs" style="width: 80px;" :header="$t('latency')" />
+          <Column :field="txBytes" style="width: 80px;" :header="$t('upload_bytes')" />
+          <Column :field="rxBytes" style="width: 80px;" :header="$t('download_bytes')" />
+          <Column :field="lossRate" style="width: 60px;" :header="$t('loss_rate')" />
         </DataTable>
       </template>
     </Card>

From bde5b7f6ea132192dd87588228f82d799f10ef99 Mon Sep 17 00:00:00 2001
From: m1m1sha <18262227804@163.com>
Date: Wed, 8 May 2024 16:06:11 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=F0=9F=8E=88=20perf:=20get=20hostname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 easytier/src/common/config.rs         | 25 +++++++++++++++++------
 easytier/src/common/global_ctx.rs     | 29 ++++-----------------------
 easytier/src/easytier-core.rs         | 19 +-----------------
 easytier/src/peers/peer_ospf_route.rs | 10 +++------
 easytier/src/peers/peer_rip_route.rs  |  8 ++------
 5 files changed, 29 insertions(+), 62 deletions(-)

diff --git a/easytier/src/common/config.rs b/easytier/src/common/config.rs
index 92ea475..7201172 100644
--- a/easytier/src/common/config.rs
+++ b/easytier/src/common/config.rs
@@ -194,6 +194,7 @@ impl TomlConfigLoader {
                 config_str, config_str
             )
         })?;
+
         Ok(TomlConfigLoader {
             config: Arc::new(Mutex::new(config)),
         })
@@ -221,12 +222,24 @@ impl ConfigLoader for TomlConfigLoader {
     }
 
     fn get_hostname(&self) -> String {
-        self.config
-            .lock()
-            .unwrap()
-            .hostname
-            .clone()
-            .unwrap_or(gethostname::gethostname().to_string_lossy().to_string())
+        let hostname = self.config.lock().unwrap().hostname.clone();
+
+        match hostname {
+            Some(hostname) => {
+                let re = regex::Regex::new(r"[^\u4E00-\u9FA5a-zA-Z0-9\-]*").unwrap();
+                let mut name = re.replace_all(&hostname, "").to_string();
+
+                if name.len() > 32 {
+                    name = name.chars().take(32).collect::<String>();
+                }
+
+                if hostname != name {
+                    self.set_hostname(Some(name.clone()));
+                }
+                name
+            }
+            None => gethostname::gethostname().to_string_lossy().to_string(),
+        }
     }
 
     fn set_hostname(&self, name: Option<String>) {
diff --git a/easytier/src/common/global_ctx.rs b/easytier/src/common/global_ctx.rs
index 969988c..d574311 100644
--- a/easytier/src/common/global_ctx.rs
+++ b/easytier/src/common/global_ctx.rs
@@ -54,7 +54,7 @@ pub struct GlobalCtx {
 
     ip_collector: Arc<IPCollector>,
 
-    hostname: AtomicCell<Option<String>>,
+    hostname: String,
 
     stun_info_collection: Box<dyn StunInfoCollectorTrait>,
 
@@ -97,7 +97,7 @@ impl GlobalCtx {
 
             ip_collector: Arc::new(IPCollector::new(net_ns)),
 
-            hostname: AtomicCell::new(Some(hostname)),
+            hostname,
 
             stun_info_collection: Box::new(StunInfoCollector::new_with_default_servers()),
 
@@ -166,29 +166,8 @@ impl GlobalCtx {
         self.ip_collector.clone()
     }
 
-    pub fn get_hostname(&self) -> Option<String> {
-        let hostname = gethostname::gethostname().to_string_lossy().to_string();
-
-        let hostname = match self.hostname.take() {
-            Some(name) => {
-                // when allowing custom hostname, there may be empty
-                if name.is_empty() {
-                    hostname
-                } else {
-                    name
-                }
-            },
-            None => hostname,
-        };
-
-        let re = regex::Regex::new(r"[^\u4E00-\u9FA5a-zA-Z0-9\-]*").unwrap();
-        let mut hostname = re.replace_all(&hostname, "").to_string();
-        if hostname.len() > 32 {
-            hostname = hostname.chars().take(32).collect::<String>();
-        }
-
-        self.hostname.store(Some(hostname.clone()));
-        return Some(hostname);
+    pub fn get_hostname(&self) -> String {
+        return self.hostname.clone();
     }
 
     pub fn get_stun_info_collector(&self) -> impl StunInfoCollectorTrait + '_ {
diff --git a/easytier/src/easytier-core.rs b/easytier/src/easytier-core.rs
index ec67338..3860664 100644
--- a/easytier/src/easytier-core.rs
+++ b/easytier/src/easytier-core.rs
@@ -181,24 +181,7 @@ impl From<Cli> for TomlConfigLoader {
 
         cfg.set_inst_name(cli.instance_name.clone());
 
-        let hostname = gethostname::gethostname().to_string_lossy().to_string();
-        let hostname = match cli.hostname {
-            Some(name) => {
-                // when allowing custom hostname, there may be empty
-                if name.is_empty() {
-                    hostname
-                } else {
-                    name
-                }
-            }
-            None => hostname,
-        };
-        let re = regex::Regex::new(r"[^\u4E00-\u9FA5a-zA-Z0-9\-]*").unwrap();
-        let mut hostname = re.replace_all(&hostname, "").to_string();
-        if hostname.len() > 32 {
-            hostname = hostname.chars().take(32).collect::<String>();
-        }
-        cfg.set_hostname(Some(hostname));
+        cfg.set_hostname(cli.hostname.clone());
 
         cfg.set_network_identity(NetworkIdentity::new(
             cli.network_name.clone(),
diff --git a/easytier/src/peers/peer_ospf_route.rs b/easytier/src/peers/peer_ospf_route.rs
index b7b9624..1ea5152 100644
--- a/easytier/src/peers/peer_ospf_route.rs
+++ b/easytier/src/peers/peer_ospf_route.rs
@@ -68,7 +68,7 @@ struct RoutePeerInfo {
     cost: u8,
     ipv4_addr: Option<Ipv4Addr>,
     proxy_cidrs: Vec<String>,
-    hostname: Option<String>,
+    hostname: String,
     udp_stun_info: i8,
     last_update: SystemTime,
     version: Version,
@@ -82,7 +82,7 @@ impl RoutePeerInfo {
             cost: 0,
             ipv4_addr: None,
             proxy_cidrs: Vec::new(),
-            hostname: None,
+            hostname: String::new(),
             udp_stun_info: 0,
             last_update: SystemTime::now(),
             version: 0,
@@ -138,11 +138,7 @@ impl Into<crate::rpc::Route> for RoutePeerInfo {
             next_hop_peer_id: 0,
             cost: self.cost as i32,
             proxy_cidrs: self.proxy_cidrs.clone(),
-            hostname: if let Some(hostname) = &self.hostname {
-                hostname.clone()
-            } else {
-                "".to_string()
-            },
+            hostname: self.hostname,
             stun_info: {
                 let mut stun_info = StunInfo::default();
                 if let Ok(udp_nat_type) = NatType::try_from(self.udp_stun_info as i32) {
diff --git a/easytier/src/peers/peer_rip_route.rs b/easytier/src/peers/peer_rip_route.rs
index fda9e5a..3137e01 100644
--- a/easytier/src/peers/peer_rip_route.rs
+++ b/easytier/src/peers/peer_rip_route.rs
@@ -36,7 +36,7 @@ pub struct SyncPeerInfo {
     pub cost: u32,
     pub ipv4_addr: Option<Ipv4Addr>,
     pub proxy_cidrs: Vec<String>,
-    pub hostname: Option<String>,
+    pub hostname: String,
     pub udp_stun_info: i8,
 }
 
@@ -585,11 +585,7 @@ impl Route for BasicRoute {
             route.next_hop_peer_id = route_info.peer_id;
             route.cost = route_info.cost as i32;
             route.proxy_cidrs = route_info.proxy_cidrs.clone();
-            route.hostname = if let Some(hostname) = &route_info.hostname {
-                hostname.clone()
-            } else {
-                "".to_string()
-            };
+            route.hostname = route_info.hostname.clone();
 
             let mut stun_info = StunInfo::default();
             if let Ok(udp_nat_type) = NatType::try_from(route_info.udp_stun_info as i32) {

From 30ccfab28890a734ce3557761445f4f7877cd001 Mon Sep 17 00:00:00 2001
From: m1m1sha <18262227804@163.com>
Date: Wed, 8 May 2024 16:18:09 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=F0=9F=90=9E=20fix:=20hostname=20empty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 easytier/src/common/config.rs | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/easytier/src/common/config.rs b/easytier/src/common/config.rs
index 7201172..9604e37 100644
--- a/easytier/src/common/config.rs
+++ b/easytier/src/common/config.rs
@@ -226,17 +226,22 @@ impl ConfigLoader for TomlConfigLoader {
 
         match hostname {
             Some(hostname) => {
-                let re = regex::Regex::new(r"[^\u4E00-\u9FA5a-zA-Z0-9\-]*").unwrap();
-                let mut name = re.replace_all(&hostname, "").to_string();
+                if !hostname.is_empty() {
+                    let re = regex::Regex::new(r"[^\u4E00-\u9FA5a-zA-Z0-9\-]*").unwrap();
+                    let mut name = re.replace_all(&hostname, "").to_string();
 
-                if name.len() > 32 {
-                    name = name.chars().take(32).collect::<String>();
-                }
+                    if name.len() > 32 {
+                        name = name.chars().take(32).collect::<String>();
+                    }
 
-                if hostname != name {
-                    self.set_hostname(Some(name.clone()));
+                    if hostname != name {
+                        self.set_hostname(Some(name.clone()));
+                    }
+                    name
+                } else {
+                    self.set_hostname(None);
+                    gethostname::gethostname().to_string_lossy().to_string()
                 }
-                name
             }
             None => gethostname::gethostname().to_string_lossy().to_string(),
         }

From 4ca840239ab9fcf2db98989770f12deaa9cdf7cf Mon Sep 17 00:00:00 2001
From: Yumin Wu <wuyumin@wuyumin.com>
Date: Wed, 8 May 2024 17:40:43 +0800
Subject: [PATCH 05/18] wireguard client keepalive

---
 README.md                            | 1 +
 README_CN.md                         | 1 +
 easytier/src/vpn_portal/wireguard.rs | 1 +
 3 files changed, 3 insertions(+)

diff --git a/README.md b/README.md
index dfedce5..ba86c35 100644
--- a/README.md
+++ b/README.md
@@ -227,6 +227,7 @@ Address = 10.14.14.0/24 # should assign an ip from this cidr manually
 PublicKey = zhrZQg4QdPZs8CajT3r4fmzcNsWpBL9ImQCUsnlXyGM=
 AllowedIPs = 192.168.80.0/20,10.147.223.0/24,10.144.144.0/24
 Endpoint = 0.0.0.0:11013 # should be the public ip of the vpn server
+PersistentKeepalive = 25
 
 connected_clients:
 []
diff --git a/README_CN.md b/README_CN.md
index e36c184..99007ee 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -228,6 +228,7 @@ Address = 10.14.14.0/24 # should assign an ip from this cidr manually
 PublicKey = zhrZQg4QdPZs8CajT3r4fmzcNsWpBL9ImQCUsnlXyGM=
 AllowedIPs = 192.168.80.0/20,10.147.223.0/24,10.144.144.0/24
 Endpoint = 0.0.0.0:11013 # should be the public ip of the vpn server
+PersistentKeepalive = 25
 
 connected_clients:
 []
diff --git a/easytier/src/vpn_portal/wireguard.rs b/easytier/src/vpn_portal/wireguard.rs
index 2423ccd..dccdeda 100644
--- a/easytier/src/vpn_portal/wireguard.rs
+++ b/easytier/src/vpn_portal/wireguard.rs
@@ -284,6 +284,7 @@ Address = {client_cidr} # should assign an ip from this cidr manually
 PublicKey = {my_public_key}
 AllowedIPs = {allow_ips}
 Endpoint = {listenr_addr} # should be the public ip of the vpn server
+PersistentKeepalive = 25
 "#,
             peer_secret_key = BASE64_STANDARD.encode(cfg.peer_secret_key()),
             my_public_key = BASE64_STANDARD.encode(cfg.my_public_key()),

From e6ad308cd5d236e32c4ed2262ca51c3da5f809da Mon Sep 17 00:00:00 2001
From: m1m1sha <18262227804@163.com>
Date: Wed, 8 May 2024 20:49:33 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E2=86=A9=20revert:=20=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 easytier/src/peers/peer_ospf_route.rs | 8 ++++----
 easytier/src/peers/peer_rip_route.rs  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/easytier/src/peers/peer_ospf_route.rs b/easytier/src/peers/peer_ospf_route.rs
index 1ea5152..59bdbf4 100644
--- a/easytier/src/peers/peer_ospf_route.rs
+++ b/easytier/src/peers/peer_ospf_route.rs
@@ -68,7 +68,7 @@ struct RoutePeerInfo {
     cost: u8,
     ipv4_addr: Option<Ipv4Addr>,
     proxy_cidrs: Vec<String>,
-    hostname: String,
+    hostname: Option<String>,
     udp_stun_info: i8,
     last_update: SystemTime,
     version: Version,
@@ -82,7 +82,7 @@ impl RoutePeerInfo {
             cost: 0,
             ipv4_addr: None,
             proxy_cidrs: Vec::new(),
-            hostname: String::new(),
+            hostname: None,
             udp_stun_info: 0,
             last_update: SystemTime::now(),
             version: 0,
@@ -101,7 +101,7 @@ impl RoutePeerInfo {
                 .map(|x| x.to_string())
                 .chain(global_ctx.get_vpn_portal_cidr().map(|x| x.to_string()))
                 .collect(),
-            hostname: global_ctx.get_hostname(),
+            hostname: Some(global_ctx.get_hostname()),
             udp_stun_info: global_ctx
                 .get_stun_info_collector()
                 .get_stun_info()
@@ -138,7 +138,7 @@ impl Into<crate::rpc::Route> for RoutePeerInfo {
             next_hop_peer_id: 0,
             cost: self.cost as i32,
             proxy_cidrs: self.proxy_cidrs.clone(),
-            hostname: self.hostname,
+            hostname: self.hostname.unwrap_or_default(),
             stun_info: {
                 let mut stun_info = StunInfo::default();
                 if let Ok(udp_nat_type) = NatType::try_from(self.udp_stun_info as i32) {
diff --git a/easytier/src/peers/peer_rip_route.rs b/easytier/src/peers/peer_rip_route.rs
index 3137e01..2ce0a05 100644
--- a/easytier/src/peers/peer_rip_route.rs
+++ b/easytier/src/peers/peer_rip_route.rs
@@ -36,7 +36,7 @@ pub struct SyncPeerInfo {
     pub cost: u32,
     pub ipv4_addr: Option<Ipv4Addr>,
     pub proxy_cidrs: Vec<String>,
-    pub hostname: String,
+    pub hostname: Option<String>,
     pub udp_stun_info: i8,
 }
 
@@ -52,7 +52,7 @@ impl SyncPeerInfo {
                 .map(|x| x.to_string())
                 .chain(global_ctx.get_vpn_portal_cidr().map(|x| x.to_string()))
                 .collect(),
-            hostname: global_ctx.get_hostname(),
+            hostname: Some(global_ctx.get_hostname()),
             udp_stun_info: global_ctx
                 .get_stun_info_collector()
                 .get_stun_info()
@@ -585,7 +585,7 @@ impl Route for BasicRoute {
             route.next_hop_peer_id = route_info.peer_id;
             route.cost = route_info.cost as i32;
             route.proxy_cidrs = route_info.proxy_cidrs.clone();
-            route.hostname = route_info.hostname.clone();
+            route.hostname = route_info.hostname.clone().unwrap_or_default();
 
             let mut stun_info = StunInfo::default();
             if let Ok(udp_nat_type) = NatType::try_from(route_info.udp_stun_info as i32) {

From 52fef9fd4f8cee31c2c0471dd5061a27a0d8be1a Mon Sep 17 00:00:00 2001
From: m1m1sha <18262227804@163.com>
Date: Wed, 8 May 2024 21:02:14 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=F0=9F=8E=88=20perf:=20=E4=B8=BB=E6=9C=BA?=
 =?UTF-8?q?=E5=90=8D=E6=8F=90=E7=A4=BA=E6=98=BE=E7=A4=BA=E6=9C=AC=E6=9C=BA?=
 =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.lock                              |  1 +
 easytier-gui/locales/cn.yml             |  2 +-
 easytier-gui/locales/en.yml             |  2 +-
 easytier-gui/src-tauri/Cargo.toml       |  8 ++++++--
 easytier-gui/src-tauri/src/main.rs      |  8 +++++++-
 easytier-gui/src/auto-imports.d.ts      |  3 +++
 easytier-gui/src/components/Config.vue  | 10 +++++++++-
 easytier-gui/src/composables/network.ts |  4 ++++
 8 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5bb95a4..91b2dfa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1349,6 +1349,7 @@ dependencies = [
  "chrono",
  "dashmap",
  "easytier",
+ "gethostname",
  "once_cell",
  "privilege",
  "serde",
diff --git a/easytier-gui/locales/cn.yml b/easytier-gui/locales/cn.yml
index aa2ce02..63cb2bb 100644
--- a/easytier-gui/locales/cn.yml
+++ b/easytier-gui/locales/cn.yml
@@ -32,7 +32,7 @@ settings: 设置
 exchange_language: Switch to English
 exit: 退出
 chips_placeholder: 例如： {0}, 按回车添加
-hostname_placeholder: 留空默认为设备名称 
+hostname_placeholder: '留空默认为主机名: {0}'
 off_text: 点击关闭
 on_text: 点击开启
 show_config: 显示配置
diff --git a/easytier-gui/locales/en.yml b/easytier-gui/locales/en.yml
index 7221c0e..b19c362 100644
--- a/easytier-gui/locales/en.yml
+++ b/easytier-gui/locales/en.yml
@@ -33,7 +33,7 @@ exchange_language: 切换中文
 exit: Exit
 
 chips_placeholder: 'e.g: {0}, press Enter to add'
-hostname_placeholder: Leave blank and default to device name
+hostname_placeholder: 'Leave blank and default to host name: {0}'
 off_text: Press to disable
 on_text: Press to enable
 show_config: Show Config
diff --git a/easytier-gui/src-tauri/Cargo.toml b/easytier-gui/src-tauri/Cargo.toml
index c98b231..bf702f8 100644
--- a/easytier-gui/src-tauri/Cargo.toml
+++ b/easytier-gui/src-tauri/Cargo.toml
@@ -11,7 +11,11 @@ edition = "2021"
 tauri-build = { version = "1", features = [] }
 
 [dependencies]
-tauri = { version = "1", features = [ "process-exit", "system-tray", "shell-open"] }
+tauri = { version = "1", features = [
+  "process-exit",
+  "system-tray",
+  "shell-open",
+] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 
@@ -24,7 +28,7 @@ once_cell = "1.18.0"
 dashmap = "5.5.3"
 
 privilege = "0.3"
-
+gethostname = "0.4.3"
 [features]
 # This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!!
 custom-protocol = ["tauri/custom-protocol"]
diff --git a/easytier-gui/src-tauri/src/main.rs b/easytier-gui/src-tauri/src/main.rs
index 6124ee5..6ce7ce3 100644
--- a/easytier-gui/src-tauri/src/main.rs
+++ b/easytier-gui/src-tauri/src/main.rs
@@ -283,6 +283,11 @@ fn collect_network_infos() -> Result<String, String> {
     Ok(serde_json::to_string(&ret).map_err(|e| e.to_string())?)
 }
 
+#[tauri::command]
+fn get_os_hostname() -> Result<String, String> {
+    Ok(gethostname::gethostname().to_string_lossy().to_string())
+}
+
 fn toggle_window_visibility(window: &Window) {
     if window.is_visible().unwrap() {
         window.hide().unwrap();
@@ -320,7 +325,8 @@ fn main() {
             parse_network_config,
             run_network_instance,
             retain_network_instance,
-            collect_network_infos
+            collect_network_infos,
+            get_os_hostname
         ])
         .system_tray(SystemTray::new().with_menu(tray_menu))
         .on_system_tray_event(|app, event| match event {
diff --git a/easytier-gui/src/auto-imports.d.ts b/easytier-gui/src/auto-imports.d.ts
index 9fbc786..d337cfb 100644
--- a/easytier-gui/src/auto-imports.d.ts
+++ b/easytier-gui/src/auto-imports.d.ts
@@ -20,6 +20,7 @@ declare global {
   const getActivePinia: typeof import('pinia')['getActivePinia']
   const getCurrentInstance: typeof import('vue')['getCurrentInstance']
   const getCurrentScope: typeof import('vue')['getCurrentScope']
+  const getOsHostname: typeof import('./composables/network')['getOsHostname']
   const h: typeof import('vue')['h']
   const inject: typeof import('vue')['inject']
   const isProxy: typeof import('vue')['isProxy']
@@ -108,6 +109,7 @@ declare module 'vue' {
     readonly getActivePinia: UnwrapRef<typeof import('pinia')['getActivePinia']>
     readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
     readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
+    readonly getOsHostname: UnwrapRef<typeof import('./composables/network')['getOsHostname']>
     readonly h: UnwrapRef<typeof import('vue')['h']>
     readonly inject: UnwrapRef<typeof import('vue')['inject']>
     readonly isProxy: UnwrapRef<typeof import('vue')['isProxy']>
@@ -189,6 +191,7 @@ declare module '@vue/runtime-core' {
     readonly getActivePinia: UnwrapRef<typeof import('pinia')['getActivePinia']>
     readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
     readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
+    readonly getOsHostname: UnwrapRef<typeof import('./composables/network')['getOsHostname']>
     readonly h: UnwrapRef<typeof import('vue')['h']>
     readonly inject: UnwrapRef<typeof import('vue')['inject']>
     readonly isProxy: UnwrapRef<typeof import('vue')['isProxy']>
diff --git a/easytier-gui/src/components/Config.vue b/easytier-gui/src/components/Config.vue
index 0a65ca3..aac1b77 100644
--- a/easytier-gui/src/components/Config.vue
+++ b/easytier-gui/src/components/Config.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import InputGroup from 'primevue/inputgroup'
 import InputGroupAddon from 'primevue/inputgroupaddon'
+import { getOsHostname } from '~/composables/network'
 import { i18n } from '~/modules/i18n'
 import { NetworkingMethod } from '~/types/network'
 
@@ -44,6 +45,12 @@ function validateHostname() {
       curNetwork.value.hostname = name
   }
 }
+
+const osHostname = ref<string>('')
+
+onMounted(async () => {
+  osHostname.value = await getOsHostname()
+})
 </script>
 
 <template>
@@ -167,7 +174,8 @@ function validateHostname() {
               <div class="flex flex-column gap-2 basis-5/12 grow">
                 <label for="hostname">{{ $t('hostname') }}</label>
                 <InputText
-                  id="hostname" v-model="curNetwork.hostname" aria-describedby="hostname-help" :format="true" @blur="validateHostname"
+                  id="hostname" v-model="curNetwork.hostname" aria-describedby="hostname-help" :format="true"
+                  :placeholder="$t('hostname_placeholder', [osHostname])" @blur="validateHostname"
                 />
               </div>
             </div>
diff --git a/easytier-gui/src/composables/network.ts b/easytier-gui/src/composables/network.ts
index 90455eb..7314803 100644
--- a/easytier-gui/src/composables/network.ts
+++ b/easytier-gui/src/composables/network.ts
@@ -20,3 +20,7 @@ export async function collectNetworkInfos() {
   const ret: string = await invoke('collect_network_infos', {})
   return JSON.parse(ret)
 }
+
+export async function getOsHostname(): Promise<string> {
+  return await invoke('get_os_hostname')
+}
\ No newline at end of file

From 4387d49a42af85ce88c85f84109dfd0dfdd23814 Mon Sep 17 00:00:00 2001
From: Yumin Wu <wuyumin@wuyumin.com>
Date: Wed, 8 May 2024 21:50:38 +0800
Subject: [PATCH 08/18] update Cargo.lock

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3dc6e30..0535eb3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -387,7 +387,7 @@ dependencies = [
 [[package]]
 name = "boringtun"
 version = "0.6.0"
-source = "git+https://github.com/KKRainbow/boringtun.git#449204c3eca736dc23b075d81426527a357e2f2a"
+source = "git+https://github.com/EasyTier/boringtun.git#449204c3eca736dc23b075d81426527a357e2f2a"
 dependencies = [
  "aead",
  "atomic-shim",

From 5d5d8b122a05cbd403968615de61c7dbb76bc25c Mon Sep 17 00:00:00 2001
From: Yumin Wu <wuyumin@wuyumin.com>
Date: Wed, 8 May 2024 21:51:37 +0800
Subject: [PATCH 09/18] rename config for IDE

---
 .cargo/{config => config.toml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .cargo/{config => config.toml} (100%)

diff --git a/.cargo/config b/.cargo/config.toml
similarity index 100%
rename from .cargo/config
rename to .cargo/config.toml

From 801104ca691f7c8e83fc5eb8299af2a498f26081 Mon Sep 17 00:00:00 2001
From: Yumin Wu <wuyumin@wuyumin.com>
Date: Wed, 8 May 2024 21:52:59 +0800
Subject: [PATCH 10/18] add target

---
 .cargo/config.toml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 74438e7..296abef 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,8 +1,14 @@
+[target.x86_64-unknown-linux-musl]
+linker = "rust-lld"
+rustflags = ["-C", "linker-flavor=ld.lld"]
+
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"
+
 [target.aarch64-unknown-linux-musl]
 linker = "aarch64-linux-musl-gcc"
 rustflags = ["-C", "target-feature=+crt-static"]
+
 [target.'cfg(all(windows, target_env = "msvc"))']
 rustflags = ["-C", "target-feature=+crt-static"]
 

From 8e841bf5b52a89443c35b225d768d24a48519490 Mon Sep 17 00:00:00 2001
From: Yumin Wu <wuyumin@wuyumin.com>
Date: Thu, 9 May 2024 15:02:28 +0800
Subject: [PATCH 11/18] fixed version

---
 Cargo.lock          | 2 +-
 easytier/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 91b2dfa..68b4c42 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -387,7 +387,7 @@ dependencies = [
 [[package]]
 name = "boringtun"
 version = "0.6.0"
-source = "git+https://github.com/EasyTier/boringtun.git#449204c3eca736dc23b075d81426527a357e2f2a"
+source = "git+https://github.com/EasyTier/boringtun.git?rev=449204c#449204c3eca736dc23b075d81426527a357e2f2a"
 dependencies = [
  "aead",
  "atomic-shim",
diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml
index e78fca7..3dc0d3a 100644
--- a/easytier/Cargo.toml
+++ b/easytier/Cargo.toml
@@ -127,7 +127,7 @@ network-interface = "1.1.1"
 pathfinding = "4.9.1"
 
 # for encryption
-boringtun = { git = "https://github.com/EasyTier/boringtun.git", optional = true }
+boringtun = { git = "https://github.com/EasyTier/boringtun.git", optional = true, rev = "449204c" }
 ring = { version = "0.17", optional = true }
 bitflags = "2.5"
 aes-gcm = { version = "0.10.3", optional = true }

From e4146c3f92f7cbb97f85b51887e87c0c6df07342 Mon Sep 17 00:00:00 2001
From: Yumin Wu <wuyumin@wuyumin.com>
Date: Thu, 9 May 2024 15:04:27 +0800
Subject: [PATCH 12/18] release reduce size

---
 Cargo.toml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index bd1ae95..6bf512d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,4 +7,8 @@ default-members = [ "easytier" ]
 panic = "unwind"
 
 [profile.release]
-panic = "unwind"
+lto = true
+codegen-units = 1
+panic = "abort"
+strip = true
+opt-level = "z"

From 770ab4a01b907a2af28312ad5e68a6f060811086 Mon Sep 17 00:00:00 2001
From: Yumin Wu <wuyumin@wuyumin.com>
Date: Thu, 9 May 2024 15:06:32 +0800
Subject: [PATCH 13/18] command friendly tips

---
 easytier/src/easytier-cli.rs  | 2 +-
 easytier/src/easytier-core.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/easytier/src/easytier-cli.rs b/easytier/src/easytier-cli.rs
index 33c53a8..c78e269 100644
--- a/easytier/src/easytier-cli.rs
+++ b/easytier/src/easytier-cli.rs
@@ -25,7 +25,7 @@ use humansize::format_size;
 use tabled::settings::Style;
 
 #[derive(Parser, Debug)]
-#[command(author, version, about, long_about = None)]
+#[command(name = "easytier-cli", author, version, about, long_about = None)]
 struct Cli {
     /// the instance name
     #[arg(short = 'p', long, default_value = "127.0.0.1:15888")]
diff --git a/easytier/src/easytier-core.rs b/easytier/src/easytier-core.rs
index 3860664..e367f32 100644
--- a/easytier/src/easytier-core.rs
+++ b/easytier/src/easytier-core.rs
@@ -41,7 +41,7 @@ use mimalloc_rust::*;
 static GLOBAL_MIMALLOC: GlobalMiMalloc = GlobalMiMalloc;
 
 #[derive(Parser, Debug)]
-#[command(author, version, about, long_about = None)]
+#[command(name = "easytier-core", author, version, about, long_about = None)]
 struct Cli {
     #[arg(
         short,

From 469187d0bb9b1c09b8d645c266ac10fa9bd36934 Mon Sep 17 00:00:00 2001
From: Yumin Wu <wuyumin@wuyumin.com>
Date: Thu, 9 May 2024 15:20:49 +0800
Subject: [PATCH 14/18] temporary version(v1.0.0 is already published)

---
 Cargo.lock          | 2 +-
 easytier/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 68b4c42..cd0657b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1266,7 +1266,7 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
 
 [[package]]
 name = "easytier"
-version = "1.0.0"
+version = "1.0.1-pre"
 dependencies = [
  "aes-gcm",
  "anyhow",
diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml
index 3dc0d3a..938ffc3 100644
--- a/easytier/Cargo.toml
+++ b/easytier/Cargo.toml
@@ -3,7 +3,7 @@ name = "easytier"
 description = "A full meshed p2p VPN, connecting all your devices in one network with one command."
 homepage = "https://github.com/KKRainbow/EasyTier"
 repository = "https://github.com/KKRainbow/EasyTier"
-version = "1.0.0"
+version = "1.0.1-pre"
 edition = "2021"
 authors = ["kkrainbow"]
 keywords = ["vpn", "p2p", "network", "easytier"]

From b1f8c5c1759969b78cecacfeb5735b3b0c3443b5 Mon Sep 17 00:00:00 2001
From: Yumin Wu <wuyumin@wuyumin.com>
Date: Thu, 9 May 2024 17:18:20 +0800
Subject: [PATCH 15/18] update  release profile

---
 Cargo.toml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6bf512d..0e2e920 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,8 +7,9 @@ default-members = [ "easytier" ]
 panic = "unwind"
 
 [profile.release]
-lto = true
-codegen-units = 1
-panic = "abort"
-strip = true
-opt-level = "z"
+panic = "unwind"
+# panic = "abort"
+# lto = true
+# codegen-units = 1
+# strip = true
+# opt-level = "z"

From b4ebe7a4812f5b56454c67d1ec8ff75431ff91fa Mon Sep 17 00:00:00 2001
From: Yumin Wu <wuyumin@wuyumin.com>
Date: Thu, 9 May 2024 17:56:00 +0800
Subject: [PATCH 16/18] update .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index fb2d30c..9a7f190 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,6 @@ nohup.out
 components.d.ts
 
 musl_gcc
+
+# log
+easytier-panic.log

From 7d3b8e42fe4cc060d11e4c93f7511a2b09c0b733 Mon Sep 17 00:00:00 2001
From: "Sijie.Sun" <sunsijie@buaa.edu.cn>
Date: Thu, 9 May 2024 18:51:58 +0800
Subject: [PATCH 17/18] move reconn task join into select! (#88)

if join_next stuck, may miss global event and cause panic
---
 easytier/src/connector/manual.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/easytier/src/connector/manual.rs b/easytier/src/connector/manual.rs
index 1feb461..0eab45e 100644
--- a/easytier/src/connector/manual.rs
+++ b/easytier/src/connector/manual.rs
@@ -167,7 +167,6 @@ impl ManualConnectorManager {
         let mut reconn_interval = tokio::time::interval(std::time::Duration::from_millis(
             use_global_var!(MANUAL_CONNECTOR_RECONNECT_INTERVAL_MS),
         ));
-        let mut reconn_tasks = JoinSet::new();
         let (reconn_result_send, mut reconn_result_recv) = mpsc::channel(100);
 
         loop {
@@ -176,8 +175,8 @@ impl ManualConnectorManager {
                     if let Ok(event) = event {
                         Self::handle_event(&event, data.clone()).await;
                     } else {
-                        log::warn!("event_recv closed");
-                        panic!("event_recv closed");
+                        tracing::warn!(?event, "event_recv got error");
+                        panic!("event_recv got error, err: {:?}", event);
                     }
                 }
 
@@ -193,7 +192,7 @@ impl ManualConnectorManager {
                         let insert_succ = data.reconnecting.insert(dead_url.clone());
                         assert!(insert_succ);
 
-                        reconn_tasks.spawn(async move {
+                        tokio::spawn(async move {
                             let reconn_ret = Self::conn_reconnect(data_clone.clone(), dead_url.clone(), connector.clone()).await;
                             sender.send(reconn_ret).await.unwrap();
 
@@ -205,8 +204,7 @@ impl ManualConnectorManager {
                 }
 
                 ret = reconn_result_recv.recv() => {
-                    log::warn!("reconn_tasks done, out: {:?}", ret);
-                    let _ = reconn_tasks.join_next().await.unwrap();
+                    log::warn!("reconn_tasks done, reconn result: {:?}", ret);
                 }
             }
         }

From 4da7f4ec20521ae5e99ecac210247d4445806b07 Mon Sep 17 00:00:00 2001
From: Yumin Wu <wuyumin@wuyumin.com>
Date: Thu, 9 May 2024 22:01:55 +0800
Subject: [PATCH 18/18] fix AllowIps and Address fields for WireGuard client
 (#99)

- add Wireguard client cidr into AllowIps
- change subnet number to 32 in Address field
---
 README.md                            | 12 +++++++-----
 README_CN.md                         | 12 +++++++-----
 easytier/src/easytier-cli.rs         | 11 +++++++++--
 easytier/src/easytier-core.rs        |  2 +-
 easytier/src/vpn_portal/wireguard.rs | 14 ++++++++------
 5 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index ba86c35..c9e5087 100644
--- a/README.md
+++ b/README.md
@@ -218,20 +218,22 @@ After successfully starting easytier-core, use easytier-cli to obtain the WireGu
 $> easytier-cli vpn-portal
 portal_name: wireguard
 
-client_config:
+############### client_config_start ###############
+
 [Interface]
 PrivateKey = 9VDvlaIC9XHUvRuE06hD2CEDrtGF+0lDthgr9SZfIho=
-Address = 10.14.14.0/24 # should assign an ip from this cidr manually
+Address = 10.14.14.0/32 # should assign an ip from this cidr manually
 
 [Peer]
 PublicKey = zhrZQg4QdPZs8CajT3r4fmzcNsWpBL9ImQCUsnlXyGM=
-AllowedIPs = 192.168.80.0/20,10.147.223.0/24,10.144.144.0/24
-Endpoint = 0.0.0.0:11013 # should be the public ip of the vpn server
+AllowedIPs = 10.144.144.0/24,10.14.14.0/24
+Endpoint = 0.0.0.0:11013 # should be the public ip(or domain) of the vpn server
 PersistentKeepalive = 25
 
+############### client_config_end ###############
+
 connected_clients:
 []
-
 ```
 
 Before using the Client Config, you need to modify the Interface Address and Peer Endpoint to the client's IP and the IP of the EasyTier node, respectively. Import the configuration file into the WireGuard client to access the EasyTier network.
diff --git a/README_CN.md b/README_CN.md
index 99007ee..8016664 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -219,20 +219,22 @@ easytier-core 启动成功后，使用 easytier-cli 获取 WireGuard Client 的
 $> easytier-cli vpn-portal
 portal_name: wireguard
 
-client_config:
+############### client_config_start ###############
+
 [Interface]
 PrivateKey = 9VDvlaIC9XHUvRuE06hD2CEDrtGF+0lDthgr9SZfIho=
-Address = 10.14.14.0/24 # should assign an ip from this cidr manually
+Address = 10.14.14.0/32 # should assign an ip from this cidr manually
 
 [Peer]
 PublicKey = zhrZQg4QdPZs8CajT3r4fmzcNsWpBL9ImQCUsnlXyGM=
-AllowedIPs = 192.168.80.0/20,10.147.223.0/24,10.144.144.0/24
-Endpoint = 0.0.0.0:11013 # should be the public ip of the vpn server
+AllowedIPs = 10.144.144.0/24,10.14.14.0/24
+Endpoint = 0.0.0.0:11013 # should be the public ip(or domain) of the vpn server
 PersistentKeepalive = 25
 
+############### client_config_end ###############
+
 connected_clients:
 []
-
 ```
 
 使用 Client Config 前，需要将 Interface Address 和 Peer Endpoint 分别修改为客户端的 IP 和 EasyTier 节点的 IP。将配置文件导入 WireGuard 客户端，即可访问 EasyTier 网络。
diff --git a/easytier/src/easytier-cli.rs b/easytier/src/easytier-cli.rs
index c78e269..44dc223 100644
--- a/easytier/src/easytier-cli.rs
+++ b/easytier/src/easytier-cli.rs
@@ -360,8 +360,15 @@ async fn main() -> Result<(), Error> {
                 .into_inner()
                 .vpn_portal_info
                 .unwrap_or_default();
-            println!("portal_name: {}\n", resp.vpn_type);
-            println!("client_config:{}", resp.client_config);
+            println!("portal_name: {}", resp.vpn_type);
+            println!(
+                r#"
+############### client_config_start ###############
+{}
+############### client_config_end ###############
+"#,
+                resp.client_config
+            );
             println!("connected_clients:\n{:#?}", resp.connected_clients);
         }
     }
diff --git a/easytier/src/easytier-core.rs b/easytier/src/easytier-core.rs
index e367f32..f4ddeff 100644
--- a/easytier/src/easytier-core.rs
+++ b/easytier/src/easytier-core.rs
@@ -428,7 +428,7 @@ pub async fn async_main(cli: Cli) {
     });
 
     println!("Starting easytier with config:");
-    println!("############### TOML ##############\n");
+    println!("############### TOML ###############\n");
     println!("{}", cfg.dump());
     println!("-----------------------------------");
 
diff --git a/easytier/src/vpn_portal/wireguard.rs b/easytier/src/vpn_portal/wireguard.rs
index dccdeda..9ef3428 100644
--- a/easytier/src/vpn_portal/wireguard.rs
+++ b/easytier/src/vpn_portal/wireguard.rs
@@ -264,33 +264,35 @@ impl VpnPortal for WireGuard {
             break;
         }
 
+        let vpn_cfg = global_ctx.config.get_vpn_portal_config().unwrap();
+        let client_cidr = vpn_cfg.client_cidr;
+
+        allow_ips.push(client_cidr.to_string());
+
         let allow_ips = allow_ips
             .into_iter()
             .map(|x| x.to_string())
             .collect::<Vec<_>>()
             .join(",");
 
-        let vpn_cfg = global_ctx.config.get_vpn_portal_config().unwrap();
-        let client_cidr = vpn_cfg.client_cidr;
-
         let cfg = self.inner.as_ref().unwrap().wg_config.clone();
         let cfg_str = format!(
             r#"
 [Interface]
 PrivateKey = {peer_secret_key}
-Address = {client_cidr} # should assign an ip from this cidr manually
+Address = {address} # should assign an ip from this cidr manually
 
 [Peer]
 PublicKey = {my_public_key}
 AllowedIPs = {allow_ips}
-Endpoint = {listenr_addr} # should be the public ip of the vpn server
+Endpoint = {listenr_addr} # should be the public ip(or domain) of the vpn server
 PersistentKeepalive = 25
 "#,
             peer_secret_key = BASE64_STANDARD.encode(cfg.peer_secret_key()),
             my_public_key = BASE64_STANDARD.encode(cfg.my_public_key()),
             listenr_addr = self.inner.as_ref().unwrap().listenr_addr,
             allow_ips = allow_ips,
-            client_cidr = client_cidr,
+            address = client_cidr.first_address().to_string() + "/32",
         );
 
         cfg_str