lbt/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix changing outproxy without stopping tunnel (ticket #1164)

Browse Source
This commit is contained in:
zzz
2014-04-05 12:24:50 +00:00
parent e1fc6893b4
commit 8d73b2e838
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
View File

@ -16,6 +16,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
@ -171,6 +173,33 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
}
}
/**
* Update the outproxy list then call super.
*
* @since 0.9.12
*/
@Override
public void optionsUpdated(I2PTunnel tunnel) {
if (getTunnel() != tunnel)
return;
Properties props = tunnel.getClientOptions();
// see TunnelController.setSessionOptions()
String proxies = props.getProperty("proxyList");
if (proxies != null) {
StringTokenizer tok = new StringTokenizer(proxies, ", ");
synchronized(_proxyList) {
_proxyList.clear();
while (tok.hasMoreTokens())
_proxyList.add(tok.nextToken().trim());
}
} else {
synchronized(_proxyList) {
_proxyList.clear();
}
}
super.optionsUpdated(tunnel);
}
/**
* @since 0.9.4
*/

4
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
View File

@ -445,6 +445,10 @@ public class TunnelController implements Logging {
String target = getTargetDestination();
if (target != null)
opts.setProperty("targetDestination", target);
// Ditto outproxy list. Since 0.9.12.
String proxies = getProxyList();
if (proxies != null)
opts.setProperty("proxyList", proxies);
_tunnel.setClientOptions(opts);
}