dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move HTTP VPN bypass proxy to 9998

This commit is contained in:
Nathan Freitas 2015-02-14 02:30:14 -05:00
parent a1ba41ce0b
commit 9c77526f22
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/torproject/android/service/TorService.java
View File

@ -2120,9 +2120,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst
{ {
if (mUseVPN) //set the proxy here if we aren't using a bridge if (mUseVPN) //set the proxy here if we aren't using a bridge
{ {
String proxyType = "http";//"socks5"; String proxyType = "socks5";
String proxyHost = "10.0.0.1"; String proxyHost = "127.0.0.1";
int proxyPort = 8888;//9999; int proxyPort = 9999;
updateConfiguration(proxyType + "Proxy", proxyHost + ':' + proxyPort, false); updateConfiguration(proxyType + "Proxy", proxyHost + ':' + proxyPort, false);
} }
@ -2245,8 +2245,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst
if (mUseVPN) if (mUseVPN)
{ {
proxyType = "http"; //"socks5"; proxyType = "http"; //"socks5";
String proxyHost = "10.0.0.1"; String proxyHost = "127.0.0.1";
int proxyPort = 8888; //9999; int proxyPort = 9998; //9999;
proxyBridge = " proxy=" + proxyType + "://" + proxyHost + ':' + proxyPort; proxyBridge = " proxy=" + proxyType + "://" + proxyHost + ':' + proxyPort;

2
src/org/torproject/android/vpn/HttpProxy.java
View File

@ -211,7 +211,7 @@ public class HttpProxy extends Thread
try { try {
// create a server socket, and loop forever listening for // create a server socket, and loop forever listening for
// client connections // client connections
server = new ServerSocket(thisPort); server = new ServerSocket(thisPort,5,InetAddress.getLocalHost());
if (debugLevel > 0) if (debugLevel > 0)
debugOut.println("Started HttpProxy on port " + thisPort); debugOut.println("Started HttpProxy on port " + thisPort);

2
src/org/torproject/android/vpn/OrbotVpnService.java
View File

@ -125,7 +125,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback {
mThreadProxy.start(); mThreadProxy.start();
mHttpProxyServer = new HttpProxy(8888); mHttpProxyServer = new HttpProxy(9998);
HttpProxy.setVpnService(OrbotVpnService.this); HttpProxy.setVpnService(OrbotVpnService.this);
mHttpProxyServer.setDebug(5, System.out); mHttpProxyServer.setDebug(5, System.out);
mHttpProxyServer.start(); mHttpProxyServer.start();