g3proxy: update socks5 proxy udp peer ip transmute rules

bytedance · Oct 16, 2023 · a9da70c · a9da70c
1 parent e25e477
commit a9da70c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/g3proxy/CHANGELOG b/g3proxy/CHANGELOG
@@ -3,6 +3,7 @@ v1.7.27:
  - Optimization: set default c-ares init options as c-ares 1.20.1 default values
  - Feature: rename trust-dns resolver type to hickory to be sync with upstream
  - Feature: add dns over http/3 support in hickory resolver
+ - Feature: use tcp peer ip if socks5 proxy returns unspecified udp peer ip
 
 v1.7.26:
  - BUG FIX: fix deb and rpm build scripts

diff --git a/g3proxy/src/config/escaper/proxy_socks5.rs b/g3proxy/src/config/escaper/proxy_socks5.rs
@@ -306,8 +306,10 @@ impl ProxySocks5EscaperConfig {
         tcp_peer_ip: IpAddr,
     ) -> SocketAddr {
         if let Some(map) = &self.transmute_udp_peer_ip {
-            let ip = map.get(&returned_addr.ip()).unwrap_or(&tcp_peer_ip);
-            SocketAddr::new(*ip, returned_addr.port())
+            let ip = map.get(&returned_addr.ip()).copied().unwrap_or(tcp_peer_ip);
+            SocketAddr::new(ip, returned_addr.port())
+        } else if returned_addr.ip().is_unspecified() {
+            SocketAddr::new(tcp_peer_ip, returned_addr.port())
         } else {
             returned_addr
         }

diff --git a/g3proxy/src/escape/proxy_float/peer/socks5/mod.rs b/g3proxy/src/escape/proxy_float/peer/socks5/mod.rs
@@ -118,8 +118,10 @@ impl ProxyFloatSocks5Peer {
         tcp_peer_ip: IpAddr,
     ) -> SocketAddr {
         if let Some(map) = &self.transmute_udp_peer_ip {
-            let ip = map.get(&returned_addr.ip()).unwrap_or(&tcp_peer_ip);
-            SocketAddr::new(*ip, returned_addr.port())
+            let ip = map.get(&returned_addr.ip()).copied().unwrap_or(tcp_peer_ip);
+            SocketAddr::new(ip, returned_addr.port())
+        } else if returned_addr.ip().is_unspecified() {
+            SocketAddr::new(tcp_peer_ip, returned_addr.port())
         } else {
             returned_addr
         }