diff options
Diffstat (limited to 'src/main/java/com/btr/proxy/search/desktop/osx/OsxProxySearchStrategy.java')
| -rw-r--r-- | src/main/java/com/btr/proxy/search/desktop/osx/OsxProxySearchStrategy.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/btr/proxy/search/desktop/osx/OsxProxySearchStrategy.java b/src/main/java/com/btr/proxy/search/desktop/osx/OsxProxySearchStrategy.java index 3d67ae7..71d7a8f 100644 --- a/src/main/java/com/btr/proxy/search/desktop/osx/OsxProxySearchStrategy.java +++ b/src/main/java/com/btr/proxy/search/desktop/osx/OsxProxySearchStrategy.java @@ -3,6 +3,7 @@ package com.btr.proxy.search.desktop.osx; import java.io.File; import java.io.IOException; import java.net.NetworkInterface; +import java.net.Proxy; import java.net.ProxySelector; import java.net.SocketException; import java.util.ArrayList; @@ -14,8 +15,6 @@ import com.btr.proxy.search.ProxySearchStrategy; import com.btr.proxy.search.browser.ie.IELocalByPassFilter; import com.btr.proxy.search.wpad.WpadProxySearchStrategy; import com.btr.proxy.selector.direct.NoProxySelector; -import com.btr.proxy.selector.fixed.FixedProxySelector; -import com.btr.proxy.selector.fixed.FixedSocksSelector; import com.btr.proxy.selector.misc.ProtocolDispatchSelector; import com.btr.proxy.selector.whitelist.ProxyBypassListSelector; import com.btr.proxy.util.Logger; @@ -288,7 +287,7 @@ public class OsxProxySearchStrategy implements ProxySearchStrategy { if (isActive(proxySettings.get("SOCKSEnable"))) { String proxyHost = (String) proxySettings.get("SOCKSProxy"); int proxyPort = (Integer) proxySettings.get("SOCKSPort"); - ps.setSelector("socks", new FixedSocksSelector(proxyHost, proxyPort)); + ps.setSelector("socks", ProxyUtil.parseProxySettings(proxyHost.trim(), Proxy.Type.SOCKS, proxyPort)); Logger.log(getClass(), LogLevel.TRACE, "OSX socks proxy is {0}:{1}", proxyHost, proxyPort); } } @@ -306,7 +305,7 @@ public class OsxProxySearchStrategy implements ProxySearchStrategy { if (isActive(proxySettings.get(prefix+"Enable"))) { String proxyHost = (String) proxySettings.get(prefix+"Proxy"); int proxyPort = (Integer) proxySettings.get(prefix+"Port"); - FixedProxySelector fp = new FixedProxySelector(proxyHost, proxyPort); + ProxySelector fp = ProxyUtil.parseProxySettings(proxyHost.trim(), Proxy.Type.HTTP, proxyPort); ps.setSelector(protocol.toLowerCase(), fp); Logger.log(getClass(), LogLevel.TRACE, "OSX uses for {0} the proxy {1}:{2}", protocol, proxyHost, proxyPort); } |