Merge branch 'master' into rxsocks

RockyLOMO · Mar 4, 2025 · 81ba5c4 · 81ba5c4
2 parents bd69327 + 9b45b90
commit 81ba5c4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 101 deletions.
diff --git a/rxlib/src/main/java/org/rx/Main.java b/rxlib/src/main/java/org/rx/Main.java
@@ -199,7 +199,6 @@ public void addWhiteList(InetAddress endpoint) {
             AuthenticEndpoint udp2rawSvrEp = AuthenticEndpoint.valueOf(conf.udp2rawEndpoint);
             frontConf.getUdp2rawServers().add(udp2rawSvrEp.getEndpoint());
         }
-        //Authenticator.dbAuth(shadowUsers.select(p -> p.right).toList(), port + 1)
         SocksProxyServer frontSvr = new SocksProxyServer(frontConf, new DefaultSocksAuthenticator(shadowUsers.select(p -> p.right).toList()));
         Upstream shadowDnsUpstream = new Upstream(new UnresolvedEndpoint(shadowDnsEp));
         TripleAction<SocksProxyServer, SocksContext> firstRoute = (s, e) -> {

diff --git a/rxlib/src/main/java/org/rx/net/socks/DbAuthenticator.java b/rxlib/src/main/java/org/rx/net/socks/DbAuthenticator.java
diff --git a/rxlib/src/main/java/org/rx/net/support/EndpointTracer.java b/rxlib/src/main/java/org/rx/net/support/EndpointTracer.java
@@ -4,28 +4,38 @@
 import lombok.extern.slf4j.Slf4j;
 import org.rx.core.Cache;
 import org.rx.core.cache.MemoryCache;
+import org.rx.net.Sockets;
 
+import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
 import static org.rx.core.Sys.fastCacheKey;
 
 @Slf4j
 public final class EndpointTracer {
+    static final InetSocketAddress unknownAddr = Sockets.newAnyEndpoint(0);
     final Cache<String, SocketAddress> index = Cache.getInstance(MemoryCache.class);
 
     String key(SocketAddress sa) {
         return fastCacheKey("EpTrace", sa);
     }
 
     public void link(Channel inbound, Channel outbound) {
-        SocketAddress data = index.get(key(outbound.localAddress()), k -> inbound.remoteAddress());
+        SocketAddress addr = index.get(key(outbound.localAddress()), k -> inbound.remoteAddress());
 //        log.info("EpTracer link {} <- {} {}", data.head, inbound, outbound);
     }
 
     public SocketAddress head(Channel channel) {
-        SocketAddress data = index.get(key(channel.remoteAddress()));
-        SocketAddress head = data == null ? channel.remoteAddress() : data;
+        //inbound channel
+        SocketAddress addr = index.get(key(channel.remoteAddress()));
+        if (addr == null) {
+            //outbound channel
+            addr = index.get(key(channel.localAddress()));
+        }
+        if (addr == null) {
+            addr = unknownAddr;
+        }
 //        log.info("EpTracer head {} <- {}", head, channel);
-        return head;
+        return addr;
     }
 }
diff --git a/rxlib/src/test/resources/logback.xml b/rxlib/src/test/resources/logback.xml
@@ -33,7 +33,7 @@
 
     <logger name="io.netty" level="INFO"/>
     <logger name="org.apache.sshd" level="INFO"/>
-<!--    <logger name="org.rx.core.ThreadPool" level="INFO"/>-->
+    <logger name="org.rx.core.ThreadPool" level="INFO"/>
     <logger name="org.rx.core.CpuWatchman" level="INFO"/>
     <logger name="org.rx.io.EntityDatabaseImpl" level="INFO"/>
     <!--    <logger name="org.rx.net" level="DEBUG"/>-->