From fd0b1375a66d4d8b9d9b9679e1eb063f7c03dd1c Mon Sep 17 00:00:00 2001 From: Nathan Freitas Date: Mon, 19 Jul 2010 22:39:50 +0000 Subject: [PATCH] fixed path for control port cookie lookup - moved from /data to /cache svn:r22667 --- src/org/torproject/android/service/TorServiceConstants.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 3fff489f..1d193be6 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -9,6 +9,8 @@ public interface TorServiceConstants { //home directory of Android application public final static String TOR_HOME = "/data/data/org.torproject.android/"; + public final static String TOR_HOME_DATA_DIR = TOR_HOME + "cache/"; + //name of the tor C binary public final static String TOR_BINARY_ASSET_KEY = "tor"; public final static String TOR_BINARY_INSTALL_PATH = TOR_HOME + TOR_BINARY_ASSET_KEY; //path to install the Tor binary too @@ -38,7 +40,7 @@ public interface TorServiceConstants { public final static String TOR_LOG_PATH = TOR_HOME + "notices.log"; //control port cookie path - public final static String TOR_CONTROL_AUTH_COOKIE = TOR_HOME + "data/control_auth_cookie"; + public final static String TOR_CONTROL_AUTH_COOKIE = TOR_HOME_DATA_DIR + "control_auth_cookie"; //various console cmds @@ -70,7 +72,7 @@ public interface TorServiceConstants { public final static int UPDATE_TIMEOUT = 1000; //path to check Tor against - public final static String URL_TOR_CHECK = "http://check.torproject.org"; + public final static String URL_TOR_CHECK = "https://check.torproject.org"; //IPTABLES // public final static String CMD_IPTABLES_PREROUTING = "iptables -t nat -A OUTPUT -p tcp --dport 80 -j DNAT --to 127.0.0.1:8118 || exit\n";