X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=server.c;h=0f292a349e84b7d302db79b4a103ee03c87c5bbe;hb=c18626ad35cdf94edbff196070ccbb6ae825abd0;hp=35dbe3ac567c4a1dee239d0984fcb1b3a7d0dc93;hpb=4de18a7015ed77eac277bee669d4c8d9dae60b89;p=catta

diff --git a/server.c b/server.c
index 35dbe3a..0f292a3 100644
--- a/server.c
+++ b/server.c
@@ -1,28 +1,285 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <string.h>
+#include <sys/utsname.h>
+#include <unistd.h>
 
 #include "server.h"
 #include "util.h"
+#include "iface.h"
+#include "socket.h"
+
+static void handle_query_key(flxServer *s, flxKey *k, flxInterface *i, const flxAddress *a) {
+    flxEntry *e;
+    
+    g_assert(s);
+    g_assert(k);
+    g_assert(i);
+    g_assert(a);
+
+    for (e = g_hash_table_lookup(s->rrset_by_name, k); e; e = e->by_name_next) {
+
+        if ((e->interface <= 0 || e->interface == i->index) &&
+            (e->protocol == AF_UNSPEC || e->protocol == a->family)) {
+
+            flx_interface_post_response(i, a->family, e->record);
+        }
+    }
+}
+
+static void handle_query(flxServer *s, flxDnsPacket *p, flxInterface *i, const flxAddress *a) {
+    guint n;
+    
+    g_assert(s);
+    g_assert(p);
+    g_assert(i);
+    g_assert(a);
+
+    for (n = flx_dns_packet_get_field(p, DNS_FIELD_QDCOUNT); n > 0; n --) {
+        flxKey *key;
+
+        if (!(key = flx_dns_packet_consume_key(p))) {
+            g_warning("Packet too short");
+            return;
+        }
+
+        handle_query_key(s, key, i, a);
+        flx_key_unref(key);
+    }
+}
+
+static void handle_response(flxServer *s, flxDnsPacket *p, flxInterface *i, const flxAddress *a) {
+    guint n;
+    
+    g_assert(s);
+    g_assert(p);
+    g_assert(i);
+    g_assert(a);
+    
+    for (n = flx_dns_packet_get_field(p, DNS_FIELD_ANCOUNT); n > 0; n--) {
+        flxRecord *record;
+        gboolean cache_flush = FALSE;
+        
+        if (!(record = flx_dns_packet_consume_record(p, &cache_flush))) {
+            g_warning("Packet too short");
+            return;
+        }
+
+        flx_cache_update(a->family == AF_INET ? i->ipv4_cache : i->ipv6_cache, record, cache_flush, a);
+        flx_packet_scheduler_drop_response(a->family == AF_INET ? i->ipv4_scheduler : i->ipv6_scheduler, record);
+        flx_record_unref(record);
+    }
+}
+
+static void dispatch_packet(flxServer *s, flxDnsPacket *p, struct sockaddr *sa, gint iface, gint ttl) {
+    flxInterface *i;
+    flxAddress a;
+    
+    g_assert(s);
+    g_assert(p);
+    g_assert(sa);
+    g_assert(iface > 0);
+
+    g_message("new packet recieved.");
+
+    if (!(i = flx_interface_monitor_get_interface(s->monitor, iface))) {
+        g_warning("Recieved packet from invalid interface.");
+        return;
+    }
+
+    if (ttl != 255) {
+        g_warning("Recieved packet with invalid TTL on interface '%s'.", i->name);
+        return;
+    }
+
+    if (sa->sa_family == AF_INET6) {
+        static const unsigned char ipv4_in_ipv6[] = {
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0xFF, 0xFF, 0xFF, 0xFF };
+
+        if (memcmp(((struct sockaddr_in6*) sa)->sin6_addr.s6_addr, ipv4_in_ipv6, sizeof(ipv4_in_ipv6)) == 0) {
+
+            /* This is an IPv4 address encapsulated in IPv6, so let's ignore it. */
+            return;
+        }
+    }
+
+    if (flx_dns_packet_check_valid(p) < 0) {
+        g_warning("Recieved invalid packet.");
+        return;
+    }
+
+    flx_address_from_sockaddr(sa, &a);
+
+    
+    if (flx_dns_packet_is_query(p)) {
+
+        if (flx_dns_packet_get_field(p, DNS_FIELD_QDCOUNT) == 0 ||
+            flx_dns_packet_get_field(p, DNS_FIELD_ARCOUNT) != 0 ||
+            flx_dns_packet_get_field(p, DNS_FIELD_NSCOUNT) != 0) {
+            g_warning("Invalid query packet.");
+            return;
+        }
+                
+        handle_query(s, p, i, &a);    
+        g_message("Handled query");
+    } else {
+        if (flx_dns_packet_get_field(p, DNS_FIELD_QDCOUNT) != 0 ||
+            flx_dns_packet_get_field(p, DNS_FIELD_ANCOUNT) == 0 ||
+            flx_dns_packet_get_field(p, DNS_FIELD_NSCOUNT) != 0 ||
+            flx_dns_packet_get_field(p, DNS_FIELD_ARCOUNT) != 0) {
+            g_warning("Invalid response packet.");
+            return;
+        }
+
+        handle_response(s, p, i, &a);
+        g_message("Handled response");
+    }
+}
+
+static gboolean work(flxServer *s) {
+    struct sockaddr_in6 sa6;
+    struct sockaddr_in sa;
+    flxDnsPacket *p;
+    gint iface = -1;
+    guint8 ttl;
+        
+    g_assert(s);
+
+    if (s->pollfd_ipv4.revents & G_IO_IN) {
+        if ((p = flx_recv_dns_packet_ipv4(s->fd_ipv4, &sa, &iface, &ttl)))
+            dispatch_packet(s, p, (struct sockaddr*) &sa, iface, ttl);
+    }
+
+    if (s->pollfd_ipv6.revents & G_IO_IN) {
+        if ((p = flx_recv_dns_packet_ipv6(s->fd_ipv6, &sa6, &iface, &ttl)))
+            dispatch_packet(s, p, (struct sockaddr*) &sa6, iface, ttl);
+    }
+
+    return TRUE;
+}
+
+static gboolean prepare_func(GSource *source, gint *timeout) {
+    g_assert(source);
+    g_assert(timeout);
+    
+    *timeout = -1;
+    return FALSE;
+}
+
+static gboolean check_func(GSource *source) {
+    flxServer* s;
+    g_assert(source);
+
+    s = *((flxServer**) (((guint8*) source) + sizeof(GSource)));
+    g_assert(s);
+    
+    return (s->pollfd_ipv4.revents | s->pollfd_ipv6.revents) & (G_IO_IN | G_IO_HUP | G_IO_ERR);
+}
+
+static gboolean dispatch_func(GSource *source, GSourceFunc callback, gpointer user_data) {
+    flxServer* s;
+    g_assert(source);
+
+    s = *((flxServer**) (((guint8*) source) + sizeof(GSource)));
+    g_assert(s);
+    
+    return work(s);
+}
+
+static void add_default_entries(flxServer *s) {
+    gint length = 0;
+    struct utsname utsname;
+    gchar *hinfo;
+    flxAddress a;
+    
+    g_assert(s);
+    
+    /* Fill in HINFO rr */
+    uname(&utsname);
+    hinfo = g_strdup_printf("%s%c%s%n", g_strup(utsname.machine), 0, g_strup(utsname.sysname), &length);
+    
+    flx_server_add_full(s, 0, 0, AF_UNSPEC, TRUE,
+                        s->hostname, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_HINFO, hinfo, length+1, FLX_DEFAULT_TTL);
+
+    g_free(hinfo);
+
+    /* Add localhost entries */
+    flx_address_parse("127.0.0.1", AF_INET, &a);
+    flx_server_add_address(s, 0, 0, AF_UNSPEC, TRUE, "localhost", &a);
+
+    flx_address_parse("::1", AF_INET6, &a);
+    flx_server_add_address(s, 0, 0, AF_UNSPEC, TRUE, "ip6-localhost", &a);
+}
 
 flxServer *flx_server_new(GMainContext *c) {
-    flxServer *s = g_new(flxServer, 1);
+    gchar *hn, *e;
+    flxServer *s;
+    
+    static GSourceFuncs source_funcs = {
+        prepare_func,
+        check_func,
+        dispatch_func,
+        NULL,
+        NULL,
+        NULL
+    };
+
+    s = g_new(flxServer, 1);
+
+    s->fd_ipv4 = flx_open_socket_ipv4();
+    s->fd_ipv6 = flx_open_socket_ipv6();
+    
+    if (s->fd_ipv6 < 0 && s->fd_ipv4 < 0) {
+        g_critical("Failed to create sockets.\n");
+        g_free(s);
+        return NULL;
+    }
 
-    if (c) {
-        g_main_context_ref(c);
-        s->context = c;
-    } else
+    if (s->fd_ipv4 < 0)
+        g_message("Failed to create IPv4 socket, proceeding in IPv6 only mode");
+    else if (s->fd_ipv6 < 0)
+        g_message("Failed to create IPv6 socket, proceeding in IPv4 only mode");
+    
+    if (c)
+        g_main_context_ref(s->context = c);
+    else
         s->context = g_main_context_default();
     
     s->current_id = 1;
     s->rrset_by_id = g_hash_table_new(g_int_hash, g_int_equal);
-    s->rrset_by_name = g_hash_table_new(g_str_hash, g_str_equal);
-    s->entries = NULL;
+    s->rrset_by_name = g_hash_table_new((GHashFunc) flx_key_hash, (GEqualFunc) flx_key_equal);
+
+    FLX_LLIST_HEAD_INIT(flxEntry, s->entries);
 
-    s->first_response_job = s->last_response_job = NULL;
-    s->first_query_jobs = s->last_query_job = NULL;
+    s->monitor = flx_interface_monitor_new(s);
+    s->time_event_queue = flx_time_event_queue_new(s->context);
     
-    s->monitor = flx_interface_monitor_new(s->context);
+    /* Get host name */
+    hn = flx_get_host_name();
+    if ((e = strchr(hn, '.')))
+        *e = 0;
+
+    s->hostname = g_strdup_printf("%s.local.", hn);
+    g_free(hn);
+
+    add_default_entries(s);
+
+    s->source = g_source_new(&source_funcs, sizeof(GSource) + sizeof(flxServer*));
+    *((flxServer**) (((guint8*) s->source) + sizeof(GSource))) = s;
+
+    memset(&s->pollfd_ipv4, 0, sizeof(s->pollfd_ipv4));
+    s->pollfd_ipv4.fd = s->fd_ipv4;
+    s->pollfd_ipv4.events = G_IO_IN|G_IO_ERR|G_IO_HUP;
+    g_source_add_poll(s->source, &s->pollfd_ipv4);
+    
+    memset(&s->pollfd_ipv6, 0, sizeof(s->pollfd_ipv6));
+    s->pollfd_ipv6.fd = s->fd_ipv6;
+    s->pollfd_ipv6.events = G_IO_IN|G_IO_ERR|G_IO_HUP;
+    g_source_add_poll(s->source, &s->pollfd_ipv6);
+
+    g_source_attach(s->source, s->context);
     
     return s;
 }
@@ -31,12 +288,25 @@ void flx_server_free(flxServer* s) {
     g_assert(s);
 
     flx_interface_monitor_free(s->monitor);
-
+    
     flx_server_remove(s, 0);
     
     g_hash_table_destroy(s->rrset_by_id);
     g_hash_table_destroy(s->rrset_by_name);
+
+    flx_time_event_queue_free(s->time_event_queue);
+
+    if (s->fd_ipv4 >= 0)
+        close(s->fd_ipv4);
+    if (s->fd_ipv6 >= 0)
+        close(s->fd_ipv6);
+    
+    g_free(s->hostname);
+
+    g_source_destroy(s->source);
+    g_source_unref(s->source);
     g_main_context_unref(s->context);
+
     g_free(s);
 }
 
@@ -46,53 +316,59 @@ gint flx_server_get_next_id(flxServer *s) {
     return s->current_id++;
 }
 
-void flx_server_add_rr(flxServer *s, gint id, gint interface, guchar protocol, const flxRecord *rr) {
-    flxEntry *e;
+void flx_server_add(
+    flxServer *s,
+    gint id,
+    gint interface,
+    guchar protocol,
+    gboolean unique,
+    flxRecord *r) {
+    
+    flxEntry *e, *t;
     g_assert(s);
-    g_assert(rr);
-    g_assert(rr->name);
-    g_assert(rr->data);
-    g_assert(rr->size);
+    g_assert(r);
 
     e = g_new(flxEntry, 1);
-    flx_record_copy_normalize(&e->rr, rr);
+    e->record = flx_record_ref(r);
     e->id = id;
     e->interface = interface;
     e->protocol = protocol;
+    e->unique = unique;
 
-    /* Insert into linked list */
-    e->prev = NULL;
-    if ((e->next = s->entries))
-        e->next->prev = e;
-    s->entries = e;
+    FLX_LLIST_PREPEND(flxEntry, entry, s->entries, e);
 
     /* Insert into hash table indexed by id */
-    e->prev_by_id = NULL;
-    if ((e->next_by_id = g_hash_table_lookup(s->rrset_by_id, &id)))
-        e->next_by_id->prev = e;
-    g_hash_table_replace(s->rrset_by_id, &e->id, e);
-
+    t = g_hash_table_lookup(s->rrset_by_id, &e->id);
+    FLX_LLIST_PREPEND(flxEntry, by_id, t, e);
+    g_hash_table_replace(s->rrset_by_id, &e->id, t);
+    
     /* Insert into hash table indexed by name */
-    e->prev_by_name = NULL;
-    if ((e->next_by_name = g_hash_table_lookup(s->rrset_by_name, e->rr.name)))
-        e->next_by_name->prev = e;
-    g_hash_table_replace(s->rrset_by_name, e->rr.name, e);
+    t = g_hash_table_lookup(s->rrset_by_name, e->record->key);
+    FLX_LLIST_PREPEND(flxEntry, by_name, t, e);
+    g_hash_table_replace(s->rrset_by_name, e->record->key, t);
 }
 
-void flx_server_add(flxServer *s, gint id, gint interface, guchar protocol, const gchar *name, guint16 type, gconstpointer data, guint size) {
-    flxRecord rr;
+void flx_server_add_full(
+    flxServer *s,
+    gint id,
+    gint interface,
+    guchar protocol,
+    gboolean unique,
+    const gchar *name,
+    guint16 class,
+    guint16 type,
+    gconstpointer data,
+    guint size,
+    guint32 ttl) {
+    
+    flxRecord *r;
     g_assert(s);
-    g_assert(name);
     g_assert(data);
     g_assert(size);
 
-    rr.name = (gchar*) name;
-    rr.type = type;
-    rr.class = FLX_DNS_CLASS_IN;
-    rr.data = (gpointer) data;
-    rr.size = size;
-    rr.ttl = FLX_DEFAULT_TTL;
-    flx_server_add_rr(s, id, interface, protocol, &rr);
+    r = flx_record_new_full(name ? name : s->hostname, class, type, data, size, ttl);
+    flx_server_add(s, id, interface, protocol, unique, r);
+    flx_record_unref(r);
 }
 
 const flxRecord *flx_server_iterate(flxServer *s, gint id, void **state) {
@@ -101,53 +377,42 @@ const flxRecord *flx_server_iterate(flxServer *s, gint id, void **state) {
     g_assert(e);
 
     if (e)
-        *e = id > 0 ? (*e)->next_by_id : (*e)->next;
+        *e = id > 0 ? (*e)->by_id_next : (*e)->entry_next;
     else
         *e = id > 0 ? g_hash_table_lookup(s->rrset_by_id, &id) : s->entries;
         
     if (!*e)
         return NULL;
 
-    return &(*e)->rr;
+    return flx_record_ref((*e)->record);
 }
 
 static void free_entry(flxServer*s, flxEntry *e) {
+    flxEntry *t;
+    
     g_assert(e);
 
     /* Remove from linked list */
-    if (e->prev)
-        e->prev->next = e->next;
-    else
-        s->entries = e->next;
-    
-    if (e->next)
-        e->next->prev = e->prev;
+    FLX_LLIST_REMOVE(flxEntry, entry, s->entries, e);
 
     /* Remove from hash table indexed by id */
-    if (e->prev_by_id)
-        e->prev_by_id = e->next_by_id;
-    else {
-        if (e->next_by_id)
-            g_hash_table_replace(s->rrset_by_id, &e->next_by_id->id, e->next_by_id);
-        else
-            g_hash_table_remove(s->rrset_by_id, &e->id);
-    }
-
-    if (e->next_by_id)
-        e->next_by_id->prev_by_id = e->prev_by_id;
-
-    /* Remove from hash table indexed by name */
-    if (e->prev_by_name)
-        e->prev_by_name = e->next_by_name;
-    else {
-        if (e->next_by_name)
-            g_hash_table_replace(s->rrset_by_name, &e->next_by_name->rr.name, e->next_by_name);
-        else
-            g_hash_table_remove(s->rrset_by_name, &e->rr.name);
-    }
+    t = g_hash_table_lookup(s->rrset_by_id, &e->id);
+    FLX_LLIST_REMOVE(flxEntry, by_id, t, e);
+    if (t)
+        g_hash_table_replace(s->rrset_by_id, &t->id, t);
+    else
+        g_hash_table_remove(s->rrset_by_id, &e->id);
     
-    if (e->next_by_name)
-        e->next_by_name->prev_by_name = e->prev_by_name;
+    /* Remove from hash table indexed by name */
+    t = g_hash_table_lookup(s->rrset_by_name, e->record->key);
+    FLX_LLIST_REMOVE(flxEntry, by_name, t, e);
+    if (t)
+        g_hash_table_replace(s->rrset_by_name, t->record->key, t);
+    else
+        g_hash_table_remove(s->rrset_by_name, e->record->key);
+
+    flx_record_unref(e->record);
+    g_free(e);
 }
 
 void flx_server_remove(flxServer *s, gint id) {
@@ -164,211 +429,99 @@ void flx_server_remove(flxServer *s, gint id) {
     }
 }
 
-flxRecord *flx_record_copy_normalize(flxRecord *ret_dest, const flxRecord*src) {
-    g_assert(ret_dest);
-    g_assert(src);
-
-    *ret_dest = *src;
-    ret_dest->name = flx_normalize_name(src->name);
-    ret_dest->data = g_memdup(src->data, src->size);
-
-    return ret_dest;    
-}
-
-static const gchar *dns_class_to_string(guint16 class) {
-    if (class == FLX_DNS_CLASS_IN)
-        return "IN";
-
-    return NULL;
-}
-
-static const gchar *dns_type_to_string(guint16 type) {
-    switch (type) {
-        case FLX_DNS_TYPE_A:
-            return "A";
-        case FLX_DNS_TYPE_AAAA:
-            return "AAAA";
-        case FLX_DNS_TYPE_PTR:
-            return "PTR";
-        case FLX_DNS_TYPE_HINFO:
-            return "HINFO";
-        case FLX_DNS_TYPE_TXT:
-            return "TXT";
-        default:
-            return NULL;
-    }
-}
-
 void flx_server_dump(flxServer *s, FILE *f) {
     flxEntry *e;
     g_assert(s);
     g_assert(f);
 
-    for (e = s->entries; e; e = e->next) {
-        char t[256];
-        fprintf(f, "%i.%u: %-40s %-8s %-8s ", e->interface, e->protocol, e->rr.name, dns_class_to_string(e->rr.class), dns_type_to_string(e->rr.type));
+    fprintf(f, ";;; ZONE DUMP FOLLOWS ;;;\n");
 
-        t[0] = 0;
-        
-        if (e->rr.class == FLX_DNS_CLASS_IN) {
-            if (e->rr.type == FLX_DNS_TYPE_A)
-                inet_ntop(AF_INET, e->rr.data, t, sizeof(t));
-            else if (e->rr.type == FLX_DNS_TYPE_AAAA)
-                inet_ntop(AF_INET6, e->rr.data, t, sizeof(t));
-            else if (e->rr.type == FLX_DNS_TYPE_PTR)
-                g_strlcpy(t, e->rr.data, sizeof(t));
-            else if (e->rr.type == FLX_DNS_TYPE_HINFO) {
-                char *s2;
-
-                if ((s2 = memchr(e->rr.data, 0, e->rr.size))) {
-                    s2++;
-                    if (memchr(s2, 0, e->rr.size - ((char*) s2 - (char*) e->rr.data)))
-                        snprintf(t, sizeof(t), "'%s' '%s'", (char*) e->rr.data, s2);
-                }
-                
-            }
-        }
-            
+    for (e = s->entries; e; e = e->entry_next) {
+        gchar *t;
+
+        t = flx_record_to_string(e->record);
         fprintf(f, "%s\n", t);
+        g_free(t);
     }
+
+    flx_dump_caches(s, f);
 }
 
-void flx_server_add_address(flxServer *s, gint id, gint interface, guchar protocol, const gchar *name, flxAddress *a) {
+void flx_server_add_address(
+    flxServer *s,
+    gint id,
+    gint interface,
+    guchar protocol,
+    gboolean unique,
+    const gchar *name,
+    flxAddress *a) {
+
     gchar *n;
     g_assert(s);
-    g_assert(name);
     g_assert(a);
 
-    n = flx_normalize_name(name);
+    n = name ? flx_normalize_name(name) : s->hostname;
     
     if (a->family == AF_INET) {
         gchar *r;
         
-        flx_server_add(s, id, interface, protocol, n, FLX_DNS_TYPE_A, &a->ipv4, sizeof(a->ipv4));
+        flx_server_add_full(s, id, interface, protocol, unique, n, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_A, &a->ipv4, sizeof(a->ipv4), FLX_DEFAULT_TTL);
 
         r = flx_reverse_lookup_name_ipv4(&a->ipv4);
         g_assert(r);
-        flx_server_add(s, id, interface, protocol, r, FLX_DNS_TYPE_PTR, n, strlen(n)+1);
+        flx_server_add_full(s, id, interface, protocol, unique, r, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_PTR, n, strlen(n)+1, FLX_DEFAULT_TTL);
         g_free(r);
         
     } else {
         gchar *r;
             
-        flx_server_add(s, id, interface, protocol, n, FLX_DNS_TYPE_AAAA, &a->ipv6, sizeof(a->ipv6));
+        flx_server_add_full(s, id, interface, protocol, unique, n, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_AAAA, &a->ipv6, sizeof(a->ipv6), FLX_DEFAULT_TTL);
 
         r = flx_reverse_lookup_name_ipv6_arpa(&a->ipv6);
         g_assert(r);
-        flx_server_add(s, id, interface, protocol, r, FLX_DNS_TYPE_PTR, n, strlen(n)+1);
+        flx_server_add_full(s, id, interface, protocol, unique, r, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_PTR, n, strlen(n)+1, FLX_DEFAULT_TTL);
         g_free(r);
     
         r = flx_reverse_lookup_name_ipv6_int(&a->ipv6);
         g_assert(r);
-        flx_server_add(s, id, interface, protocol, r, FLX_DNS_TYPE_PTR, n, strlen(n)+1);
+        flx_server_add_full(s, id, interface, protocol, unique, r, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_PTR, n, strlen(n)+1, FLX_DEFAULT_TTL);
         g_free(r);
     }
     
     g_free(n);
 }
 
-flxQueryJob* flx_query_job_new(void) {
-    flxQueryJob *job = g_new(flxQueryJob);
-    job->query.name = NULL;
-    job->query.class = 0;
-    job->query.type = 0;
-    job->ref = 1;
-    return job;
-}
-
-flxQueryJob* flx_query_job_ref(flxQueryJob *job) {
-    g_assert(job);
-    g_assert(job->ref >= 1);
-    job->ref++;
-    return job;
-}
+void flx_server_add_text(
+    flxServer *s,
+    gint id,
+    gint interface,
+    guchar protocol,
+    gboolean unique,
+    const gchar *name,
+    const gchar *text) {
+    
+    g_assert(s);
+    g_assert(text);
 
-void flx_query_job_unref(flxQueryJob *job) {
-    g_assert(job);
-    g_assert(job->ref >= 1);
-    if (!(--job->ref))
-        g_free(job);
+    flx_server_add_full(s, id, interface, protocol, unique, name, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_TXT, text, strlen(text), FLX_DEFAULT_TTL);
 }
 
-static void post_query_job(flxServer *s, gint interface, guchar protocol, flxQueryJob *job) {
-    flxQueryJobInstance *i;
+void flx_server_send_query(flxServer *s, gint interface, guchar protocol, flxKey *k) {
     g_assert(s);
-    g_assert(job);
+    g_assert(k);
 
     if (interface <= 0) {
         flxInterface *i;
+
+        for (i = flx_interface_monitor_get_first(s->monitor); i; i = i->interface_next)
+            flx_interface_post_query(i, protocol, k);
         
-        for (i = s->monitor->interfaces; i; i = i->next)
-            post_query_job(s, i->index, protocol, job);
-    } else if (protocol == AF_UNSPEC) {
-        post_query_job(s, index, AF_INET, job);
-        post_query_job(s, index, AF_INET6, job);
     } else {
+        flxInterface *i;
 
-        if (query_job_exists(s, interface, protocol, &job->query))
+        if (!(i = flx_interface_monitor_get_interface(s->monitor, interface)))
             return;
-        
-        i = g_new(flxQueryJobInstance, 1);
-        i->job = flx_query_job_ref(job);
-        i->interface = interface;
-        i->protocol = protocol;
-        if (i->prev = s->last_query_job)
-            i->prev->next = i;
-        else
-            s->first_query_job = i;
-        i->next = NULL;
-        s->last_query_job = i;
-    }
-}
-
-void flx_server_post_query_job(flxServer *s, gint interface, guchar protocol, const flxQuery *q) {
-    flxQueryJob *job;
-    g_assert(s);
-    g_assert(q);
 
-    job = flx_query_job_new();
-    job->query.name = g_strdup(q->name);
-    job->query.class = q->class;
-    job->query.type = q->type;
-    post_query_job(s, interface, protocol, job);
-}
-
-void flx_server_drop_query_job(flxServer *s, gint interface, guchar protocol, const flxQuery *q) {
-    flxQueryJobInstance *i, *next;
-    g_assert(s);
-    g_assert(interface > 0);
-    g_assert(protocol != AF_UNSPEC);
-    g_assert(q);
-
-    for (i = s->first_query_job; i; i = next) {
-        next = i->next;
-    
-        if (flx_query_equal(i->query, q))
-            flx_server_remove_query_job_instance(s, i);
+        flx_interface_post_query(i, protocol, k);
     }
 }
-
-gboolean flx_query_equal(const flxQuery *a, const flxQuery *b) {
-    return strcmp(a->name, b->name) == 0 && a->type == b->type && a->class == b->class;
-}
-
-void flx_server_remove_query_job_instance(flxServer *s, flxQueryJobInstance *i) {
-    g_assert(s);
-    g_assert(i);
-
-    if (i->prev)
-        i->prev = i->next;
-    else
-        s->first_query_job = i->next;
-
-    if (i->next)
-        i->next = i->prev;
-    else
-        s->last_query_job = i->prev;
-
-    flx_query_job_unref(i->job);
-    g_free(i);
-}