X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-bus.c;h=1244b6dd079176af3db7ef35bb1920b911070471;hb=faa133f3aa7a18f26563dc5d6b95898cb315c37a;hp=acdfd5240335b6b5e287e6daa67fc9b650c79924;hpb=309e9d86f0e7f9c5f0a2a09227bdfdb3174d4436;p=elogind.git diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index acdfd5240..1244b6dd0 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -60,17 +60,15 @@ static int reply_query_state(DnsQuery *q) { case DNS_QUERY_FAILURE: { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - assert(q->received); - - if (DNS_PACKET_RCODE(q->received) == DNS_RCODE_NXDOMAIN) + if (q->answer_rcode == DNS_RCODE_NXDOMAIN) sd_bus_error_setf(&error, _BUS_ERROR_DNS "NXDOMAIN", "'%s' not found", name); else { const char *rc, *n; char p[3]; /* the rcode is 4 bits long */ - rc = dns_rcode_to_string(DNS_PACKET_RCODE(q->received)); + rc = dns_rcode_to_string(q->answer_rcode); if (!rc) { - sprintf(p, "%i", DNS_PACKET_RCODE(q->received)); + sprintf(p, "%i", q->answer_rcode); rc = p; } @@ -95,23 +93,26 @@ static int append_address(sd_bus_message *reply, DnsResourceRecord *rr, int ifin assert(reply); assert(rr); - r = sd_bus_message_open_container(reply, 'r', "yayi"); + r = sd_bus_message_open_container(reply, 'r', "iayi"); if (r < 0) return r; - if (rr->key.type == DNS_TYPE_A) { - r = sd_bus_message_append(reply, "y", AF_INET); + if (rr->key->type == DNS_TYPE_A) { + r = sd_bus_message_append(reply, "i", AF_INET); if (r < 0) return r; r = sd_bus_message_append_array(reply, 'y', &rr->a.in_addr, sizeof(struct in_addr)); - } else { - r = sd_bus_message_append(reply, "y", AF_INET6); + + } else if (rr->key->type == DNS_TYPE_AAAA) { + r = sd_bus_message_append(reply, "i", AF_INET6); if (r < 0) return r; r = sd_bus_message_append_array(reply, 'y', &rr->aaaa.in6_addr, sizeof(struct in6_addr)); - } + } else + return -EAFNOSUPPORT; + if (r < 0) return r; @@ -129,9 +130,9 @@ static int append_address(sd_bus_message *reply, DnsResourceRecord *rr, int ifin static void bus_method_resolve_hostname_complete(DnsQuery *q) { _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *cname = NULL, *canonical = NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - unsigned i, n, added = 0; - size_t answer_rindex; - int r; + _cleanup_(dns_answer_unrefp) DnsAnswer *answer = NULL; + unsigned added = 0, i; + int r, ifindex; assert(q); @@ -140,54 +141,39 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { goto finish; } - assert(q->received); - - r = dns_packet_skip_question(q->received); - if (r < 0) - goto parse_fail; - - answer_rindex = q->received->rindex; - r = sd_bus_message_new_method_return(q->request, &reply); if (r < 0) goto finish; - r = sd_bus_message_open_container(reply, 'a', "(yayi)"); + r = sd_bus_message_open_container(reply, 'a', "(iayi)"); if (r < 0) goto finish; - n = DNS_PACKET_ANCOUNT(q->received) + - DNS_PACKET_NSCOUNT(q->received) + - DNS_PACKET_ARCOUNT(q->received); - - for (i = 0; i < n; i++) { - _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL; - - r = dns_packet_read_rr(q->received, &rr, NULL); - if (r < 0) - goto parse_fail; + answer = dns_answer_ref(q->answer); + ifindex = q->answer_ifindex; - r = dns_query_matches_rr(q, rr); + for (i = 0; i < answer->n_rrs; i++) { + r = dns_question_matches_rr(q->question, answer->rrs[i]); if (r < 0) goto parse_fail; if (r == 0) { /* Hmm, if this is not an address record, maybe it's a cname? If so, remember this */ - r = dns_query_matches_cname(q, rr); + r = dns_question_matches_cname(q->question, answer->rrs[i]); if (r < 0) goto parse_fail; if (r > 0) - cname = dns_resource_record_ref(rr); + cname = dns_resource_record_ref(answer->rrs[i]); continue; } - r = append_address(reply, rr, q->received->ifindex); + r = append_address(reply, answer->rrs[i], ifindex); if (r < 0) goto finish; if (!canonical) - canonical = dns_resource_record_ref(rr); + canonical = dns_resource_record_ref(answer->rrs[i]); added ++; } @@ -200,7 +186,7 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { /* This has a cname? Then update the query with the * new cname. */ - r = dns_query_follow_cname(q, cname->cname.name); + r = dns_query_cname_redirect(q, cname->cname.name); if (r < 0) { if (r == -ELOOP) r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_CNAME_LOOP, "CNAME loop on '%s'", q->request_hostname); @@ -212,26 +198,19 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { /* Before we restart the query, let's see if any of * the RRs we already got already answers our query */ - dns_packet_rewind(q->received, answer_rindex); - for (i = 0; i < n; i++) { - _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL; - - r = dns_packet_read_rr(q->received, &rr, NULL); - if (r < 0) - goto parse_fail; - - r = dns_query_matches_rr(q, rr); + for (i = 0; i < answer->n_rrs; i++) { + r = dns_question_matches_rr(q->question, answer->rrs[i]); if (r < 0) goto parse_fail; if (r == 0) continue; - r = append_address(reply, rr, q->received->ifindex); + r = append_address(reply, answer->rrs[i], ifindex); if (r < 0) goto finish; if (!canonical) - canonical = dns_resource_record_ref(rr); + canonical = dns_resource_record_ref(answer->rrs[i]); added++; } @@ -239,7 +218,7 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { /* If we didn't find anything, then let's restart the * query, this time with the cname */ if (added <= 0) { - r = dns_query_start(q); + r = dns_query_go(q); if (r == -ESRCH) { r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_NAME_SERVERS, "No appropriate name servers or networks for name found"); goto finish; @@ -258,7 +237,7 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { /* Return the precise spelling and uppercasing reported by the server */ assert(canonical); - r = sd_bus_message_append(reply, "s", canonical->key.name); + r = sd_bus_message_append(reply, "s", DNS_RESOURCE_KEY_NAME(canonical->key)); if (r < 0) goto finish; @@ -276,43 +255,56 @@ finish: } static int bus_method_resolve_hostname(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { + _cleanup_(dns_question_unrefp) DnsQuestion *question = NULL; Manager *m = userdata; const char *hostname; - uint8_t family; - DnsResourceKey keys[2]; + int family; DnsQuery *q; - unsigned n = 0; int r; assert(bus); assert(message); assert(m); - r = sd_bus_message_read(message, "sy", &hostname, &family); + r = sd_bus_message_read(message, "si", &hostname, &family); if (r < 0) return r; if (!IN_SET(family, AF_INET, AF_INET6, AF_UNSPEC)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %u", family); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %i", family); if (!hostname_is_valid(hostname)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid hostname '%s'", hostname); + question = dns_question_new(family == AF_UNSPEC ? 2 : 1); + if (!question) + return -ENOMEM; + if (family != AF_INET6) { - keys[n].class = DNS_CLASS_IN; - keys[n].type = DNS_TYPE_A; - keys[n].name = (char*) hostname; - n++; + _cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL; + + key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, hostname); + if (!key) + return -ENOMEM; + + r = dns_question_add(question, key); + if (r < 0) + return r; } if (family != AF_INET) { - keys[n].class = DNS_CLASS_IN; - keys[n].type = DNS_TYPE_AAAA; - keys[n].name = (char*) hostname; - n++; + _cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL; + + key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_AAAA, hostname); + if (!key) + return -ENOMEM; + + r = dns_question_add(question, key); + if (r < 0) + return r; } - r = dns_query_new(m, &q, keys, n); + r = dns_query_new(m, &q, question); if (r < 0) return r; @@ -321,7 +313,7 @@ static int bus_method_resolve_hostname(sd_bus *bus, sd_bus_message *message, voi q->request_hostname = hostname; q->complete = bus_method_resolve_hostname_complete; - r = dns_query_start(q); + r = dns_query_go(q); if (r < 0) { dns_query_free(q); @@ -336,7 +328,8 @@ static int bus_method_resolve_hostname(sd_bus *bus, sd_bus_message *message, voi static void bus_method_resolve_address_complete(DnsQuery *q) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - unsigned i, n, added = 0; + _cleanup_(dns_answer_unrefp) DnsAnswer *answer = NULL; + unsigned added = 0, i; int r; assert(q); @@ -346,12 +339,6 @@ static void bus_method_resolve_address_complete(DnsQuery *q) { goto finish; } - assert(q->received); - - r = dns_packet_skip_question(q->received); - if (r < 0) - goto parse_fail; - r = sd_bus_message_new_method_return(q->request, &reply); if (r < 0) goto finish; @@ -360,24 +347,16 @@ static void bus_method_resolve_address_complete(DnsQuery *q) { if (r < 0) goto finish; - n = DNS_PACKET_ANCOUNT(q->received) + - DNS_PACKET_NSCOUNT(q->received) + - DNS_PACKET_ARCOUNT(q->received); - - for (i = 0; i < n; i++) { - _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL; - - r = dns_packet_read_rr(q->received, &rr, NULL); - if (r < 0) - goto parse_fail; + answer = dns_answer_ref(q->answer); - r = dns_query_matches_rr(q, rr); + for (i = 0; i < answer->n_rrs; i++) { + r = dns_question_matches_rr(q->question, answer->rrs[i]); if (r < 0) goto parse_fail; if (r == 0) continue; - r = sd_bus_message_append(reply, "s", rr->ptr.name); + r = sd_bus_message_append(reply, "s", answer->rrs[i]->ptr.name); if (r < 0) goto finish; @@ -411,11 +390,12 @@ finish: } static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { - _cleanup_(dns_resource_key_free) DnsResourceKey key = {}; + _cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL; + _cleanup_(dns_question_unrefp) DnsQuestion *question = NULL; + _cleanup_free_ char *reverse = NULL; Manager *m = userdata; - uint8_t family; + int family, ifindex; const void *d; - int ifindex; DnsQuery *q; size_t sz; int r; @@ -424,19 +404,18 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void assert(message); assert(m); - r = sd_bus_message_read(message, "y", &family); + r = sd_bus_message_read(message, "i", &family); if (r < 0) return r; if (!IN_SET(family, AF_INET, AF_INET6)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %u", family); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %i", family); r = sd_bus_message_read_array(message, 'y', &d, &sz); if (r < 0) return r; - if ((family == AF_INET && sz != sizeof(struct in_addr)) || - (family == AF_INET6 && sz != sizeof(struct in6_addr))) + if (sz != FAMILY_ADDRESS_SIZE(family)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid address size"); r = sd_bus_message_read(message, "i", &ifindex); @@ -445,13 +424,25 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void if (ifindex < 0) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid interface index"); - key.class = DNS_CLASS_IN; - key.type = DNS_TYPE_PTR; - r = dns_name_reverse(family, d, &key.name); + r = dns_name_reverse(family, d, &reverse); if (r < 0) return r; - r = dns_query_new(m, &q, &key, 1); + question = dns_question_new(1); + if (!question) + return -ENOMEM; + + key = dns_resource_key_new_consume(DNS_CLASS_IN, DNS_TYPE_PTR, reverse); + if (!key) + return -ENOMEM; + + reverse = NULL; + + r = dns_question_add(question, key); + if (r < 0) + return r; + + r = dns_query_new(m, &q, question); if (r < 0) return r; @@ -460,9 +451,13 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void memcpy(&q->request_address, d, sz); q->complete = bus_method_resolve_address_complete; - r = dns_query_start(q); + r = dns_query_go(q); if (r < 0) { dns_query_free(q); + + if (r == -ESRCH) + sd_bus_error_setf(error, BUS_ERROR_NO_NAME_SERVERS, "No appropriate name servers or networks for name found"); + return r; } @@ -471,8 +466,8 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void static const sd_bus_vtable resolve_vtable[] = { SD_BUS_VTABLE_START(0), - SD_BUS_METHOD("ResolveHostname", "sy", "a(yayi)s", bus_method_resolve_hostname, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("ResolveAddress", "yayi", "as", bus_method_resolve_address, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("ResolveHostname", "si", "a(iayi)s", bus_method_resolve_hostname, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("ResolveAddress", "iayi", "as", bus_method_resolve_address, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_VTABLE_END, };