chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dns-domain: introduce macros for accessing all DNS header fields
[elogind.git]
/
src
/
resolve
/
resolved-manager.c
diff --git
a/src/resolve/resolved-manager.c
b/src/resolve/resolved-manager.c
index dc6deeb7e54ee704499366bc650abb869f08d841..09b758f3f4dad0cdf1adcce9f3fc580217779202 100644
(file)
--- a/
src/resolve/resolved-manager.c
+++ b/
src/resolve/resolved-manager.c
@@
-377,10
+377,9
@@
int manager_parse_config_file(Manager *m) {
assert(m);
assert(m);
- r = config_parse(NULL,
- "/etc/systemd/resolved.conf", NULL,
+ r = config_parse(NULL, "/etc/systemd/resolved.conf", NULL,
"Resolve\0",
"Resolve\0",
- config_item_perf_lookup,
(void*)
resolved_gperf_lookup,
+ config_item_perf_lookup, resolved_gperf_lookup,
false, false, m);
if (r < 0)
log_warning("Failed to parse configuration file: %s", strerror(-r));
false, false, m);
if (r < 0)
log_warning("Failed to parse configuration file: %s", strerror(-r));
@@
-654,7
+653,7
@@
static int on_dns_ipv4_packet(sd_event_source *s, int fd, uint32_t revents, void
if (r <= 0)
return r;
if (r <= 0)
return r;
- t = hashmap_get(m->dns_query_transactions, UINT_TO_PTR(DNS_PACKET_
HEADER(p)->id
));
+ t = hashmap_get(m->dns_query_transactions, UINT_TO_PTR(DNS_PACKET_
ID(p)
));
if (!t)
return 0;
if (!t)
return 0;
@@
-671,7
+670,7
@@
static int on_dns_ipv6_packet(sd_event_source *s, int fd, uint32_t revents, void
if (r <= 0)
return r;
if (r <= 0)
return r;
- t = hashmap_get(m->dns_query_transactions, UINT_TO_PTR(DNS_PACKET_
HEADER(p)->id
));
+ t = hashmap_get(m->dns_query_transactions, UINT_TO_PTR(DNS_PACKET_
ID(p)
));
if (!t)
return 0;
if (!t)
return 0;