February 2016 - tor-commits - lists.torproject.org

[doctor/master] Don't alarm for BadExit being out of sync with new relays
by atagar＠torproject.org 24 Feb '16

24 Feb '16

commit 9ebead8ccc16955ffa8fd0c24c53adc9b6570185 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 24 09:23:45 2016 -0800 Don't alarm for BadExit being out of sync with new relays Each consensus has a lot of churn and it's normal for relays to be out of sync initially. Only send BadExit sync notifications once a relay's been around for a while. --- consensus_health_checker.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index b0efb5c..be06cf9 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -673,6 +673,15 @@ def bad_exits_in_sync(latest_consensus, consensuses, votes): else: not_in_consensus.append(authority) + # If this relay's missing from a consensus and has been active for less + # than an hour then don't bother. It gets negligable traffic and is likely + # part of normal network churn. + + desc = votes[with_flag[0]].routers[fingerprint] + + if not_in_consensus and (datetime.datetime.now() - desc.published).total_seconds() > 3600: + continue + attr = ['with flag: %s' % ', '.join(with_flag)] if without_flag:

1 0

[webwml/master] Add Tor Messenger to volunteer page and update link for TorBirdy
by atagar＠torproject.org 24 Feb '16

24 Feb '16

commit 6e6fe7d2a54c999d9d859f367d711a3cd1c2b514 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Feb 24 11:24:39 2016 -0500 Add Tor Messenger to volunteer page and update link for TorBirdy --- getinvolved/en/volunteer.wml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 4c7d4df..47b661f 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -197,6 +197,14 @@ meetings around the world.</li> </tr> <tr> + <td><a href="#project-tormessenger">Tor Messenger</a></td> + <td>Bundle</td> + <td>JavaScript, XUL, Scripting</td> + <td>Heavy</td> + <td>arlolra, boklm, sukhe</td> + </tr> + + <tr> <td><a href="#project-torbirdy">TorBirdy</a></td> <td>Browser Add-on</td> <td>JavaScript</td> @@ -505,9 +513,18 @@ meetings around the world.</li> otherwise feature complete. + <a id="project-tormessenger"></a> + <h3><a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> (<a + href="https://gitweb.torproject.org/tor-messenger-build.git">code</a>, <a + href="https://trac.torproject.org/projects/tor/query?status=!closed&component=Tor…">bug tracker</a>)</h3> + + + Tor Messenger is a cross-platform chat program that aims to be secure by default and sends all of its traffic over Tor. + + <a id="project-torbirdy"></a> <h3>TorBirdy (<a - href="https://github.com/ioerror/torbirdy">code</a>, <a + href="https://gitweb.torproject.org/torbirdy.git">code</a>, <a href="https://trac.torproject.org/projects/tor/wiki/torbirdy/dev">bug tracker</a>)</h3>

1 0

[webwml/master] Update TorBirdy description on the volunteer page
by atagar＠torproject.org 24 Feb '16

24 Feb '16

commit e1434db26bd3a5930c6fb4095ef95486a61ecc7c Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Feb 23 15:52:51 2016 -0500 Update TorBirdy description on the volunteer page --- getinvolved/en/volunteer.wml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index c1a36c9..4c7d4df 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -1027,40 +1027,32 @@ meetings around the world.</li> TorBirdy is an extension that configures Thunderbird to make connections over the Tor anonymity network. TorBirdy has been under development for quite a while but there are two known leaks that prevent it from being used by a wider -audience. As part of this project, you will be working on plugging the known -leaks and implementing a HTTP proxy. +audience. As part of this project, you will be working on implementing a HTTP +proxy. -Part 1: There are two patches pending with Mozilla that will plug the two known -leaks in Thunderbird where the local time is disclosed through the date and the -message-ID header. As part of your project, you will work on getting these -patches finished/reimplemented and getting them merged with Mozilla. Please -look at tickets <a -href="https://trac.torproject.org/projects/tor/ticket/6314">#6314</a> and <a -href="https://trac.torproject.org/projects/tor/ticket/6315">#6315</a> for more -information. - -Part 2: TorBirdy needs a HTTP proxy or a HTTP -> SOCKS5 shim. Please look at +HTTP Proxy TorBirdy needs a HTTP proxy or a HTTP -> SOCKS5 shim. Please look at ticket <a href="https://trac.torproject.org/projects/tor/ticket/6958">#6958</a> -for more information. Note: this has to be done using JavaScript and not using +for more information. Note: this has to be done using JavaScript and without using an external proxy. If time permits and you are awesome enough to finish the above two tasks, you -will be working on the remaining TorBirdy tickets. +will be working on the <a href="https://trac.torproject.org/projects/tor/query?status=!closed&component=Tor…"> +remaining TorBirdy tickets</a>. -Applicants should be familiar with C++ and JavaScript. As part of your -application for this project, please submit code samples for previous C++ and -JavaScript projects that you have developed or point us to projects you have -been involved with (links to a public Git/GitHub repository preferred). Prior -extension development is a big plus and will be given preference during -application ranking. +Applicants should be familiar with JavaScript (and preferably C++ as well). As +part of your application for this project, please submit code samples for +previous JavaScript projects that you have developed, or point us to projects +you have been involved with (links to a public Git/GitHub repository +preferred). Prior extension development is a big plus and will be given +preference during application ranking.

1 0

[webwml/master] List GSoC idea under the project
by atagar＠torproject.org 24 Feb '16

24 Feb '16

commit 2a4999e7a887bed84e91cd84919744eae69cf47c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 24 08:31:18 2016 -0800 List GSoC idea under the project Oops, I've been striving to include task ideas under the project they're related to. --- getinvolved/en/volunteer.wml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index cd4908f..c1a36c9 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -693,6 +693,11 @@ meetings around the world.</li> Onions</a> research paper. + + Project Ideas: + <a href="#exitmap_improvements">Exitmap Improvements</a> + + <a id="project-doctor"></a> <h3>DocTor (<a href="https://gitweb.torproject.org/doctor.git">code</a>, <a

1 0

[tor-messenger-build/master] Update ChangeLog for OTR over Twitter DMs support
by sukhbir＠torproject.org 24 Feb '16

24 Feb '16

commit c1697ca2af51833ac40b859d286a77dcdb6ddc4f Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Feb 24 10:56:30 2016 -0500 Update ChangeLog for OTR over Twitter DMs support --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d50f962..990b68d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ Tor Messenger 0.1.0b5 -- * Bug 18235: Disable Facebook as they no longer support XMPP * Bug 17494: Better error reporting for failed outgoing messages * Bug 17749: Show version information in the "About" window - * Bug 13312: OTR over Twitter DMs + * Bug 13312: Add support for OTR over Twitter DMs * Mac * Bug 17896: Add Edit menu to the conversation window on OS X * Windows

1 0

[orbot/master] remove meek-client and use obfs4 meek_lite mode instead
by n8fr8＠torproject.org 24 Feb '16

24 Feb '16

commit 66a5b7ad261d2e79f05f80d908d9862fc821bd1a Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 23 23:20:21 2016 -0500 remove meek-client and use obfs4 meek_lite mode instead --- external/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/external/Makefile b/external/Makefile index e25cd0d..92e4c0c 100644 --- a/external/Makefile +++ b/external/Makefile @@ -285,7 +285,6 @@ pluto-build-stamp: pluto/bin/android_arm/obfs4proxy pluto: pluto-build-stamp test -d bin || mkdir bin cp pluto/bin/android_arm/obfs4proxy bin - cp pluto/bin/android_arm/meek-client bin pluto-clean: # -rm -rf pluto/bin @@ -304,8 +303,6 @@ assets: tor polipo iptables pluto -zip ../assets/$(APP_ABI)/tor.mp3 bin/tor -$(STRIP) bin/xtables -zip ../assets/$(APP_ABI)/xtables.mp3 bin/xtables - -$(STRIP) bin/meek-client - -zip ../assets/$(APP_ABI)/meek-client.mp3 bin/meek-client -$(STRIP) bin/obfs4proxy -zip ../assets/$(APP_ABI)/obfs4proxy.mp3 bin/obfs4proxy -$(STRIP) ../libs/$(APP_ABI)/pdnsd @@ -316,7 +313,6 @@ assets-clean: -rm ../assets/$(APP_ABI)/polipo.mp3 -rm ../assets/$(APP_ABI)/tor.mp3 -rm ../assets/$(APP_ABI)/xtables.mp3 - -rm ../assets/$(APP_ABI)/meek-client.mp3 -rm ../assets/$(APP_ABI)/obfs4proxy.mp3 -rm ../assets/$(APP_ABI)/pdnsd.mp3

1 0

[orbot/master] update to 15.1.2
by n8fr8＠torproject.org 24 Feb '16

24 Feb '16

commit 204733a245d6c06fa73301134e2f107c0c4564b8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 23 23:23:32 2016 -0500 update to 15.1.2 --- AndroidManifest.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4b3cd03..ccf0692 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.1.1" - android:versionCode="15110000" + android:versionName="15.1.2" + android:versionCode="15120000" android:installLocation="auto" > - <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/> <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label"

1 0

[orbot/master] switch back to Android-16 as target
by n8fr8＠torproject.org 24 Feb '16

24 Feb '16

commit 3eb70b8b9a39c997099f6a560b872cf96122981f Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 23 23:19:52 2016 -0500 switch back to Android-16 as target --- jni/Application.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/Application.mk b/jni/Application.mk index 32e48c2..554a462 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,4 +1,4 @@ APP_ABI := armeabi x86 -APP_PLATFORM := android-10 +APP_PLATFORM := android-16 APP_STL := stlport_static NDK_TOOLCHAIN_VERSION := 4.8

1 0

[orbot/master] update changelog for 15.1.2
by n8fr8＠torproject.org 24 Feb '16

24 Feb '16

commit beb3bc8a4a6178bca653039f7dcb6583c1205c53 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 24 10:01:28 2016 -0500 update changelog for 15.1.2 --- CHANGELOG | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e1241ca..144b6c1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,20 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 15.1.2 / 24-February-2016 / 204733a245d6c06fa73301134e2f107c0c4564b8 **/ + +5785593 move to using meek_lite mode from obfs4client and update/improve proxying code +66a5b7a remove meek-client and use obfs4 meek_lite mode instead +f9f33a1 set this to Android 16 SDK for PIE executable We'll use a different build for non-PIE < Android-16 +e9d28a4 handle NPE better for dev.gp.info #6686 in some cases the connection becomes null while you are interacting with it +9a8e4dd update to orbot ant build version +80e8c47 peg to last ant compat release +5eb628b bridges dedicated to GeorgeTorwell +c8584f6 update superuser commands library +3cc2439 update license to include badvpn +9c82aa8 fix escaping of apostro +eba95b2 update strings and descs from transifex (somehow french got left out before!) +8047ec6 update the log + /** 15.1.0-RC-7 / 27-January-2016 / 91225ab053d0ffec4a414be461ee41e6465446bd **/ * fd45fa3 enable TransProxy and DNSPort by default without root - some users run their own iptables transproxy scripts with AFWall and n

1 0

[orbot/master] move to using meek_lite mode from obfs4client and update/improve proxying code
by n8fr8＠torproject.org 24 Feb '16

24 Feb '16

commit 57855932f4518b8c4e8b5fed4ae7a89fe224dcbb Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 23 23:21:02 2016 -0500 move to using meek_lite mode from obfs4client and update/improve proxying code --- src/org/torproject/android/OrbotApp.java | 5 +--- .../android/service/TorResourceInstaller.java | 3 ++- src/org/torproject/android/service/TorService.java | 29 +++++++++++++++------- .../android/service/TorServiceConstants.java | 8 +++--- .../android/service/TorServiceUtils.java | 4 +-- .../torproject/android/vpn/OrbotVpnService.java | 29 +++++++++++++++++----- 6 files changed, 52 insertions(+), 26 deletions(-) diff --git a/src/org/torproject/android/OrbotApp.java b/src/org/torproject/android/OrbotApp.java index 021336d..7bbb649 100644 --- a/src/org/torproject/android/OrbotApp.java +++ b/src/org/torproject/android/OrbotApp.java @@ -28,7 +28,7 @@ public class OrbotApp extends Application implements OrbotConstants public static File fileTor; public static File filePolipo; public static File fileObfsclient; - public static File fileMeekclient; + // public static File fileMeekclient; public static File fileXtables; public static File fileTorRc; public static File filePdnsd; @@ -48,13 +48,10 @@ public class OrbotApp extends Application implements OrbotConstants fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY); filePolipo = new File(appBinHome, TorServiceConstants.POLIPO_ASSET_KEY); fileObfsclient = new File(appBinHome, TorServiceConstants.OBFSCLIENT_ASSET_KEY); - fileMeekclient = new File(appBinHome, TorServiceConstants.MEEK_ASSET_KEY); fileXtables = new File(appBinHome, TorServiceConstants.IPTABLES_ASSET_KEY); fileTorRc = new File(appBinHome, TorServiceConstants.TORRC_ASSET_KEY); filePdnsd = new File(appBinHome, TorServiceConstants.PDNSD_ASSET_KEY); - - } @Override diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java index 1fad991..67dc32d 100644 --- a/src/org/torproject/android/service/TorResourceInstaller.java +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -100,12 +100,13 @@ public class TorResourceInstaller implements TorServiceConstants { shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); streamToFile(is,outFile, false, true); setExecutable(outFile); - + /** is = context.getAssets().open(cpuPath + "/" + MEEK_ASSET_KEY + MP3_EXT); outFile = new File(installFolder, MEEK_ASSET_KEY); shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); streamToFile(is,outFile, false, true); setExecutable(outFile); + */ } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 12da009..627f2e9 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -61,6 +61,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintStream; import java.io.PrintWriter; +import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Proxy; import java.net.Socket; @@ -482,25 +483,30 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon try { TorServiceUtils.killProcess(OrbotApp.fileObfsclient); } catch (IOException e) { - e.printStackTrace(); + // e.printStackTrace(); + Log.w(TAG,"could not kill obfsclient",e); cannotKillFile = OrbotApp.fileObfsclient; } + + /** try { TorServiceUtils.killProcess(OrbotApp.fileMeekclient); } catch (IOException e) { e.printStackTrace(); cannotKillFile = OrbotApp.fileMeekclient; } + */ + try { TorServiceUtils.killProcess(OrbotApp.filePolipo); } catch (IOException e) { - e.printStackTrace(); + Log.w(TAG,"could not kill polipo",e); cannotKillFile = OrbotApp.filePolipo; } try { TorServiceUtils.killProcess(OrbotApp.fileTor); } catch (IOException e) { - e.printStackTrace(); + Log.w(TAG,"could not kill tor",e); cannotKillFile = OrbotApp.fileTor; } } @@ -743,7 +749,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (Prefs.bridgesEnabled()) if (Prefs.useVpn() && !mIsLollipop) - customEnv.add("TOR_PT_PROXY=socks5://127.0.0.1:" + OrbotVpnService.sSocksProxyServerPort); + { + customEnv.add("TOR_PT_PROXY=socks5://" + OrbotVpnService.sSocksProxyLocalhost + ":" + OrbotVpnService.sSocksProxyServerPort); + } String baseDirectory = OrbotApp.fileTor.getParent(); Shell shellUser = Shell.startShell(customEnv, baseDirectory); @@ -1658,7 +1666,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } catch (Exception ioe){ - debug("error requesting newnym: " + ioe.getLocalizedMessage()); + + debug("error requesting newnym: " + ioe.getLocalizedMessage()); + } } }.start(); @@ -1885,8 +1895,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (!mIsLollipop) { String proxyType = "socks5"; - String proxyHost = "127.0.0.1"; - extraLines.append(proxyType + "Proxy" + ' ' + proxyHost + ':' + OrbotVpnService.sSocksProxyServerPort).append('\n'); + extraLines.append(proxyType + "Proxy" + ' ' + OrbotVpnService.sSocksProxyLocalhost + ':' + OrbotVpnService.sSocksProxyServerPort).append('\n'); }; } @@ -1936,7 +1945,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { //check if any PT bridges are needed - boolean obfsBridges = bridgeList.contains("obfs3")||bridgeList.contains("obfs4")||bridgeList.contains("scramblesuit"); + boolean obfsBridges = bridgeList.contains("obfs3")||bridgeList.contains("obfs4")||bridgeList.contains("scramblesuit")||bridgeList.contains("meek"); if (obfsBridges) { @@ -1972,7 +1981,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon debug ("Using meek bridges"); - String bridgeConfig = "meek exec " + OrbotApp.fileMeekclient.getCanonicalPath(); + // String bridgeConfig = "meek exec " + OrbotApp.fileMeekclient.getCanonicalPath(); + String bridgeConfig = "meek_lite exec " + OrbotApp.fileObfsclient.getCanonicalPath(); + extraLines.append("ClientTransportPlugin" + ' ' + bridgeConfig).append('\n'); int meekIdx = 2; //let's use Azure by default diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 54213d9..e2f0964 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -141,7 +141,7 @@ public interface TorServiceConstants { //obfsproxy public static final String OBFSCLIENT_ASSET_KEY = "obfs4proxy"; - public static final String MEEK_ASSET_KEY = "meek-client"; + // public static final String MEEK_ASSET_KEY = "meek-client"; //name of the iptables binary public final static String IPTABLES_ASSET_KEY = "xtables"; @@ -155,9 +155,9 @@ public interface TorServiceConstants { //MEEK BRIDGEs public final static String[] BRIDGES_MEEK = { - "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com", - "meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com", - "meek 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com" + "meek_lite 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com", + "meek_lite 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com", + "meek_lite 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com" }; } diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index b8ae024..8549eda 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -178,12 +178,12 @@ public class TorServiceUtils implements TorServiceConstants { } catch(ConnectException ce){ - ce.printStackTrace(); + //ce.printStackTrace(); return false; } catch (Exception ex) { - ex.printStackTrace(); + //ex.printStackTrace(); return false; } } diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 92d868c..c9247c2 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -22,6 +22,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintStream; import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Locale; import java.util.concurrent.TimeoutException; @@ -68,6 +69,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { private int mTorSocks = TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT; public static int sSocksProxyServerPort = -1; + public static String sSocksProxyLocalhost = null; private ProxyServer mSocksProxyServer; @@ -108,11 +110,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { if (!mIsLollipop) { - - //generate the proxy port that the - if (sSocksProxyServerPort == -1) - sSocksProxyServerPort = (int)((Math.random()*1000)+10000); - + startSocksBypass(); } @@ -151,6 +149,24 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { public void run () { + + //generate the proxy port that the + if (sSocksProxyServerPort == -1) + { + try { + + sSocksProxyLocalhost = "127.0.0.1";// InetAddress.getLocalHost().getHostAddress(); + sSocksProxyServerPort = (int)((Math.random()*1000)+10000); + + } catch (Exception e) { + Log.e(TAG,"Unable to access localhost",e); + throw new RuntimeException("Unable to access localhost: " + e); + + } + + } + + if (mSocksProxyServer != null) { stopSocksBypass (); @@ -274,7 +290,6 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { //start PDNSD daemon pointing to OpenDNS startDNS(DEFAULT_ACTUAL_DNS,53); - final String vpnName = "OrbotVPN"; final String localhost = "127.0.0.1"; @@ -392,8 +407,10 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { " -c " + baseDirectory + "/pdnsd.conf"; SimpleCommand shellCommand = new SimpleCommand(cmdString); + shell.add(shellCommand).waitForFinish(); + Log.i(TAG,"PDNSD: " + shellCommand.getExitCode() + ": " + shellCommand.getOutput()); }

1 0