chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-network: remove redundant array size parameter from functions that return arrays
[elogind.git]
/
src
/
resolve
/
resolved-dns-query.h
diff --git
a/src/resolve/resolved-dns-query.h
b/src/resolve/resolved-dns-query.h
index a07f1747068205ef66959454d0c88856d667238b..864036acc73609675f24c60abf59d395155c156d 100644
(file)
--- a/
src/resolve/resolved-dns-query.h
+++ b/
src/resolve/resolved-dns-query.h
@@
-36,13
+36,14
@@
typedef struct DnsQueryTransaction DnsQueryTransaction;
typedef enum DnsQueryState {
DNS_QUERY_NULL,
typedef enum DnsQueryState {
DNS_QUERY_NULL,
- DNS_QUERY_
SENT
,
+ DNS_QUERY_
PENDING
,
DNS_QUERY_FAILURE,
DNS_QUERY_SUCCESS,
DNS_QUERY_FAILURE,
DNS_QUERY_SUCCESS,
- DNS_QUERY_
SKIPPED
,
+ DNS_QUERY_
NO_SERVERS
,
DNS_QUERY_TIMEOUT,
DNS_QUERY_ATTEMPTS_MAX,
DNS_QUERY_INVALID_REPLY,
DNS_QUERY_TIMEOUT,
DNS_QUERY_ATTEMPTS_MAX,
DNS_QUERY_INVALID_REPLY,
+ DNS_QUERY_RESOURCES
} DnsQueryState;
struct DnsQueryTransaction {
} DnsQueryState;
struct DnsQueryTransaction {
@@
-55,7
+56,13
@@
struct DnsQueryTransaction {
sd_event_source *timeout_event_source;
unsigned n_attempts;
sd_event_source *timeout_event_source;
unsigned n_attempts;
- DnsPacket *packet;
+ 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);
LIST_FIELDS(DnsQueryTransaction, transactions_by_query);
LIST_FIELDS(DnsQueryTransaction, transactions_by_scope);
@@
-68,12
+75,13
@@
struct DnsQuery {
unsigned n_keys;
DnsQueryState state;
unsigned n_keys;
DnsQueryState state;
+ unsigned n_cname;
sd_event_source *timeout_event_source;
sd_event_source *timeout_event_source;
- uint16_t rcode;
- DnsPacket *packet;
+ DnsPacket *received;
+ /* Bus client information */
sd_bus_message *request;
unsigned char request_family;
const char *request_hostname;
sd_bus_message *request;
unsigned char request_family;
const char *request_hostname;
@@
-88,10
+96,12
@@
struct DnsQuery {
int dns_query_new(Manager *m, DnsQuery **q, DnsResourceKey *keys, unsigned n_keys);
DnsQuery *dns_query_free(DnsQuery *q);
int dns_query_start(DnsQuery *q);
int dns_query_new(Manager *m, DnsQuery **q, DnsResourceKey *keys, unsigned n_keys);
DnsQuery *dns_query_free(DnsQuery *q);
int dns_query_start(DnsQuery *q);
-void dns_query_finish(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);
DnsQueryTransaction* dns_query_transaction_free(DnsQueryTransaction *t);
-
int dns_query_transaction_start(DnsQueryTransaction *t
);
-
int dns_query_transaction_reply(DnsQueryTransaction *t, DnsPacket *p
);
+
void dns_query_transaction_reply(DnsQueryTransaction *t, DnsPacket *p
);
+
void dns_query_finish(DnsQuery *q
);
DEFINE_TRIVIAL_CLEANUP_FUNC(DnsQuery*, dns_query_free);
DEFINE_TRIVIAL_CLEANUP_FUNC(DnsQuery*, dns_query_free);