Update dependencies and refactor DNS and HTTP handling

- Updated various dependencies in Cargo.toml for improved performance and security.
- Refactored DNS resolution logic to use GenericConnector and RDRuntime for better async handling.
- Enhanced HTTP client to handle CONNECT requests more efficiently, including improved error handling and response parsing.
- Updated local network configuration to use appropriate socket options for TCP and UDP.
- Improved GeoIP matching logic to handle country lookups more robustly.
- Refactored API server to utilize Axum's latest features, including WebSocket handling and request processing.
- Cleaned up schema generation logic for better maintainability and clarity.
- Removed deprecated tracing integration with OpenTelemetry.

Author: spacemeowx2

Cargo.lock

@@ -35,24 +35,24 @@ serde = { version = "1.0.228", features = ["derive"] }
 rd-interface = { path = "./rd-interface/", version = "0.4" }
 rd-std = { path = "./rd-std/", version = "0.1" }
 cfg-if = "1.0.4"
-reqwest = { version = "0.11.27", features = ["native-tls-vendored", "socks"] }
+reqwest = { version = "0.13.1", features = ["native-tls-vendored", "socks"] }
 parking_lot = "0.12.5"
 uuid = { version = "1.19.0", features = ["v4"] }
 fs2 = "0.4.3"
 async-stream = "0.3.6"
 once_cell = "1.21.3"
 
-axum = { version = "0.6.20", features = ["ws"], optional = true }
+axum = { version = "0.8.8", features = ["ws"], optional = true }
 serde_urlencoded = { version = "0.7.1", optional = true }
-tower-http = { version = "0.4.4", features = [
+tower-http = { version = "0.6.8", features = [
     "fs",
     "cors",
     "trace",
 ], optional = true }
 dirs = { version = "6.0.0" }
 json-patch = { version = "4.1.0", optional = true }
 url = { version = "2.5.8", optional = true, features = ["serde"] }
-hyper = { version = "0.14.32", optional = true, features = ["http1", "client"] }
+hyper = { version = "1.8.1", optional = true, features = ["http1", "client"] }
 percent-encoding = { version = "2.3.2", optional = true }
 bytes = { version = "1.11.0", optional = true }
 
@@ -62,16 +62,12 @@ rpc = { path = "./protocol/rpc", optional = true }
 raw = { path = "./protocol/raw", optional = true }
 obfs = { path = "./protocol/obfs", optional = true }
 
-console-subscriber = { version = "0.1.10", optional = true }
+console-subscriber = { version = "0.5.0", optional = true }
 
 chrono = { version = "0.4.43", optional = true }
-tracing-serde = { version = "0.1.3", optional = true }
-tracing-opentelemetry = { version = "0.19.0", optional = true }
-opentelemetry = { version = "0.19.0", features = ["rt-tokio"], optional = true }
-opentelemetry-jaeger = { version = "0.18.0", features = [
-    "rt-tokio",
-    "reqwest_collector_client",
-], optional = true }
+tracing-serde = { version = "0.2.0", optional = true }
+tracing-opentelemetry = { version = "0.32.1", optional = true }
+opentelemetry = { version = "0.31.0", optional = true }
 
 rhai = { version = "1.24.0", optional = true, features = [
     "no_float",
@@ -113,7 +109,6 @@ console = ["console-subscriber", "tokio/tracing"]
 telemetry = [
     "tracing-opentelemetry",
     "opentelemetry",
-    "opentelemetry-jaeger",
     "chrono",
     "tracing-serde",
 ]

Cargo.toml

@@ -24,7 +24,7 @@ tracing-subscriber = { version = "0.3.7", features = [
 tracing = "0.1.26"
 
 [build-dependencies]
-cbindgen = "0.20.0"
+cbindgen = "0.29.2"
 
 [lib]
 crate-type = ["cdylib", "staticlib"]

ffi/Cargo.toml

@@ -11,5 +11,5 @@ serde = "1.0.177"
 tokio = "1.29.1"
 pin-project-lite = "0.2.10"
 futures = "0.3.28"
-rand = "0.8.5"
-base64 = "0.21.2"
+rand = "0.9.2"
+base64 = "0.22.1"

protocol/obfs/Cargo.toml

@@ -9,6 +9,7 @@ use base64::{engine::general_purpose::STANDARD, Engine};
 use futures::ready;
 use pin_project_lite::pin_project;
 use rand::prelude::*;
+use rand::rng;
 use rd_interface::{
     async_trait, prelude::*, rd_config, Address, AsyncWrite, ITcpStream, IntoDyn, ReadBuf, Result,
     TcpStream, NOT_IMPLEMENTED,
@@ -129,10 +130,10 @@ impl ITcpStream for Connect {
         loop {
             match &mut self.write {
                 WriteState::Wait => {
-                    let major = thread_rng().next_u32() % 51;
-                    let minor = thread_rng().next_u32() % 2;
+                    let major = rng().next_u32() % 51;
+                    let minor = rng().next_u32() % 2;
 
-                    let key_bytes: [u8; 16] = thread_rng().gen();
+                    let key_bytes: [u8; 16] = rng().random();
                     let key = STANDARD.encode(key_bytes);
 
                     let mut cursor = Cursor::new(Vec::<u8>::with_capacity(1024));

protocol/obfs/src/http_simple.rs

@@ -10,34 +10,34 @@ rd-std = { path = "../../rd-std/", version = "0.1" }
 # rd-interface = "0.3"
 serde = "1.0"
 tracing = "0.1.26"
-tokio-smoltcp = "0.2.4"
+tokio-smoltcp = "0.5.2"
 tokio = { version = "1.5.0", features = ["rt", "macros", "net"] }
-pcap = { version = "0.9.1", optional = true }
+pcap = { version = "2.4.0", optional = true }
 futures = "0.3"
 lru_time_cache = "0.11"
 parking_lot = "0.12.1"
 parking_lot_core = "0.9.8"
 
-tokio-util = { version = "0.6", features = ["codec"] }
+tokio-util = { version = "0.7.18", features = ["codec"] }
 
 [target.'cfg(unix)'.dependencies.tun-crate]
-version = "0.5.4"
+version = "0.8.5"
 package = "tun"
 features = ["async"]
 
 [target.'cfg(windows)'.dependencies]
 libc = "0.2"
-wintun = "0.2"
+wintun = "0.5.1"
 once_cell = "1.7.2"
 # the same as parking_lot_core, should reduce the compile time
-windows-sys = { version = "0.48.0", features = [
+windows-sys = { version = "0.61.2", features = [
     "Win32_NetworkManagement_IpHelper",
     "Win32_NetworkManagement_Ndis",
     "Win32_Foundation",
 ] }
 
 [target.'cfg(unix)'.dependencies]
-nix = "0.26.2"
+nix = "0.31.0"
 
 [features]
 default = []

protocol/raw/Cargo.toml

@@ -89,7 +89,7 @@ impl RawUdpSource for Source {
 }
 
 /// buf is a ip packet
-fn parse_udp(buf: &[u8]) -> smoltcp::Result<(SocketAddr, SocketAddr, Vec<u8>)> {
+fn parse_udp(buf: &[u8]) -> smoltcp::wire::Result<(SocketAddr, SocketAddr, Vec<u8>)> {
     let ipv4 = Ipv4Packet::new_checked(buf)?;
     let udp = UdpPacket::new_checked(ipv4.payload())?;
 
@@ -111,7 +111,7 @@ fn pack_udp(src: SocketAddr, dst: SocketAddr, payload: &[u8]) -> Option<Vec<u8>>
             let ipv4_repr = Ipv4Repr {
                 src_addr: Ipv4Address::from(*src_v4.ip()),
                 dst_addr: Ipv4Address::from(*dst_v4.ip()),
-                protocol: IpProtocol::Udp,
+                next_header: IpProtocol::Udp,
                 payload_len: udp_repr.header_len() + payload.len(),
                 hop_limit: 64,
             };

protocol/raw/src/forward/source.rs

@@ -162,7 +162,7 @@ where
         }
     }
 
-    fn correct_arp_request(&self, packet: &mut Vec<u8>) -> smoltcp::Result<()> {
+    fn correct_arp_request(&self, packet: &mut Vec<u8>) -> smoltcp::wire::Result<()> {
         if let Layer::L2 = self.layer {
             // SAFETY: we know that the packet is a valid EthernetFrame
             let mut frame = EthernetFrame::new_unchecked(packet);
@@ -257,11 +257,11 @@ impl MapTable {
 fn set_dst_addr<T: AsRef<[u8]> + AsMut<[u8]>>(
     ip: &mut Ipv4Packet<T>,
     dst_addr: SocketAddrV4,
-) -> smoltcp::Result<Option<(SocketAddrV4, SocketAddrV4)>> {
+) -> smoltcp::wire::Result<Option<(SocketAddrV4, SocketAddrV4)>> {
     let src_addr = ip.src_addr();
     let orig_addr = ip.dst_addr();
 
-    let (src_port, orig_port) = match ip.protocol() {
+    let (src_port, orig_port) = match ip.next_header() {
         IpProtocol::Tcp => {
             ip.set_dst_addr(dst_addr.ip().to_owned().into());
 
@@ -282,7 +282,7 @@ fn set_dst_addr<T: AsRef<[u8]> + AsMut<[u8]>>(
 
 fn get_src_addr<T: AsRef<[u8]> + ?Sized>(ip: &Ipv4Packet<&T>) -> Option<SocketAddrV4> {
     let src_addr = ip.src_addr();
-    let port = match ip.protocol() {
+    let port = match ip.next_header() {
         IpProtocol::Tcp => TcpPacket::new_checked(ip.payload()).ok()?.src_port(),
         IpProtocol::Udp => UdpPacket::new_checked(ip.payload()).ok()?.src_port(),
         _ => return None,
@@ -292,7 +292,7 @@ fn get_src_addr<T: AsRef<[u8]> + ?Sized>(ip: &Ipv4Packet<&T>) -> Option<SocketAd
 
 fn get_dst_addr<T: AsRef<[u8]> + AsMut<[u8]>>(ip: &mut Ipv4Packet<T>) -> Option<SocketAddrV4> {
     let dst_addr = ip.dst_addr();
-    let port = match ip.protocol() {
+    let port = match ip.next_header() {
         IpProtocol::Tcp => TcpPacket::new_checked(ip.payload_mut()).ok()?.dst_port(),
         IpProtocol::Udp => UdpPacket::new_checked(ip.payload_mut()).ok()?.dst_port(),
         _ => return None,
@@ -303,11 +303,11 @@ fn get_dst_addr<T: AsRef<[u8]> + AsMut<[u8]>>(ip: &mut Ipv4Packet<T>) -> Option<
 fn set_src_addr<T: AsRef<[u8]> + AsMut<[u8]>>(
     ip: &mut Ipv4Packet<T>,
     src_addr_v4: SocketAddrV4,
-) -> smoltcp::Result<()> {
+) -> smoltcp::wire::Result<()> {
     let src_addr = src_addr_v4.ip().to_owned().into();
     let dst_addr = ip.dst_addr();
     let port = src_addr_v4.port();
-    if let IpProtocol::Tcp = ip.protocol() {
+    if let IpProtocol::Tcp = ip.next_header() {
         ip.set_src_addr(src_addr);
 
         let mut tcp = TcpPacket::new_checked(ip.payload_mut())?;