- tor-commits - lists.torproject.org

[arm/master] Moving config value editing to the config panel
by atagar＠torproject.org 10 May '11

10 May '11

commit 52998db3600cdc42e4290b9b3fa5547390a2893a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 9 22:02:03 2011 -0700 Moving config value editing to the config panel --- src/cli/configPanel.py | 46 ++++++++++++++++++++++++++++++++++++++ src/cli/controller.py | 57 ------------------------------------------------ src/cli/popups.py | 14 ++++++----- 3 files changed, 54 insertions(+), 63 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 31a78ab..37b7ddb 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -11,6 +11,7 @@ import popups from util import conf, enum, panel, torTools, torConfig, uiTools DEFAULT_CONFIG = {"features.config.selectionDetails.height": 6, + "features.config.prepopulateEditValues": True, "features.config.state.showPrivateOptions": False, "features.config.state.showVirtualOptions": False, "features.config.state.colWidth.option": 25, @@ -135,6 +136,14 @@ class ConfigEntry(): return self.labelCache + def isUnset(self): + """ + True if we have no value, false otherwise. + """ + + confValue = torTools.getConn().getOption(self.get(Field.OPTION), [], True) + return not bool(confValue) + def _getValue(self): """ Provides the current value of the configuration entry, taking advantage of @@ -256,6 +265,43 @@ class ConfigPanel(panel.Panel): isChanged = self.scroller.handleKey(key, self._getConfigOptions(), pageHeight) if isChanged: self.redraw(True) + elif uiTools.isSelectionKey(key): + # Prompts the user to edit the selected configuration value. The + # interface is locked to prevent updates between setting the value + # and showing any errors. + + panel.CURSES_LOCK.acquire() + try: + selection = self.getSelection() + configOption = selection.get(Field.OPTION) + if selection.isUnset(): initialValue = "" + else: initialValue = selection.get(Field.VALUE) + + promptMsg = "%s Value (esc to cancel): " % configOption + isPrepopulated = self._config["features.config.prepopulateEditValues"] + newValue = popups.inputPrompt(promptMsg, initialValue if isPrepopulated else "") + + if newValue != None and newValue != initialValue: + try: + if selection.get(Field.TYPE) == "Boolean": + # if the value's a boolean then allow for 'true' and 'false' inputs + if newValue.lower() == "true": newValue = "1" + elif newValue.lower() == "false": newValue = "0" + elif selection.get(Field.TYPE) == "LineList": + # setOption accepts list inputs when there's multiple values + newValue = newValue.split(",") + + torTools.getConn().setOption(configOption, newValue) + + # resets the isDefault flag + customOptions = torConfig.getCustomOptions() + selection.fields[Field.IS_DEFAULT] = not configOption in customOptions + + self.redraw(True) + except Exception, exc: + popups.showMsg("%s (press any key)" % exc) + finally: + panel.CURSES_LOCK.release() elif key == ord('a') or key == ord('A'): self.showAll = not self.showAll self.redraw(True) diff --git a/src/cli/controller.py b/src/cli/controller.py index 3d40631..63b3b86 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -98,7 +98,6 @@ PAGES = [ CONFIG = {"log.torrc.readFailed": log.WARN, "features.graph.type": 1, - "features.config.prepopulateEditValues": True, "queries.refreshRate.rate": 5, "log.torEventTypeUnrecognized": log.NOTICE, "features.graph.bw.prepopulate": True, @@ -1101,62 +1100,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panel.CURSES_LOCK.release() panels["config"].redraw(True) - elif page == 2 and uiTools.isSelectionKey(key): - # let the user edit the configuration value, unchanged if left blank - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - - # provides prompt - selection = panels["config"].getSelection() - configOption = selection.get(configPanel.Field.OPTION) - titleMsg = "%s Value (esc to cancel): " % configOption - panels["control"].setMsg(titleMsg) - panels["control"].redraw(True) - - displayWidth = panels["control"].getPreferredSize()[1] - initialValue = selection.get(configPanel.Field.VALUE) - - # initial input for the text field - initialText = "" - if CONFIG["features.config.prepopulateEditValues"] and initialValue != "<none>": - initialText = initialValue - - newConfigValue = panels["control"].getstr(0, len(titleMsg), initialText) - - # it would be nice to quit on esc, but looks like this might not be possible... - if newConfigValue != None and newConfigValue != initialValue: - conn = torTools.getConn() - - # if the value's a boolean then allow for 'true' and 'false' inputs - if selection.get(configPanel.Field.TYPE) == "Boolean": - if newConfigValue.lower() == "true": newConfigValue = "1" - elif newConfigValue.lower() == "false": newConfigValue = "0" - - try: - if selection.get(configPanel.Field.TYPE) == "LineList": - newConfigValue = newConfigValue.split(",") - - conn.setOption(configOption, newConfigValue) - - # resets the isDefault flag - customOptions = torConfig.getCustomOptions() - selection.fields[configPanel.Field.IS_DEFAULT] = not configOption in customOptions - - panels["config"].redraw(True) - except Exception, exc: - errorMsg = "%s (press any key)" % exc - panels["control"].setMsg(uiTools.cropStr(errorMsg, displayWidth), curses.A_STANDOUT) - panels["control"].redraw(True) - - curses.cbreak() # wait indefinitely for key presses (no timeout) - stdscr.getch() - curses.halfdelay(REFRESH_RATE * 10) - - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - setPauseState(panels, isPaused, page) - finally: - panel.CURSES_LOCK.release() else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/popups.py b/src/cli/popups.py index 81b4589..2b02685 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -44,32 +44,33 @@ def finalize(): controller.refresh() panel.CURSES_LOCK.release() -def inputPrompt(msg): +def inputPrompt(msg, initialValue = ""): """ Prompts the user to enter a string on the control line (which usually displays the page number and basic controls). Arguments: - msg - message to prompt the user for input with + msg - message to prompt the user for input with + initialValue - initial value of the field """ panel.CURSES_LOCK.acquire() controlPanel = controller.getPanel("control") controlPanel.setMsg(msg) controlPanel.redraw(True) - userInput = controlPanel.getstr(0, len(msg)) + userInput = controlPanel.getstr(0, len(msg), initialValue) controlPanel.revertMsg() panel.CURSES_LOCK.release() return userInput -def showMsg(msg, maxWait, attr = curses.A_STANDOUT): +def showMsg(msg, maxWait = -1, attr = curses.A_STANDOUT): """ Displays a single line message on the control line for a set time. Pressing any key will end the message. Arguments: msg - message to be displayed to the user - maxWait - time to show the message + maxWait - time to show the message, indefinite if -1 attr - attributes with which to draw the message """ @@ -78,7 +79,8 @@ def showMsg(msg, maxWait, attr = curses.A_STANDOUT): controlPanel.setMsg(msg, attr) controlPanel.redraw(True) - curses.halfdelay(maxWait * 10) + if maxWait == -1: curses.cbreak() + else: curses.halfdelay(maxWait * 10) controller.getScreen().getch() controlPanel.revertMsg() curses.halfdelay(controller.REFRESH_RATE * 10)

1 0

[arm/master] fix: Never show conn details if panel's empty
by atagar＠torproject.org 10 May '11

10 May '11

commit ea8799aab65ad6509972ddebcdd0c3eb7f3e9769 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 9 19:14:28 2011 -0700 fix: Never show conn details if panel's empty The connection panel could get stuck in the 'show connection details' mode if the panel's contents became empty while we were showing something. This wouldn't crash (like with the issue addressed in the previous fix), but the panel title would be wrong. This reverts the 'show details' flag if we don't have any contents. --- src/cli/connections/connPanel.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 36687ac..8ecffc2 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -151,7 +151,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): if self._showDetails: pageHeight -= (DETAILS_HEIGHT + 1) isChanged = self._scroller.handleKey(key, self._entryLines, pageHeight) if isChanged: self.redraw(True) - elif uiTools.isSelectionKey(key) and self._entries: + elif uiTools.isSelectionKey(key): self._showDetails = not self._showDetails self.redraw(True) elif key == ord('s') or key == ord('S'): @@ -248,6 +248,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): def draw(self, width, height): self.valsLock.acquire() + # if we don't have any contents then refuse to show details + if not self._entries: self._showDetails = False + # extra line when showing the detail panel is for the bottom border detailPanelOffset = DETAILS_HEIGHT + 1 if self._showDetails else 0 isScrollbarVisible = len(self._entryLines) > height - detailPanelOffset - 1

1 0

[arm/master] fix: Config value changes weren't being reflected
by atagar＠torproject.org 10 May '11

10 May '11

commit 8e90af9c9eb4af4f3fa12d7f12c19279314d8b64 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 9 22:04:21 2011 -0700 fix: Config value changes weren't being reflected When a value was edited in the configuration panel the listed value didn't change (though it did in other places like the detail panel). This was due to a cached copy of the display element. Flushing this cache when editing values. --- src/cli/configPanel.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 37b7ddb..b6fba8b 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -293,6 +293,9 @@ class ConfigPanel(panel.Panel): torTools.getConn().setOption(configOption, newValue) + # forces the label to be remade with the new value + selection.labelCache = None + # resets the isDefault flag customOptions = torConfig.getCustomOptions() selection.fields[Field.IS_DEFAULT] = not configOption in customOptions

1 0

r24739: {website} move the anchors inside the div tags to match the right sect (website/trunk/donate/en)
by Andrew Lewman 10 May '11

10 May '11

Author: phobos Date: 2011-05-10 02:14:44 +0000 (Tue, 10 May 2011) New Revision: 24739 Modified: website/trunk/donate/en/donate.wml Log: move the anchors inside the div tags to match the right sections. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-05-10 02:09:51 UTC (rev 24738) +++ website/trunk/donate/en/donate.wml 2011-05-10 02:14:44 UTC (rev 24739) @@ -29,11 +29,11 @@ </ul></p> <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.</p>  - <a id="paypal"></a> - <a class="anchor" href="#paypal"> </a> <div class="title toptwenty">Tor Project Subscription via PayPal</div> <div class="left hundred"> <div class="paypal focus"> + <a id="paypal"></a> + <a class="anchor" href="#paypal"></a> <h4>Monthly Subscription to The Tor Project</h4> <table> <form id="subscribe" action="https://www.paypal.com/cgi-bin/webscr" method="post"> @@ -125,11 +125,11 @@ </div>   - <a id="amazon"></a> - <a class="anchor" href="#amazon"> </a> <div class="title topforty">Single Donation via Amazon Payments</div> <div class="hundred left"> <div class="paypal focus"> + <a id="amazon"></a> + <a class="anchor" href="#amazon"></a> <h4>Make a single donation.</h4> <form action="https://authorize.payments.amazon.com/pba/paypipeline" method="post"> <table> @@ -157,11 +157,11 @@ </div>   - <a id="google"></a> - <a class="anchor" href="#google"> </a> <div class="title topforty">Single Donation via Google Checkout</div> <div class="hundred left"> <div class="paypal focus"> + <a id="google"></a> + <a class="anchor" href="#google"></a> <h4>Make a single donation.</h4> <script type="text/javascript"> @@ -201,20 +201,20 @@ </div>   - <a id="givv"></a> - <a class="anchor" href="#givv"> </a> <div class="title topforty">Donate via Givv.org</div> <div class="hundred left"> + <a id="givv"></a> + <a class="anchor" href="#givv"></a> <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like. Automatic, one-click giving. You stay anonymous and stay in control! <strong><a href="http://givv.org/recipients/the-tor-project">Continue to Givv.org »</a></strong></p> </div>   - <a id="cash"></a> - <a class="anchor" href="#cash"> </a> <div class="title toptwenty">Donate via Check, Cash, or Money Order</div> <div class="left hundred"> + <a id="cash"></a> + <a class="anchor" href="#cash"></a> <p>You can send checks or money orders to:</p> <p>The Tor Project, Inc<br> 969 Main Street, Suite 206<br>

1 0

r24738: {} added new drawable graphics resource for errors (projects/android/trunk/Orbot/res/drawable)
by Nathan Freitas 10 May '11

10 May '11

Author: n8fr8 Date: 2011-05-10 02:09:51 +0000 (Tue, 10 May 2011) New Revision: 24738 Added: projects/android/trunk/Orbot/res/drawable/torerror.png Log: added new drawable graphics resource for errors Added: projects/android/trunk/Orbot/res/drawable/torerror.png =================================================================== (Binary files differ) Property changes on: projects/android/trunk/Orbot/res/drawable/torerror.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream

1 0

r24737: {projects} project file modifications (projects/android/trunk/Orbot)
by Nathan Freitas 10 May '11

10 May '11

Author: n8fr8 Date: 2011-05-10 02:08:50 +0000 (Tue, 10 May 2011) New Revision: 24737 Modified: projects/android/trunk/Orbot/AndroidManifest.xml projects/android/trunk/Orbot/BUILD projects/android/trunk/Orbot/CHANGELOG Log: project file modifications Modified: projects/android/trunk/Orbot/AndroidManifest.xml =================================================================== --- projects/android/trunk/Orbot/AndroidManifest.xml 2011-05-10 02:08:28 UTC (rev 24736) +++ projects/android/trunk/Orbot/AndroidManifest.xml 2011-05-10 02:08:50 UTC (rev 24737) @@ -1,6 +1,6 @@ <?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.2.22-orbot-alpha-1.0.5.20110503a-dev" android:versionCode="11"> + package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5" android:versionCode="11"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> @@ -46,9 +46,8 @@ <receiver android:name=".OnBootReceiver"> <intent-filter> - <action - android:name="android.intent.action.BOOT_COMPLETED" /> - <category android:name="android.intent.category.HOME" /> + <action android:name="android.intent.action.BOOT_COMPLETED" /> + <category android:name="android.intent.category.HOME" /> </intent-filter> </receiver> Modified: projects/android/trunk/Orbot/BUILD =================================================================== --- projects/android/trunk/Orbot/BUILD 2011-05-10 02:08:28 UTC (rev 24736) +++ projects/android/trunk/Orbot/BUILD 2011-05-10 02:08:50 UTC (rev 24737) @@ -73,7 +73,7 @@ cd ~/mydroid/external/libevent svn co https://levent.svn.sourceforge.net/svnroot/levent/tags/release-1.4.12-stabl… . - export LIBEVENTDIR=`pwd` + export LIBEVENTDIR=`cd $DROID_ROOT/external/libevent && pwd` ./autogen.sh # Put the contents of http://pastebin.ca/1577207 in /tmp/libevent-patch patch < /tmp/libevent-patch @@ -81,14 +81,14 @@ make Copy over the libevent library: - cp .libs/libevent.a ~/mydroid/out/target/product/generic/obj/lib + cp .libs/libevent.a $DROID_ROOT/out/target/product/generic/obj/lib Fetch and build Tor: - export OPENSSLDIR=`cd ~/mydroid/external/openssl/include/ && pwd` - export ZLIBDIR=`cd ~/mydroid/external/zlib && pwd` + export OPENSSLDIR=`cd $DROID_ROOT/external/openssl/include/ && pwd` + export ZLIBDIR=`cd $DROID_ROOT/external/zlib && pwd` - cd ~/mydroid/external/tor + cd $DROID_ROOT/external/tor git clone git://git.torproject.org/git/tor.git cd tor/ ./autogen.sh @@ -98,17 +98,16 @@ make At this point, you'll have a Tor binary that can be run on an Android handset. +You can verify the ARM binary was properly built using the following command: + +file src/or/tor + +You should see something like: +src/or/tor: ELF 32-bit LSB executable, ARM, version 1 (SYSV), dynamically linked (uses shared libs), not stripped + This isn't enough though and we'll now sew up the binary into a small package that will handle basic Tor controlling features. -We need to build our Java SOCKS library: - - # If you're in Orbot's directory already... - cd ../asocks/ - ant compile - ant jar - cp bin/jar/asocks.jar ../Orbot/libs - We need to get the TorControl library for Java: (see also https://svn.torproject.org/svn/torctl/trunk/doc/howto.txt) @@ -124,8 +123,8 @@ export APP_SDK=~/Documents/projects/android/android-sdk-linux_x86-1.5_r3/tools cd ../Orbot/ - cp ~/mydroid/external/privoxy/privoxy-3.0.12-stable/privoxy assets/privoxy - cp ~/mydroid/external/tor/tor/src/or/tor assets/tor + cp $DROID_ROOT/external/privoxy/privoxy-3.0.12-stable/privoxy assets/privoxy + cp $DROID_ROOT/external/tor/tor/src/or/tor assets/tor $APP_SDK/android update project --name Orbot --target 3 --path . ant release Modified: projects/android/trunk/Orbot/CHANGELOG =================================================================== --- projects/android/trunk/Orbot/CHANGELOG 2011-05-10 02:08:28 UTC (rev 24736) +++ projects/android/trunk/Orbot/CHANGELOG 2011-05-10 02:08:50 UTC (rev 24737) @@ -1,6 +1,8 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 1.0.5 +- fixed tor binary installation issue related to max resource size and compression +- updated "start on boot" code to test for proper launch event - updated to Tor 0.2.2.25-alpha binary - moved back to single notification bar id to avoid double entries - cleaned up progress dialog and alert handling to avoid leaky windows

1 0

r24736: {projects} updated torrc (projects/android/trunk/Orbot/res/raw)
by Nathan Freitas 10 May '11

10 May '11

Author: n8fr8 Date: 2011-05-10 02:08:28 +0000 (Tue, 10 May 2011) New Revision: 24736 Modified: projects/android/trunk/Orbot/res/raw/torrc Log: updated torrc Modified: projects/android/trunk/Orbot/res/raw/torrc =================================================================== --- projects/android/trunk/Orbot/res/raw/torrc 2011-05-10 02:08:16 UTC (rev 24735) +++ projects/android/trunk/Orbot/res/raw/torrc 2011-05-10 02:08:28 UTC (rev 24736) @@ -1,5 +1,4 @@ SocksPort 9050 -SocksListenAddress 127.0.0.1 SafeSocks 1 Log notice stdout ControlPort 9051

1 0

r24735: {projects} fixed onboot handling and updated transproxy (in projects/android/trunk/Orbot/src/org/torproject/android: . service)
by Nathan Freitas 10 May '11

10 May '11

Author: n8fr8 Date: 2011-05-10 02:08:16 +0000 (Tue, 10 May 2011) New Revision: 24735 Modified: projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java Log: fixed onboot handling and updated transproxy Modified: projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java 2011-05-10 01:43:30 UTC (rev 24734) +++ projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java 2011-05-10 02:08:16 UTC (rev 24735) @@ -1,5 +1,7 @@ package org.torproject.android; +import org.torproject.android.service.TorService; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -8,10 +10,18 @@ @Override public void onReceive(Context context, Intent intent) { - Intent serviceIntent = new Intent(); - serviceIntent.setAction("org.torproject.android.service.TorService"); - context.startService(serviceIntent); + if (intent.getAction() != null + && intent.getAction().equals("android.intent.action.BOOT_COMPLETED")) + { + //Phase 1: Launch a service + Intent service = new Intent(); + service.setAction("onboot"); + service.setClass(context, TorService.class); + context.startService(service); + } + + } Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2011-05-10 01:43:30 UTC (rev 24734) +++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2011-05-10 02:08:16 UTC (rev 24735) @@ -68,7 +68,6 @@ //if Tor binary is not running, then start the service up startService(new Intent(INTENT_TOR_SERVICE)); - bindService (); setTheme(android.R.style.Theme_Black_NoTitleBar); @@ -81,6 +80,9 @@ lblStatus.setOnLongClickListener(this); imgStatus = (ImageView)findViewById(R.id.imgStatus); imgStatus.setOnLongClickListener(this); + + + } /* @@ -248,13 +250,10 @@ protected void onPause() { super.onPause(); - if (progressDialog != null) - { - progressDialog.dismiss(); - progressDialog = null; - } - + hideProgressDialog(); + if (aDialog != null) + aDialog.dismiss(); } public void onSaveInstanceState(Bundle savedInstanceState) { @@ -333,6 +332,8 @@ protected void onResume() { super.onResume(); + bindService(); + updateStatus(""); if (getIntent() == null) @@ -423,7 +424,6 @@ updateStatus (""); - } /* (non-Javadoc) @@ -432,7 +432,7 @@ protected void onStop() { super.onStop(); - unbindService(); + //unbindService(); } @@ -478,13 +478,20 @@ } } + AlertDialog aDialog = null; + private void showAlert(String title, String msg, boolean button) { - AlertDialog aDialog = null; + try + { + if (aDialog != null && aDialog.isShowing()) + aDialog.dismiss(); + } + catch (Exception e){} //swallow any errors if (button) { - aDialog = new AlertDialog.Builder(this) + aDialog = new AlertDialog.Builder(this) .setIcon(R.drawable.icon) .setTitle(title) .setMessage(msg) @@ -520,13 +527,8 @@ { imgStatus.setImageResource(R.drawable.toron); - if (progressDialog != null) - { - progressDialog.dismiss(); - progressDialog = null; - } + hideProgressDialog(); - String lblMsg = getString(R.string.status_activated); //+ "\n" + torServiceMsg; @@ -571,11 +573,8 @@ { imgStatus.setImageResource(R.drawable.toroff); - if (progressDialog != null) - { - progressDialog.dismiss(); - progressDialog = null; - } + + hideProgressDialog(); lblStatus.setText(getString(R.string.status_shutting_down)); @@ -585,11 +584,8 @@ else { - if (progressDialog != null) - { - progressDialog.dismiss(); - progressDialog = null; - } + + hideProgressDialog(); imgStatus.setImageResource(R.drawable.toroff); lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start)); @@ -612,6 +608,8 @@ private void startTor () throws RemoteException { + bindService(); + mService.setProfile(TorServiceConstants.PROFILE_ON); //this means turn on imgStatus.setImageResource(R.drawable.torstarting); @@ -633,9 +631,7 @@ mHandler.sendMessage(msg); } - // stopService(new Intent(ITorService.class.getName())); - - + } /* @@ -655,8 +651,9 @@ else if (mService.getStatus() == STATUS_READY) { + createProgressDialog(getString(R.string.status_starting_up)); + startTor(); - } else { @@ -721,7 +718,6 @@ break; case TorServiceConstants.ENABLE_TOR_MSG: - createProgressDialog(getString(R.string.status_starting_up)); updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG)); @@ -737,17 +733,8 @@ } } - private synchronized void createProgressDialog (String msg) - { - if (progressDialog == null) - { - progressDialog = ProgressDialog.show(Orbot.this, "", msg); - - progressDialog.setCancelable(true); - } - - } + }; @@ -811,8 +798,6 @@ mIsBound = true; - - } private void unbindService () @@ -837,4 +822,25 @@ } } + private void createProgressDialog (String msg) + { + if (progressDialog != null && progressDialog.isShowing()) + return; + + progressDialog = ProgressDialog.show(Orbot.this, "", msg); + progressDialog.setCancelable(true); + + } + + private void hideProgressDialog () + { + + if (progressDialog != null && progressDialog.isShowing()) + { + progressDialog.dismiss(); + + } + + + } } Modified: projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java 2011-05-10 01:43:30 UTC (rev 24734) +++ projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java 2011-05-10 02:08:16 UTC (rev 24735) @@ -313,6 +313,49 @@ return code; } + public static int enableWifiHotspotRules (Context context) throws Exception + { + + boolean runRoot = true; + boolean waitFor = true; + + //redirectDNSResolvConf(); //not working yet + + String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); + + StringBuilder script = new StringBuilder(); + + StringBuilder res = new StringBuilder(); + int code = -1; + + script.append(ipTablesPath); + script.append(" -I FORWARD"); + script.append(" -m state --state ESTABLISHED,RELATED -j ACCEPT"); + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -I FORWARD"); + script.append(" -s 192.168.43.0/24 -j ACCEPT"); + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -P FORWARD DROP"); + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -t nat -I POSTROUTING -s 192.168.43.0/24 -j MASQUERADE"); + 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; + } + public static int setTransparentProxyingAll(Context context) throws Exception { boolean runRoot = true; @@ -329,6 +372,8 @@ purgeIptables(context); + //enableWifiHotspotRules(context); + int torUid = context.getApplicationInfo().uid; // Set up port redirection

1 0

[arm/master] fix: Selection crashed an empty connection panel
by atagar＠torproject.org 10 May '11

10 May '11

commit 9fbed0c32c88b534b79485748031996ec2b05946 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 9 18:55:58 2011 -0700 fix: Selection crashed an empty connection panel If there were no connection results, pressing enter on the connection page would crash arm. This isn't a commonly encountered use case, but could arise if you both lack permissions to query connections and don't have any circuits. Caught by asn (https://trac.torproject.org/projects/tor/ticket/3128) --- src/cli/connections/connPanel.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 4d89d5c..36687ac 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -151,7 +151,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): if self._showDetails: pageHeight -= (DETAILS_HEIGHT + 1) isChanged = self._scroller.handleKey(key, self._entryLines, pageHeight) if isChanged: self.redraw(True) - elif uiTools.isSelectionKey(key): + elif uiTools.isSelectionKey(key) and self._entries: self._showDetails = not self._showDetails self.redraw(True) elif key == ord('s') or key == ord('S'): @@ -256,7 +256,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): cursorSelection = self._scroller.getCursorSelection(self._entryLines) # draws the detail panel if currently displaying it - if self._showDetails: + if self._showDetails and cursorSelection: # This is a solid border unless the scrollbar is visible, in which case a # 'T' pipe connects the border to the bar. uiTools.drawBox(self, 0, 0, width, DETAILS_HEIGHT + 2)

1 0

[arm/master] Moving torrc reloading to torrc panel
by atagar＠torproject.org 10 May '11

10 May '11

commit f494a50901129123890e11d0ef07fb16d1eaa1de Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 9 18:48:07 2011 -0700 Moving torrc reloading to torrc panel --- src/cli/controller.py | 25 ------------------------- src/cli/torrcPanel.py | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 6f4b70d..3d40631 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -1157,31 +1157,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): setPauseState(panels, isPaused, page) finally: panel.CURSES_LOCK.release() - elif page == 3 and key == ord('r') or key == ord('R'): - # reloads torrc, providing a notice if successful or not - loadedTorrc = torConfig.getTorrc() - loadedTorrc.getLock().acquire() - - try: - loadedTorrc.load() - isSuccessful = True - except IOError: - isSuccessful = False - - loadedTorrc.getLock().release() - - #isSuccessful = panels["torrc"].loadConfig(logErrors = False) - #confTypeLabel = confPanel.CONFIG_LABELS[panels["torrc"].configType] - resetMsg = "torrc reloaded" if isSuccessful else "failed to reload torrc" - if isSuccessful: - panels["torrc"]._lastContentHeightArgs = None - panels["torrc"].redraw(True) - - panels["control"].setMsg(resetMsg, curses.A_STANDOUT) - panels["control"].redraw(True) - time.sleep(1) - - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/torrcPanel.py b/src/cli/torrcPanel.py index 5ca839f..75ddd1b 100644 --- a/src/cli/torrcPanel.py +++ b/src/cli/torrcPanel.py @@ -6,6 +6,8 @@ import math import curses import threading +import popups + from util import conf, enum, panel, torConfig, uiTools DEFAULT_CONFIG = {"features.config.file.showScrollbars": True, @@ -57,6 +59,19 @@ class TorrcPanel(panel.Panel): self.stripComments = not self.stripComments self._lastContentHeightArgs = None self.redraw(True) + elif key == ord('r') or key == ord('R'): + # reloads torrc, providing a notice if successful or not + try: + torConfig.getTorrc().load() + self._lastContentHeightArgs = None + self.redraw(True) + resultMsg = "torrc reloaded" + except IOError: + resultMsg = "failed to reload torrc" + + self._lastContentHeightArgs = None + self.redraw(True) + popups.showMsg(resultMsg, 1) else: isKeystrokeConsumed = False self.valsLock.release()

1 0