From b77cea63e9eecd45ab257906868c77baec27e6b7 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Wed, 21 Jul 2021 12:06:02 +0800 Subject: [PATCH] Update dns_server.c --- src/dns_server.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/dns_server.c b/src/dns_server.c index 8c209df..651b309 100644 --- a/src/dns_server.c +++ b/src/dns_server.c @@ -691,13 +691,13 @@ static int _dns_setup_ipset(struct dns_request *request) /* check ipset rule */ 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]; } - 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]; } - 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]; } @@ -1837,16 +1837,14 @@ static int _dns_server_setup_ipset_packet(struct dns_request *request, struct dn } /* check ipset rule */ rule_flags = request->domain_rule.rules[DOMAIN_RULE_FLAGS]; - if (rule_flags) { - if ((rule_flags->flags & DOMAIN_FLAG_IPSET_IGN) == 0) { - ipset_rule = request->domain_rule.rules[DOMAIN_RULE_IPSET]; - } - if ((rule_flags->flags & DOMAIN_FLAG_IPSET_IPV4_IGN) == 0) { - ipset_rule_v4 = request->domain_rule.rules[DOMAIN_RULE_IPSET_IPV4]; - } - if ((rule_flags->flags & DOMAIN_FLAG_IPSET_IPV6_IGN) == 0) { - ipset_rule_v6 = request->domain_rule.rules[DOMAIN_RULE_IPSET_IPV6]; - } + if (!rule_flags || (rule_flags->flags & DOMAIN_FLAG_IPSET_IGN) == 0) { + ipset_rule = request->domain_rule.rules[DOMAIN_RULE_IPSET]; + } + if (!rule_flags || (rule_flags->flags & DOMAIN_FLAG_IPSET_IPV4_IGN) == 0) { + ipset_rule_v4 = request->domain_rule.rules[DOMAIN_RULE_IPSET_IPV4]; + } + if (!rule_flags || (rule_flags->flags & DOMAIN_FLAG_IPSET_IPV6_IGN) == 0) { + ipset_rule_v6 = request->domain_rule.rules[DOMAIN_RULE_IPSET_IPV6]; } if (!(ipset_rule || ipset_rule_v4 || ipset_rule_v6)) {