dns_answer_unref(q->answer);
sd_bus_message_unref(q->request);
+ sd_bus_track_unref(q->bus_track);
if (q->manager) {
LIST_REMOVE(queries, q->manager->dns_queries, q);
return NULL;
}
-int dns_query_new(Manager *m, DnsQuery **ret, DnsQuestion *question) {
+int dns_query_new(Manager *m, DnsQuery **ret, DnsQuestion *question, int ifindex, uint64_t flags) {
_cleanup_(dns_query_freep) DnsQuery *q = NULL;
unsigned i;
int r;
return -ENOMEM;
q->question = dns_question_ref(question);
+ q->ifindex = ifindex;
+ q->flags = flags;
for (i = 0; i < question->n_keys; i++) {
_cleanup_free_ char *p;
assert(q);
assert(s);
- r = set_ensure_allocated(&q->transactions, NULL, NULL);
+ r = set_ensure_allocated(&q->transactions, NULL);
if (r < 0)
return r;
} else
question = dns_question_ref(q->question);
- t = dns_scope_find_transaction(s, question);
+ t = dns_scope_find_transaction(s, question, true);
if (!t) {
r = dns_transaction_new(&t, s, question);
if (r < 0)
return r;
}
- r = set_ensure_allocated(&t->queries, NULL, NULL);
+ r = set_ensure_allocated(&t->queries, NULL);
if (r < 0)
goto gc;
LIST_FOREACH(scopes, s, q->manager->dns_scopes) {
DnsScopeMatch match;
- match = dns_scope_good_domain(s, name);
+ match = dns_scope_good_domain(s, q->ifindex, q->flags, name);
if (match < 0)
return match;
LIST_FOREACH(scopes, s, first->scopes_next) {
DnsScopeMatch match;
- match = dns_scope_good_domain(s, name);
+ match = dns_scope_good_domain(s, q->ifindex, q->flags, name);
if (match < 0)
goto fail;
q->answer = dns_answer_unref(q->answer);
q->answer_ifindex = 0;
q->answer_rcode = 0;
+ q->answer_family = AF_UNSPEC;
+ q->answer_protocol = _DNS_PROTOCOL_INVALID;
r = sd_event_add_time(
q->manager->event,
q->answer = dns_answer_ref(answer);
q->answer_rcode = rcode;
q->answer_ifindex = (scope && scope->link) ? scope->link->ifindex : 0;
+ q->answer_protocol = scope ? scope->protocol : _DNS_PROTOCOL_INVALID;
+ q->answer_family = scope ? scope->family : AF_UNSPEC;
}
dns_query_complete(q, state);
return 0;
}
+
+static int on_bus_track(sd_bus_track *t, void *userdata) {
+ DnsQuery *q = userdata;
+
+ assert(t);
+ assert(q);
+
+ log_debug("Client of active query vanished, aborting query.");
+ dns_query_complete(q, DNS_TRANSACTION_ABORTED);
+ return 0;
+}
+
+int dns_query_bus_track(DnsQuery *q, sd_bus *bus, sd_bus_message *m) {
+ int r;
+
+ assert(q);
+ assert(m);
+
+ if (!q->bus_track) {
+ r = sd_bus_track_new(bus, &q->bus_track, on_bus_track, q);
+ if (r < 0)
+ return r;
+ }
+
+ r = sd_bus_track_add_sender(q->bus_track, m);
+ if (r < 0)
+ return r;
+
+ return 0;
+}