diff options
Diffstat (limited to 'src/grp-resolve')
17 files changed, 28 insertions, 25 deletions
diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c index 39afbada25..7d58edcdfa 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c +++ b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c @@ -22,12 +22,13 @@ #endif #include "basic/alloc-util.h" +#include "basic/hexdecoct.h" +#include "basic/string-table.h" #include "shared/dns-domain.h" #include "shared/gcrypt-util.h" -#include "basic/hexdecoct.h" + #include "resolved-dns-dnssec.h" #include "resolved-dns-packet.h" -#include "basic/string-table.h" #define VERIFY_RRS_MAX 256 #define MAX_KEY_SIZE (32*1024) diff --git a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h index 81879e287f..b73cc24100 100644 --- a/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h +++ b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h @@ -19,11 +19,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "shared/dns-domain.h" + typedef enum DnssecResult DnssecResult; typedef enum DnssecVerdict DnssecVerdict; -#include "shared/dns-domain.h" - #include "resolved-dns-answer.h" #include "resolved-dns-rr.h" diff --git a/src/grp-resolve/systemd-resolve/resolve-tool.c b/src/grp-resolve/systemd-resolve/resolve-tool.c index d9f28576b7..dee23289b3 100644 --- a/src/grp-resolve/systemd-resolve/resolve-tool.c +++ b/src/grp-resolve/systemd-resolve/resolve-tool.c @@ -28,13 +28,12 @@ #include "basic/in-addr-util.h" #include "basic/parse-util.h" #include "basic/terminal-util.h" +#include "resolved-def.h" +#include "resolved-dns-packet.h" #include "sd-bus/bus-error.h" #include "shared/bus-util.h" #include "shared/gcrypt-util.h" -#include "resolved-def.h" -#include "resolved-dns-packet.h" - #define DNS_CALL_TIMEOUT_USEC (45*USEC_PER_SEC) static int arg_family = AF_UNSPEC; diff --git a/src/grp-resolve/systemd-resolved/resolved-bus.c b/src/grp-resolve/systemd-resolved/resolved-bus.c index 31c6999743..1454e1f5f4 100644 --- a/src/grp-resolve/systemd-resolved/resolved-bus.c +++ b/src/grp-resolve/systemd-resolved/resolved-bus.c @@ -18,12 +18,12 @@ ***/ #include "basic/alloc-util.h" +#include "resolved-def.h" #include "sd-bus/bus-common-errors.h" #include "shared/bus-util.h" #include "shared/dns-domain.h" #include "resolved-bus.h" -#include "resolved-def.h" #include "resolved-dns-synthesize.h" #include "resolved-link-bus.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c index 8ef2048c49..33e0582d98 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c @@ -22,11 +22,11 @@ #include "basic/af-list.h" #include "basic/alloc-util.h" #include "basic/string-util.h" +#include "resolved-dns-answer.h" +#include "resolved-dns-packet.h" #include "shared/dns-domain.h" -#include "resolved-dns-answer.h" #include "resolved-dns-cache.h" -#include "resolved-dns-packet.h" /* Never cache more than 4K entries. RFC 1536, Section 5 suggests to * leave DNS caches unbounded, but that's crazy. */ diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-query.c b/src/grp-resolve/systemd-resolved/resolved-dns-query.c index f512748f8d..7b9282a69d 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-query.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.c @@ -20,10 +20,10 @@ #include "basic/alloc-util.h" #include "basic/hostname-util.h" #include "basic/string-util.h" +#include "dns-type.h" #include "sd-netlink/local-addresses.h" #include "shared/dns-domain.h" -#include "dns-type.h" #include "resolved-dns-query.h" #include "resolved-dns-synthesize.h" #include "resolved-etc-hosts.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-query.h b/src/grp-resolve/systemd-resolved/resolved-dns-query.h index 86d861ce76..4a127930bd 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-query.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.h @@ -23,12 +23,12 @@ #include <systemd/sd-bus.h> #include "basic/set.h" +#include "resolved-dns-answer.h" +#include "resolved-dns-question.h" typedef struct DnsQuery DnsQuery; typedef struct DnsQueryCandidate DnsQueryCandidate; -#include "resolved-dns-answer.h" -#include "resolved-dns-question.h" #include "resolved-dns-search-domain.h" #include "resolved-dns-stream.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-scope.h b/src/grp-resolve/systemd-resolved/resolved-dns-scope.h index 293e2bdf37..e3c4e15ead 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-scope.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.h @@ -20,12 +20,12 @@ ***/ #include "basic/list.h" +#include "resolved-dns-dnssec.h" +#include "resolved-dns-packet.h" typedef struct DnsScope DnsScope; #include "resolved-dns-cache.h" -#include "resolved-dns-dnssec.h" -#include "resolved-dns-packet.h" #include "resolved-dns-server.h" #include "resolved-dns-stream.h" #include "resolved-dns-zone.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-stream.h b/src/grp-resolve/systemd-resolved/resolved-dns-stream.h index a47b2ab3ed..65be14c5ed 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-stream.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-stream.h @@ -20,10 +20,10 @@ ***/ #include "basic/socket-util.h" +#include "resolved-dns-packet.h" typedef struct DnsStream DnsStream; -#include "resolved-dns-packet.h" #include "resolved-dns-transaction.h" #include "resolved-manager.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h index 5d829bb2e7..2309105068 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.h @@ -21,6 +21,7 @@ #include "resolved-dns-answer.h" #include "resolved-dns-question.h" + #include "resolved-manager.h" int dns_synthesize_ifindex(int ifindex); diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h index 9783488200..96cedd7bc8 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.h @@ -60,6 +60,7 @@ enum DnsTransactionSource { #include "resolved-dns-answer.h" #include "resolved-dns-packet.h" #include "resolved-dns-question.h" + #include "resolved-dns-scope.h" struct DnsTransaction { diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c index b7c0b08fba..c9f221d425 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c @@ -29,9 +29,9 @@ #include "basic/set.h" #include "basic/string-util.h" #include "basic/strv.h" +#include "resolved-dns-dnssec.h" #include "shared/dns-domain.h" -#include "resolved-dns-dnssec.h" #include "resolved-dns-trust-anchor.h" static const char trust_anchor_dirs[] = CONF_PATHS_NULSTR("dnssec-trust-anchors.d"); diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h index 193e4a6923..ee5cda0748 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.h @@ -20,12 +20,11 @@ ***/ #include "basic/hashmap.h" - -typedef struct DnsTrustAnchor DnsTrustAnchor; - #include "resolved-dns-answer.h" #include "resolved-dns-rr.h" +typedef struct DnsTrustAnchor DnsTrustAnchor; + /* This contains a fixed database mapping domain names to DS or DNSKEY records. */ struct DnsTrustAnchor { diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c index 192811fc17..3d5bc9ea82 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c @@ -20,9 +20,9 @@ #include "basic/alloc-util.h" #include "basic/list.h" #include "basic/string-util.h" +#include "resolved-dns-packet.h" #include "shared/dns-domain.h" -#include "resolved-dns-packet.h" #include "resolved-dns-zone.h" /* Never allow more than 1K entries */ diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-zone.h b/src/grp-resolve/systemd-resolved/resolved-dns-zone.h index baddbc78ec..0c43bf2b96 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-zone.h +++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.h @@ -26,12 +26,13 @@ typedef struct DnsZone { Hashmap *by_name; } DnsZone; -typedef struct DnsZoneItem DnsZoneItem; -typedef enum DnsZoneItemState DnsZoneItemState; - #include "resolved-dns-answer.h" #include "resolved-dns-question.h" #include "resolved-dns-rr.h" + +typedef enum DnsZoneItemState DnsZoneItemState; +typedef struct DnsZoneItem DnsZoneItem; + #include "resolved-dns-transaction.h" /* RFC 4795 Section 2.8. suggests a TTL of 30s by default */ diff --git a/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h index 047443a896..e68d87417e 100644 --- a/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h +++ b/src/grp-resolve/systemd-resolved/resolved-etc-hosts.h @@ -21,6 +21,7 @@ #include "resolved-dns-answer.h" #include "resolved-dns-question.h" + #include "resolved-manager.h" void manager_etc_hosts_flush(Manager *m); diff --git a/src/grp-resolve/systemd-resolved/resolved-link.h b/src/grp-resolve/systemd-resolved/resolved-link.h index 8aa270cfd6..98b440b563 100644 --- a/src/grp-resolve/systemd-resolved/resolved-link.h +++ b/src/grp-resolve/systemd-resolved/resolved-link.h @@ -23,12 +23,12 @@ #include "basic/in-addr-util.h" #include "basic/ratelimit.h" +#include "resolved-dns-rr.h" #include "shared/resolve-util.h" typedef struct Link Link; typedef struct LinkAddress LinkAddress; -#include "resolved-dns-rr.h" #include "resolved-dns-scope.h" #include "resolved-dns-search-domain.h" #include "resolved-dns-server.h" |