- tor-commits - lists.torproject.org

[orbot/master] don't build plain armeabi anymore
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit c0afffebcedb1550c7719dccd29af056056deca9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 12:58:52 2019 -0400 don't build plain armeabi anymore --- orbotservice/src/main/jni/Application.mk | 2 +- orbotservice/src/main/libs/arm64-v8a/pdnsd | Bin 0 -> 207448 bytes orbotservice/src/main/libs/armeabi-v7a/pdnsd | Bin 0 -> 153644 bytes orbotservice/src/main/libs/x86/pdnsd | Bin 0 -> 198644 bytes orbotservice/src/main/libs/x86_64/pdnsd | Bin 0 -> 219928 bytes 5 files changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/jni/Application.mk b/orbotservice/src/main/jni/Application.mk index 58e4e08f..334c62fe 100644 --- a/orbotservice/src/main/jni/Application.mk +++ b/orbotservice/src/main/jni/Application.mk @@ -1,3 +1,3 @@ -APP_ABI := armeabi armeabi-v7a x86 arm64-v8a x86_64 +APP_ABI := armeabi-v7a x86 arm64-v8a x86_64 APP_PLATFORM := android-16 APP_STL := c++_static diff --git a/orbotservice/src/main/libs/arm64-v8a/pdnsd b/orbotservice/src/main/libs/arm64-v8a/pdnsd new file mode 100755 index 00000000..9c23b87b Binary files /dev/null and b/orbotservice/src/main/libs/arm64-v8a/pdnsd differ diff --git a/orbotservice/src/main/libs/armeabi-v7a/pdnsd b/orbotservice/src/main/libs/armeabi-v7a/pdnsd new file mode 100755 index 00000000..af435fe1 Binary files /dev/null and b/orbotservice/src/main/libs/armeabi-v7a/pdnsd differ diff --git a/orbotservice/src/main/libs/x86/pdnsd b/orbotservice/src/main/libs/x86/pdnsd new file mode 100755 index 00000000..4799d46b Binary files /dev/null and b/orbotservice/src/main/libs/x86/pdnsd differ diff --git a/orbotservice/src/main/libs/x86_64/pdnsd b/orbotservice/src/main/libs/x86_64/pdnsd new file mode 100755 index 00000000..9dc1b045 Binary files /dev/null and b/orbotservice/src/main/libs/x86_64/pdnsd differ

1 0

[orbot/master] pdnsd must be named with a .so extension to be included
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit 929cb6b67cf2416dc1f093554f47f45b54fe7e42 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 13:00:01 2019 -0400 pdnsd must be named with a .so extension to be included --- orbotservice/src/main/libs/arm64-v8a/{pdnsd => pdnsd.so} | Bin orbotservice/src/main/libs/armeabi-v7a/{pdnsd => pdnsd.so} | Bin orbotservice/src/main/libs/x86/{pdnsd => pdnsd.so} | Bin orbotservice/src/main/libs/x86_64/{pdnsd => pdnsd.so} | Bin 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/orbotservice/src/main/libs/arm64-v8a/pdnsd b/orbotservice/src/main/libs/arm64-v8a/pdnsd.so similarity index 100% rename from orbotservice/src/main/libs/arm64-v8a/pdnsd rename to orbotservice/src/main/libs/arm64-v8a/pdnsd.so diff --git a/orbotservice/src/main/libs/armeabi-v7a/pdnsd b/orbotservice/src/main/libs/armeabi-v7a/pdnsd.so similarity index 100% rename from orbotservice/src/main/libs/armeabi-v7a/pdnsd rename to orbotservice/src/main/libs/armeabi-v7a/pdnsd.so diff --git a/orbotservice/src/main/libs/x86/pdnsd b/orbotservice/src/main/libs/x86/pdnsd.so similarity index 100% rename from orbotservice/src/main/libs/x86/pdnsd rename to orbotservice/src/main/libs/x86/pdnsd.so diff --git a/orbotservice/src/main/libs/x86_64/pdnsd b/orbotservice/src/main/libs/x86_64/pdnsd.so similarity index 100% rename from orbotservice/src/main/libs/x86_64/pdnsd rename to orbotservice/src/main/libs/x86_64/pdnsd.so

1 0

[orbot/master] Merge branch 'master' of github.com:n8fr8/orbot
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit be6feea87941aec8bce9c0a848904a7eab3869f2 Merge: d2005234 c7e9b01f Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 13:01:08 2019 -0400 Merge branch 'master' of github.com:n8fr8/orbot .../org/torproject/android/OrbotMainActivity.java | 30 ++++++++++++++++------ .../torproject/android/ui/AppManagerActivity.java | 15 +++-------- .../android/service/vpn/TorifiedApp.java | 3 ++- 3 files changed, 28 insertions(+), 20 deletions(-)

1 0

[orbot/master] Merge branch 'ejo4041-mergeDebugJniLibFolders_issue'
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit 72ff7dd2fce67204306b896bb05822e819e4a260 Merge: be6feea8 07e34239 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 13:07:36 2019 -0400 Merge branch 'ejo4041-mergeDebugJniLibFolders_issue' orbotservice/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] Merge branch 'mergeDebugJniLibFolders_issue' of https://github.com/ejo4041/orbot into ejo4041-mergeDebugJniLibFolders_issue
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit 07e3423935b2008164bd88b4d82c54a5675614b7 Merge: be6feea8 fc0b035a Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 13:02:20 2019 -0400 Merge branch 'mergeDebugJniLibFolders_issue' of https://github.com/ejo4041/orbot into ejo4041-mergeDebugJniLibFolders_issue orbotservice/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] update gradle
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit d2005234afa56a47ffe0586794b3dd920cd0f0f5 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 13:00:25 2019 -0400 update gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dd82e239..ad5ff6ed 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:3.4.2' } }

1 0

[orbot/master] make sure we don't have any orphaned pdnsd processes
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit be5b8d885e345ddc1d0fd335d8892847476150a4 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jul 31 16:35:26 2019 -0400 make sure we don't have any orphaned pdnsd processes --- orbotservice/build.gradle | 2 +- .../java/org/torproject/android/service/vpn/OrbotVpnManager.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index e3045712..7e933c7f 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -32,7 +32,7 @@ android { } dependencies { - // implementation project(':jsocksAndroid') + implementation 'org.torproject:tor-android-binary:0.4.0.4-rc' implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.6' implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.6' diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index 40ea51af..c843c183 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -95,6 +95,13 @@ public class OrbotVpnManager implements Handler.Callback { filePdnsd = CustomNativeLoader.loadNativeBinary(service.getApplicationContext(),PDNSD_BIN,new File(service.getFilesDir(),PDNSD_BIN)); + // if that fails, try again using native utils + try { + killProcess(filePdnsd, "-1"); // this is -HUP + } catch (Exception e) { + e.printStackTrace(); + } + Tun2Socks.init();

1 0

[orbot/master] Merge pull request #247 from bitmold/low_dpi_launcher_icon
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit d5e570a5ed2edf107d117a5eac094e300bb3f991 Merge: e146f703 767a8596 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Aug 6 09:36:48 2019 -0400 Merge pull request #247 from bitmold/low_dpi_launcher_icon Launcher icon was out of date on low resolution devices. app/src/main/res/drawable-ldpi/ic_launcher.png | Bin 2852 -> 2394 bytes 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[orbot/master] send ports on start request, even if tor is already running
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit c6bfc4911bc23aabe2ecc6c4d3878fd4d766b942 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Aug 2 09:26:08 2019 -0400 send ports on start request, even if tor is already running --- .../src/main/java/org/torproject/android/service/TorService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index c83c252e..793257d7 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -381,8 +381,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (action != null) { if (action.equals(ACTION_START)) { - replyWithStatus(mIntent); startTor(); + replyWithStatus(mIntent); + } else if (action.equals(ACTION_STATUS)) { replyWithStatus(mIntent); @@ -814,6 +815,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon LocalBroadcastManager.getInstance(this).sendBroadcast(reply); + if (mPortSOCKS != -1 && mPortHTTP != -1) + sendCallbackPorts(mPortSOCKS, mPortHTTP, mPortDns, mPortTrans); + } /**

1 0

[orbot/master] make sure to kill existing pdnsd, and set the new ports properly
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit e146f703254bae36c2f9535595d71d97ef963bce Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Aug 2 10:26:33 2019 -0400 make sure to kill existing pdnsd, and set the new ports properly --- .../android/service/vpn/OrbotVpnManager.java | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index c843c183..65db4659 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -144,15 +144,19 @@ public class OrbotVpnManager implements Handler.Callback { { Log.d(TAG,"starting OrbotVPNService service!"); - mTorSocks = intent.getIntExtra(TorService.EXTRA_SOCKS_PROXY_PORT,-1); - mTorDns = intent.getIntExtra(TorService.EXTRA_DNS_PORT,-1); + int newTorSocks = intent.getIntExtra(TorService.EXTRA_SOCKS_PROXY_PORT,-1); + int newTorDns = intent.getIntExtra(TorService.EXTRA_DNS_PORT,-1); - if (!mIsLollipop) - { - startSocksBypass(); - } + if ((mTorSocks != newTorSocks || mTorDns != newTorDns)) { + mTorSocks = newTorSocks; + mTorDns = newTorDns; + + if (!mIsLollipop) { + startSocksBypass(); + } - setupTun2Socks(builder); + setupTun2Socks(builder); + } } } @@ -424,6 +428,14 @@ public class OrbotVpnManager implements Handler.Callback { private boolean stopDns () { + + // if that fails, try again using native utils + try { + killProcess(filePdnsd, "-1"); // this is -HUP + } catch (Exception e) { + e.printStackTrace(); + } + File filePid = new File(mService.getFilesDir(),"pdnsd.pid"); String pid = null; @@ -443,6 +455,7 @@ public class OrbotVpnManager implements Handler.Callback { } } + return false; }

1 0