daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dns_server.c

Browse Source
This commit is contained in:
LoveSy
2021-07-21 12:06:02 +08:00
committed by Nick Peng
parent f1ce462989
commit b77cea63e9
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/dns_server.c
View File

@@ -691,13 +691,13 @@ static int _dns_setup_ipset(struct dns_request *request)
/* check ipset rule */ /* check ipset rule */
rule_flags = request->domain_rule.rules[DOMAIN_RULE_FLAGS]; rule_flags = request->domain_rule.rules[DOMAIN_RULE_FLAGS];
if (!rule_flags || (rule_flags->flags & DOMAIN_FLAG_IPSET_IGN) != 0) { if (!rule_flags || (rule_flags->flags & DOMAIN_FLAG_IPSET_IGN) == 0) {
ipset_rule = request->domain_rule.rules[DOMAIN_RULE_IPSET]; ipset_rule = request->domain_rule.rules[DOMAIN_RULE_IPSET];
} }
if (!rule_flags || (rule_flags->flags & DOMAIN_FLAG_IPSET_IPV4_IGN) != 0) { if (!rule_flags || (rule_flags->flags & DOMAIN_FLAG_IPSET_IPV4_IGN) == 0) {
ipset_rule_v4 = request->domain_rule.rules[DOMAIN_RULE_IPSET_IPV4]; ipset_rule_v4 = request->domain_rule.rules[DOMAIN_RULE_IPSET_IPV4];
} }
if (!rule_flags || (rule_flags->flags & DOMAIN_FLAG_IPSET_IPV6_IGN) != 0) { if (!rule_flags || (rule_flags->flags & DOMAIN_FLAG_IPSET_IPV6_IGN) == 0) {
ipset_rule_v6 = request->domain_rule.rules[DOMAIN_RULE_IPSET_IPV6]; ipset_rule_v6 = request->domain_rule.rules[DOMAIN_RULE_IPSET_IPV6];
} }
@@ -1837,16 +1837,14 @@ static int _dns_server_setup_ipset_packet(struct dns_request *request, struct dn
} }
/* check ipset rule */ /* check ipset rule */
rule_flags = request->domain_rule.rules[DOMAIN_RULE_FLAGS]; rule_flags = request->domain_rule.rules[DOMAIN_RULE_FLAGS];
if (rule_flags) { if (!rule_flags || (rule_flags->flags & DOMAIN_FLAG_IPSET_IGN) == 0) {
if ((rule_flags->flags & DOMAIN_FLAG_IPSET_IGN) == 0) { ipset_rule = request->domain_rule.rules[DOMAIN_RULE_IPSET];
ipset_rule = request->domain_rule.rules[DOMAIN_RULE_IPSET]; }
} if (!rule_flags || (rule_flags->flags & DOMAIN_FLAG_IPSET_IPV4_IGN) == 0) {
if ((rule_flags->flags & DOMAIN_FLAG_IPSET_IPV4_IGN) == 0) { ipset_rule_v4 = request->domain_rule.rules[DOMAIN_RULE_IPSET_IPV4];
ipset_rule_v4 = request->domain_rule.rules[DOMAIN_RULE_IPSET_IPV4]; }
} if (!rule_flags || (rule_flags->flags & DOMAIN_FLAG_IPSET_IPV6_IGN) == 0) {
if ((rule_flags->flags & DOMAIN_FLAG_IPSET_IPV6_IGN) == 0) { ipset_rule_v6 = request->domain_rule.rules[DOMAIN_RULE_IPSET_IPV6];
ipset_rule_v6 = request->domain_rule.rules[DOMAIN_RULE_IPSET_IPV6];
}
} }
if (!(ipset_rule || ipset_rule_v4 || ipset_rule_v6)) { if (!(ipset_rule || ipset_rule_v4 || ipset_rule_v6)) {