mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Disable private DNS in filtering mode only

This commit is contained in:
M66B 2019-08-03 18:38:50 +02:00
parent 1fe3a04ae7
commit bb9a99d2cd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View File

@ -1128,9 +1128,10 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean ip6 = prefs.getBoolean("ip6", true);
boolean pdns = Util.isPrivateDns(context);
boolean filter = prefs.getBoolean("filter", false);
// Make sure normal DNS servers are used when private DNS is enabled
String vpnDns1 = prefs.getString("dns", pdns ? "8.8.8.8" : null);
String vpnDns2 = prefs.getString("dns2", pdns ? "8.8.4.4" : null);
String vpnDns1 = prefs.getString("dns", pdns && filter ? "8.8.8.8" : null);
String vpnDns2 = prefs.getString("dns2", pdns && filter ? "8.8.4.4" : null);
Log.i(TAG, "DNS system=" + TextUtils.join(",", sysDns) + " VPN1=" + vpnDns1 + " VPN2=" + vpnDns2);
if (vpnDns1 != null)
@ -1167,8 +1168,8 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
// Remove local DNS servers when not routing LAN
boolean lan = prefs.getBoolean("lan", false);
boolean use_hosts = prefs.getBoolean("filter", false) && prefs.getBoolean("use_hosts", false);
if (lan && use_hosts) {
boolean use_hosts = prefs.getBoolean("use_hosts", false);
if (lan && use_hosts && filter) {
List<InetAddress> listLocal = new ArrayList<>();
try {
Enumeration<NetworkInterface> nis = NetworkInterface.getNetworkInterfaces();