n/nextdns-mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed cannot reload RuleResolver when no rule is activated

Browse Source
This commit is contained in:
PeratX 2017-12-18 20:30:59 +08:00
parent 57191b8fd0
commit ace52e19b4
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/itxtech/daedalus/Daedalus.java
View File

@ -140,7 +140,7 @@ public class Daedalus extends Application {
return gson.fromJson(reader, beanClass); return gson.fromJson(reader, beanClass);
} }
public static void initHostsResolver() { public static void initRuleResolver() {
if (Daedalus.getPrefs().getBoolean("settings_local_rules_resolution", false)) { if (Daedalus.getPrefs().getBoolean("settings_local_rules_resolution", false)) {
ArrayList<String> pendingLoad = new ArrayList<>(); ArrayList<String> pendingLoad = new ArrayList<>();
ArrayList<Rule> usingRules = configurations.getUsingRules(); ArrayList<Rule> usingRules = configurations.getUsingRules();
@ -161,6 +161,8 @@ public class Daedalus extends Application {
RuleResolver.startLoadDnsmasq(arr); RuleResolver.startLoadDnsmasq(arr);
break; break;
} }
} else {
RuleResolver.clear();
} }
} else { } else {
RuleResolver.clear(); RuleResolver.clear();
@ -171,7 +173,7 @@ public class Daedalus extends Application {
public static void setRulesChanged() { public static void setRulesChanged() {
if (DaedalusVpnService.isActivated() && if (DaedalusVpnService.isActivated() &&
getPrefs().getBoolean("settings_allow_dynamic_rule_reload", false)) { getPrefs().getBoolean("settings_allow_dynamic_rule_reload", false)) {
initHostsResolver(); initRuleResolver();
} }
} }

2
app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
View File

@ -111,7 +111,7 @@ public class DaedalusVpnService extends VpnService implements Runnable {
this.notification = builder; this.notification = builder;
} }
Daedalus.initHostsResolver(); Daedalus.initRuleResolver();
DNSServerHelper.buildPortCache(); DNSServerHelper.buildPortCache();
if (this.mThread == null) { if (this.mThread == null) {

14
app/src/main/java/org/itxtech/daedalus/util/RuleResolver.java
View File

@ -33,8 +33,8 @@ public class RuleResolver implements Runnable {
private static int mode = MODE_HOSTS; private static int mode = MODE_HOSTS;
private static String[] hostsFiles; private static String[] hostsFiles;
private static String[] dnsmasqFiles; private static String[] dnsmasqFiles;
private static HashMap<String, String> rulesA; private static HashMap<String, String> rulesA = new HashMap<>();
private static HashMap<String, String> rulesAAAA; private static HashMap<String, String> rulesAAAA = new HashMap<>();
private static boolean shutdown = false; private static boolean shutdown = false;
public RuleResolver() { public RuleResolver() {
@ -61,18 +61,20 @@ public class RuleResolver implements Runnable {
} }
public static void clear() { public static void clear() {
rulesA = null; rulesA = new HashMap<>();
rulesAAAA = null; rulesAAAA = new HashMap<>();
} }
public static String resolve(String hostname, Record.TYPE type) { public static String resolve(String hostname, Record.TYPE type) {
HashMap<String, String> rules = null; HashMap<String, String> rules;
if (type == Record.TYPE.A) { if (type == Record.TYPE.A) {
rules = rulesA; rules = rulesA;
} else if (type == Record.TYPE.AAAA) { } else if (type == Record.TYPE.AAAA) {
rules = rulesAAAA; rules = rulesAAAA;
} else {
return null;
} }
if (rules == null) { if (rules.size() == 0) {
return null; return null;
} }
if (rules.containsKey(hostname)) { if (rules.containsKey(hostname)) {