X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-dns-query.h;h=788992e679ea31192bd629065312b0bd11b055f0;hb=32a568fb90bf0a22a3007fa670305403a5d0bb72;hp=864036acc73609675f24c60abf59d395155c156d;hpb=8ba9fd9cee0eef572f7b3ed7a8c3ed31160e93d3;p=elogind.git
diff --git a/src/resolve/resolved-dns-query.h b/src/resolve/resolved-dns-query.h
index 864036acc..788992e67 100644
--- a/src/resolve/resolved-dns-query.h
+++ b/src/resolve/resolved-dns-query.h
@@ -21,87 +21,60 @@
along with systemd; If not, see .
***/
-#include
#include "sd-bus.h"
-#include "util.h"
+#include "set.h"
typedef struct DnsQuery DnsQuery;
-typedef struct DnsQueryTransaction DnsQueryTransaction;
-
-#include "resolved.h"
-#include "resolved-dns-scope.h"
-#include "resolved-dns-rr.h"
-#include "resolved-dns-packet.h"
-
-typedef enum DnsQueryState {
- DNS_QUERY_NULL,
- DNS_QUERY_PENDING,
- DNS_QUERY_FAILURE,
- DNS_QUERY_SUCCESS,
- DNS_QUERY_NO_SERVERS,
- DNS_QUERY_TIMEOUT,
- DNS_QUERY_ATTEMPTS_MAX,
- DNS_QUERY_INVALID_REPLY,
- DNS_QUERY_RESOURCES
-} DnsQueryState;
-
-struct DnsQueryTransaction {
- DnsQuery *query;
- DnsScope *scope;
-
- DnsQueryState state;
- uint16_t id;
- sd_event_source *timeout_event_source;
- unsigned n_attempts;
-
- DnsPacket *sent, *received;
-
- /* TCP connection logic */
- int tcp_fd;
- sd_event_source *tcp_event_source;
- size_t tcp_written, tcp_read;
- be16_t tcp_read_size;
-
- LIST_FIELDS(DnsQueryTransaction, transactions_by_query);
- LIST_FIELDS(DnsQueryTransaction, transactions_by_scope);
-};
+#include "resolved-dns-question.h"
+#include "resolved-dns-answer.h"
+#include "resolved-dns-stream.h"
struct DnsQuery {
Manager *manager;
+ DnsQuestion *question;
- DnsResourceKey *keys;
- unsigned n_keys;
+ uint64_t flags;
+ int ifindex;
- DnsQueryState state;
- unsigned n_cname;
+ DnsTransactionState state;
+ unsigned n_cname_redirects;
sd_event_source *timeout_event_source;
- DnsPacket *received;
+ /* Discovered data */
+ DnsAnswer *answer;
+ int answer_ifindex;
+ int answer_family;
+ DnsProtocol answer_protocol;
+ int answer_rcode;
/* Bus client information */
sd_bus_message *request;
- unsigned char request_family;
+ int request_family;
const char *request_hostname;
union in_addr_union request_address;
+ /* Completion callback */
void (*complete)(DnsQuery* q);
+ unsigned block_ready;
+
+ Set *transactions;
+
+ sd_bus_track *bus_track;
- LIST_HEAD(DnsQueryTransaction, transactions);
LIST_FIELDS(DnsQuery, queries);
};
-int dns_query_new(Manager *m, DnsQuery **q, DnsResourceKey *keys, unsigned n_keys);
+int dns_query_new(Manager *m, DnsQuery **q, DnsQuestion *question, int family, uint64_t flags);
DnsQuery *dns_query_free(DnsQuery *q);
-int dns_query_start(DnsQuery *q);
-int dns_query_follow_cname(DnsQuery *q, const char *name);
-int dns_query_matches_rr(DnsQuery *q, DnsResourceRecord *rr);
-int dns_query_matches_cname(DnsQuery *q, DnsResourceRecord *rr);
-
-DnsQueryTransaction* dns_query_transaction_free(DnsQueryTransaction *t);
-void dns_query_transaction_reply(DnsQueryTransaction *t, DnsPacket *p);
-void dns_query_finish(DnsQuery *q);
+
+int dns_query_go(DnsQuery *q);
+void dns_query_ready(DnsQuery *q);
+
+int dns_query_cname_redirect(DnsQuery *q, const char *name);
+
+int dns_query_bus_track(DnsQuery *q, sd_bus *bus, sd_bus_message *m);
DEFINE_TRIVIAL_CLEANUP_FUNC(DnsQuery*, dns_query_free);