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

[tor-ramdisk/master] TODO: add note about IPv6, menu changes, screen locking.
by blueness＠torproject.org 14 Apr '15

14 Apr '15

commit 86e21444df111550814521c8465edf7f11591ab9 Author: Anthony G. Basile <blueness(a)gentoo.org> Date: Mon Apr 13 20:06:53 2015 -0400 TODO: add note about IPv6, menu changes, screen locking. --- TODO | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/TODO b/TODO index c108671..718f861 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,9 @@ +2015-04-13 + + * Add IPv6 support. + * Merge resource and entropy menu options. + * Add screen locking with passowrd. + 2015-01-14 * Add a version/information menu item which gives info

1 0

[obfs4/master] Add routines for querying the log module state.
by yawning＠torproject.org 13 Apr '15

13 Apr '15

commit 8996cb2646f2721b2d86f5f6b54b5c21d2acc71d Author: Yawning Angel <yawning(a)torproject.org> Date: Mon Apr 13 21:21:12 2015 +0000 Add routines for querying the log module state. Unless you have very good reason to do so, there should be no reason to actually call these ever, since the log messages are only generated if they will result in output being written to a log file. --- common/log/log.go | 50 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/common/log/log.go b/common/log/log.go index 5d0a146..f29b33b 100644 --- a/common/log/log.go +++ b/common/log/log.go @@ -41,13 +41,20 @@ import ( const ( elidedAddr = "[scrubbed]" - levelError = iota - levelWarn - levelInfo - levelDebug + // LevelError is the ERROR log level (NOTICE/ERROR). + LevelError = iota + + // LevelWarn is the WARN log level, (NOTICE/ERROR/WARN). + LevelWarn + + // LevelInfo is the INFO log level, (NOTICE/ERROR/WARN/INFO). + LevelInfo + + // LevelDebug is the DEBUG log level, (NOTICE/ERROR/WARN/INFO/DEBUG). + LevelDebug ) -var logLevel = levelInfo +var logLevel = LevelInfo var enableLogging bool var unsafeLogging bool @@ -66,18 +73,34 @@ func Init(enable bool, logFilePath string, unsafe bool) error { return nil } +// Enabled returns if logging is enabled. +func Enabled() bool { + return enableLogging +} + +// Unsafe returns if unsafe logging is allowed (the caller MAY skip eliding +// addresses and other bits of sensitive information). +func Unsafe() bool { + return unsafeLogging +} + +// Level returns the current log level. +func Level() int { + return logLevel +} + // SetLogLevel sets the log level to the value indicated by the given string // (case-insensitive). func SetLogLevel(logLevelStr string) error { switch strings.ToUpper(logLevelStr) { case "ERROR": - logLevel = levelError + logLevel = LevelError case "WARN": - logLevel = levelWarn + logLevel = LevelWarn case "INFO": - logLevel = levelInfo + logLevel = LevelInfo case "DEBUG": - logLevel = levelDebug + logLevel = LevelDebug default: return fmt.Errorf("invalid log level '%s'", logLevelStr) } @@ -85,6 +108,7 @@ func SetLogLevel(logLevelStr string) error { } // Noticef logs the given format string/arguments at the NOTICE log level. +// Unless logging is disabled, Noticef logs are always emitted. func Noticef(format string, a ...interface{}) { if enableLogging { msg := fmt.Sprintf(format, a...) @@ -94,7 +118,7 @@ func Noticef(format string, a ...interface{}) { // Errorf logs the given format string/arguments at the ERROR log level. func Errorf(format string, a ...interface{}) { - if enableLogging && logLevel >= levelError { + if enableLogging && logLevel >= LevelError { msg := fmt.Sprintf(format, a...) log.Print("[ERROR]: " + msg) } @@ -102,7 +126,7 @@ func Errorf(format string, a ...interface{}) { // Warnf logs the given format string/arguments at the WARN log level. func Warnf(format string, a ...interface{}) { - if enableLogging && logLevel >= levelWarn { + if enableLogging && logLevel >= LevelWarn { msg := fmt.Sprintf(format, a...) log.Print("[WARN]: " + msg) } @@ -110,7 +134,7 @@ func Warnf(format string, a ...interface{}) { // Infof logs the given format string/arguments at the INFO log level. func Infof(format string, a ...interface{}) { - if enableLogging && logLevel >= levelInfo { + if enableLogging && logLevel >= LevelInfo { msg := fmt.Sprintf(format, a...) log.Print("[INFO]: " + msg) } @@ -118,7 +142,7 @@ func Infof(format string, a ...interface{}) { // Debugf logs the given format string/arguments at the INFO log level. func Debugf(format string, a ...interface{}) { - if enableLogging && logLevel >= levelDebug { + if enableLogging && logLevel >= LevelDebug { msg := fmt.Sprintf(format, a...) log.Print("[DEBUG]: " + msg) }

1 0

[tor/master] Disable the udp_socket_trick_blackbox tests that fail due to #12377
by nickm＠torproject.org 13 Apr '15

13 Apr '15

commit e891deb02120c3756ccfb87171e36d271c3d7077 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Apr 10 18:13:34 2015 +0000 Disable the udp_socket_trick_blackbox tests that fail due to #12377 Till someone writes get_interface_address6 interface enumeration that is routing table aware, these tests will continue to fail on certain systems because the get_interface_address6() code is broken. --- src/test/test_address.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 317119c..5236162 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -585,6 +585,7 @@ test_address_udp_socket_trick_blackbox(void *arg) (void)arg; +#if 0 retval_reference = get_interface_address6(LOG_DEBUG,AF_INET,&addr4); retval = get_interface_address6_via_udp_socket_hack(LOG_DEBUG, AF_INET, @@ -594,10 +595,6 @@ test_address_udp_socket_trick_blackbox(void *arg) tt_assert( (retval == -1 && retval_reference == -1) || (tor_addr_compare(&addr4,&addr4_to_check,CMP_EXACT) == 0) ); - //[XXX: Skipping the AF_INET6 case because bug #12377 makes it fail.] - (void)addr6_to_check; - (void)addr6; -#if 0 retval_reference = get_interface_address6(LOG_DEBUG,AF_INET6,&addr6); retval = get_interface_address6_via_udp_socket_hack(LOG_DEBUG, AF_INET6, @@ -607,6 +604,21 @@ test_address_udp_socket_trick_blackbox(void *arg) tt_assert( (retval == -1 && retval_reference == -1) || (tor_addr_compare(&addr6,&addr6_to_check,CMP_EXACT) == 0) ); +#else + /* Both of the blackbox test cases fail horribly if: + * * The host has no external addreses. + * * There are multiple interfaces with either AF_INET or AF_INET6. + * * The last address isn't the one associated with the default route. + * + * The tests SHOULD be re-enabled when #12377 is fixed correctly, but till + * then this fails a lot, in situations we expect failures due to knowing + * about the code being broken. + */ + + (void)addr4_to_check; + (void)addr6_to_check; + (void)addr6; + (void) retval_reference; #endif /* When family is neither AF_INET nor AF_INET6, we want _hack to

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 13 Apr '15

13 Apr '15

commit adba83a28c05163f321da0acda23d1e4514b1af9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 13 13:15:45 2015 +0000 Update translations for torbutton-torbuttonproperties --- hu/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hu/torbutton.properties b/hu/torbutton.properties index 9ed6871..b865cd5 100644 --- a/hu/torbutton.properties +++ b/hu/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = A kiegészítők, , mint a Flash sérthetik az torbutton.popup.never_ask_again = Ne kérdezze többé torbutton.popup.confirm_newnym = A Tor Böngésző becsukja az összes ablakot és fület. Minden weboldalkapcsolat megszakad.\n\nÚjraindítsuk a Tor Böngészőt, hogy alaphelyzetbe állítsuk személyazonosságát?\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = A zöld onion menüben most már megtalálható egy biztonsági csuszka amellyel szabályozhatja a biztonsági szintet. Tekintse meg! +torbutton.slider_notification_button = Biztonsági beállítások megnyitása -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = A Tor Böngésző teljes méretűvé állítása engedélyt adhat a weboldalaknak arra, hogy megállapítsák a monitor méretét, amit felhasználhatnak az Ön követéséhez. Azt javasoljuk, hogy tartsa meg a Tor Böngésző alapértelmezett ablakméretét. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Ez az oldal (%S) megpróbál HTML5 képvászon adatokat kicsomagolni, ami a számítógépe egyedi azonosítására lehet alkalmas.\n\nMegengedje a Tor böngésző a HTML5 vászon kép információk kiemelését?

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

[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] 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] 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] make socksbypass local port random
by n8fr8＠torproject.org 13 Apr '15

13 Apr '15

commit 421764bf3304fd641d1e1a1a7c382ccacf8e5f8b Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Apr 11 21:16:56 2015 -0400 make socksbypass local port random --- src/org/torproject/android/service/TorService.java | 19 ++++++++++--------- src/org/torproject/android/vpn/OrbotVpnService.java | 4 +--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index e26dca2..1a48c46 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -96,8 +96,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private int mPortHTTP = 8118; private int mPortSOCKS = 9050; - private int mVpnProxyPort = 9099; - private static final int NOTIFY_ID = 1; private static final int TRANSPROXY_NOTIFY_ID = 2; private static final int ERROR_NOTIFY_ID = 3; @@ -640,6 +638,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon mNumberFormat = NumberFormat.getInstance(Locale.getDefault()); //localized numbers! + if (OrbotVpnService.mSocksProxyPort == -1) + OrbotVpnService.mSocksProxyPort = (int)((Math.random()*1000)+10000); + } catch (Exception e) { @@ -821,7 +822,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (useBridges) if (mUseVPN && !mIsLollipop) - customEnv.add("TOR_PT_PROXY=socks5://127.0.0.1:" + mVpnProxyPort); + customEnv.add("TOR_PT_PROXY=socks5://127.0.0.1:" + OrbotVpnService.mSocksProxyPort); String baseDirectory = fileTor.getParent(); Shell shellUser = Shell.startShell(customEnv, baseDirectory); @@ -1462,7 +1463,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon intent.setAction("start"); if (!mIsLollipop) - intent.putExtra("proxyPort",mVpnProxyPort); + intent.putExtra("proxyPort",OrbotVpnService.mSocksProxyPort); startService(intent); @@ -1474,7 +1475,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon try { - // conn.setConf("DisableNetwork", "1"); + conn.setConf("DisableNetwork", "1"); Intent intent = new Intent(TorService.this, OrbotVpnService.class); intent.setAction("refresh"); @@ -1486,7 +1487,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon saveConfiguration(); - // conn.setConf("DisableNetwork", "0"); + conn.setConf("DisableNetwork", "0"); } catch (Exception ioe) { @@ -2208,14 +2209,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'); + extraLines.append(proxyType + "Proxy" + ' ' + proxyHost + ':' + OrbotVpnService.mSocksProxyPort).append('\n'); }; - */ + } else { diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 4c214ed..1096906 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -51,7 +51,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { private String mSessionName = "OrbotVPN"; private ParcelFileDescriptor mInterface; - private int mSocksProxyPort = -1; + public static int mSocksProxyPort = -1; private ProxyServer mSocksProxyServer; private final static int VPN_MTU = 1500; @@ -60,8 +60,6 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { private boolean isRestart = false; - - @Override public int onStartCommand(Intent intent, int flags, int startId) {

1 0

[orbot/master] update to v15 RC3
by n8fr8＠torproject.org 13 Apr '15

13 Apr '15

commit 8cbdf187334c8838cd5cca1aaf05eaa067c792d4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Apr 11 21:20:52 2015 -0400 update to v15 RC3 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b569adb..d4badeb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.0.0-RC-2" - android:versionCode="15104" + android:versionName="15.0.0-RC-3" + android:versionCode="150003" android:installLocation="auto" >

1 0