X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-dns-scope.h;h=cfbde1343f49641234e6aa6764d5750f2409fb2b;hb=32a568fb90bf0a22a3007fa670305403a5d0bb72;hp=6ba5ef241906642d8329c7478c57a39fb79db6dc;hpb=a407657425a3e47fd2b559cd3bc800f791303f63;p=elogind.git

diff --git a/src/resolve/resolved-dns-scope.h b/src/resolve/resolved-dns-scope.h
index 6ba5ef241..cfbde1343 100644
--- a/src/resolve/resolved-dns-scope.h
+++ b/src/resolve/resolved-dns-scope.h
@@ -27,11 +27,8 @@ typedef struct DnsScope DnsScope;
 
 #include "resolved-dns-server.h"
 #include "resolved-dns-packet.h"
-#include "resolved-dns-query.h"
 #include "resolved-dns-cache.h"
 #include "resolved-dns-zone.h"
-#include "resolved-dns-stream.h"
-#include "resolved-manager.h"
 #include "resolved-link.h"
 
 typedef enum DnsScopeMatch {
@@ -55,7 +52,7 @@ struct DnsScope {
         DnsCache cache;
         DnsZone zone;
 
-        Hashmap *conflict_queue;
+        OrderedHashmap *conflict_queue;
         sd_event_source *conflict_event_source;
 
         RateLimit ratelimit;
@@ -71,7 +68,7 @@ DnsScope* dns_scope_free(DnsScope *s);
 int dns_scope_emit(DnsScope *s, DnsPacket *p);
 int dns_scope_tcp_socket(DnsScope *s, int family, const union in_addr_union *address, uint16_t port);
 
-DnsScopeMatch dns_scope_good_domain(DnsScope *s, const char *domain);
+DnsScopeMatch dns_scope_good_domain(DnsScope *s, int ifindex, uint64_t flags, const char *domain);
 int dns_scope_good_key(DnsScope *s, DnsResourceKey *key);
 int dns_scope_good_dns_server(DnsScope *s, int family, const union in_addr_union *address);