April 2014 - tor-commits - lists.torproject.org

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 09 Apr '14

09 Apr '14

commit d67c0c6428194a42bc58cb5132203ef2210afb25 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 9 17:15:11 2014 +0000 Update translations for gettor_completed --- pt/gettor.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt/gettor.po b/pt/gettor.po index e7929b3..7a2536c 100644 --- a/pt/gettor.po +++ b/pt/gettor.po @@ -5,14 +5,15 @@ # Translators: # SonhosDigitais <sonhosdigitais(a)gmx.com>, 2013 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 +# alfalb_mansil <manuela.silva(a)sky.com>, 2014 # Zeca Gatilho <paulo.mosh(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-07-09 14:30+0000\n" -"Last-Translator: SonhosDigitais <sonhosdigitais(a)gmx.com>\n" +"PO-Revision-Date: 2014-04-09 17:11+0000\n" +"Last-Translator: alfalb_mansil <manuela.silva(a)sky.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,7 +41,7 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "Apenas processamos pedidos de serviços de email que suportem \"DKIM\",\numa funcionalidade de email que nos permite verificar que o endereço \"De\" é realmente o de quem enviou o mail. " +msgstr "Nós só processamos os pedidos de serviços de e-mail que suportem \"DKIM\",\nque é uma função de e-mail que nos permite verificar que o endereço na linha \"De\", é realmente o de quem enviou o correio." #: lib/gettor/i18n.py:39 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 09 Apr '14

09 Apr '14

commit bae1b4859c2afdb9e1dbaa1844231008d67e732e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 9 17:15:07 2014 +0000 Update translations for gettor --- pt/gettor.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt/gettor.po b/pt/gettor.po index e7929b3..7a2536c 100644 --- a/pt/gettor.po +++ b/pt/gettor.po @@ -5,14 +5,15 @@ # Translators: # SonhosDigitais <sonhosdigitais(a)gmx.com>, 2013 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 +# alfalb_mansil <manuela.silva(a)sky.com>, 2014 # Zeca Gatilho <paulo.mosh(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-07-09 14:30+0000\n" -"Last-Translator: SonhosDigitais <sonhosdigitais(a)gmx.com>\n" +"PO-Revision-Date: 2014-04-09 17:11+0000\n" +"Last-Translator: alfalb_mansil <manuela.silva(a)sky.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,7 +41,7 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "Apenas processamos pedidos de serviços de email que suportem \"DKIM\",\numa funcionalidade de email que nos permite verificar que o endereço \"De\" é realmente o de quem enviou o mail. " +msgstr "Nós só processamos os pedidos de serviços de e-mail que suportem \"DKIM\",\nque é uma função de e-mail que nos permite verificar que o endereço na linha \"De\", é realmente o de quem enviou o correio." #: lib/gettor/i18n.py:39 msgid ""

1 0

[tor/master] Demote "we stalled too much while trying to write" message to INFO
by nickm＠torproject.org 09 Apr '14

09 Apr '14

commit a7904543689917d0087ea47ad3d3c1631cdd2bde Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 9 11:34:00 2014 -0400 Demote "we stalled too much while trying to write" message to INFO Resolves ticket 5286. --- changes/bug5286 | 4 ++++ src/or/main.c | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/changes/bug5286 b/changes/bug5286 new file mode 100644 index 0000000..de02a9a --- /dev/null +++ b/changes/bug5286 @@ -0,0 +1,4 @@ + o Minor features: + - Demote the message that we give when a flushing connection times + out for too long from NOTICE to INFO. It was usually meaningless. + Resolves ticket 5286. diff --git a/src/or/main.c b/src/or/main.c index 86f3437..c6619fe 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -919,16 +919,7 @@ conn_close_if_marked(int i) return 0; } if (connection_wants_to_flush(conn)) { - int severity; - if (conn->type == CONN_TYPE_EXIT || - (conn->type == CONN_TYPE_OR && server_mode(get_options())) || - (conn->type == CONN_TYPE_DIR && conn->purpose == DIR_PURPOSE_SERVER)) - severity = LOG_INFO; - else - severity = LOG_NOTICE; - /* XXXX Maybe allow this to happen a certain amount per hour; it usually - * is meaningless. */ - log_fn(severity, LD_NET, "We stalled too much while trying to write %d " + log_fn(LOG_INFO, LD_NET, "We stalled too much while trying to write %d " "bytes to address %s. If this happens a lot, either " "something is wrong with your network connection, or " "something is wrong with theirs. "

1 0

[tor/master] Fix a dumb C bug in the unit tests for 9841
by nickm＠torproject.org 09 Apr '14

09 Apr '14

commit 2f73525883373df17a7e11a8feae28f7558fe62e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 9 09:20:25 2014 -0400 Fix a dumb C bug in the unit tests for 9841 Fixes bug 11460; bug only affects unit tests and is not in any released version of Tor. --- src/test/test_circuitlist.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index 54c0c03..53cd415 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -177,7 +177,10 @@ test_rend_token_maps(void *arg) c3 = or_circuit_new(0, NULL); c4 = or_circuit_new(0, NULL); - tt_int_op(strlen((char*)tok1), ==, REND_TOKEN_LEN); + /* Make sure we really filled up the tok* variables */ + tt_int_op(tok1[REND_TOKEN_LEN-1], ==, 'y'); + tt_int_op(tok2[REND_TOKEN_LEN-1], ==, ' '); + tt_int_op(tok3[REND_TOKEN_LEN-1], ==, '.'); /* No maps; nothing there. */ tt_ptr_op(NULL, ==, circuit_get_rendezvous(tok1));

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 09 Apr '14

09 Apr '14

commit d927d577ed354513b9eda198c7255d3be231acfe Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 9 13:15:35 2014 +0000 Update translations for tor-launcher-properties_completed --- fr/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index 807e901..d113f54 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identité incorrecte torlauncher.bootstrapWarning.timeout=temps de connexion expiré torlauncher.bootstrapWarning.noroute=pas de route vers l'hôte torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture +torlauncher.bootstrapWarning.pt_missing=un transport câblé est manquant

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 09 Apr '14

09 Apr '14

commit 3045228097d35f5c4d0b74bac0d4d100bec5df04 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 9 13:15:32 2014 +0000 Update translations for tor-launcher-properties --- fr/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index 5686ddc..d113f54 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=identité incorrecte torlauncher.bootstrapWarning.timeout=temps de connexion expiré torlauncher.bootstrapWarning.noroute=pas de route vers l'hôte torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=un transport câblé est manquant

1 0

[orbot/master] updates to optimize resource memory usage
by n8fr8＠torproject.org 09 Apr '14

09 Apr '14

commit 227253de767deb2795411bd6e20145f584eb5c6f Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Apr 9 09:10:23 2014 -0400 updates to optimize resource memory usage --- res/drawable/onion.png | Bin 77446 -> 12877 bytes res/drawable/onionrootonly.png | Bin 97350 -> 99659 bytes res/drawable/onionrootonlygold.png | Bin 97365 -> 101250 bytes res/drawable/onionrootonlygrey.png | Bin 97377 -> 86099 bytes res/drawable/onionroots.png | Bin 91020 -> 28072 bytes res/drawable/toron.png | Bin 93076 -> 155580 bytes res/layout-land/layout_main.xml | 2 +- res/menu/main.xml | 3 ++- 8 files changed, 3 insertions(+), 2 deletions(-) diff --git a/res/drawable/onion.png b/res/drawable/onion.png index cf7cd50..2285819 100644 Binary files a/res/drawable/onion.png and b/res/drawable/onion.png differ diff --git a/res/drawable/onionrootonly.png b/res/drawable/onionrootonly.png index dcd4116..48f3cce 100644 Binary files a/res/drawable/onionrootonly.png and b/res/drawable/onionrootonly.png differ diff --git a/res/drawable/onionrootonlygold.png b/res/drawable/onionrootonlygold.png index 8f80ece..c90f65c 100644 Binary files a/res/drawable/onionrootonlygold.png and b/res/drawable/onionrootonlygold.png differ diff --git a/res/drawable/onionrootonlygrey.png b/res/drawable/onionrootonlygrey.png index 9f89a06..d7a213c 100644 Binary files a/res/drawable/onionrootonlygrey.png and b/res/drawable/onionrootonlygrey.png differ diff --git a/res/drawable/onionroots.png b/res/drawable/onionroots.png index 10f6327..e069eb9 100644 Binary files a/res/drawable/onionroots.png and b/res/drawable/onionroots.png differ diff --git a/res/drawable/toron.png b/res/drawable/toron.png index 2a0fc65..09257b1 100644 Binary files a/res/drawable/toron.png and b/res/drawable/toron.png differ diff --git a/res/layout-land/layout_main.xml b/res/layout-land/layout_main.xml index b424327..38cf619 100644 --- a/res/layout-land/layout_main.xml +++ b/res/layout-land/layout_main.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/viewMain" - + android:background="@drawable/onionrootonlygrey" android:paddingTop="0sp">  </menu> </item>

1 0

[orbot/master] ensure appmgr doesn't fail on loading apps
by n8fr8＠torproject.org 09 Apr '14

09 Apr '14

commit 8445f2e55dc01762f03cc4f0349412c039e32ce4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Apr 9 09:10:56 2014 -0400 ensure appmgr doesn't fail on loading apps also don't load icons to improve memory usage --- .../torproject/android/settings/AppManager.java | 21 ++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index 7121e5e..6e2b90b 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -113,8 +113,11 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC final TorifiedApp app = mApps.get(position); - - entry.icon.setImageDrawable(app.getIcon()); + if (app.getIcon() != null) + entry.icon.setImageDrawable(app.getIcon()); + else + entry.icon.setVisibility(View.GONE); + entry.text.setText(app.getName()); final CheckBox box = entry.box; @@ -227,8 +230,18 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC app.setUid(aInfo.uid); app.setUsername(pMgr.getNameForUid(app.getUid())); app.setProcname(aInfo.processName); - app.setName(pMgr.getApplicationLabel(aInfo).toString()); - app.setIcon(pMgr.getApplicationIcon(aInfo)); + + try + { + app.setName(pMgr.getApplicationLabel(aInfo).toString()); + } + catch (Exception e) + { + app.setName(aInfo.packageName); + } + + + //app.setIcon(pMgr.getApplicationIcon(aInfo)); // check if this application is allowed if (Arrays.binarySearch(tordApps, app.getUsername()) >= 0) {

1 0

[orbot/master] remove "persistant" flag, as its only for system apps
by n8fr8＠torproject.org 09 Apr '14

09 Apr '14

commit af95098ae816eb412c053f4a2e9bfe7b3789a836 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Apr 9 09:12:32 2014 -0400 remove "persistant" flag, as its only for system apps --- AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a9afaba..77a18bf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,7 +19,6 @@ android:label="@string/app_name" android:configChanges="locale|orientation|screenSize" android:theme="@style/Theme.AppCompat" - android:persistent="true" android:allowBackup="false" android:allowClearUserData="true" >

1 0

[orbot/master] improved logging and exit code reporting for transproxy
by n8fr8＠torproject.org 09 Apr '14

09 Apr '14

commit 831a52a7e9b302b87a570ee564af0c22fa79e586 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Apr 9 09:12:00 2014 -0400 improved logging and exit code reporting for transproxy --- src/org/torproject/android/service/TorService.java | 20 +++- .../torproject/android/service/TorTransProxy.java | 104 ++++++++++++-------- 2 files changed, 78 insertions(+), 46 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 9382fe2..1d2c727 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -273,16 +273,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst appBinHome = getDir(DIRECTORY_TOR_BINARY,Application.MODE_PRIVATE); appCacheHome = getDir(DIRECTORY_TOR_DATA,Application.MODE_PRIVATE); - - + IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); - mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - - if (intent != null && intent.getAction()!=null && intent.getAction().equals("onboot")) { @@ -293,6 +289,20 @@ public class TorService extends Service implements TorServiceConstants, TorConst setTorProfile(PROFILE_ON); } } + else if (intent == null) + { + try { + initBinaries(); + findExistingProc () ; + + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + + } // We want this service to continue running until it is explicitly // stopped, so return sticky. diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 5438d16..b813ac8 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -1,7 +1,9 @@ package org.torproject.android.service; import java.io.File; +import java.io.IOException; import java.util.ArrayList; +import java.util.concurrent.TimeoutException; import org.sufficientlysecure.rootcommands.Shell; import org.sufficientlysecure.rootcommands.command.SimpleCommand; @@ -286,6 +288,7 @@ public class TorTransProxy implements TorServiceConstants { //reset script Shell shell = Shell.startRootShell(); + int lastExit = -1; //build up array of shell cmds to execute under one root context for (TorifiedApp tApp:apps) @@ -312,7 +315,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j REDIRECT --to-ports "); script.append(TOR_TRANSPROXY_PORT); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); // Same for DNS @@ -326,9 +329,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; for (int port : ports) @@ -345,8 +349,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(port); script.append(" -j ACCEPT"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); + } @@ -360,8 +365,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -o lo"); script.append(" -j ACCEPT"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); + // Reject all other outbound TCP packets script.append(ipTablesPath); @@ -373,9 +379,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); + // Reject all other outbound UDP packets script.append(ipTablesPath); script.append(" -t filter"); @@ -386,7 +393,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); - shell.add(new SimpleCommand(script.toString())); + lastExit = executeCommand (shell, script.toString()); + script = new StringBuilder(); + } } @@ -395,9 +404,19 @@ public class TorTransProxy implements TorServiceConstants { shell.close(); - return 1; + return lastExit; } + private int executeCommand (Shell shell, String cmdString) throws IOException, TimeoutException + { + SimpleCommand cmd = new SimpleCommand(cmdString); + shell.add(cmd); + cmd.waitForFinish(); + logMessage(cmdString + "; exit=" + cmd.getExitCode() + ";output=" + cmd.getOutput()); + + return cmd.getExitCode(); + } + public int enableTetheringRules (Context context) throws Exception { @@ -410,6 +429,8 @@ public class TorTransProxy implements TorServiceConstants { Shell shell = Shell.startRootShell(); + int lastExit = -1; + for (int i = 0; i < hwinterfaces.length; i++) { @@ -420,7 +441,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -p udp --dport 53 -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); + script = new StringBuilder(); + script = new StringBuilder(); script.append(ipTablesPath); @@ -429,22 +452,22 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -p tcp -j REDIRECT --to-ports "); script.append(TOR_TRANSPROXY_PORT); - shell.add(new SimpleCommand(script.toString())); + lastExit = executeCommand (shell, script.toString()); + script = new StringBuilder(); + } shell.close(); - return 0; + return lastExit; } private void logMessage (String msg) { if (mTorService != null) mTorService.logMessage(msg); - else - Log.w(TorConstants.TAG,msg); } public int clearTransparentProxyingAll(Context context) throws Exception @@ -463,7 +486,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -t nat"); script.append(" -F ").append(chainName); //delete previous user-defined chain - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); + script = new StringBuilder(); + script = new StringBuilder(); @@ -471,15 +496,11 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -t filter"); script.append(" -F ").append(chainName); //delete previous user-defined chain - SimpleCommand cmd = new SimpleCommand(script.toString()); - - shell.add(cmd); - - int exitCode = cmd.getExitCode(); - + int lastExit = executeCommand (shell, script.toString()); + shell.close(); - return exitCode; + return lastExit; } public int fixTransproxyLeak (Context context) throws Exception @@ -491,16 +512,20 @@ public class TorTransProxy implements TorServiceConstants { StringBuilder script = new StringBuilder(); script.append(ipTablesPath); script.append(" -I OUTPUT ! -o lo ! -d 127.0.0.1 ! -s 127.0.0.1 -p tcp -m tcp --tcp-flags ACK,FIN ACK,FIN -j DROP"); - shell.add(new SimpleCommand(script.toString())); + + executeCommand (shell, script.toString()); + script = new StringBuilder(); script = new StringBuilder(); script.append(ipTablesPath); script.append(" -I OUTPUT ! -o lo ! -d 127.0.0.1 ! -s 127.0.0.1 -p tcp -m tcp --tcp-flags ACK,RST ACK,RST -j DROP"); - shell.add(new SimpleCommand(script.toString())); + + int lastExit = executeCommand (shell, script.toString()); + script = new StringBuilder(); shell.close(); - return 1; + return lastExit; } @@ -528,9 +553,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(torUid); script.append(" -j ACCEPT"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); + // Set up port redirection script.append(ipTablesPath); script.append(" -t nat"); @@ -543,7 +569,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j REDIRECT --to-ports "); script.append(TOR_TRANSPROXY_PORT); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); // Same for DNS @@ -559,9 +585,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); - + /** int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; @@ -591,9 +617,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -o lo"); script.append(" -j ACCEPT"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); - + if (TorService.ENABLE_DEBUG_LOG) { @@ -608,9 +634,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" --log-prefix='ORBOT_DNSLEAK_PROTECTION'"); script.append(" --log-uid"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); - + script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A ").append(srcChainName); @@ -619,9 +645,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" --log-prefix='ORBOT_TCPLEAK_PROTECTION'"); script.append(" --log-uid"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); - + } // Reject all other outbound TCP packets @@ -634,9 +660,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); - shell.add(new SimpleCommand(script.toString())); + executeCommand (shell, script.toString()); script = new StringBuilder(); - + // Reject all other outbound UDP packets script.append(ipTablesPath); script.append(" -t filter"); @@ -647,16 +673,12 @@ public class TorTransProxy implements TorServiceConstants { script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); - SimpleCommand cmd = new SimpleCommand(script.toString()); - shell.add(cmd); + int lastExit = executeCommand (shell, script.toString()); fixTransproxyLeak (context); - - int exitCode = cmd.getExitCode(); - shell.close(); - return exitCode; + return lastExit; }

1 0