tor-commits April 2015

tor-commits@lists.torproject.org

19 participants
1110 discussions

[orbot/master] update resource installer to handle different architecture
by n8fr8＠torproject.org 13 Apr '15

13 Apr '15

commit 4ab18548482ffd217f575e88b2a43087e55bdf67 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Apr 11 21:16:41 2015 -0400 update resource installer to handle different architecture --- .../android/service/TorResourceInstaller.java | 39 ++++++++++++-------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java index 139da02..3d99225 100644 --- a/src/org/torproject/android/service/TorResourceInstaller.java +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -26,6 +26,7 @@ import org.torproject.android.OrbotConstants; import org.torproject.android.R; import android.content.Context; +import android.os.Build; import android.util.Log; public class TorResourceInstaller implements TorServiceConstants { @@ -86,33 +87,41 @@ public class TorResourceInstaller implements TorServiceConstants { shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); streamToFile(is,outFile, false, false); + String cpuPath = null; - is = context.getResources().openRawResource(R.raw.tor); + //only install if ARM (GoLang only supports ARM for now) + if (Build.CPU_ABI.contains("arm")) + { + is = context.getResources().openRawResource(R.raw.obfs4proxy); + outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY); + shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); + streamToFile(is,outFile, false, true); + + is = context.getResources().openRawResource(R.raw.meek); + outFile = new File(installFolder, MEEK_ASSET_KEY); + shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); + streamToFile(is,outFile, false, true); + + cpuPath = "armeabi"; + } + else if (Build.CPU_ABI.contains("x86")) + cpuPath = "x86"; + + is = context.getAssets().open(cpuPath + "/tor.mp3"); outFile = new File(installFolder, TOR_ASSET_KEY); shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); streamToFile(is,outFile, false, true); - is = context.getResources().openRawResource(R.raw.polipo); + is = context.getAssets().open(cpuPath + "/polipo.mp3"); outFile = new File(installFolder, POLIPO_ASSET_KEY); shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); streamToFile(is,outFile, false, true); - is = context.getResources().openRawResource(R.raw.obfs4proxy); - outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY); - shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); - streamToFile(is,outFile, false, true); - - - is = context.getResources().openRawResource(R.raw.meek); - outFile = new File(installFolder, MEEK_ASSET_KEY); - shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); - streamToFile(is,outFile, false, true); - - is = context.getResources().openRawResource(R.raw.xtables); + is = context.getAssets().open(cpuPath + "/xtables.mp3"); outFile = new File(installFolder, IPTABLES_ASSET_KEY); shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); streamToFile(is,outFile, false, true); - + return true; }

1 0

[orbot/master] support variable arch builds to support x86
by n8fr8＠torproject.org 13 Apr '15

13 Apr '15

commit e7a7d8c7cd91e46768077e92580c030b7501496c Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Apr 11 21:16:20 2015 -0400 support variable arch builds to support x86 move asset builds to /assets folder --- external/Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/external/Makefile b/external/Makefile index befa030..5b13fb5 100644 --- a/external/Makefile +++ b/external/Makefile @@ -23,11 +23,11 @@ endif # Android NDK setup NDK_BASE ?= /opt/android-ndk -NDK_PLATFORM_LEVEL ?= 19 +NDK_PLATFORM_LEVEL ?= 16 NDK_ABI ?= arm NDK_TOOLCHAIN_VERSION=4.8 -NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) APP_ABI ?= armeabi +NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') ifeq ($(NDK_ABI),x86) HOST = i686-linux-android @@ -223,6 +223,7 @@ polipo: polipo-build-stamp cp polipo/polipo bin polipo-clean: + $(MAKE) -C polipo clean -rm -f polipo/polipo -rm -f bin/polipo -rm -f polipo-build-stamp @@ -256,18 +257,18 @@ jtorctl-clean: assets: tor polipo jtorctl iptables install -d ../libs install bin/jtorctl.jar ../libs - install -d ../res/raw + install -d ../assets/$(APP_ABI) -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/polipo - -zip ../res/raw/polipo.mp3 bin/polipo + -zip ../assets/$(APP_ABI)/polipo.mp3 bin/polipo -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/tor - -zip ../res/raw/tor.mp3 bin/tor + -zip ../assets/$(APP_ABI)/tor.mp3 bin/tor -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/xtables - -zip ../res/raw/xtables.mp3 bin/xtables + -zip ../assets/$(APP_ABI)/xtables.mp3 bin/xtables assets-clean: - -rm ../res/raw/polipo.mp3 - -rm ../res/raw/tor.mp3 - -rm ../res/raw/xtables.mp3 + -rm ../assets/$(APP_ABI)/polipo.mp3 + -rm ../assets/$(APP_ABI)/tor.mp3 + -rm ../assets/$(APP_ABI)/xtables.mp3 -rm ../libs/jtorctl.jar #------------------------------------------------------------------------------#

1 0

[orbot/master] support building tun2socks for x86
by n8fr8＠torproject.org 13 Apr '15

13 Apr '15

commit 74deb39c292e20bb34a3b849160ea20c4405b75a Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Apr 11 21:16:03 2015 -0400 support building tun2socks for x86 --- jni/Application.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/Application.mk b/jni/Application.mk index d4d6c44..980a0d4 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,3 +1,3 @@ APP_OPTIM := release -APP_ABI := armeabi armeabi-v7a +APP_ABI := armeabi armeabi-v7a x86 APP_PLATFORM := android-14

1 0

[orbot/master] Small VPN and socket monitoring related fixes
by n8fr8＠torproject.org 13 Apr '15

13 Apr '15

commit 933b2e9b4ec4dd3d683953d2c5a7caba93f3effc Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 10 22:29:13 2015 -0400 Small VPN and socket monitoring related fixes --- src/org/torproject/android/service/TorService.java | 24 +++----- .../torproject/android/vpn/OrbotVpnService.java | 61 ++++++++++++++++++-- 2 files changed, 64 insertions(+), 21 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 3e7edc6..e26dca2 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -727,7 +727,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon extraLines.append("AutomapHostsOnResolve 1").append('\n'); extraLines.append("DisableNetwork 0").append('\n'); - + //.extraLines.append("CircuitStreamTimeout 60").append('\n'); processSettingsImpl(extraLines); @@ -974,7 +974,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return true; } - private boolean runTorShellCmd(Shell shell) throws Exception + private boolean runTorShellCmd(final Shell shell) throws Exception { String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getCanonicalPath(); @@ -1005,18 +1005,16 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon shellTorCommand = new SimpleCommand(torCmdString); shell.add(shellTorCommand).waitForFinish(); - exitCode = shellTorCommand.getExitCode(); output = shellTorCommand.getOutput(); - if (exitCode != 0 && output != null && output.length() > 0) { logNotice("Tor (" + exitCode + "): " + output); //throw new Exception ("unable to start"); return false; } - + //now try to connect mLastProcessId = initControlConnection (100,false); @@ -1031,7 +1029,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { logNotice("Tor started; process id=" + mLastProcessId); - } @@ -1749,7 +1746,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Proxy proxy = null; - if (mUseVPN) + if (!mUseVPN) //if not on the VPN then we should proxy { proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 8118)); conn = new URL(ONIONOO_BASE_URL + mNode.id).openConnection(proxy); @@ -2211,13 +2208,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (mUseVPN) //set the proxy here if we aren't using a bridge { + /* if (!mIsLollipop) { String proxyType = "socks5"; String proxyHost = "127.0.0.1"; extraLines.append(proxyType + "Proxy" + ' ' + proxyHost + ':' + mVpnProxyPort).append('\n'); }; - + */ } else { @@ -2294,14 +2292,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } - /** - extraLines.append("Bridge obfs3 192.36.31.74:35870 FEB63CA5EBD805C42DC0E5FBDDE82F3B1CDD80B4\n"); - extraLines.append("Bridge obfs3 131.72.136.85:52447 1AC601EA50397948DD5FB5B453922EB8A69A5EF6\n"); - extraLines.append("Bridge obfs3 192.36.31.76:33439 54C59DF0FCEE2D08F789CA04E5B57519071C232B\n"); - */ - - // extraLines.append("Bridge obfs4 54.66.226.196:18965 95151988DC29FCCB4F610A1C700A1DDF7D5FFBD4 cert=3wYo19iAMNbfO7snEeqVBmsIat+RMmMDV5BV4jDvXuz9BaACXt7XffC8Dz8J1MUvLKHKaQ iat-mode=0\n"); - } else { @@ -2617,5 +2607,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon // TODO Auto-generated method stub return null; } + + } diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index bc06f43..4c214ed 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -16,7 +16,6 @@ package org.torproject.android.vpn; -import java.io.IOException; import java.net.InetAddress; import java.util.Locale; @@ -86,7 +85,9 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { } if (!isLollipop) + { startSocksBypass(); + } setupTun2Socks(); } @@ -114,8 +115,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { return START_STICKY; } - - + private void startSocksBypass() { @@ -183,7 +183,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { Tun2Socks.Stop(); - stopSocksBypass (); + //stopSocksBypass (); if (mInterface != null){ try @@ -203,6 +203,9 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { Log.d(TAG,"error stopping tun2socks",e); } } + + mThreadVPN = null; + } @Override @@ -310,5 +313,53 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { super.onRevoke(); } - + /* + private void monitorSocketsFD () + { + + final String fdPath = "/proc/self/fd/"; + + new Thread () + { + public void run () + { + while (mThreadVPN != null) + { + try { + Thread.sleep(500); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + try + { + + File fileDir = new File(fdPath); + File[] files = fileDir.listFiles(); + if (files != null) + for (File file : files) + { + String cPath = file.getCanonicalPath(); + + if (cPath.contains("socket")) + { + Log.d(TAG,"found FD for socket: " + file.getAbsolutePath()); + + protect(Integer.parseInt(file.getName())); + + } + + } + } + catch (Exception e) + { + Log.e(TAG,"error getting fd: " + fdPath,e); + } + } + } + }.start(); + + } + */ }

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit f71a7aa593e802873398e26a81a40387db840366 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 14:45:46 2015 +0000 Update translations for tor-launcher-network-settings_completed --- zh_CN/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 7162b0f..221b05d 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -47,7 +47,7 @@ <!ENTITY torsettings.useBridges.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> -<!ENTITY torsettings.useBridges.placeholder "输入 address:port"> +<!ENTITY torsettings.useBridges.placeholder "输入地址:端口"> <!ENTITY torsettings.copyLog "点击复制 Tor 日志"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit eb2fad8baa2c5222d36c96780d07f779ced730d3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 14:45:41 2015 +0000 Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 7162b0f..221b05d 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -47,7 +47,7 @@ <!ENTITY torsettings.useBridges.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> -<!ENTITY torsettings.useBridges.placeholder "输入 address:port"> +<!ENTITY torsettings.useBridges.placeholder "输入地址:端口"> <!ENTITY torsettings.copyLog "点击复制 Tor 日志"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助">

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit 7ae0aa082f690844746ee60713764343d099fdfd Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 14:45:32 2015 +0000 Update translations for mat-gui --- ku_IQ.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ku_IQ.po b/ku_IQ.po index f613e23..8e2894f 100644 --- a/ku_IQ.po +++ b/ku_IQ.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-04-12 02:10+0000\n" +"PO-Revision-Date: 2015-04-12 14:16+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/torproject/language/ku_IQ/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit 5b269e13bb0a3cd5b9b46dd815da13e4ec1dc29f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 14:45:04 2015 +0000 Update translations for bridgedb --- ku_IQ/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ku_IQ/LC_MESSAGES/bridgedb.po b/ku_IQ/LC_MESSAGES/bridgedb.po index 1d1b337..12bb806 100644 --- a/ku_IQ/LC_MESSAGES/bridgedb.po +++ b/ku_IQ/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-04-12 02:10+0000\n" +"PO-Revision-Date: 2015-04-12 14:15+0000\n" "Last-Translator: Haval Abdulkarim <haval.abdulkarim(a)gmail.com>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/torproject/language/ku_IQ/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit 32f570943772a37ac2941893bbf90cdc59c88111 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 14:16:19 2015 +0000 Update translations for tails-misc --- ku_IQ.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ku_IQ.po b/ku_IQ.po index 26082c9..55f6623 100644 --- a/ku_IQ.po +++ b/ku_IQ.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-03-30 16:51+0200\n" -"PO-Revision-Date: 2015-04-12 02:10+0000\n" +"PO-Revision-Date: 2015-04-12 14:16+0000\n" "Last-Translator: Haval Abdulkarim <haval.abdulkarim(a)gmail.com>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/torproject/language/ku_IQ/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit a104e06b0ba18972a4a898717bc0734c39ef631b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 14:15:41 2015 +0000 Update translations for tails-persistence-setup --- ku_IQ/ku_IQ.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ku_IQ/ku_IQ.po b/ku_IQ/ku_IQ.po index b29113b..c0dd4c2 100644 --- a/ku_IQ/ku_IQ.po +++ b/ku_IQ/ku_IQ.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-04-12 02:10+0000\n" +"PO-Revision-Date: 2015-04-12 14:15+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/torproject/language/ku_IQ/)\n" "MIME-Version: 1.0\n"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2015