commit 2a92b72941dae3d69237f8d520ddb45bdc3e8824
Author: Nathan Freitas <[email protected]>
Date: Sun Nov 13 10:39:24 2011 -0500
don't transproxy orweb
---
.../android/service/TorServiceConstants.java | 1 +
.../torproject/android/service/TorTransProxy.java | 6 ++++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/org/torproject/android/service/TorServiceConstants.java
b/src/org/torproject/android/service/TorServiceConstants.java
index e47ed71..b06565e 100644
--- a/src/org/torproject/android/service/TorServiceConstants.java
+++ b/src/org/torproject/android/service/TorServiceConstants.java
@@ -6,6 +6,7 @@ public interface TorServiceConstants {
public final static String TOR_APP_USERNAME = "org.torproject.android";
+ public final static String ORWEB_APP_USERNAME =
"info.guardianproject.browser";
//home directory of Android application
diff --git a/src/org/torproject/android/service/TorTransProxy.java
b/src/org/torproject/android/service/TorTransProxy.java
index 2c1119a..73dac7c 100644
--- a/src/org/torproject/android/service/TorTransProxy.java
+++ b/src/org/torproject/android/service/TorTransProxy.java
@@ -192,6 +192,12 @@ public class TorTransProxy implements TorServiceConstants {
continue;
}
+ if
(apps[i].getUsername().equals(TorServiceConstants.ORWEB_APP_USERNAME))
+ {
+ //should never trans proxy the Orbot
app (and Tor or Privoxy) itself
+ continue;
+ }
+
TorService.logMessage("enabling transproxy for
app: " + apps[i].getUsername() + "(" + apps[i].getUid() + ")");
//TCP
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
