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

Simplified and improved DNS selection logic

This commit is contained in:
M66B 2016-02-06 18:42:10 +01:00
parent 4038831c7b
commit 86334e72aa
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/eu/faircode/netguard/SinkholeService.java
View File

@ -737,24 +737,18 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
try {
if (TextUtils.isEmpty(vpnDns.trim()))
throw new UnknownHostException("dns");
InetAddress vpn = InetAddress.getByName(vpnDns);
Log.i(TAG, "DNS vpn using=" + vpn);
return vpn;
} catch (UnknownHostException ignored1) {
InetAddress dns = InetAddress.getByName(vpnDns);
if (dns.isAnyLocalAddress() || dns.isLinkLocalAddress() || dns.isLoopbackAddress())
throw new UnknownHostException("dns");
Log.i(TAG, "DNS using=" + dns);
return dns;
} catch (Throwable ignored) {
try {
if (TextUtils.isEmpty(sysDns.trim()))
throw new UnknownHostException("dns");
InetAddress sys = InetAddress.getByName(sysDns);
Log.i(TAG, "DNS sys using=" + sys);
return sys;
} catch (UnknownHostException ignored2) {
try {
InetAddress def = InetAddress.getByName("8.8.8.8");
Log.i(TAG, "DNS def using=" + def);
return def;
} catch (UnknownHostException ignored) {
return null;
}
InetAddress def = InetAddress.getByName("8.8.8.8");
Log.i(TAG, "DNS using=" + def);
return def;
} catch (UnknownHostException ignored1) {
return null;
}
}
}