[tor-commits] [orbot/master] move HTTP VPN bypass proxy to 9998

[n8fr8]

commit 9c77526f22f6a2bd1a27e0c480f91e28529d8390
Author: Nathan Freitas <nat...@freitas.net>
Date:   Sat Feb 14 02:30:14 2015 -0500

    move HTTP VPN bypass proxy to 9998
---
 src/org/torproject/android/service/TorService.java  |   10 +++++-----
 src/org/torproject/android/vpn/HttpProxy.java       |    2 +-
 src/org/torproject/android/vpn/OrbotVpnService.java |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java 
b/src/org/torproject/android/service/TorService.java
index 01fa339..c3a771b 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -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
                {
-                       String proxyType = "http";//"socks5";
-                       String proxyHost = "10.0.0.1";
-                       int proxyPort = 8888;//9999;
+                       String proxyType = "socks5";
+                       String proxyHost = "127.0.0.1";
+                       int proxyPort = 9999;
                    updateConfiguration(proxyType + "Proxy", proxyHost + ':' + 
proxyPort, false);
        
                }
@@ -2245,8 +2245,8 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
                if (mUseVPN)
                 {
                        proxyType = "http"; //"socks5";
-                       String proxyHost = "10.0.0.1";
-                       int proxyPort = 8888; //9999;
+                       String proxyHost = "127.0.0.1";
+                       int proxyPort = 9998; //9999;
                        
                        proxyBridge = " proxy=" + proxyType + "://" + proxyHost 
+ ':' + proxyPort;
                        
diff --git a/src/org/torproject/android/vpn/HttpProxy.java 
b/src/org/torproject/android/vpn/HttpProxy.java
index 617788b..d211342 100644
--- a/src/org/torproject/android/vpn/HttpProxy.java
+++ b/src/org/torproject/android/vpn/HttpProxy.java
@@ -211,7 +211,7 @@ public class HttpProxy extends Thread
                try {
                        // create a server socket, and loop forever listening 
for
                        // client connections
-                       server = new ServerSocket(thisPort);
+                       server = new 
ServerSocket(thisPort,5,InetAddress.getLocalHost());
                        if (debugLevel > 0)
                                debugOut.println("Started HttpProxy on port " + 
thisPort);
                        
diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java 
b/src/org/torproject/android/vpn/OrbotVpnService.java
index 42a8b2b..dd5ffd9 100644
--- a/src/org/torproject/android/vpn/OrbotVpnService.java
+++ b/src/org/torproject/android/vpn/OrbotVpnService.java
@@ -125,7 +125,7 @@ public class OrbotVpnService extends VpnService implements 
Handler.Callback {
         
         mThreadProxy.start();
         
-       mHttpProxyServer = new HttpProxy(8888);
+       mHttpProxyServer = new HttpProxy(9998);
        HttpProxy.setVpnService(OrbotVpnService.this);
        mHttpProxyServer.setDebug(5, System.out);
        mHttpProxyServer.start();



_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits