remove some dep

easytier/Cargo.toml

@@ -62,7 +62,6 @@ timedmap = "=1.0.1"
 zerocopy = { version = "0.7.32", features = ["derive", "simd"] }
 bytes = "1.5.0"
 pin-project-lite = "0.2.13"
-atomicbox = "0.4.0"
 tachyonix = "0.3.0"
 
 quinn = { version = "0.11.0", optional = true, features = ["ring"] }
@@ -99,7 +98,6 @@ uuid = { version = "1.5.0", features = [
 ] }
 
 # for ring tunnel
-crossbeam-queue = "0.3"
 once_cell = "1.18.0"
 
 # for rpc
@@ -138,7 +136,7 @@ async-recursion = "1.0.5"
 network-interface = "2.0"
 
 # for ospf route
-petgraph = "0.6.5"
+petgraph = "0.7.1"
 
 # for wireguard
 boringtun = { package = "boringtun-easytier", version = "0.6.1", optional = true }
@@ -154,13 +152,9 @@ humansize = "2.1.3"
 
 base64 = "0.22"
 
-derivative = "2.2.0"
-
 mimalloc-rust = { version = "0.2.1", optional = true }
 
-# for mips
-indexmap = { version = "~1.9.3", optional = false, features = ["std"] }
-
+# mips
 atomic-shim = "0.2.0"
 
 smoltcp = { version = "0.12.0", optional = true, default-features = false, features = [
@@ -194,6 +188,9 @@ prost-reflect = { version = "0.14.5", features = [
     "text-format"
 ] }
 
+# for http connector
+# reqwest = { version = "0.12.12", default-features = false, features = ["rustls-tls"] }
+
 [target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "freebsd"))'.dependencies]
 machine-uid = "0.5.3"
 
@@ -226,7 +223,7 @@ rpc_build = { package = "easytier-rpc-build", version = "0.1.0", features = ["in
 prost-reflect-build = { version = "0.14.0" }
 
 [target.'cfg(windows)'.build-dependencies]
-reqwest = { version = "0.11", features = ["blocking"] }
+reqwest = { version = "0.12.12", features = ["blocking"] }
 zip = "0.6.6"
 
 

easytier/src/connector/mod.rs

@@ -19,6 +19,8 @@ pub mod direct;
 pub mod manual;
 pub mod udp_hole_punch;
 
+mod http_connector;
+
 async fn set_bind_addr_for_peer_connector(
     connector: &mut (impl TunnelConnector + ?Sized),
     is_ipv4: bool,

easytier/src/gateway/kcp_proxy.rs

@@ -361,7 +361,9 @@ impl KcpProxyDst {
             proxy_entries.remove(&conn_id);
         }
 
-        if Some(dst_socket.ip()) == global_ctx.get_ipv4().map(|ip| IpAddr::V4(ip.address())) {
+        if Some(dst_socket.ip()) == global_ctx.get_ipv4().map(|ip| IpAddr::V4(ip.address()))
+            && global_ctx.no_tun()
+        {
             dst_socket = format!("127.0.0.1:{}", dst_socket.port()).parse().unwrap();
         }