From b21b953ef296506daf235362f39b29a86f19d1f2 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 12 Aug 2016 16:34:44 +0000
Subject: [PATCH] i2ptunnel: Use preferred sigtype for new SOCKS tunnels
---
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java | 1 +
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java | 1 +
2 files changed, 2 insertions(+)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
index 1e6206a22e..9079efb01c 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
@@ -666,6 +666,7 @@ public class TunnelController implements Logging {
// same default logic as in EditBean.getSigType()
if (!isClient(type) ||
type.equals(TYPE_IRC_CLIENT) || type.equals(TYPE_STD_CLIENT) ||
+ type.equals(TYPE_SOCKS) ||
type.equals(TYPE_SOCKS_IRC) || type.equals(TYPE_STREAMR_CLIENT) ||
(type.equals(TYPE_HTTP_CLIENT) && Boolean.valueOf(getSharedClient()))) {
if (!_config.containsKey(OPT_SIG_TYPE))
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
index 40e2d439f5..4ebf3f4d4e 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
@@ -452,6 +452,7 @@ public class GeneralHelper {
if (!TunnelController.isClient(ttype) ||
TunnelController.TYPE_IRC_CLIENT.equals(ttype) ||
TunnelController.TYPE_SOCKS_IRC.equals(ttype) ||
+ TunnelController.TYPE_SOCKS.equals(ttype) ||
TunnelController.TYPE_STREAMR_CLIENT.equals(ttype) ||
TunnelController.TYPE_STD_CLIENT.equals(ttype) ||
(TunnelController.TYPE_HTTP_CLIENT.equals(ttype) && isShared))
--
GitLab