- tor-commits - lists.torproject.org

[orbot/master] update tor to 0.4.6.8w
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 1d47994f9d8f7dcbc5958b817c6f9c5c472ce16e Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 14:52:01 2021 -0500 update tor to 0.4.6.8w --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index c9b4f783..4feeb6e5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -22,7 +22,7 @@ ext { guardian_jtorctl : "0.4.5.7", ipt_proxy : "1.3.0", portmapper : "2.0.5", - tor_android : "0.4.6.7" + tor_android : "0.4.6.8" ] libs = [

1 0

[orbot/master] Merge pull request #558 from guardianproject/tor-android-0.4.6.8
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 1ed8efd0f241000fdc6d355e2bef842cc66a5ab2 Merge: dd723e49 06453716 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Mon Dec 20 15:54:23 2021 -0500 Merge pull request #558 from guardianproject/tor-android-0.4.6.8 tor-android 0.4.6.7 -> 0.4.6.8

1 0

[orbot/master] register local v3 name receiver
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 06851dd156abf220979d815766a0b3733314f077 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 22:01:44 2021 -0500 register local v3 name receiver --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index ba40d5c5..86043921 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -252,6 +252,8 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG)); lbm.registerReceiver(mLocalBroadcastReceiver, new IntentFilter(TorServiceConstants.LOCAL_ACTION_PORTS)); + lbm.registerReceiver(mLocalBroadcastReceiver, + new IntentFilter(TorServiceConstants.LOCAL_ACTION_V3_NAMES_UPDATED)); boolean showFirstTime = mPrefs.getBoolean("connect_first_time", true);

1 0

[orbot/master] disable MOAT and Snowflake on SDK < 28 since they don't currently work
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 816c5825098a7a5d98f600feae00e90117a6eca9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 23:18:43 2021 -0500 disable MOAT and Snowflake on SDK < 28 since they don't currently work --- .../android/ui/onboarding/BridgeWizardActivity.java | 14 ++++++++++---- app/src/main/res/layout/content_bridge_wizard.xml | 3 ++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index 5dc4e770..c28515ed 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -43,10 +43,16 @@ public class BridgeWizardActivity extends AppCompatActivity { if (actionBar != null) { actionBar.setDisplayHomeAsUpEnabled(true); } - - findViewById(R.id.btnMoat).setOnClickListener(v -> { - startActivityForResult(new Intent(BridgeWizardActivity.this, MoatActivity.class), MOAT_REQUEST_CODE); - }); + if(android.os.Build.VERSION.SDK_INT < 28){ + findViewById(R.id.btnMoat).setVisibility(View.GONE); + findViewById(R.id.btnBridgesSnowflake).setVisibility(View.GONE); + findViewById(R.id.btnSnowflakeAmp).setVisibility(View.GONE); + } + else { + findViewById(R.id.btnMoat).setOnClickListener(v -> { + startActivityForResult(new Intent(BridgeWizardActivity.this, MoatActivity.class), MOAT_REQUEST_CODE); + }); + } mBtDirect = findViewById(R.id.btnBridgesDirect); mBtDirect.setOnCheckedChangeListener((buttonView, isChecked) -> { diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index 65364846..887e5ea4 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -30,7 +30,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - android:text="@string/request_bridges_from_torproject" /> + android:text="@string/request_bridges_from_torproject" + /> <RadioGroup android:layout_width="match_parent"

1 0

[orbot/master] simplify snowflake strings
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 03470d46b3cde0ef3611cb78b8d16c836b333018 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 22:16:38 2021 -0500 simplify snowflake strings --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6130dbd1..1771bd29 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -214,8 +214,8 @@ <string name="paste_bridges">Paste Bridges</string> <string name="use_qr_code">Use QR Code</string> <string name="snowflake_proxy_pref_category">Snowflake Proxy (Experimental)</string> - <string name="bridge_snowflake">Connect through peers via the snowflake proxy using domain fronting (Snowflake connections can sometimes take a long time to establish)</string> - <string name="bridge_snowflake_amp">Connect through peers via the snowflake proxy using AMP cache rendezvous (Snowflake connections can sometimes take a long time to establish)</string> + <string name="bridge_snowflake">Connect through other Tor users using Snowflake (Method 1 - Fastly)</string> + <string name="bridge_snowflake_amp">Connect through other Tor users using Snowflake (Method 2 - AMP)</string> <string name="be_a_snowflake_title">Run Snowflake Proxy</string> <string name="be_a_snowflake_desc">Allow other Tor users to connect to Tor through your device. (This can\'t be used if you connect alongside bridges)</string>

1 0

[orbot/master] handle new local action for v3 onion names updating;
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 0ef3500ef9239e54b782c53efe643bf7a3bb1d3b Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 14:55:34 2021 -0500 handle new local action for v3 onion names updating; also don't allow rapid stop/starts to avoid crashes --- .../org/torproject/android/OrbotMainActivity.java | 64 ++++++++++++++-------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 2310b3b8..ba40d5c5 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -179,6 +179,26 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan break; } + case TorServiceConstants.LOCAL_ACTION_V3_NAMES_UPDATED: + if (lastInsertedOnionServiceRowId == -1) break; // another app did not request an onion service + ContentResolver cr = getContentResolver(); + String where = OnionServiceContentProvider.OnionService._ID + "=" + lastInsertedOnionServiceRowId; + Cursor v3Cursor = cr.query(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.PROJECTION, + where, null, null); + if (v3Cursor == null || v3Cursor.getCount() != 1 || !v3Cursor.moveToFirst()) { + if (v3Cursor != null) v3Cursor.close(); + OrbotMainActivity.this.setResult(RESULT_CANCELED); + OrbotMainActivity.this.finish(); + return; + } + String hostname = v3Cursor.getString(v3Cursor.getColumnIndex(OnionServiceContentProvider.OnionService.DOMAIN)); + v3Cursor.close(); + if (TextUtils.isEmpty(hostname)) break; + Intent response = new Intent(); + response.putExtra(INTENT_EXTRA_REQUESTED_V3_HOSTNAME, hostname); + OrbotMainActivity.this.setResult(RESULT_OK, response); + OrbotMainActivity.this.finish(); + break; case TorServiceConstants.ACTION_STATUS: { lastStatusIntent = intent; @@ -260,10 +280,29 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan startService(intent); } + private boolean waitingToStop = false; + private void stopTor() { - if (mBtnVPN.isChecked()) sendIntentToService(ACTION_STOP_VPN); - sendIntentToService(ACTION_STOP); + if (torStatus.equals(TorServiceConstants.STATUS_ON)) + { + if (mBtnVPN.isChecked()) sendIntentToService(ACTION_STOP_VPN); + sendIntentToService(ACTION_STOP); + } + else if (torStatus.equals(STATUS_STARTING)) { + + if (!waitingToStop) { + waitingToStop = true; + updateStatus("...", STATUS_STOPPING); + mStatusUpdateHandler.postDelayed(() -> { + + if (mBtnVPN.isChecked()) sendIntentToService(ACTION_STOP_VPN); + sendIntentToService(ACTION_STOP); + waitingToStop = false; + + }, 3000); + } + } SnowfallView sv = findViewById(R.id.snowflake_view); sv.setVisibility(View.GONE); @@ -874,26 +913,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan break; - case TorServiceConstants.STATUS_V3_NAMES_UPDATED: - if (lastInsertedOnionServiceRowId == -1) break; // another app did not request an onion service - ContentResolver cr = getContentResolver(); - String where = OnionServiceContentProvider.OnionService._ID + "=" + lastInsertedOnionServiceRowId; - Cursor v3Cursor = cr.query(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.PROJECTION, - where, null, null); - if (v3Cursor == null || v3Cursor.getCount() != 1 || !v3Cursor.moveToFirst()) { - if (v3Cursor != null) v3Cursor.close(); - setResult(RESULT_CANCELED); - finish(); - return; - } - String hostname = v3Cursor.getString(v3Cursor.getColumnIndex(OnionServiceContentProvider.OnionService.DOMAIN)); - v3Cursor.close(); - if (TextUtils.isEmpty(hostname)) break; - Intent response = new Intent(); - response.putExtra(INTENT_EXTRA_REQUESTED_V3_HOSTNAME, hostname); - setResult(RESULT_OK, response); - finish(); - return; + } }

1 0

[orbot/master] update to 1652200100
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit dd723e49596e0e4d470573cf8b2324f3a0f51ec4 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 14:57:33 2021 -0500 update to 1652200100 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0f5a8b21..44d7466e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,7 +40,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1652100110 + versionCode 1652200100 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] update build info on renaming pdnsd after ndk-build
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit ecd12b0be63337f3f253730ddfe7db577c18b409 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 9 16:21:21 2021 -0400 update build info on renaming pdnsd after ndk-build --- BUILD.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/BUILD.md b/BUILD.md index b1e9a362..28b636a1 100644 --- a/BUILD.md +++ b/BUILD.md @@ -22,19 +22,19 @@ UNIX: cd orbotservice/src/main ndk-build (located in Android/Sdk/ndk/VERSION/) - mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/pdnsd.so - mv libs/arm64-v8a/pdnsd libs/arm64-v8a/pdnsd.so - mv libs/x86/pdnsd libs/x86/pdnsd.so - mv libs/x86_64/pdnsd libs/x86_64/pdnsd.so + mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/libpdnsd.so + mv libs/arm64-v8a/pdnsd libs/arm64-v8a/libpdnsd.so + mv libs/x86/pdnsd libs/x86/libpdnsd.so + mv libs/x86_64/pdnsd libs/x86_64/libpdnsd.so Windows: cd orbotservice\src\main ndk-build.cmd (located in Android\Sdk\ndk\VERSION\) - ren libs\armeabi-v7a\pdnsd pdnsd.so - ren libs\arm64-v8a\pdnsd pdnsd.so - ren libs\x86\pdnsd pdnsd.so - ren libs\x86_64\pdnsd pdnsd.so + ren libs\armeabi-v7a\pdnsd libpdnsd.so + ren libs\arm64-v8a\pdnsd libpdnsd.so + ren libs\x86\pdnsd libpdnsd.so + ren libs\x86_64\pdnsd libpdnsd.so Now build the Android app using Android Studio/gradle @@ -43,4 +43,4 @@ This will produce an unsigned Orbot package APK. To produce a usable package, you'll need to sign the .apk. The basics on signing can be found on the Android developer site: -http://developer.android.com/guide/publishing/app-signing.html \ No newline at end of file +http://developer.android.com/guide/publishing/app-signing.html

1 0

[orbot/master] Translated using Weblate (Sinhala)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 443f383ab138241884bf24fff6e5640a16f59550 Author: HelaBasa <R45XvezA(a)protonmail.ch> Date: Sun Jul 11 01:23:31 2021 +0200 Translated using Weblate (Sinhala) Currently translated at 34.3% (76 of 221 strings) Co-authored-by: HelaBasa <R45XvezA(a)protonmail.ch> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/si/ Translation: Guardian Project/Orbot --- app/src/main/res/values-si-rLK/strings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml index 613c38e7..2a490c83 100644 --- a/app/src/main/res/values-si-rLK/strings.xml +++ b/app/src/main/res/values-si-rLK/strings.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Orbot</string> - <string name="app_description">Orbot à¶ºà¶±à· à¶à¶±à·à¶à·à¶à· à¶à·à¶Žà·à·à· à·à¶§ à·à¶©à· à¶à·à¶»à¶à·à·à·à¶à·à¶»à·à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œà·à¶ºà· à·à·à¶»à·à·à·à¶»à·à¶žà¶§ à¶à¶© à·à¶œà·à·à¶¯à·à¶± à¶±à·à·à¶žà·à¶œà·à· à¶œà¶¶à·à¶¯à·à¶±à·à¶±à·à·à· à¶Žà·à¶»à·à¶à·à·à· à·à·à·à·à·à·à¶à·. à¶à¶º Tor à¶ºà·à·à¶¯à·à¶à¶±à·à¶žà·à¶±à· à¶à¶¶à¶à·à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œ à¶à¶±à·à¶¯à·à¶±à· à¶à·à·à¶à¶±à¶º à¶à¶»à¶ºà· à¶à¶žà·à¶±à·à¶ž à¶à¶º à¶œà·à·à· à·à¶§à· à·à· à¶à¶±à·à¶à·à¶à· à·à¶žà·à¶±à·à¶à¶» à¶Žà¶»à·à¶à¶±à¶ à·à¶»à·à· à¶à·à¶±à¶ºà¶žà·à¶±à· à¶à¶¶à¶à·à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œ à¶à¶±à·à¶¯à·à¶±à· à·à¶à·à· à¶à¶¶à·à¶à¶±à·. Tor à¶ºà¶±à· </string> - <string name="status_starting_up">Orbot à¶à¶»à¶žà·à¶· à¶à¶»à¶žà·à¶±à·âŠ</string> - <string name="status_activated">Tor à¶¢à·à¶œà¶ºà¶§ à·à¶¶à·à¶¯à·à¶ºà·</string> - <string name="status_disabled">Orbot à¶à·âà¶»à·à¶ºà·à·à·à¶»à·à·à¶ à¶à¶» à¶à¶ </string> - <string name="menu_settings">à·à·à¶§à·à·à¶žà·</string> + <string name="app_name">à¶à¶»à·à¶¶à·à¶§à·</string> + <string name="app_description">à¶à¶»à·à¶¶à·à¶§à· à¶ºà¶±à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œà¶º à·à¶©à·à¶à· à¶à¶»à¶à·à·à·à¶à· à¶·à·à·à·à¶à· à¶à·à¶»à·à¶žà¶§ à¶à¶±à·à¶à·à¶à· à¶ºà·à¶¯à·à¶žà· à·à¶œà¶§ à¶¶à¶œà¶º à¶œà¶¶à· à¶¯à·à¶± à¶±à·à¶žà·à¶œà· à¶Žà·à¶»à¶à¶œà·à·à· à¶ºà·à¶¯à·à¶žà¶à·. à¶à¶»à·à¶¶à¶§à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œ à¶à¶žà¶±à·à¶à¶žà¶±à¶º à·à¶à¶à·à¶à·à¶à¶à¶±à¶º à¶à·à¶»à·à¶žà¶§ à¶§à·à¶»à· à¶·à·à·à·à¶à· à¶à¶»à¶± à¶à¶à¶» à¶Žà·à·à· à¶à¶º à¶œà·à· à¶Žà·à¶»à· à¶Žà¶»à·à¶à¶«à¶ à¶žà·à¶œà·à·à¶à· à·à¶»à·à· à¶Žà·à¶±à·à¶± à·à·à¶žà·à¶±à· à·à·à¶à·à·à¶žà¶§ à¶œà¶à· à¶à¶»à¶ºà·. à¶§à·à¶»à· à¶ºà¶±à· à¶±à·à·à¶žà·à¶œà· à¶žà·à¶¯à·à¶à·à¶à¶à¶ºà¶à· à·à¶± à¶à¶à¶» à¶Žà·à¶¯à·à¶à¶œà·à¶ à¶±à·à¶¯à·à· à·à· à¶Žà·à¶¯à·à¶à¶œà·à¶à¶à·à·à¶º, à·à·à·à·à·à·à· à¶à¶§à¶ºà·à¶à· à·à·âà¶ºà·à¶Žà·à¶»à·à¶ à¶à·âà¶»à·à¶ºà·à¶à·à¶»à¶à¶žà· à·à· à·à¶¶à·à¶³à·à¶ºà ·à·à¶±à·à¶ à¶§ à¶à¶à·à·à¶± à¶à¶»à·à¶¢à¶±, à·à· à¶¢à¶±à¶Žà¶¯ à¶à¶»à¶à·à·à·à· à¶œà·à· à·à·à¶³à·à¶±à·à·à·à¶± à¶Žà·âà¶»à·à·à· à·à·à·à·à¶œà·à·à¶«à¶º à¶ºà¶±à·à¶¯à· à¶¢à·à¶œ à¶Žà·âà¶»à·à·à¶à·à·à¶« à¶à¶à·à¶» à·à¶œà¶§ à¶à¶»à·à·à·à· à·à·à¶§à·à¶žà¶§ à¶à¶¶à¶§ à·à·à·à¶º à·à¶± à·à·à·à·à¶ à¶¢à·à¶œà¶ºà¶à·.</string> + <string name="status_starting_up">à¶à¶»à·à¶¶à·à¶§à· à¶à¶»à¶¹à·à¶žà·à¶±à·âŠ</string> + <string name="status_activated">à¶§à·à¶»à· à¶¢à·à¶œà¶ºà¶§ à·à¶žà·à¶¶à¶±à·à¶°à¶ºà·</string> + <string name="status_disabled">à¶à¶»à·à¶¶à·à¶§à· à¶à·âà¶»à·à¶ºà·à·à·à¶»à·à·à¶ à¶à¶» à¶à¶</string> + <string name="menu_settings">à·à·à¶à·à·à¶žà·</string> <string name="menu_log">à¶œà·à¶à¶º </string> <string name="menu_start">à¶à¶»à¶¹à¶±à·à¶±</string> <string name="menu_stop">à¶±à·à¶à·à·à¶±à·à¶±</string> - <string name="menu_about">à¶Žà·à·à·à¶¶à¶¯</string> + <string name="menu_about">à¶Žà·à·à·à¶¶à¶³à·</string> <string name="main_layout_download">à¶¶à·à¶à¶±à·à¶±</string> <string name="main_layout_upload">à¶à¶©à·à¶à¶ à¶à¶»à¶±à·à¶± </string> - <string name="button_about">à¶Žà·à·à·à¶¶à¶¯</string> - <string name="menu_exit">à¶à·à¶à· à·à¶±à·à¶±</string> + <string name="button_about">à¶Žà·à·à·à¶¶à¶³à·</string> + <string name="menu_exit">à¶Žà·à¶§à·à¶±à·à¶±</string>  <string name="wizard_details">Orbot à¶Žà·à·à·à¶¶à¶¯ à¶à¶à·à¶žà· à·à·à·à·à¶à¶» </string>

1 0

[orbot/master] Only enable pdnsd debug output when debug logging is enabled
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 93bf7b24b14d74e1b628b3ac544f62b1c2b1ed46 Author: Tad <tad(a)spotco.us> Date: Sat Jul 10 05:14:39 2021 -0400 Only enable pdnsd debug output when debug logging is enabled --- .../torproject/android/service/vpn/OrbotVpnManager.java | 17 ++++++++++++----- orbotservice/src/main/res/values/pdnsd.xml | 1 + 2 files changed, 13 insertions(+), 5 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 7e991ace..447031b7 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 @@ -79,16 +79,18 @@ public class OrbotVpnManager implements Handler.Callback { private final File filePdnsd; private boolean isRestart = false; private final VpnService mService; + private final SharedPreferences prefs; public OrbotVpnManager(VpnService service) { mService = service; + prefs = Prefs.getSharedPrefs(mService.getApplicationContext()); filePdnsd = CustomNativeLoader.loadNativeBinary(service.getApplicationContext(), PDNSD_BIN, new File(service.getFilesDir(), PDNSD_BIN)); Tun2Socks.init(); } - public static File makePdnsdConf(Context context, File fileDir, String torDnsHost, int torDnsPort, String pdnsdHost, int pdnsdPort) throws IOException { + public static File makePdnsdConf(Context context, File fileDir, String torDnsHost, int torDnsPort, String pdnsdHost, int pdnsdPort, String pdnsdDebug) throws IOException { String conf = String.format(context.getString(R.string.pdnsd_conf), - torDnsHost, torDnsPort, fileDir.getAbsolutePath(), pdnsdHost, pdnsdPort); + torDnsHost, torDnsPort, fileDir.getAbsolutePath(), pdnsdHost, pdnsdPort, pdnsdDebug); Log.d(TAG, "pdsnd conf:" + conf); @@ -335,7 +337,6 @@ public class OrbotVpnManager implements Handler.Callback { @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void doLollipopAppRouting(VpnService.Builder builder) throws NameNotFoundException { - SharedPreferences prefs = Prefs.getSharedPrefs(mService.getApplicationContext()); ArrayList<TorifiedApp> apps = TorifiedApp.getApps(mService, prefs); @@ -360,10 +361,16 @@ public class OrbotVpnManager implements Handler.Callback { } private void startDNS(String pdnsPath, String torDnsHost, int torDnsPort, String pdnsdHost, int pdnsdPort) throws IOException, TimeoutException { + String debugEnabledCmd = ""; + String debugEnabledConf = "off"; + if (prefs.getBoolean(PREF_ENABLE_LOGGING, false)) { + debugEnabledCmd = "-g"; + debugEnabledConf = "on"; + } - File fileConf = makePdnsdConf(mService, mService.getFilesDir(), torDnsHost, torDnsPort, pdnsdHost, pdnsdPort); + File fileConf = makePdnsdConf(mService, mService.getFilesDir(), torDnsHost, torDnsPort, pdnsdHost, pdnsdPort, debugEnabledConf); - String[] cmdString = {pdnsPath, "-c", fileConf.toString(), "-g", "-v2"}; + String[] cmdString = {pdnsPath, "-c", fileConf.toString(), debugEnabledCmd, "-v2"}; ProcessBuilder pb = new ProcessBuilder(cmdString); pb.redirectErrorStream(true); Process proc = pb.start(); diff --git a/orbotservice/src/main/res/values/pdnsd.xml b/orbotservice/src/main/res/values/pdnsd.xml index 3b5bb7ad..38b7c5a2 100644 --- a/orbotservice/src/main/res/values/pdnsd.xml +++ b/orbotservice/src/main/res/values/pdnsd.xml @@ -12,6 +12,7 @@ global { timeout=10; daemon=on; pid_file="%3$s/pdnsd.pid"; + debug=%6$d; } server {

1 0