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

Fix ignore flags not working issue

Browse Source
This commit is contained in:
Nick Peng
2019-11-11 00:07:33 +08:00
parent 4e0cbc50b3
commit 1fb5cbbcd9
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/dns_server.c
View File

@@ -1717,7 +1717,35 @@ static void _dns_server_log_rule(const char *domain, enum domain_rule rule_type,
tlog(TLOG_INFO, "RULE-MATCH, type: %d, domain: %s, rule: %s", rule_type, domain, rule_name); tlog(TLOG_INFO, "RULE-MATCH, type: %d, domain: %s, rule: %s", rule_type, domain, rule_name);
} }
int _dns_server_get_rules(unsigned char *key, uint32_t key_len, void *value, void *arg) static void _dns_server_update_rule_by_flags(struct dns_request *request)
{
struct dns_rule_flags *rule_flag =
(struct dns_rule_flags *)request->domain_rule.rules[0];
unsigned flags = rule_flag->flags;
if (flags & DOMAIN_FLAG_ADDR_IGN) {
request->domain_rule.rules[DOMAIN_RULE_ADDRESS_IPV4] = NULL;
request->domain_rule.rules[DOMAIN_RULE_ADDRESS_IPV6] = NULL;
}
if (flags & DOMAIN_FLAG_ADDR_IPV4_IGN) {
request->domain_rule.rules[DOMAIN_RULE_ADDRESS_IPV4] = NULL;
}
if (flags & DOMAIN_FLAG_ADDR_IPV6_IGN) {
request->domain_rule.rules[DOMAIN_RULE_ADDRESS_IPV6] = NULL;
}
if (flags & DOMAIN_FLAG_IPSET_IGNORE) {
request->domain_rule.rules[DOMAIN_RULE_IPSET] = NULL;
}
if (flags & DOMAIN_FLAG_NAMESERVER_IGNORE) {
request->domain_rule.rules[DOMAIN_RULE_NAMESERVER] = NULL;
}
}
static int _dns_server_get_rules(unsigned char *key, uint32_t key_len, void *value, void *arg)
{ {
struct rule_walk_args *walk_args = arg; struct rule_walk_args *walk_args = arg;
struct dns_request *request = walk_args->args; struct dns_request *request = walk_args->args;
@@ -1737,6 +1765,9 @@ int _dns_server_get_rules(unsigned char *key, uint32_t key_len, void *value, voi
walk_args->key_len[i] = key_len; walk_args->key_len[i] = key_len;
} }
/* update rules by flags */
_dns_server_update_rule_by_flags(request);
return 0; return 0;
} }