[tor-commits] [orbot/master] renable polipo

[n8fr8 at torproject.org]

commit d56fdb20aa6bd22f26749ecbe151a4fe5298ff58
Author: Nathan Freitas <nathan at freitas.net>
Date:   Fri Sep 23 11:01:20 2016 -0400

    renable polipo
---
 orbotservice/build.gradle                                    |  1 +
 .../main/java/org/torproject/android/service/TorService.java | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index 34ddd60..59cb257 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -20,6 +20,7 @@ android {
 
 dependencies {
     compile 'com.android.support:appcompat-v7:23.+'
+ //   compile group: 'org.littleshoot', name: 'littleproxy', version: '1.1.0-beta1'
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
 }
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index c8aadb2..6638dbf 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -54,6 +54,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.io.PrintWriter;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.Socket;
@@ -69,12 +70,15 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
+import java.util.Queue;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeoutException;
 
+import javax.net.ssl.SSLEngine;
+
 public class TorService extends Service implements TorServiceConstants, OrbotConstants, EventHandler
 {
     
@@ -85,7 +89,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
     private TorControlConnection conn = null;
     private Socket torConnSocket = null;
     private int mLastProcessId = -1;
-    
+
+
     private int mPortHTTP = HTTP_PROXY_PORT_DEFAULT;
     private int mPortSOCKS = SOCKS_PROXY_PORT_DEFAULT;
     
@@ -504,13 +509,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
             Log.w(OrbotConstants.TAG,"could not kill obfsclient",e);
             cannotKillFile = fileObfsclient;
         }
-        
+
         try {
         	TorServiceUtils.killProcess(filePolipo);
         } catch (IOException e) {
             Log.w(OrbotConstants.TAG,"could not kill polipo",e);
             cannotKillFile = filePolipo;
         }
+
         try {
             TorServiceUtils.killProcess(fileTor);
         } catch (IOException e) {
@@ -782,7 +788,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
 	        if (success)
 	        {
 	            if (mPortHTTP != -1)
-	                runPolipoShellCmd();
+                    runPolipoShellCmd();
 	            
 	            if (Prefs.useRoot() && Prefs.useTransparentProxying())
 	            {