i2ptunnel: Fix SOCKS outproxy port configuration after testing

log tweaks

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java

@@ -130,10 +130,17 @@ public class I2PSOCKSTunnel extends I2PTunnelClientBase {
            StringTokenizer tok = new StringTokenizer((String)e.getValue(), ", \t");
            while (tok.hasMoreTokens()) {
                String proxy = tok.nextToken().trim();
-               if (proxy.endsWith(".i2p"))
+               String host = proxy;
+               int colon = proxy.indexOf(':');
+               if (colon > 0)
+                   host = host.substring(0, colon);
+               if (host.endsWith(".i2p")) {
                    proxyList.add(proxy);
-               else
-                   _log.error("Non-i2p SOCKS outproxy: " + proxy);
+               } else {
+                   String m = "Non-i2p SOCKS outproxy: " + proxy;
+                   l.log(m);
+                   _log.error(m);
+               }
            }
            proxies.put(port, proxyList);
         }

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java

@@ -523,8 +523,6 @@ class SOCKS5Server extends SOCKSServer {
                     // TODO sticky proxy selection like in HTTP client
                     int p = _context.random().nextInt(proxies.size());
                     String proxy = proxies.get(p);
-                    if (_log.shouldLog(Log.DEBUG))
-                        _log.debug("connecting to proxy " + proxy + " for " + connHostName + " port " + connPort);
                     try {
                         destSock = outproxyConnect(t, proxy);
                     } catch (SOCKSException se) {
@@ -604,6 +602,8 @@ class SOCKS5Server extends SOCKSServer {
                 }
             }
             boolean https = "connect".equals(props.getProperty(I2PSOCKSTunnel.PROP_OUTPROXY_TYPE));
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("connecting to " + (https ? "HTTPS" : "SOCKS") + " outproxy " + proxy + " for " + connHostName + " port " + connPort);
             if (https) {
                 httpsConnect(destSock, out, connHostName, connPort, configUser, configPW);
             } else {

history.txt

@@ -1,7 +1,24 @@
+2022-11-26 zzz
+ * Console: Hide IPv4/v6 columns on /peers status tab
+ * i2ptunnel: Fix SOCKS outproxy port configuration
+ * SSU: Don't build a 4 cap address at startup if configured for IPv6-only
+ * SSU2: Avoid rare NPE handling apparent session confirmed without inbound state
+ * Util: Fast check for random nextInt(1) and nextLong(1)
+
+2022-11-25 zzz
+ * i2ptunnel: Allow IRCv3 ACCOUNT and CHGHOST through the filter
+ * Profiles: Don't let one corrupt file kill the loader thread
+
+2022-11-24 zzz
+ * Console, i2psnark standalone: Fix UI configuration for Argentinan Spanish
+ * i2psnark: Add partial Danish translation
+ * i2psnark standalone: Enable zh_TW UI configuration
+
 2022-11-23 zzz
  * Build: Add debcheckpatch to release targets
  * CLI: Sort MTU output by address
  * Console:
+   - Add LS lookup to search form
    - Add status and banned tabs to /peers (WIP)
    - Change mtn tunnel in help FAQ to git
    - Cleanup /debug update and app manager sections
@@ -15,6 +32,7 @@
  * SSU: Remove unneeded queue latency check in UDPSender
  * SSU2: Increase Session Created max padding
  * SusiDNS: Fix off-by-one in next page last item number
+ * Tunnels: Adjust expiration job start if default reject time overridden by config
 
 2022-11-21 2.0.0 (API 0.9.56) released
 

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Git";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 1;
+    public final static long BUILD = 2;
 
     /** for example "-test" */
     public final static String EXTRA = "";