X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-manager.c;h=72034c1f487868fffe12a0a0b4db4c93676a4821;hb=9c92ce6d67f88beb31dd6555d12ae3f632218a39;hp=523ed20208683b0ed32e76da9d1209c6810259c0;hpb=bf3f1271e2cc0c22b11c8a805a997578dabe9191;p=elogind.git diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index 523ed2020..72034c1f4 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -32,6 +32,7 @@ #include "network-internal.h" #include "conf-parser.h" #include "socket-util.h" +#include "af-list.h" #include "resolved.h" #define SEND_TIMEOUT_USEC (200 * USEC_PER_MSEC) @@ -58,10 +59,10 @@ static int manager_process_link(sd_rtnl *rtnl, sd_rtnl_message *mm, void *userda switch (type) { - case RTM_NEWLINK: - if (!l) { - log_debug("Found link %i", ifindex); + case RTM_NEWLINK:{ + bool is_new = !l; + if (!l) { r = link_new(m, &l, ifindex); if (r < 0) goto fail; @@ -71,11 +72,15 @@ static int manager_process_link(sd_rtnl *rtnl, sd_rtnl_message *mm, void *userda if (r < 0) goto fail; + if (is_new) + log_debug("Found new link %i/%s", ifindex, l->name); + break; + } case RTM_DELLINK: if (l) { - log_debug("Removing link %i", l->ifindex); + log_debug("Removing link %i/%s", l->ifindex, l->name); link_free(l); } @@ -299,7 +304,7 @@ static int manager_network_monitor_listen(Manager *m) { } static int parse_dns_server_string(Manager *m, const char *string) { - char *word, *state; + const char *word, *state; size_t length; int r; @@ -328,6 +333,7 @@ static int parse_dns_server_string(Manager *m, const char *string) { if (r < 0) return r; } + /* do not warn about state here, since probably systemd already did */ return 0; } @@ -455,7 +461,7 @@ Manager *manager_free(Manager *m) { while (m->dns_queries) dns_query_free(m->dns_queries); - hashmap_free(m->dns_query_transactions); + hashmap_free(m->dns_transactions); while ((l = hashmap_first(m->links))) link_free(l); @@ -697,7 +703,7 @@ int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret) { static int on_dns_packet(sd_event_source *s, int fd, uint32_t revents, void *userdata) { _cleanup_(dns_packet_unrefp) DnsPacket *p = NULL; - DnsQueryTransaction *t = NULL; + DnsTransaction *t = NULL; Manager *m = userdata; int r; @@ -706,11 +712,11 @@ static int on_dns_packet(sd_event_source *s, int fd, uint32_t revents, void *use return r; if (dns_packet_validate_reply(p) > 0) { - t = hashmap_get(m->dns_query_transactions, UINT_TO_PTR(DNS_PACKET_ID(p))); + t = hashmap_get(m->dns_transactions, UINT_TO_PTR(DNS_PACKET_ID(p))); if (!t) return 0; - dns_query_transaction_process_reply(t, p); + dns_transaction_process_reply(t, p); } else log_debug("Invalid DNS packet."); @@ -908,6 +914,8 @@ int manager_send(Manager *m, int fd, int ifindex, int family, const union in_add assert(port > 0); assert(p); + log_debug("Sending %s packet with id %u on interface %i/%s", DNS_PACKET_QR(p) ? "response" : "query", DNS_PACKET_ID(p), ifindex, af_to_name(family)); + if (family == AF_INET) return manager_ipv4_send(m, fd, ifindex, &addr->in, port, p); else if (family == AF_INET6) @@ -916,7 +924,6 @@ int manager_send(Manager *m, int fd, int ifindex, int family, const union in_add return -EAFNOSUPPORT; } - DnsServer* manager_find_dns_server(Manager *m, int family, const union in_addr_union *in_addr) { DnsServer *s; @@ -983,7 +990,7 @@ uint32_t manager_find_mtu(Manager *m) { static int on_llmnr_packet(sd_event_source *s, int fd, uint32_t revents, void *userdata) { _cleanup_(dns_packet_unrefp) DnsPacket *p = NULL; - DnsQueryTransaction *t = NULL; + DnsTransaction *t = NULL; Manager *m = userdata; int r; @@ -992,11 +999,13 @@ static int on_llmnr_packet(sd_event_source *s, int fd, uint32_t revents, void *u return r; if (dns_packet_validate_reply(p) > 0) { - t = hashmap_get(m->dns_query_transactions, UINT_TO_PTR(DNS_PACKET_ID(p))); + log_debug("Got reply packet for id %u", DNS_PACKET_ID(p)); + + t = hashmap_get(m->dns_transactions, UINT_TO_PTR(DNS_PACKET_ID(p))); if (!t) return 0; - dns_query_transaction_process_reply(t, p); + dns_transaction_process_reply(t, p); } else if (dns_packet_validate_query(p) > 0) { Link *l; @@ -1388,14 +1397,80 @@ int manager_ifindex_is_loopback(Manager *m, int ifindex) { } int manager_find_ifindex(Manager *m, int family, const union in_addr_union *in_addr) { - Link *l; + LinkAddress *a; + + assert(m); + + a = manager_find_address(m, family, in_addr); + if (a) + return a->link->ifindex; + + return 0; +} + +int manager_next_hostname(Manager *m) { + const char *p; Iterator i; + uint64_t u; + char *h; + Link *l; assert(m); - HASHMAP_FOREACH(l, m->links, i) - if (link_find_address(l, family, in_addr)) - return l->ifindex; + p = strchr(m->hostname, 0); + assert(p); + + while (p > m->hostname) { + if (!strchr("0123456789", p[-1])) + break; + + p--; + } + + if (*p == 0 || safe_atou64(p, &u) < 0 || u <= 0) + u = 1; + + u++; + + if (asprintf(&h, "%.*s%" PRIu64, (int) (p - m->hostname), m->hostname, u) < 0) + return -ENOMEM; + + log_info("Hostname conflict, changing local hostname from '%s' to '%s'.", m->hostname, h); + + free(m->hostname); + m->hostname = h; + + m->host_ipv4_key = dns_resource_key_unref(m->host_ipv4_key); + m->host_ipv6_key = dns_resource_key_unref(m->host_ipv6_key); + + HASHMAP_FOREACH(l, m->links, i) { + link_add_rrs(l, true); + link_add_rrs(l, false); + } return 0; } + +LinkAddress* manager_find_address(Manager *m, int family, const union in_addr_union *in_addr) { + Iterator i; + Link *l; + + assert(m); + + HASHMAP_FOREACH(l, m->links, i) { + LinkAddress *a; + + a = link_find_address(l, family, in_addr); + if (a) + return a; + } + + return NULL; +} + +int manager_our_packet(Manager *m, DnsPacket *p) { + assert(m); + assert(p); + + return !!manager_find_address(m, p->family, &p->sender); +}