unified local UDP association implementation

NOTE: Every time when sending packets back to local listener will require an allocation of Box<Pin<Future>> because GAT is not stablized yet.
shadowsocks · Dec 31, 2020 · 474e57a · 474e57a
1 parent e048bc2
commit 474e57a
Show file tree

Hide file tree

Showing 14 changed files with 735 additions and 1,127 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/shadowsocks-service/src/config.rs b/crates/shadowsocks-service/src/config.rs
@@ -236,7 +236,7 @@ cfg_if! {
 
             /// For Linux-like systems' Netfilter `REDIRECT`. Only for TCP connections.
             ///
-            /// This is supported from Linux 2.4 Kernel. Document: https://www.netfilter.org/documentation/index.html#documentation-howto
+            /// This is supported from Linux 2.4 Kernel. Document: <https://www.netfilter.org/documentation/index.html#documentation-howto>
             ///
             /// NOTE: Filter rule `REDIRECT` can only be applied to TCP connections.
             #[cfg(any(target_os = "linux", target_os = "android"))]
@@ -252,7 +252,7 @@ cfg_if! {
             ///
             /// Supported by OpenBSD 3.0+, FreeBSD 5.3+, NetBSD 3.0+, Solaris 11.3+, macOS 10.7+, iOS, QNX
             ///
-            /// Document: https://www.freebsd.org/doc/handbook/firewalls-pf.html
+            /// Document: <https://www.freebsd.org/doc/handbook/firewalls-pf.html>
             #[cfg(any(
                 target_os = "openbsd",
                 target_os = "freebsd",

diff --git a/crates/shadowsocks-service/src/local/net/mod.rs b/crates/shadowsocks-service/src/local/net/mod.rs
@@ -1,6 +1,9 @@
 //! Shadowsocks Local Network Utilities
 
-pub use self::{auto_proxy_io::AutoProxyIo, auto_proxy_stream::AutoProxyClientStream};
+pub use self::{
+    tcp::{auto_proxy_io::AutoProxyIo, auto_proxy_stream::AutoProxyClientStream},
+    udp::{UdpAssociationManager, UdpInboundWrite},
+};
 
-mod auto_proxy_io;
-mod auto_proxy_stream;
+mod tcp;
+mod udp;
diff --git a/...ks-service/src/local/net/auto_proxy_io.rs → ...ervice/src/local/net/tcp/auto_proxy_io.rs b/...ks-service/src/local/net/auto_proxy_io.rs → ...ervice/src/local/net/tcp/auto_proxy_io.rs
diff --git a/...ervice/src/local/net/auto_proxy_stream.rs → ...ce/src/local/net/tcp/auto_proxy_stream.rs b/...ervice/src/local/net/auto_proxy_stream.rs → ...ce/src/local/net/tcp/auto_proxy_stream.rs
diff --git a/crates/shadowsocks-service/src/local/net/tcp/mod.rs b/crates/shadowsocks-service/src/local/net/tcp/mod.rs
@@ -0,0 +1,2 @@
+pub mod auto_proxy_io;
+pub mod auto_proxy_stream;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		pub mod auto_proxy_io;
		pub mod auto_proxy_stream;