Skip to content

Query domain of upstream DNS server, ignored address rules #1920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Query domain of upstream DNS server, ignored address rules #1920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/dns_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,8 @@ struct dns_request {
int has_cname_loop;

void *private_data;

int is_pending_server;
};

/* dns server data */
Expand Down Expand Up @@ -5459,7 +5461,11 @@ static void _dns_server_get_domain_rule_by_domain(struct dns_request *request, c
return;
}

_dns_server_get_domain_rule_by_domain_ext(request->conf, &request->domain_rule, -1, domain, out_log);
if (request->is_pending_server) {
_dns_server_get_domain_rule_by_domain_ext(request->conf, &request->domain_rule, DOMAIN_RULE_NAMESERVER, domain, out_log);
} else {
_dns_server_get_domain_rule_by_domain_ext(request->conf, &request->domain_rule, -1, domain, out_log);
}
request->skip_domain_rule = 1;
}

Expand Down Expand Up @@ -7342,6 +7348,7 @@ int dns_server_query(const char *domain, int qtype, struct dns_server_query_opti

safe_strncpy(request->domain, domain, sizeof(request->domain));
request->qtype = qtype;
request->is_pending_server = 1;
_dns_server_setup_server_query_options(request, server_query_option);
_dns_server_request_set_callback(request, callback, user_ptr);
ret = _dns_server_do_query(request, 0);
Expand Down