tor-commits October 2012

tor-commits@lists.torproject.org

20 participants
1288 discussions

r25853: {website} 0.2.3.24-rc tarball is up (in website/trunk: . include)
by Roger Dingledine 26 Oct '12

26 Oct '12

Author: arma Date: 2012-10-26 04:53:54 +0000 (Fri, 26 Oct 2012) New Revision: 25853 Modified: website/trunk/Makefile website/trunk/include/versions.wmi Log: 0.2.3.24-rc tarball is up Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-10-23 09:49:55 UTC (rev 25852) +++ website/trunk/Makefile 2012-10-26 04:53:54 UTC (rev 25853) @@ -11,7 +11,7 @@ # 5. ./publish export STABLETAG=tor-0.2.2.39 -export DEVTAG=tor-0.2.3.23-rc +export DEVTAG=tor-0.2.3.24-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-10-23 09:49:55 UTC (rev 25852) +++ website/trunk/include/versions.wmi 2012-10-26 04:53:54 UTC (rev 25853) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.23-rc</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.24-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.39</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.23-rc</define-tag>

1 0

[tor/master] forward-port the 0.2.3.24-rc changelog
by arma＠torproject.org 26 Oct '12

26 Oct '12

commit 17a6aa56cefe9d833a14bffd8e972099dadd2c88 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Oct 26 00:39:55 2012 -0400 forward-port the 0.2.3.24-rc changelog --- ChangeLog | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e017fcd..0541c44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,39 @@ Changes in version 0.2.4.5-alpha - 2012-10-25 to its own file. +Changes in version 0.2.3.24-rc - 2012-10-25 + Tor 0.2.3.24-rc fixes two important security vulnerabilities that + could lead to remotely triggerable relay crashes, and fixes + a major bug that was preventing clients from choosing suitable exit + nodes. + + o Major bugfixes (security): + - Fix a group of remotely triggerable assertion failures related to + incorrect link protocol negotiation. Found, diagnosed, and fixed + by "some guy from France". Fix for CVE-2012-2250; bugfix on + 0.2.3.6-alpha. + - Fix a denial of service attack by which any directory authority + could crash all the others, or by which a single v2 directory + authority could crash everybody downloading v2 directory + information. Fixes bug 7191; bugfix on 0.2.0.10-alpha. + + o Major bugfixes: + - When parsing exit policy summaries from microdescriptors, we had + previously been ignoring the last character in each one, so that + "accept 80,443,8080" would be treated by clients as indicating + a node that allows access to ports 80, 443, and 808. That would + lead to clients attempting connections that could never work, + and ignoring exit nodes that would support their connections. Now + clients parse these exit policy summaries correctly. Fixes bug 7192; + bugfix on 0.2.3.1-alpha. + + o Minor bugfixes: + - Clients now consider the ClientRejectInternalAddresses config option + when using a microdescriptor consensus stanza to decide whether + an exit relay would allow exiting to an internal address. Fixes + bug 7190; bugfix on 0.2.3.1-alpha. + + Changes in version 0.2.4.4-alpha - 2012-10-20 Tor 0.2.4.4-alpha adds a new v3 directory authority, fixes a privacy vulnerability introduced by a change in OpenSSL, fixes a remotely

1 0

[tor/master] touch-ups
by arma＠torproject.org 26 Oct '12

26 Oct '12

commit 4fc866ce7f2f3a6685d7982fae45503a5828571e Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Oct 26 00:39:06 2012 -0400 touch-ups --- ChangeLog | 12 ++++++------ src/common/tortls.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b348392..e017fcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,13 @@ Changes in version 0.2.4.5-alpha - 2012-10-25 - Tor 0.2.3.24-rc comes hard at the heels of 0.2.4.4-alpha, to fix two - important security vulnerabilities that could lead to remotely - triggerable relay crashes, fixes a major bug that was preventing - clients from choosing good exit nodes, and refactor some of our code. + Tor 0.2.4.5-alpha comes hard at the heels of 0.2.4.4-alpha, to fix + two important security vulnerabilities that could lead to remotely + triggerable relay crashes, fix a major bug that was preventing clients + from choosing suitable exit nodes, and refactor some of our code. o Major bugfixes (security, also in 0.2.3.24-rc): - Fix a group of remotely triggerable assertion failures related to incorrect link protocol negotiation. Found, diagnosed, and fixed - by "some guy from France." Fix for CVE-2012-2250; bugfix on + by "some guy from France". Fix for CVE-2012-2250; bugfix on 0.2.3.6-alpha. - Fix a denial of service attack by which any directory authority could crash all the others, or by which a single v2 directory @@ -32,7 +32,7 @@ Changes in version 0.2.4.5-alpha - 2012-10-25 o Minor bugfixes: - Only disable TLS session ticket support when running as a TLS - server. This keeps clients harder to distinguish from regular firefox + server. Now clients will blend better with regular Firefox connections. Fixes bug 7189; bugfix on Tor 0.2.3.23-rc. o Code simplification and refactoring: diff --git a/src/common/tortls.c b/src/common/tortls.c index 1b7b544..d4f02d3 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1195,7 +1195,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, * create an opportunity to fingerprint us (since it's unusual to use them * with TLS sessions turned off). * - * In 0.2.4, clients advertise support for them, though to avoid a TLS + * In 0.2.4, clients advertise support for them though, to avoid a TLS * distinguishability vector. This can give us worse PFS, though, if we * get a server that doesn't set SSL_OP_NO_TICKET. With luck, there will * be few such servers by the time 0.2.4 is more stable.

1 0

[orbot/master] updated target version
by n8fr8＠torproject.org 26 Oct '12

26 Oct '12

commit 219242cef7fa5f76c28ee5a14e59503dbaab9d6b Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 25 15:27:38 2012 +0530 updated target version --- project.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/project.properties b/project.properties index b94fad8..2566d16 100644 --- a/project.properties +++ b/project.properties @@ -8,5 +8,5 @@ # project structure. # Project target. -target=Google Inc.:Google APIs:16 +target=android-16 android.library.reference.1=../ActionBarSherlock/library

1 0

[orbot/master] moved init to oncreate to try and stop flashing
by n8fr8＠torproject.org 26 Oct '12

26 Oct '12

commit 29573d1c0f66f817c4dd06004093decd56480b7d Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 25 15:15:11 2012 +0530 moved init to oncreate to try and stop flashing --- .../android/settings/SettingsPreferences.java | 27 +++++++------------ 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java index fd857fd..82085d9 100644 --- a/src/org/torproject/android/settings/SettingsPreferences.java +++ b/src/org/torproject/android/settings/SettingsPreferences.java @@ -6,27 +6,24 @@ package org.torproject.android.settings; import java.util.Locale; import org.torproject.android.R; -import org.torproject.android.R.xml; import org.torproject.android.TorConstants; import org.torproject.android.service.TorServiceUtils; import org.torproject.android.service.TorTransProxy; -import com.actionbarsherlock.app.SherlockPreferenceActivity; - import android.content.Intent; import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; import android.content.res.Configuration; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.Preference; -import android.preference.PreferenceManager; import android.preference.Preference.OnPreferenceClickListener; -import android.preference.PreferenceActivity; import android.preference.PreferenceCategory; +import android.preference.PreferenceManager; import android.util.Log; import android.widget.Toast; +import com.actionbarsherlock.app.SherlockPreferenceActivity; + public class SettingsPreferences extends SherlockPreferenceActivity implements OnPreferenceClickListener { @@ -39,7 +36,6 @@ public class SettingsPreferences private Preference prefLocale = null; private boolean hasRoot = false; - private final static int HIDDEN_SERVICE_PREF_IDX = 6; private final static int TRANSPROXY_GROUP_IDX = 1; @@ -47,6 +43,7 @@ public class SettingsPreferences protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.preferences); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); @@ -58,6 +55,8 @@ public class SettingsPreferences hasRoot = prefs.getBoolean("use_whispercore", false); } + + init(); } @@ -66,6 +65,10 @@ public class SettingsPreferences super.onResume(); + } + + private void init () + { int REQUEST_ROOT_IDX = 1; int SET_LOCALE_IDX = 3; @@ -194,21 +197,11 @@ public class SettingsPreferences prefcBTransProxyAll.setEnabled(prefCBTransProxy.isChecked()); prefTransProxyApps.setEnabled(prefCBTransProxy.isChecked() && (!prefcBTransProxyAll.isChecked())); - if (!prefCBTransProxy.isChecked()) - clearTransProxyState (); } return true; } - private void clearTransProxyState () - { - try { - new TorTransProxy().clearTransparentProxyingAll(this); - } catch (Exception e) { - Log.e(TorConstants.TAG,"error flushing iptables",e); - } - } }

1 0

[orbot/master] moved to 0.2.3.23-RC tor binary
by n8fr8＠torproject.org 26 Oct '12

26 Oct '12

commit 3c4e2dd046e0b39a19e7598dbd64f97d14824c13 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 25 15:14:36 2012 +0530 moved to 0.2.3.23-RC tor binary --- res/raw/tor.mp3 | Bin 2140153 -> 2074073 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 index 1f158eb..aeb844c 100644 Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ

1 0

[orbot/master] updated notification icon to new onion
by n8fr8＠torproject.org 26 Oct '12

26 Oct '12

commit 4edb1cc99240161e09f4e479ce1a8ce0292250a1 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 25 15:28:45 2012 +0530 updated notification icon to new onion --- src/org/torproject/android/service/TorService.java | 121 +++++++++++++------- 1 files changed, 77 insertions(+), 44 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 8ee528b..dd4e3fb 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -8,7 +8,6 @@ package org.torproject.android.service; -import java.io.BufferedWriter; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -20,7 +19,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.StringTokenizer; import net.freehaven.tor.control.ConfigEntry; @@ -45,11 +43,8 @@ import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.net.ConnectivityManager; -import android.os.Bundle; +import android.os.AsyncTask; import android.os.IBinder; -import android.os.Looper; -import android.os.Message; -import android.os.Parcelable; import android.os.RemoteCallbackList; import android.os.RemoteException; import android.preference.PreferenceManager; @@ -89,17 +84,27 @@ public class TorService extends Service implements TorServiceConstants, TorConst private File fileObfsProxy; private TorTransProxy mTransProxy; - - public static void logMessage(String msg) + + private long mTotalTrafficWritten = 0; + private long mTotalTrafficRead = 0; + + public void logMessage(String msg) { if (ENABLE_DEBUG_LOG) + { Log.d(TAG,msg); + sendCallbackLogMessage(msg); + + } } - public static void logException(String msg, Exception e) + public void logException(String msg, Exception e) { if (ENABLE_DEBUG_LOG) + { Log.e(TAG,msg,e); + sendCallbackLogMessage(msg); + } } @@ -381,7 +386,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { try { String onionHostname = Utils.readString(new FileInputStream(file)); - showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, HS_NOTIFY_ID, R.drawable.ic_stat_notify, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, HS_NOTIFY_ID, R.drawable.ic_stat_tor, Notification.FLAG_ONGOING_EVENT); Editor pEdit = prefs.edit(); pEdit.putString("pref_hs_hostname",onionHostname); pEdit.commit(); @@ -549,7 +554,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice(getString(R.string.status_install_success)); - //showToolbarNotification(getString(R.string.status_install_success), NOTIFY_ID, R.drawable.ic_stat_notify); + //showToolbarNotification(getString(R.string.status_install_success), NOTIFY_ID, R.drawable.ic_stat_tor); } else @@ -608,6 +613,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (hasRoot && enableTransparentProxy) enableTransparentProxy(transProxyAll, transProxyTethering); + + new Thread (new TotalUpdaterRunnable()).start(); } catch (Exception e) { logException("Unable to start Tor: " + e.getMessage(),e); @@ -627,9 +634,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst { if (mTransProxy == null) - mTransProxy = new TorTransProxy(); + mTransProxy = new TorTransProxy(this); - TorService.logMessage ("Transparent Proxying: enabling..."); + logMessage ("Transparent Proxying: enabling..."); //TODO: Find a nice place for the next (commented) line //TorTransProxy.setDNSProxying(); @@ -638,27 +645,27 @@ public class TorService extends Service implements TorServiceConstants, TorConst if(proxyAll) { - showToolbarNotification(getString(R.string.setting_up_full_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); + showToolbarNotification(getString(R.string.setting_up_full_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); code = mTransProxy.setTransparentProxyingAll(this); } else { - showToolbarNotification(getString(R.string.setting_up_app_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); + showToolbarNotification(getString(R.string.setting_up_app_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); code = mTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this)); } - TorService.logMessage ("TorTransProxy resp code: " + code); + logMessage ("TorTransProxy resp code: " + code); if (code == 0) { - showToolbarNotification(getString(R.string.transparent_proxying_enabled), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); + showToolbarNotification(getString(R.string.transparent_proxying_enabled), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); if (enableTether) { - showToolbarNotification(getString(R.string.transproxy_enabled_for_tethering_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); + showToolbarNotification(getString(R.string.transproxy_enabled_for_tethering_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); mTransProxy.enableTetheringRules(this); @@ -666,7 +673,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } else { - showToolbarNotification(getString(R.string.warning_error_starting_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); + showToolbarNotification(getString(R.string.warning_error_starting_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); } @@ -682,19 +689,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst private boolean disableTransparentProxy () throws Exception { - TorService.logMessage ("Transparent Proxying: disabling..."); + logMessage ("Transparent Proxying: disabling..."); if (mTransProxy == null) - mTransProxy = new TorTransProxy(); + mTransProxy = new TorTransProxy(this); - // if (transProxyAll) - mTransProxy.clearTransparentProxyingAll(this); - // else - mTransProxy.clearTransparentProxyingByApp(this,AppManager.getApps(this)); + mTransProxy.clearTransparentProxyingAll(this); + mTransProxy.clearTransparentProxyingByApp(this,AppManager.getApps(this)); - - - //showToolbarNotification(getString(R.string.transproxy_rules_cleared), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); clearNotifications(); return true; @@ -766,7 +768,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice("Tor process id=" + procId); - //showToolbarNotification(getString(R.string.status_starting_up), NOTIFY_ID, R.drawable.ic_stat_notify); + //showToolbarNotification(getString(R.string.status_starting_up), NOTIFY_ID, R.drawable.ic_stat_tor); initControlConnection (); @@ -993,7 +995,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void startNotification () { - Notification notice = new Notification(R.drawable.ic_stat_notify, getString(R.string.status_activated), System.currentTimeMillis()); + Notification notice = new Notification(R.drawable.ic_stat_tor, getString(R.string.status_activated), System.currentTimeMillis()); //This constructor is deprecated. Use Notification.Builder instead //Notification notice = new Notification(R.drawable.iocipher, "Active: " + mIpAddress, System.currentTimeMillis()); @@ -1029,7 +1031,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } else { - showToolbarNotification (getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_notify, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor, Notification.FLAG_ONGOING_EVENT); } @@ -1088,7 +1090,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void bandwidthUsed(long read, long written) { - if (ENABLE_DEBUG_LOG) + /*if (ENABLE_DEBUG_LOG) //too much debugging data NF 2012/10 { StringBuilder sb = new StringBuilder(); sb.append("Bandwidth used: "); @@ -1098,14 +1100,44 @@ public class TorService extends Service implements TorServiceConstants, TorConst sb.append("kb written"); logNotice(sb.toString()); - } - - sendCallbackStatusMessage(written, read); - + }*/ + sendCallbackStatusMessage(written, read, mTotalTrafficWritten, mTotalTrafficRead); } + + class TotalUpdaterRunnable implements Runnable + { + + public void run () + { + + while (currentStatus != STATUS_OFF) + { + try + { + try + { + mTotalTrafficWritten = Long.parseLong(conn.getInfo("traffic/written")); + mTotalTrafficRead = Long.parseLong(conn.getInfo("traffic/read")); + + } + catch (Exception ioe) + { + Log.e(TAG,"error reading control port traffic",ioe); + } + + Thread.sleep(3000); //wait three seconds + } + catch (Exception e) + { + //nada + } + } + } + + } public void circuitStatus(String status, String circID, String path) { @@ -1190,6 +1222,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst { findExistingProc (); } + + }.start(); if (ITorService.class.getName().equals(intent.getAction())) { @@ -1402,7 +1436,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst inCallback = false; } - private synchronized void sendCallbackStatusMessage (long upload, long download) + private synchronized void sendCallbackStatusMessage (long upload, long download, long written, long read) { if (mCallbacks == null) @@ -1417,8 +1451,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { for (int i=0; i<N; i++) { try { - mCallbacks.getBroadcastItem(i).updateBandwidth(upload, download); - + mCallbacks.getBroadcastItem(i).updateBandwidth(upload, download, written, read); } catch (RemoteException e) { // The RemoteCallbackList will take care of removing @@ -1555,7 +1588,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (IOException e) { - showToolbarNotification (getString(R.string.error_installing_binares),ERROR_NOTIFY_ID,R.drawable.ic_stat_notify, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.error_installing_binares),ERROR_NOTIFY_ID,R.drawable.ic_stat_tor, Notification.FLAG_ONGOING_EVENT); return false; } @@ -1574,7 +1607,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { String msgBridge = getString(R.string.bridge_requires_ip) + getString(R.string.send_email_for_bridges); - showToolbarNotification(msgBridge, ERROR_NOTIFY_ID, R.drawable.ic_stat_notify, -1); + showToolbarNotification(msgBridge, ERROR_NOTIFY_ID, R.drawable.ic_stat_tor, -1); return false; @@ -1589,7 +1622,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst bridgeDelim = ","; } - showToolbarNotification(getString(R.string.notification_using_bridges) + ": " + bridgeList, TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_notify, -1); + showToolbarNotification(getString(R.string.notification_using_bridges) + ": " + bridgeList, TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); boolean obfsBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_OBFUSCATED, false); String bridgeCfgKey = "bridge"; @@ -1637,7 +1670,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showToolbarNotification (getString(R.string.your_reachableaddresses_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notify, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.your_reachableaddresses_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_tor, Notification.FLAG_ONGOING_EVENT); return false; } @@ -1666,7 +1699,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showToolbarNotification (getString(R.string.your_relay_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notify, Notification.FLAG_ONGOING_EVENT); + showToolbarNotification (getString(R.string.your_relay_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_tor, Notification.FLAG_ONGOING_EVENT); return false;

1 0

[orbot/master] removed getInfo for traffic totals; moved to callback
by n8fr8＠torproject.org 26 Oct '12

26 Oct '12

commit 0af2b712ce099ac58e422a2e65fd4c513171b27a Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 25 15:27:59 2012 +0530 removed getInfo for traffic totals; moved to callback --- src/org/torproject/android/Orbot.java | 60 +++++++++---------- .../android/service/ITorServiceCallback.aidl | 2 +- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 6f4e2ac..6f96350 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -12,6 +12,7 @@ import org.torproject.android.settings.ProcessSettingsAsyncTask; import org.torproject.android.settings.SettingsPreferences; import org.torproject.android.wizard.ChooseLocaleWizardActivity; +import android.annotation.SuppressLint; import android.app.AlertDialog; import android.app.NotificationManager; import android.content.ComponentName; @@ -29,6 +30,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.Message; import android.os.RemoteException; +import android.os.StrictMode; import android.preference.PreferenceManager; import android.text.ClipboardManager; import android.text.Layout; @@ -40,7 +42,6 @@ import android.view.View; import android.view.View.OnLongClickListener; import android.view.View.OnTouchListener; import android.widget.Button; -import android.widget.RelativeLayout; import android.widget.SlidingDrawer; import android.widget.TextView; import android.widget.Toast; @@ -81,9 +82,21 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick } /** Called when the activity is first created. */ - public void onCreate(Bundle savedInstanceState) { + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + //this is not the best thing to do, but we sometimes have to do strange things with Orbot + /* + if (android.os.Build.VERSION.SDK_INT > 9) { + StrictMode.ThreadPolicy policy = + new StrictMode.ThreadPolicy.Builder().permitAll().build(); + StrictMode.setThreadPolicy(policy); + StrictMode.VmPolicy vmpolicy = + new StrictMode.VmPolicy.Builder().penaltyLog().build(); + StrictMode.setVmPolicy(vmpolicy); + } + */ + Orbot.setCurrent(this); //if Tor binary is not running, then start the service up @@ -768,8 +781,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick } @Override - public void updateBandwidth(long upload, long download) - throws RemoteException { + public void updateBandwidth(long upload, long download, long written, long read) { Message msg = Message.obtain(); msg.what = TorServiceConstants.MESSAGE_TRAFFIC_COUNT; @@ -777,6 +789,8 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick Bundle data = new Bundle(); data.putLong("upload", upload); data.putLong("download", download); + data.putLong("readTotal",read); + data.putLong("writeTotal",written); msg.setData(data); mHandler.sendMessage(msg); @@ -821,36 +835,18 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick case TorServiceConstants.MESSAGE_TRAFFIC_COUNT : - //trafficRow.setVisibility(RelativeLayout.VISIBLE); Bundle data = msg.getData(); DataCount datacount = new DataCount(data.getLong("upload"),data.getLong("download")); - String TotalUpload = ""; - String TotalDownload = ""; - if (mService != null) - { - try { - TotalUpload = mService.getInfo("traffic/written"); - TotalDownload = mService.getInfo("traffic/read"); - - } catch (RemoteException e) { - Log.d(TAG,"Total bandwidth error"+e.getMessage()); - } - - 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 - } - } - break; + long totalRead = data.getLong("readTotal"); + long totalWrite = data.getLong("writeTotal"); + + downloadText.setText(formatCount(datacount.Download) + " / " + formatTotal(totalRead)); + uploadText.setText(formatCount(datacount.Upload) + " / " + formatTotal(totalWrite)); + + // downloadText.invalidate(); + // uploadText.invalidate(); + default: super.handleMessage(msg); @@ -1020,7 +1016,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick // Converts the supplied argument into a string. // Under 2Mb, returns "xxx.xKb" // Over 2Mb, returns "xxx.xxMb" - if (count < 1e6 * 2) + if (count < 1e6) return ((float)((int)(count*10/1024))/10 + "kbps"); return ((float)((int)(count*100/1024/1024))/100 + "mbps"); diff --git a/src/org/torproject/android/service/ITorServiceCallback.aidl b/src/org/torproject/android/service/ITorServiceCallback.aidl index 2492206..b7b6827 100644 --- a/src/org/torproject/android/service/ITorServiceCallback.aidl +++ b/src/org/torproject/android/service/ITorServiceCallback.aidl @@ -14,7 +14,7 @@ oneway interface ITorServiceCallback { /** * Called when the service returns the bandwidth user to display to the user */ - void updateBandwidth(long value, long value2); + void updateBandwidth(long upload, long download, long written, long read); /** * Called when the service has something to add to the log

1 0

[orbot/master] small change to transproxy test
by n8fr8＠torproject.org 26 Oct '12

26 Oct '12

commit d64cdde3a6d756094b70d9231f7d112104864a44 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 25 15:29:00 2012 +0530 small change to transproxy test --- src/org/torproject/android/wizard/Permissions.java | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index 3b64b04..ad0cd44 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -163,7 +163,6 @@ public class Permissions extends Activity implements TorConstants { { try { TorTransProxy ttProxy = new TorTransProxy(); - int resp = ttProxy.testOwnerModule(context,ttProxy.getIpTablesPath(context)); if (resp != 0)

1 0

[orbot/master] removed static call to TorService logging
by n8fr8＠torproject.org 26 Oct '12

26 Oct '12

commit 0e5b24e6d94f5ad3b1bbc2eecd8b433057d91e7f Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 25 15:29:47 2012 +0530 removed static call to TorService logging --- .../android/service/TorServiceUtils.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 9a4d9ff..e21b745 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -48,22 +48,22 @@ public class TorServiceUtils implements TorServiceConstants { int exitCode = TorServiceUtils.doShellCommand(cmd, log, false, true); if (exitCode == 0) { - TorService.logMessage("root exists, but not sure about permissions"); + Log.d(TorConstants.TAG,"root exists, but not sure about permissions"); return true; } } catch (IOException e) { //this means that there is no root to be had (normally) so we won't log anything - TorService.logException("Error checking for root access",e); + Log.e(TorConstants.TAG,"Error checking for root access",e); } catch (Exception e) { - TorService.logException("Error checking for root access",e); + Log.e(TorConstants.TAG,"Error checking for root access",e); //this means that there is no root to be had (normally) } - TorService.logMessage("Could not acquire root permissions"); + Log.e(TorConstants.TAG,"Could not acquire root permissions"); return false; @@ -125,7 +125,7 @@ public class TorServiceUtils implements TorServiceConstants { } catch (NumberFormatException e) { - TorService.logException("unable to parse process pid: " + line,e); + Log.e("TorServiceUtils","unable to parse process pid: " + line,e); } } @@ -185,7 +185,7 @@ public class TorServiceUtils implements TorServiceConstants { for (int i = 0; i < cmds.length; i++) { - TorService.logMessage("executing shell cmd: " + cmds[i] + "; runAsRoot=" + runAsRoot + ";waitFor=" + waitFor); + // TorService.logMessage("executing shell cmd: " + cmds[i] + "; runAsRoot=" + runAsRoot + ";waitFor=" + waitFor); out.write(cmds[i]); out.write("\n");

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2012