X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-dns-server.c;h=caf06fe4506781945a6f37ad040fc4bd2fcf984f;hb=d1bddcec98551ea748f39a742a4cbcf9ea9254ef;hp=2c413370ea003a4d2aac8d209d73660fe5f28e7a;hpb=4e945a6f7971fd7d1f6b2c62ee3afdaff3c95ce4;p=elogind.git

diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c
index 2c413370e..caf06fe45 100644
--- a/src/resolve/resolved-dns-server.c
+++ b/src/resolve/resolved-dns-server.c
@@ -19,6 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "siphash24.h"
+
 #include "resolved-dns-server.h"
 
 int dns_server_new(
@@ -62,9 +64,9 @@ int dns_server_new(
          * we used so far was a fallback one? Then let's try to pick
          * the new one */
         if (type != DNS_SERVER_FALLBACK &&
-            s->manager->current_dns_server &&
-            s->manager->current_dns_server->type == DNS_SERVER_FALLBACK)
-                s->manager->current_dns_server = NULL;
+            m->current_dns_server &&
+            m->current_dns_server->type == DNS_SERVER_FALLBACK)
+                manager_set_dns_server(m, NULL);
 
         if (ret)
                 *ret = s;
@@ -85,15 +87,41 @@ DnsServer* dns_server_free(DnsServer *s)  {
                         LIST_REMOVE(servers, s->manager->fallback_dns_servers, s);
                 else
                         assert_not_reached("Unknown server type");
+
+                if (s->manager->current_dns_server == s)
+                        manager_set_dns_server(s->manager, NULL);
         }
 
         if (s->link && s->link->current_dns_server == s)
-                s->link->current_dns_server = NULL;
-
-        if (s->manager && s->manager->current_dns_server == s)
-                s->manager->current_dns_server = NULL;
+                link_set_dns_server(s->link, NULL);
 
         free(s);
 
         return NULL;
 }
+
+static unsigned long dns_server_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) {
+        const DnsServer *s = p;
+        uint64_t u;
+
+        siphash24((uint8_t*) &u, &s->address, FAMILY_ADDRESS_SIZE(s->family), hash_key);
+        u = u * hash_key[0] + u + s->family;
+
+        return u;
+}
+
+static int dns_server_compare_func(const void *a, const void *b) {
+        const DnsServer *x = a, *y = b;
+
+        if (x->family < y->family)
+                return -1;
+        if (x->family > y->family)
+                return 1;
+
+        return memcmp(&x->address, &y->address, FAMILY_ADDRESS_SIZE(x->family));
+}
+
+const struct hash_ops dns_server_hash_ops = {
+        .hash = dns_server_hash_func,
+        .compare = dns_server_compare_func
+};