- tor-commits - lists.torproject.org

[orbot/master] typo update for iptables
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit bcb162b154a4d89f5c5770cd1c0741e2dfb8b605 Author: n8fr8 <nathan(a)freitas.net> Date: Sun Sep 30 18:14:44 2012 +0530 typo update for iptables --- .../torproject/android/service/TorTransProxy.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index c248a9f..a705bb5 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -468,7 +468,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(ipTablesPath); script.append(" -t nat"); script.append(" -A OUTPUT -p udp"); - script.appent(" -m owner ! --uid-owner "); + script.append(" -m owner ! --uid-owner "); script.append(torUid); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT);

1 0

[orbot/master] Merge branch 'datastats'
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit eceede30f90f2c744782c626a3bd43a160d74382 Merge: bcb162b bfcebda Author: n8fr8 <nathan(a)freitas.net> Date: Sun Sep 30 18:14:54 2012 +0530 Merge branch 'datastats' res/layout/layout_main.xml | 48 +++++ res/values/strings.xml | 2 + src/org/torproject/android/Orbot.java | 193 +++++++++++++------- .../torproject/android/service/ITorService.aidl | 5 + .../android/service/ITorServiceCallback.aidl | 5 + src/org/torproject/android/service/TorService.java | 78 +++++++- .../android/service/TorServiceConstants.java | 2 + 7 files changed, 262 insertions(+), 71 deletions(-)

1 0

[orbot/master] add total display to data transfer UI
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit e8c3fdc1edbeda9fc1f002ffb51a62a1fbe8874b Author: n8fr8 <nathan(a)freitas.net> Date: Sun Sep 30 18:37:37 2012 +0530 add total display to data transfer UI --- res/layout/layout_main.xml | 15 ++++++----- res/values/strings.xml | 4 +- src/org/torproject/android/Orbot.java | 40 +++++++++++++++++++++----------- 3 files changed, 36 insertions(+), 23 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index a9444e1..f73d79c 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -60,14 +60,15 @@ <RelativeLayout android:id="@+id/trafficRow" android:gravity="bottom" android:layout_width="fill_parent" - android:layout_alignParentBottom="true" android:visibility="invisible" - android:layout_height="80dp" + android:layout_height="wrap_content" + android:padding="6dp" + android:layout_marginTop="6dp" android:background="#A0909090"> <TextView android:id="@+id/trafficDownLabel" android:textColor="#FFFFFFFF" - android:layout_width="150dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:textSize="16sp" @@ -77,7 +78,7 @@ <TextView android:id="@+id/trafficUpLabel" android:textColor="#FFFFFFFF" - android:layout_width="150dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" android:text="@string/main_layout_upload" @@ -87,7 +88,7 @@ <TextView android:id="@+id/trafficDown" android:textColor="#FF00B627" - android:layout_width="150dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_below="@+id/trafficDownLabel" @@ -96,8 +97,8 @@ android:textStyle="bold" /> <TextView android:id="@+id/trafficUp" - android:textColor="#FFFF2211" - android:layout_width="150dp" + android:textColor="#FF00B627" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_below="@+id/trafficUpLabel" diff --git a/res/values/strings.xml b/res/values/strings.xml index 9fa461d..d733b32 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -31,8 +31,8 @@ <string name="menu_about">About</string> <string name="menu_wizard">Wizard</string> -<string name="main_layout_download">Download</string> -<string name="main_layout_upload">Upload</string> +<string name="main_layout_download">Download (speed/total)</string> +<string name="main_layout_upload">Upload (speed/total)</string> <string name="button_help">Help</string> <string name="button_close">Close</string> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index c51b104..59112da 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -763,22 +763,23 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener trafficRow.setVisibility(RelativeLayout.VISIBLE); Bundle data = msg.getData(); - DataCount datacount = new DataCount(data.getLong("upload"),data.getLong("download")); - downloadText.setText(formatCount(datacount.Download)); - uploadText.setText(formatCount(datacount.Upload)); - downloadText.invalidate(); - uploadText.invalidate(); - + DataCount datacount = new DataCount(data.getLong("upload"),data.getLong("download")); + String TotalUpload = ""; + String TotalDownload = ""; + try { - String TotalUpload = mService.getInfo("traffic/written"); - String TotalDownload = mService.getInfo("traffic/read"); - StringBuilder sb = new StringBuilder(); - sb.append("Total Upload " + TotalUpload); - sb.append("Total Download" + TotalDownload); - Log.d(TAG,sb.toString()); + TotalUpload = mService.getInfo("traffic/written"); + TotalDownload = mService.getInfo("traffic/read"); + } catch (RemoteException e) { Log.d(TAG,"Total bandwidth error"+e.getMessage()); } + + downloadText.setText(formatCount(datacount.Download) + " / " + formatTotal(Long.parseLong(TotalDownload))); + uploadText.setText(formatCount(datacount.Upload) + " / " + formatTotal(Long.parseLong(TotalUpload))); + + downloadText.invalidate(); + uploadText.invalidate(); break; @@ -949,8 +950,19 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener // Under 2Mb, returns "xxx.xKb" // Over 2Mb, returns "xxx.xxMb" if (count < 1e6 * 2) - return ((float)((int)(count*10/1024))/10 + " kbps"); - return ((float)((int)(count*100/1024/1024))/100 + " mbps"); + return ((float)((int)(count*10/1024))/10 + "kbps"); + return ((float)((int)(count*100/1024/1024))/100 + "mbps"); + + //return count+" kB"; + } + + private String formatTotal(long count) { + // Converts the supplied argument into a string. + // Under 2Mb, returns "xxx.xKb" + // Over 2Mb, returns "xxx.xxMb" + if (count < 1e6) + return ((float)((int)(count*10/1024))/10 + "KB"); + return ((float)((int)(count*100/1024/1024))/100 + "MB"); //return count+" kB"; }

1 0

[orbot/master] adding raw binaries and updating manifest
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit 7eae8d5ddbd06f30c3386bce32c9563d204bc91d Author: n8fr8 <nathan(a)freitas.net> Date: Sun Sep 30 21:17:44 2012 +0530 adding raw binaries and updating manifest --- AndroidManifest.xml | 4 ++-- project.properties | 2 +- res/raw/iptables | Bin 0 -> 198652 bytes res/raw/obfsproxy | Bin 963309 -> 951253 bytes res/raw/privoxy | Bin 0 -> 328711 bytes res/raw/tor.mp3 | Bin 0 -> 1981354 bytes res/values/strings.xml | 4 ++-- 7 files changed, 5 insertions(+), 5 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5e2d692..99ce90b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.17-alpha-1.0.10" - android:versionCode="44" + android:versionName="0.2.4.3-alpha-1.0.11" + android:versionCode="45" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> diff --git a/project.properties b/project.properties index 8da376a..a43ea8c 100644 --- a/project.properties +++ b/project.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-15 +target=Google Inc.:Google APIs:16 diff --git a/res/raw/iptables b/res/raw/iptables new file mode 100755 index 0000000..7268216 Binary files /dev/null and b/res/raw/iptables differ diff --git a/res/raw/obfsproxy b/res/raw/obfsproxy index c751ec3..023e1f9 100755 Binary files a/res/raw/obfsproxy and b/res/raw/obfsproxy differ diff --git a/res/raw/privoxy b/res/raw/privoxy new file mode 100755 index 0000000..eeb2a48 Binary files /dev/null and b/res/raw/privoxy differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 new file mode 100644 index 0000000..c173ec7 Binary files /dev/null and b/res/raw/tor.mp3 differ diff --git a/res/values/strings.xml b/res/values/strings.xml index d733b32..00f1dca 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -246,8 +246,8 @@ <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> -<string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string> +<string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>

1 0

[orbot/master] reverting to earlier version
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit 9ccedc2e6393d9e5626d5b9cccf28391bada0c25 Author: n8fr8 <nathan(a)freitas.net> Date: Sun Sep 30 22:02:41 2012 +0530 reverting to earlier version --- .../torproject/android/service/TorTransProxy.java | 106 ++++++++++--------- 1 files changed, 56 insertions(+), 50 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 2571123..5269a49 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -224,6 +224,15 @@ public class TorTransProxy implements TorServiceConstants { int torUid = context.getApplicationInfo().uid; + // Allow everything for Tor + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(torUid); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + //build up array of shell cmds to execute under one root context for (TorifiedApp tApp:apps) { @@ -235,9 +244,9 @@ public class TorTransProxy implements TorServiceConstants { { TorService.logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); - - // Set up port redirection - script.append(ipTablesPath); + + // Set up port redirection + script.append(ipTablesPath); script.append(" -t nat"); script.append(" -A OUTPUT -p tcp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost @@ -251,14 +260,28 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A OUTPUT -p udp -m owner --uid-owner "); + script.append(" -A OUTPUT -p udp"); + script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); script.append(" || exit\n"); - + + // Allow loopback + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -o lo"); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + + /* + //Outgoing loopback already allowed (23/7/12) + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; for (int port : ports) @@ -276,30 +299,8 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j ACCEPT"); script.append(" || exit\n"); } - - // Allow loopback - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -m owner --uid-owner "); - script.append(tApp.getUid()); - script.append(" -p tcp"); - script.append(" -o lo"); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - - // Reject DNS that is not from Tor (order is important - first matched rule counts!) - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -m owner --uid-owner "); - script.append(tApp.getUid()); - script.append(" -p udp"); - script.append(" --dport "); - script.append(STANDARD_DNS_PORT); - script.append(" -j REJECT"); - script.append(" || exit\n"); - + */ + // Reject all other outbound TCP packets script.append(ipTablesPath); script.append(" -t filter"); @@ -450,8 +451,8 @@ public class TorTransProxy implements TorServiceConstants { int torUid = context.getApplicationInfo().uid; - // Set up port redirection - script.append(ipTablesPath); + // Set up port redirection + script.append(ipTablesPath); script.append(" -t nat"); script.append(" -A OUTPUT -p tcp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost @@ -465,14 +466,36 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A OUTPUT -p udp -m owner ! --uid-owner "); + script.append(" -A OUTPUT -p udp"); + script.appent(" -m owner ! --uid-owner "); script.append(torUid); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); script.append(" || exit\n"); + + // Allow loopback + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -o lo"); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + // Allow everything for Tor + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(torUid); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + + + /* + //Outgoing loopback already allowed (23/7/12) + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; for (int port : ports) @@ -490,25 +513,8 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j ACCEPT"); script.append(" || exit\n"); - } + } */ - // Allow loopback - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -p tcp"); - script.append(" -o lo"); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - - // Allow everything for Tor - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -m owner --uid-owner "); - script.append(torUid); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); if (TorService.ENABLE_DEBUG_LOG) {

1 0

[orbot/master] reverting to last known working version
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit 7e91c8eecb89196f4c86dd94d56b9070023e4641 Author: n8fr8 <nathan(a)freitas.net> Date: Sun Sep 30 21:59:29 2012 +0530 reverting to last known working version --- .../torproject/android/service/TorTransProxy.java | 133 ++++++++++---------- 1 files changed, 69 insertions(+), 64 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index a705bb5..2571123 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -224,15 +224,6 @@ public class TorTransProxy implements TorServiceConstants { int torUid = context.getApplicationInfo().uid; - // Allow everything for Tor - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -m owner --uid-owner "); - script.append(torUid); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - //build up array of shell cmds to execute under one root context for (TorifiedApp tApp:apps) { @@ -244,9 +235,9 @@ public class TorTransProxy implements TorServiceConstants { { TorService.logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); - - // Set up port redirection - script.append(ipTablesPath); + + // Set up port redirection + script.append(ipTablesPath); script.append(" -t nat"); script.append(" -A OUTPUT -p tcp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost @@ -260,28 +251,14 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A OUTPUT -p udp"); - script.append(" -m owner --uid-owner "); + script.append(" -A OUTPUT -p udp -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); script.append(" || exit\n"); - - // Allow loopback - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -m owner --uid-owner "); - script.append(tApp.getUid()); - script.append(" -o lo"); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - - /* - //Outgoing loopback already allowed (23/7/12) - + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; for (int port : ports) @@ -299,32 +276,53 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j ACCEPT"); script.append(" || exit\n"); } - */ - - // Reject all other outbound TCP packets + + // Allow loopback script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A OUTPUT"); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -p tcp"); - script.append(" -j REJECT"); + script.append(" -o lo"); + script.append(" -j ACCEPT"); script.append(" || exit\n"); - - // Reject all other outbound UDP packets + + // Reject DNS that is not from Tor (order is important - first matched rule counts!) script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A OUTPUT"); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -p udp"); + script.append(" --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REJECT"); + script.append(" || exit\n"); + + // Reject all other outbound TCP packets + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -p tcp"); script.append(" -j REJECT"); script.append(" || exit\n"); - } } + + // Allow everything for Tor + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(torUid); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + String[] cmdAdd = {script.toString()}; code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); @@ -452,8 +450,8 @@ public class TorTransProxy implements TorServiceConstants { int torUid = context.getApplicationInfo().uid; - // Set up port redirection - script.append(ipTablesPath); + // Set up port redirection + script.append(ipTablesPath); script.append(" -t nat"); script.append(" -A OUTPUT -p tcp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost @@ -467,36 +465,14 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A OUTPUT -p udp"); - script.append(" -m owner ! --uid-owner "); + script.append(" -A OUTPUT -p udp -m owner ! --uid-owner "); script.append(torUid); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); script.append(" || exit\n"); - - // Allow loopback - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -o lo"); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - // Allow everything for Tor - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -m owner --uid-owner "); - script.append(torUid); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - - - /* - //Outgoing loopback already allowed (23/7/12) - int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; for (int port : ports) @@ -514,8 +490,25 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j ACCEPT"); script.append(" || exit\n"); - } */ + } + + // Allow loopback + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -p tcp"); + script.append(" -o lo"); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + // Allow everything for Tor + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(torUid); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); if (TorService.ENABLE_DEBUG_LOG) { @@ -539,11 +532,23 @@ public class TorTransProxy implements TorServiceConstants { script.append(" --log-uid"); script.append(" || exit\n"); } - - // Reject all other outbound packets by default + + // Reject DNS that is not from Tor (order is important - first matched rule counts!) script.append(ipTablesPath); script.append(" -t filter"); - script.append(" -P OUTPUT DROP"); + script.append(" -A OUTPUT"); + script.append(" -p udp"); + script.append(" --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REJECT"); + script.append(" || exit\n"); + + // Reject all other outbound TCP packets + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -p tcp"); + script.append(" -j REJECT"); script.append(" || exit\n"); String[] cmdAdd = {script.toString()};

1 0

[orbot/master] fixing transproxy to set/clear on rule by rule basis
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit efc6d95314660c2c4a33408f2775cdae0a3dca70 Author: n8fr8 <nathan(a)freitas.net> Date: Sun Sep 30 23:57:59 2012 +0530 fixing transproxy to set/clear on rule by rule basis --- src/org/torproject/android/Orbot.java | 18 +- .../android/service/.TorServiceUtils.java.swp | Bin 16384 -> 0 bytes src/org/torproject/android/service/TorService.java | 40 ++-- .../torproject/android/service/TorTransProxy.java | 301 +++++++++++++++----- .../android/settings/SettingsPreferences.java | 2 +- 5 files changed, 265 insertions(+), 96 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 59112da..d952cc4 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -710,7 +710,6 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener Message msg = Message.obtain(); msg.what = TorServiceConstants.MESSAGE_TRAFFIC_COUNT; - Bundle data = new Bundle(); data.putLong("upload", upload); data.putLong("download", download); @@ -775,12 +774,19 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener Log.d(TAG,"Total bandwidth error"+e.getMessage()); } - downloadText.setText(formatCount(datacount.Download) + " / " + formatTotal(Long.parseLong(TotalDownload))); - uploadText.setText(formatCount(datacount.Upload) + " / " + formatTotal(Long.parseLong(TotalUpload))); + try + { + downloadText.setText(formatCount(datacount.Download) + " / " + formatTotal(Long.parseLong(TotalDownload))); + uploadText.setText(formatCount(datacount.Upload) + " / " + formatTotal(Long.parseLong(TotalUpload))); + + downloadText.invalidate(); + uploadText.invalidate(); + } + catch (NumberFormatException nfe) + { + //just ignore/swallow + } - downloadText.invalidate(); - uploadText.invalidate(); - break; default: diff --git a/src/org/torproject/android/service/.TorServiceUtils.java.swp b/src/org/torproject/android/service/.TorServiceUtils.java.swp deleted file mode 100644 index b9f0c9e..0000000 Binary files a/src/org/torproject/android/service/.TorServiceUtils.java.swp and /dev/null differ diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 23921a9..73c0d71 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -55,7 +55,7 @@ import android.util.Log; public class TorService extends Service implements TorServiceConstants, TorConstants, Runnable, EventHandler { - public static boolean ENABLE_DEBUG_LOG = true; + public static boolean ENABLE_DEBUG_LOG = false; private static int currentStatus = STATUS_OFF; @@ -85,6 +85,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private File filePrivoxy; private File fileObfsProxy; + private TorTransProxy mTransProxy; + private boolean mTransProxyAll = false; public static void logMessage(String msg) { @@ -611,54 +613,53 @@ public class TorService extends Service implements TorServiceConstants, TorConst boolean hasRoot = prefs.getBoolean(PREF_HAS_ROOT,false); boolean enableTransparentProxy = prefs.getBoolean("pref_transparent", false); - TorTransProxy ttProxy = new TorTransProxy(); + if (mTransProxy == null) + mTransProxy = new TorTransProxy(); if (hasRoot && enableTransparentProxy) { - boolean transProxyAll = prefs.getBoolean("pref_transparent_all", false); - boolean transProxyPortFallback = prefs.getBoolean("pref_transparent_port_fallback", false); + mTransProxyAll = prefs.getBoolean("pref_transparent_all", false); boolean transProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); TorService.logMessage ("Transparent Proxying: " + enableTransparentProxy); - String portProxyList = prefs.getString("pref_port_list", ""); + //String portProxyList = prefs.getString("pref_port_list", ""); //TODO: Find a nice place for the next (commented) line //TorTransProxy.setDNSProxying(); int code = 0; // Default state is "okay" - + /* if(transProxyPortFallback) { - showToolbarNotification(getString(R.string.setting_up_port_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); StringTokenizer st = new StringTokenizer(portProxyList, ","); int status = code; while (st.hasMoreTokens()) { - status = ttProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken())); + status = mTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken())); if(status != 0) code = status; } } else - { - if(transProxyAll) + {*/ + if(mTransProxyAll) { showToolbarNotification(getString(R.string.setting_up_full_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); - code = ttProxy.setTransparentProxyingAll(this); + code = mTransProxy.setTransparentProxyingAll(this); } else { showToolbarNotification(getString(R.string.setting_up_app_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); - code = ttProxy.setTransparentProxyingByApp(this,AppManager.getApps(this)); + code = mTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this)); } - } + //} TorService.logMessage ("TorTransProxy resp code: " + code); @@ -670,7 +671,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { showToolbarNotification(getString(R.string.transproxy_enabled_for_tethering_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); - ttProxy.enableTetheringRules(this); + mTransProxy.enableTetheringRules(this); } } @@ -699,14 +700,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst boolean hasRoot = prefs.getBoolean(PREF_HAS_ROOT,false); boolean enableTransparentProxy = prefs.getBoolean("pref_transparent", false); - if (hasRoot && enableTransparentProxy) { TorService.logMessage ("Clearing TransProxy rules"); - new TorTransProxy().flushIptables(this); - + if (mTransProxyAll) + mTransProxy.clearTransparentProxyingAll(this); + else + mTransProxy.clearTransparentProxyingByApp(this,AppManager.getApps(this)); + showToolbarNotification(getString(R.string.transproxy_rules_cleared), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); @@ -1185,7 +1188,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst prefPersistNotifications = prefs.getBoolean(TorConstants.PREF_PERSIST_NOTIFICATIONS, true); - new Thread () { @@ -1499,7 +1501,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",true); + ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 5269a49..18eec84 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -17,9 +17,8 @@ public class TorTransProxy implements TorServiceConstants { public String getIpTablesPath (Context context) { - - if (ipTablesPath == null) - { + android.os.Debug.waitForDebugger(); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); if (prefs.getBoolean(TorConstants.PREF_USE_SYSTEM_IPTABLES, false)) @@ -50,13 +49,12 @@ public class TorTransProxy implements TorServiceConstants { ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); } - } return ipTablesPath; } - public int flushIptables(Context context) throws Exception { + public int flushIptablesAll(Context context) throws Exception { String ipTablesPath = getIpTablesPath(context); @@ -220,19 +218,10 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - flushIptables(context); + // flushIptables(context); int torUid = context.getApplicationInfo().uid; - // Allow everything for Tor - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -m owner --uid-owner "); - script.append(torUid); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - //build up array of shell cmds to execute under one root context for (TorifiedApp tApp:apps) { @@ -244,11 +233,12 @@ public class TorTransProxy implements TorServiceConstants { { TorService.logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); - - // Set up port redirection - script.append(ipTablesPath); + + // Set up port redirection + script.append(ipTablesPath); + script.append(" -A OUTPUT"); script.append(" -t nat"); - script.append(" -A OUTPUT -p tcp"); + script.append(" -p tcp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); @@ -259,37 +249,24 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); + script.append(" -A OUTPUT"); script.append(" -t nat"); - script.append(" -A OUTPUT -p udp"); - script.append(" -m owner --uid-owner "); + script.append(" -p udp -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); script.append(" || exit\n"); - - // Allow loopback - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -m owner --uid-owner "); - script.append(tApp.getUid()); - script.append(" -o lo"); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - - /* - //Outgoing loopback already allowed (23/7/12) - + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; for (int port : ports) { // Allow packets to localhost (contains all the port-redirected ones) script.append(ipTablesPath); - script.append(" -t filter"); script.append(" -A OUTPUT"); + script.append(" -t filter"); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -p tcp"); @@ -299,12 +276,34 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j ACCEPT"); script.append(" || exit\n"); } - */ - - // Reject all other outbound TCP packets + + // Allow loopback script.append(ipTablesPath); + script.append(" -A OUTPUT"); script.append(" -t filter"); + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -p tcp"); + script.append(" -o lo"); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + + // Reject DNS that is not from Tor (order is important - first matched rule counts!) + script.append(ipTablesPath); script.append(" -A OUTPUT"); + script.append(" -t filter"); + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -p udp"); + script.append(" --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REJECT"); + script.append(" || exit\n"); + + // Reject all other outbound TCP packets + script.append(ipTablesPath); + script.append(" -A OUTPUT"); + script.append(" -t filter"); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -p tcp"); @@ -317,8 +316,8 @@ public class TorTransProxy implements TorServiceConstants { // Allow everything for Tor script.append(ipTablesPath); - script.append(" -t filter"); script.append(" -A OUTPUT"); + script.append(" -t filter"); script.append(" -m owner --uid-owner "); script.append(torUid); script.append(" -j ACCEPT"); @@ -330,10 +329,108 @@ public class TorTransProxy implements TorServiceConstants { String msg = res.toString(); TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); - return code; } + public int clearTransparentProxyingByApp(Context context, ArrayList<TorifiedApp> apps) throws Exception + { + + boolean runRoot = true; + boolean waitFor = true; + + //redirectDNSResolvConf(); //not working yet + + String ipTablesPath = getIpTablesPath(context); + + StringBuilder script = new StringBuilder(); + + StringBuilder res = new StringBuilder(); + int code = -1; + + int torUid = context.getApplicationInfo().uid; + + //build up array of shell cmds to execute under one root context + for (TorifiedApp tApp:apps) + { + + if (tApp.isTorified() + && (!tApp.getUsername().equals(TorServiceConstants.TOR_APP_USERNAME)) + && (!tApp.getUsername().equals(TorServiceConstants.ORWEB_APP_USERNAME)) + ) //if app is set to true + { + + TorService.logMessage("clear transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); + + // Set up port redirection + script.append(ipTablesPath); + script.append(" -D OUTPUT"); + script.append(" -t nat"); + script.append(" -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -m tcp --syn"); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_TRANSPROXY_PORT); + script.append(" || exit\n"); + + // Same for DNS + script.append(ipTablesPath); + script.append(" -D OUTPUT"); + script.append(" -t nat"); + script.append(" -p udp -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); + script.append(" || exit\n"); + + // Reject DNS that is not from Tor (order is important - first matched rule counts!) + script.append(ipTablesPath); + script.append(" -D OUTPUT"); + script.append(" -t filter"); + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -p udp"); + script.append(" --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REJECT"); + script.append(" || exit\n"); + + // Reject all other outbound TCP packets + script.append(ipTablesPath); + script.append(" -D OUTPUT"); + script.append(" -t filter"); + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -p tcp"); + script.append(" -j REJECT"); + script.append(" || exit\n"); + + } + } + + + // Allow everything for Tor + script.append(ipTablesPath); + script.append(" -D OUTPUT"); + script.append(" -t filter"); + script.append(" -m owner --uid-owner "); + script.append(torUid); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + + String[] cmdAdd = {script.toString()}; + + code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); + String msg = res.toString(); + TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); + + return code; + } + /* + // this is a bad idea so removing public int setTransparentProxyingByPort(Context context, int port) throws Exception { @@ -348,7 +445,7 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - flushIptables(context); + //flushIptables(context); //TCP //iptables -t nat -A PREROUTING -i eth0 -p tcp --dport $srcPortNumber -j REDIRECT --to-port $dstPortNumbe @@ -390,7 +487,8 @@ public class TorTransProxy implements TorServiceConstants { return code; } - + */ + public int enableTetheringRules (Context context) throws Exception { @@ -447,12 +545,12 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder res = new StringBuilder(); int code = -1; - flushIptables(context); + //flushIptables(context); int torUid = context.getApplicationInfo().uid; - // Set up port redirection - script.append(ipTablesPath); + // Set up port redirection + script.append(ipTablesPath); script.append(" -t nat"); script.append(" -A OUTPUT -p tcp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost @@ -466,36 +564,14 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A OUTPUT -p udp"); - script.appent(" -m owner ! --uid-owner "); + script.append(" -A OUTPUT -p udp -m owner ! --uid-owner "); script.append(torUid); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); script.append(" || exit\n"); - - // Allow loopback - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -o lo"); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - // Allow everything for Tor - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -m owner --uid-owner "); - script.append(torUid); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - - - /* - //Outgoing loopback already allowed (23/7/12) - int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; for (int port : ports) @@ -513,8 +589,25 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j ACCEPT"); script.append(" || exit\n"); - } */ + } + // Allow loopback + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -p tcp"); + script.append(" -o lo"); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + + // Allow everything for Tor + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(torUid); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); if (TorService.ENABLE_DEBUG_LOG) { @@ -563,6 +656,74 @@ public class TorTransProxy implements TorServiceConstants { String msg = res.toString(); TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); + return code; + } + + public int clearTransparentProxyingAll(Context context) throws Exception + { + boolean runRoot = true; + boolean waitFor = true; + + //redirectDNSResolvConf(); //not working yet + + String ipTablesPath = getIpTablesPath(context); + + StringBuilder script = new StringBuilder(); + + StringBuilder res = new StringBuilder(); + int code = -1; + + + int torUid = context.getApplicationInfo().uid; + + // Set up port redirection + script.append(ipTablesPath); + script.append(" -D OUTPUT -p tcp"); + script.append(" -t nat"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost + script.append(" -m owner ! --uid-owner "); + script.append(torUid); + script.append(" -m tcp --syn"); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_TRANSPROXY_PORT); + script.append(" || exit\n"); + + // Same for DNS + script.append(ipTablesPath); + script.append(" -D OUTPUT"); + script.append(" -t nat"); + script.append(" -p udp -m owner ! --uid-owner "); + script.append(torUid); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); + script.append(" || exit\n"); + + // Reject DNS that is not from Tor (order is important - first matched rule counts!) + script.append(ipTablesPath); + script.append(" -D OUTPUT"); + script.append(" -t filter"); + script.append(" -p udp"); + script.append(" --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REJECT"); + script.append(" || exit\n"); + + // Reject all other outbound TCP packets + script.append(ipTablesPath); + script.append(" -D OUTPUT"); + script.append(" -t filter"); + script.append(" -p tcp"); + script.append(" -j REJECT"); + script.append(" || exit\n"); + + String[] cmdAdd = {script.toString()}; + + code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); + String msg = res.toString(); + TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); + return code; diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java index afac094..46a2211 100644 --- a/src/org/torproject/android/settings/SettingsPreferences.java +++ b/src/org/torproject/android/settings/SettingsPreferences.java @@ -203,7 +203,7 @@ public class SettingsPreferences private void clearTransProxyState () { try { - new TorTransProxy().flushIptables(this); + new TorTransProxy().clearTransparentProxyingAll(this); } catch (Exception e) { Log.e(TorConstants.TAG,"error flushing iptables",e); }

1 0

[orbot/master] layout clean-up on datastats display
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit 1d8efbfca4352566a2a287c6c10f47791f035478 Author: n8fr8 <nathan(a)freitas.net> Date: Sun Sep 30 23:57:46 2012 +0530 layout clean-up on datastats display --- res/layout/layout_main.xml | 4 ++-- res/xml/preferences.xml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index f73d79c..205dbe0 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -92,7 +92,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_below="@+id/trafficDownLabel" - android:textSize="24sp" + android:textSize="20sp" android:gravity="center_vertical|center_horizontal" android:textStyle="bold" /> <TextView @@ -102,7 +102,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_below="@+id/trafficUpLabel" - android:textSize="24sp" + android:textSize="20sp" android:gravity="center_vertical|center_horizontal" android:textStyle="bold" /> </RelativeLayout> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index a046e08..96fe78f 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -198,7 +198,6 @@ android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_v android:enabled="true"></CheckBoxPreference> - <CheckBoxPreference android:defaultValue="false" android:key="pref_use_sys_iptables" @@ -206,6 +205,7 @@ android:summary="@string/pref_use_sys_iptables_summary" android:enabled="true" android:title="@string/pref_use_sys_iptables_title"/> + </PreferenceCategory> </PreferenceScreen>

1 0

[orbot/master] Add DisableNetwork support
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit dbdadf211557e98e76bf64dd4d9677ac099f4472 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 30 20:41:54 2012 +0530 Add DisableNetwork support DisableNetwork tells tor to drop the current circuits and stop building new ones. A BroadcastReciever is triggered when there are changes in the network connection which toggles DisableNetwork. --- AndroidManifest.xml | 7 +++-- src/org/torproject/android/service/TorService.java | 22 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 99ce90b..9ff495c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -5,9 +5,10 @@ android:versionCode="45" android:installLocation="auto" > - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="15"/> <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" android:label="@string/app_name" diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 73c0d71..7711648 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -38,10 +38,13 @@ import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; +import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; +import android.net.ConnectivityManager; import android.os.Bundle; import android.os.IBinder; import android.os.Looper; @@ -275,6 +278,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst { initTor(); isRunning = true; + IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); + registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); } catch (Exception e) { @@ -1496,6 +1501,23 @@ public class TorService extends Service implements TorServiceConstants, TorConst } + /* + * Another way to do this would be to use the Observer pattern by defining the + * BroadcastReciever in the Android manifest. + */ + private final BroadcastReceiver mNetworkStateReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + boolean noConnectivity = intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false); + try { + mBinder.updateConfiguration("DisableNetwork", noConnectivity ? "1" : "0", false); + mBinder.saveConfiguration(); + } catch (RemoteException e) { + logException ("error applying prefs",e); + } + } + }; + private boolean updateTorConfiguration () throws RemoteException {

1 0

[orbot/master] removing unintended debugger statement :(
by n8fr8＠torproject.org 01 Oct '12

01 Oct '12

commit 971c04e9f2e5029fc44dceee4a00649b6537acde Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 1 00:08:47 2012 +0530 removing unintended debugger statement :( --- .../torproject/android/service/TorTransProxy.java | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 18eec84..8753097 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -17,7 +17,6 @@ public class TorTransProxy implements TorServiceConstants { public String getIpTablesPath (Context context) { - android.os.Debug.waitForDebugger(); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

1 0