shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-11 04:58:19 +03:00
Code

resolved: minor cleanups

Browse Source 
(cherry picked from commit c805014a350da7c32eb2bdb408a9fa643c191dee)
(cherry picked from commit 91ba2eac4b6b463026b3a93e5a139923e8f2cfe4)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-01-29 16:18:12 +01:00
parent f6c9e66b9d
commit 2dbe6694d1
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/resolve/resolved-dns-query.c
View File

@ -48,7 +48,6 @@ static void dns_query_candidate_stop(DnsQueryCandidate *c) {
}
DnsQueryCandidate* dns_query_candidate_free(DnsQueryCandidate *c) {
if (!c)
return NULL;
@ -67,7 +66,7 @@ DnsQueryCandidate* dns_query_candidate_free(DnsQueryCandidate *c) {
}
static int dns_query_candidate_next_search_domain(DnsQueryCandidate *c) {
DnsSearchDomain *next = NULL;
DnsSearchDomain *next;
assert(c);
@ -597,8 +596,8 @@ static int dns_query_try_etc_hosts(DnsQuery *q) {
assert(q);
/* Looks in /etc/hosts for matching entries. Note that this is done *before* the normal lookup is done. The
* data from /etc/hosts hence takes precedence over the network. */
/* Looks in /etc/hosts for matching entries. Note that this is done *before* the normal lookup is
* done. The data from /etc/hosts hence takes precedence over the network. */
r = manager_etc_hosts_lookup(
q->manager,

16
src/resolve/resolved-dns-query.h
View File

@ -29,19 +29,19 @@ struct DnsQueryCandidate {
struct DnsQuery {
Manager *manager;
/* When resolving a service, we first create a TXT+SRV query,
* and then for the hostnames we discover auxiliary A+AAAA
* queries. This pointer always points from the auxiliary
* queries back to the TXT+SRV query. */
/* When resolving a service, we first create a TXT+SRV query, and then for the hostnames we discover
* auxiliary A+AAAA queries. This pointer always points from the auxiliary queries back to the
* TXT+SRV query. */
DnsQuery *auxiliary_for;
LIST_HEAD(DnsQuery, auxiliary_queries);
unsigned n_auxiliary_queries;
int auxiliary_result;
/* The question, formatted in IDNA for use on classic DNS, and as UTF8 for use in LLMNR or mDNS. Note that even
* on classic DNS some labels might use UTF8 encoding. Specifically, DNS-SD service names (in contrast to their
* domain suffixes) use UTF-8 encoding even on DNS. Thus, the difference between these two fields is mostly
* relevant only for explicit *hostname* lookups as well as the domain suffixes of service lookups. */
/* The question, formatted in IDNA for use on classic DNS, and as UTF8 for use in LLMNR or mDNS. Note
* that even on classic DNS some labels might use UTF8 encoding. Specifically, DNS-SD service names
* (in contrast to their domain suffixes) use UTF-8 encoding even on DNS. Thus, the difference
* between these two fields is mostly relevant only for explicit *hostname* lookups as well as the
* domain suffixes of service lookups. */
DnsQuestion *question_idna;
DnsQuestion *question_utf8;