X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=server.c;h=b02fdad76736cafab5b4eaa41bf41bb827ec5dc5;hb=837fb2df0993753f39e098934dc6bd8fa8a19b47;hp=c31ff8097439279a8101d39890d225b0121c2d76;hpb=d6e2dbabccb08970da991e6d2b0fda7a56d83e6f;p=catta

diff --git a/server.c b/server.c
index c31ff80..b02fdad 100644
--- a/server.c
+++ b/server.c
@@ -2,275 +2,596 @@
 #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"
+#include "subscribe.h"
 
-static gint timeval_cmp(const GTimeVal *a, const GTimeVal *b) {
-    g_assert(a);
-    g_assert(b);
+static void free_entry(flxServer*s, flxEntry *e) {
+    flxEntry *t;
 
-    if (a->tv_sec < b->tv_sec)
-        return -1;
+    g_assert(s);
+    g_assert(e);
 
-    if (a->tv_sec > b->tv_sec)
-        return 1;
+    flx_goodbye_entry(s, e, TRUE);
 
-    if (a->tv_usec < b->tv_usec)
-        return -1;
+    /* Remove from linked list */
+    FLX_LLIST_REMOVE(flxEntry, entries, s->entries, e);
 
-    if (a->tv_usec > b->tv_usec)
-        return 1;
+    /* Remove from hash table indexed by name */
+    t = g_hash_table_lookup(s->entries_by_key, e->record->key);
+    FLX_LLIST_REMOVE(flxEntry, by_key, t, e);
+    if (t)
+        g_hash_table_replace(s->entries_by_key, t->record->key, t);
+    else
+        g_hash_table_remove(s->entries_by_key, e->record->key);
+
+    /* Remove from associated group */
+    if (e->group)
+        FLX_LLIST_REMOVE(flxEntry, by_group, e->group->entries, e);
 
-    return 0;
+    flx_record_unref(e->record);
+    g_free(e);
 }
 
-static gint query_job_instance_compare(gpointer a, gpointer b) {
-    flxQueryJobInstance *j = a, *k = b;
-    g_assert(j);
-    g_assert(k);
+static void free_group(flxServer *s, flxEntryGroup *g) {
+    g_assert(s);
+    g_assert(g);
+
+    while (g->entries)
+        free_entry(s, g->entries);
 
-    return timeval_cmp(&j->job->time, &k->job->time);
+    FLX_LLIST_REMOVE(flxEntryGroup, groups, s->groups, g);
+    g_free(g);
 }
 
-static gint response_job_instance_compare(gpointer a, gpointer b) {
-    flxResponseJobInstance *j = a, *k = b;
-    g_assert(j);
+static void cleanup_dead(flxServer *s) {
+    flxEntryGroup *g, *ng;
+    flxEntry *e, *ne;
+    g_assert(s);
+
+
+    if (s->need_group_cleanup) {
+        for (g = s->groups; g; g = ng) {
+            ng = g->groups_next;
+            
+            if (g->dead)
+                free_group(s, g);
+        }
+
+        s->need_group_cleanup = FALSE;
+    }
+
+    if (s->need_entry_cleanup) {
+        for (e = s->entries; e; e = ne) {
+            ne = e->entries_next;
+            
+            if (e->dead)
+                free_entry(s, e);
+        }
+
+        s->need_entry_cleanup = FALSE;
+    }
+}
+
+static void handle_query_key(flxServer *s, flxKey *k, flxInterface *i, const flxAddress *a) {
+    flxEntry *e;
+    gchar *txt;
+    
+    g_assert(s);
     g_assert(k);
+    g_assert(i);
+    g_assert(a);
+
+    g_message("Handling query: %s", txt = flx_key_to_string(k));
+    g_free(txt);
 
-    return timeval_cmp(&j->job->time, &k->job->time);
+    flx_packet_scheduler_incoming_query(i->scheduler, k);
+
+    if (k->type == FLX_DNS_TYPE_ANY) {
+
+        /* Handle ANY query */
+        
+        for (e = s->entries; e; e = e->entries_next)
+            if (!e->dead && flx_key_pattern_match(k, e->record->key) && flx_entry_registered(s, e, i))
+                flx_interface_post_response(i, a, e->record, e->flags & FLX_ENTRY_UNIQUE, FALSE);
+    } else {
+
+        /* Handle all other queries */
+        
+        for (e = g_hash_table_lookup(s->entries_by_key, k); e; e = e->by_key_next)
+            if (!e->dead && flx_entry_registered(s, e, i))
+                flx_interface_post_response(i, a, e->record, e->flags & FLX_ENTRY_UNIQUE, FALSE);
+    }
 }
 
-flxServer *flx_server_new(GMainContext *c) {
-    gchar *hn, *e, *hinfo;
-    struct utsname utsname;
-    gint length;
-    flxAddress a;
-    flxServer *s = g_new(flxServer, 1);
+static void withdraw_entry(flxServer *s, flxEntry *e) {
+    g_assert(s);
+    g_assert(e);
 
-    if (c) {
-        g_main_context_ref(c);
-        s->context = c;
-    } else
-        s->context = g_main_context_default();
+    e->dead = TRUE;
+    s->need_entry_cleanup = TRUE;
+
+    flx_goodbye_entry(s, e, FALSE);
     
-    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;
+    if (e->group)
+        flx_entry_group_run_callback(e->group, FLX_ENTRY_GROUP_COLLISION);
+}
 
-    s->query_job_queue = flx_prio_queue_new(query_job_instance_compare);
-    s->response_job_queue = flx_prio_queue_new(response_job_instance_compare);
+static void incoming_probe(flxServer *s, flxRecord *record, flxInterface *i) {
+    flxEntry *e, *n;
+    gchar *t;
     
-    s->monitor = flx_interface_monitor_new(s);
+    g_assert(s);
+    g_assert(record);
+    g_assert(i);
 
-    /* Get host name */
-    hn = flx_get_host_name();
-    if ((e = strchr(hn, '.')))
-        *e = 0;
+    t = flx_record_to_string(record);
 
-    s->hostname = g_strdup_printf("%s.local.", hn);
-    g_free(hn);
+    for (e = g_hash_table_lookup(s->entries_by_key, record->key); e; e = n) {
+        n = e->by_key_next;
+        
+        if (e->dead || !flx_record_equal_no_ttl(record, e->record))
+            continue;
 
-    /* Fill in HINFO rr */
-    s->hinfo_rr_id = flx_server_get_next_id(s);
+        if (flx_entry_registering(s, e, i)) {
+            
+            if (flx_record_lexicographical_compare(record, e->record) > 0) {
+                withdraw_entry(s, e);
+                g_message("Recieved conflicting probe [%s]. Local host lost. Withdrawing.", t);
+            } else
+                g_message("Recieved conflicting probe [%s]. Local host won.", t);
+        }
+    }
 
-    uname(&utsname);
-    hinfo = g_strdup_printf("%s%c%s%n", g_strup(utsname.machine), 0, g_strup(utsname.sysname), &length);
+    g_free(t);
+}
+
+static void handle_query(flxServer *s, flxDnsPacket *p, flxInterface *i, const flxAddress *a) {
+    guint n;
     
-    flx_server_add(s, s->hinfo_rr_id, 0, AF_UNSPEC,
-                   s->hostname, FLX_DNS_TYPE_HINFO, hinfo, length+1);
+    g_assert(s);
+    g_assert(p);
+    g_assert(i);
+    g_assert(a);
 
+    /* Handle the questions */
+    for (n = flx_dns_packet_get_field(p, FLX_DNS_FIELD_QDCOUNT); n > 0; n --) {
+        flxKey *key;
 
-    /* Add localhost entries */
-    flx_address_parse("127.0.0.1", AF_INET, &a);
-    flx_server_add_address(s, 0, 0, AF_UNSPEC, "localhost", &a);
+        if (!(key = flx_dns_packet_consume_key(p))) {
+            g_warning("Packet too short (1)");
+            return;
+        }
 
-    flx_address_parse("::1", AF_INET6, &a);
-    flx_server_add_address(s, 0, 0, AF_UNSPEC, "ip6-localhost", &a);
+        handle_query_key(s, key, i, a);
+        flx_key_unref(key);
+    }
 
-    return s;
+    /* Known Answer Suppresion */
+    for (n = flx_dns_packet_get_field(p, FLX_DNS_FIELD_ANCOUNT); n > 0; n --) {
+        flxRecord *record;
+        gboolean unique = FALSE;
+
+        if (!(record = flx_dns_packet_consume_record(p, &unique))) {
+            g_warning("Packet too short (2)");
+            return;
+        }
+
+        flx_packet_scheduler_incoming_known_answer(i->scheduler, record, a);
+        flx_record_unref(record);
+    }
+
+    /* Probe record */
+    for (n = flx_dns_packet_get_field(p, FLX_DNS_FIELD_NSCOUNT); n > 0; n --) {
+        flxRecord *record;
+        gboolean unique = FALSE;
+
+        if (!(record = flx_dns_packet_consume_record(p, &unique))) {
+            g_warning("Packet too short (3)");
+            return;
+        }
+
+        if (record->key->type != FLX_DNS_TYPE_ANY)
+            incoming_probe(s, record, i);
+        
+        flx_record_unref(record);
+    }
 }
 
-void flx_server_free(flxServer* s) {
+static gboolean handle_conflict(flxServer *s, flxInterface *i, flxRecord *record, const flxAddress *a) {
+    gboolean valid = TRUE;
+    flxEntry *e, *n;
+    gchar *t;
+    
     g_assert(s);
+    g_assert(i);
+    g_assert(record);
 
-    while (s->query_job_queue->last)
-        flx_server_remove_query_job_instance(s, s->query_job_queue->last->data);
-    
-    flx_prio_queue_free(s->query_job_queue);
-    flx_prio_queue_free(s->response_job_queue);
+    t = flx_record_to_string(record);
 
-    flx_interface_monitor_free(s->monitor);
+    for (e = g_hash_table_lookup(s->entries_by_key, record->key); e; e = n) {
+        n = e->by_key_next;
+
+        if (e->dead)
+            continue;
+        
+        if (flx_entry_registered(s, e, i)) {
+
+            gboolean equal = flx_record_equal_no_ttl(record, e->record);
+                
+            /* Check whether there is a unique record conflict */
+            if (!equal && (e->flags & FLX_ENTRY_UNIQUE)) {
+                
+                /* The lexicographically later data wins. */
+                if (flx_record_lexicographical_compare(record, e->record) > 0) {
+                    withdraw_entry(s, e);
+                    g_message("Recieved conflicting record [%s]. Local host lost. Withdrawing.", t);
+                } else {
+                    /* Tell the other host that our entry is lexicographically later */
+                    valid = FALSE;
+                    flx_interface_post_response(i, a, e->record, e->flags & FLX_ENTRY_UNIQUE, TRUE);
+                    g_message("Recieved conflicting record [%s]. Local host won. Refreshing.", t);
+                }
+                
+                /* Check wheter there is a TTL conflict */
+            } else if (equal && record->ttl <= e->record->ttl/2) {
+                /* Correct the TTL */
+                valid = FALSE;
+                flx_interface_post_response(i, a, e->record, e->flags & FLX_ENTRY_UNIQUE, TRUE);
+                g_message("Recieved record with bad TTL [%s]. Refreshing.", t);
+            }
+        }
+    }
+
+    g_free(t);
+
+    return valid;
+}
+
+static void handle_response(flxServer *s, flxDnsPacket *p, flxInterface *i, const flxAddress *a) {
+    guint n;
     
-    flx_server_remove(s, 0);
+    g_assert(s);
+    g_assert(p);
+    g_assert(i);
+    g_assert(a);
     
-    g_hash_table_destroy(s->rrset_by_id);
-    g_hash_table_destroy(s->rrset_by_name);
-    g_main_context_unref(s->context);
+    for (n = flx_dns_packet_get_field(p, FLX_DNS_FIELD_ANCOUNT) +
+             flx_dns_packet_get_field(p, FLX_DNS_FIELD_ARCOUNT); n > 0; n--) {
+        flxRecord *record;
+        gboolean cache_flush = FALSE;
+        gchar *txt;
+        
+        if (!(record = flx_dns_packet_consume_record(p, &cache_flush))) {
+            g_warning("Packet too short (4)");
+            return;
+        }
 
-    g_free(s->hostname);
-    g_free(s);
+        if (record->key->type != FLX_DNS_TYPE_ANY) {
+
+            g_message("Handling response: %s", txt = flx_record_to_string(record));
+            g_free(txt);
+            
+            if (handle_conflict(s, i, record, a)) {
+                flx_cache_update(i->cache, record, cache_flush, a);
+                flx_packet_scheduler_incoming_response(i->scheduler, record);
+            }
+        }
+            
+        flx_record_unref(record);
+    }
 }
 
-gint flx_server_get_next_id(flxServer *s) {
+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, sa->sa_family))) {
+        g_warning("Recieved packet from invalid interface.");
+        return;
+    }
 
-    return s->current_id++;
+    if (ttl != 255) {
+        g_warning("Recieved packet with invalid TTL on interface '%s.%i'.", i->hardware->name, i->protocol);
+        if (!s->ignore_bad_ttl)
+            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, FLX_DNS_FIELD_QDCOUNT) == 0 ||
+            flx_dns_packet_get_field(p, FLX_DNS_FIELD_ARCOUNT) != 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, FLX_DNS_FIELD_QDCOUNT) != 0 ||
+            flx_dns_packet_get_field(p, FLX_DNS_FIELD_ANCOUNT) == 0 ||
+            flx_dns_packet_get_field(p, FLX_DNS_FIELD_NSCOUNT) != 0) {
+            g_warning("Invalid response packet.");
+            return;
+        }
+
+        handle_response(s, p, i, &a);
+        g_message("Handled response");
+    }
 }
 
-void flx_server_add_rr(flxServer *s, gint id, gint interface, guchar protocol, const flxRecord *rr) {
-    flxEntry *e;
+static void work(flxServer *s) {
+    struct sockaddr_in6 sa6;
+    struct sockaddr_in sa;
+    flxDnsPacket *p;
+    gint iface = -1;
+    guint8 ttl;
+        
     g_assert(s);
-    g_assert(rr);
-    g_assert(rr->name);
-    g_assert(rr->data);
-    g_assert(rr->size);
 
-    e = g_new(flxEntry, 1);
-    flx_record_copy_normalize(&e->rr, rr);
-    e->id = id;
-    e->interface = interface;
-    e->protocol = protocol;
+    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);
+            flx_dns_packet_free(p);
+        }
+    }
+
+    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);
+            flx_dns_packet_free(p);
+        }
+    }
+}
 
-    /* Insert into linked list */
-    e->prev = NULL;
-    if ((e->next = s->entries))
-        e->next->prev = e;
-    s->entries = e;
+static gboolean prepare_func(GSource *source, gint *timeout) {
+    g_assert(source);
+    g_assert(timeout);
+    
+    *timeout = -1;
+    return FALSE;
+}
 
-    /* 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);
+static gboolean check_func(GSource *source) {
+    flxServer* s;
+    g_assert(source);
 
-    /* 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);
+    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);
 }
 
-void flx_server_add(flxServer *s, gint id, gint interface, guchar protocol, const gchar *name, guint16 type, gconstpointer data, guint size) {
-    flxRecord rr;
+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);
-    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);
+    work(s);
+    cleanup_dead(s);
+
+    return TRUE;
 }
 
-const flxRecord *flx_server_iterate(flxServer *s, gint id, void **state) {
-    flxEntry **e = (flxEntry**) state;
+static void add_default_entries(flxServer *s) {
+    gint length = 0;
+    struct utsname utsname;
+    gchar *hinfo;
+    flxAddress a;
+    flxRecord *r;
+    
     g_assert(s);
-    g_assert(e);
+    
+    /* Fill in HINFO rr */
+    r = flx_record_new_full(s->hostname, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_HINFO);
+    uname(&utsname);
+    r->data.hinfo.cpu = g_strdup(g_strup(utsname.machine));
+    r->data.hinfo.os = g_strdup(g_strup(utsname.sysname));
+    flx_server_add(s, NULL, 0, AF_UNSPEC, FLX_ENTRY_UNIQUE | FLX_ENTRY_NOANNOUNCE | FLX_ENTRY_NOPROBE, r);
+    flx_record_unref(r);
 
-    if (e)
-        *e = id > 0 ? (*e)->next_by_id : (*e)->next;
-    else
-        *e = id > 0 ? g_hash_table_lookup(s->rrset_by_id, &id) : s->entries;
-        
-    if (!*e)
-        return NULL;
+    /* Add localhost entries */
+    flx_address_parse("127.0.0.1", AF_INET, &a);
+    flx_server_add_address(s, NULL, 0, AF_UNSPEC, FLX_ENTRY_UNIQUE|FLX_ENTRY_NOPROBE|FLX_ENTRY_NOANNOUNCE, "localhost", &a);
 
-    return &(*e)->rr;
+    flx_address_parse("::1", AF_INET6, &a);
+    flx_server_add_address(s, NULL, 0, AF_UNSPEC, FLX_ENTRY_UNIQUE|FLX_ENTRY_NOPROBE|FLX_ENTRY_NOANNOUNCE, "ip6-localhost", &a);
 }
 
-static void free_entry(flxServer*s, flxEntry *e) {
-    g_assert(e);
+flxServer *flx_server_new(GMainContext *c) {
+    gchar *hn, *e;
+    flxServer *s;
+    
+    static GSourceFuncs source_funcs = {
+        prepare_func,
+        check_func,
+        dispatch_func,
+        NULL,
+        NULL,
+        NULL
+    };
+
+    s = g_new(flxServer, 1);
+
+    s->ignore_bad_ttl = FALSE;
+    s->need_entry_cleanup = s->need_group_cleanup = FALSE;
+    
+    s->fd_ipv4 = flx_open_socket_ipv4();
+    s->fd_ipv6 = -1 /*flx_open_socket_ipv6() */; 
+    
+    if (s->fd_ipv6 < 0 && s->fd_ipv4 < 0) {
+        g_critical("Failed to create IP sockets.\n");
+        g_free(s);
+        return NULL;
+    }
 
-    /* Remove from linked list */
-    if (e->prev)
-        e->prev->next = e->next;
+    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->entries = e->next;
-    
-    if (e->next)
-        e->next->prev = e->prev;
-
-    /* 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);
-    }
+        s->context = g_main_context_default();
+    
+    FLX_LLIST_HEAD_INIT(flxEntry, s->entries);
+    s->entries_by_key = g_hash_table_new((GHashFunc) flx_key_hash, (GEqualFunc) flx_key_equal);
+    FLX_LLIST_HEAD_INIT(flxGroup, s->groups);
 
-    if (e->next_by_id)
-        e->next_by_id->prev_by_id = e->prev_by_id;
+    FLX_LLIST_HEAD_INIT(flxSubscription, s->subscriptions);
+    s->subscription_hashtable = g_hash_table_new((GHashFunc) flx_key_hash, (GEqualFunc) flx_key_equal);
 
-    /* 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);
-    }
+    /* Get host name */
+    hn = flx_get_host_name();
+    hn[strcspn(hn, ".")] = 0;
+
+    s->hostname = g_strdup_printf("%s.local.", hn);
+    g_free(hn);
+
+    s->time_event_queue = flx_time_event_queue_new(s->context, G_PRIORITY_DEFAULT+10); /* Slightly less priority than the FDs */
+    s->monitor = flx_interface_monitor_new(s);
+    flx_interface_monitor_sync(s->monitor);
+    add_default_entries(s);
     
-    if (e->next_by_name)
-        e->next_by_name->prev_by_name = e->prev_by_name;
+    /* Prepare IO source registration */
+    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;
 }
 
-void flx_server_remove(flxServer *s, gint id) {
+void flx_server_free(flxServer* s) {
     g_assert(s);
 
-    if (id <= 0) {
-        while (s->entries)
-            free_entry(s, s->entries);
-    } else {
-        flxEntry *e;
+    while(s->entries)
+        free_entry(s, s->entries);
 
-        while ((e = g_hash_table_lookup(s->rrset_by_id, &id)))
-            free_entry(s, e);
-    }
-}
+    flx_interface_monitor_free(s->monitor);
+
+    while (s->groups)
+        free_group(s, s->groups);
+
+    while (s->subscriptions)
+        flx_subscription_free(s->subscriptions);
+    g_hash_table_destroy(s->subscription_hashtable);
+
+    g_hash_table_destroy(s->entries_by_key);
 
-flxRecord *flx_record_copy_normalize(flxRecord *ret_dest, const flxRecord*src) {
-    g_assert(ret_dest);
-    g_assert(src);
+    flx_time_event_queue_free(s->time_event_queue);
 
-    *ret_dest = *src;
-    ret_dest->name = flx_normalize_name(src->name);
-    ret_dest->data = g_memdup(src->data, src->size);
+    if (s->fd_ipv4 >= 0)
+        close(s->fd_ipv4);
+    if (s->fd_ipv6 >= 0)
+        close(s->fd_ipv6);
+    
+    g_free(s->hostname);
 
-    return ret_dest;    
+    g_source_destroy(s->source);
+    g_source_unref(s->source);
+    g_main_context_unref(s->context);
+
+    g_free(s);
 }
 
-static const gchar *dns_class_to_string(guint16 class) {
-    if (class == FLX_DNS_CLASS_IN)
-        return "IN";
+void flx_server_add(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    flxEntryFlags flags,
+    flxRecord *r) {
+    
+    flxEntry *e, *t;
+    g_assert(s);
+    g_assert(r);
+
+    g_assert(r->key->type != FLX_DNS_TYPE_ANY);
+
+    e = g_new(flxEntry, 1);
+    e->server = s;
+    e->record = flx_record_ref(r);
+    e->group = g;
+    e->interface = interface;
+    e->protocol = protocol;
+    e->flags = flags;
+    e->dead = FALSE;
+
+    FLX_LLIST_HEAD_INIT(flxAnnouncement, e->announcements);
+
+    FLX_LLIST_PREPEND(flxEntry, entries, s->entries, e);
+
+    /* Insert into hash table indexed by name */
+    t = g_hash_table_lookup(s->entries_by_key, e->record->key);
+    FLX_LLIST_PREPEND(flxEntry, by_key, t, e);
+    g_hash_table_replace(s->entries_by_key, e->record->key, t);
+
+    /* Insert into group list */
+    if (g)
+        FLX_LLIST_PREPEND(flxEntry, by_group, g->entries, e); 
 
-    return NULL;
+    flx_announce_entry(s, e);
 }
+const flxRecord *flx_server_iterate(flxServer *s, flxEntryGroup *g, void **state) {
+    flxEntry **e = (flxEntry**) state;
+    g_assert(s);
+    g_assert(e);
 
-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;
-    }
+    if (!*e)
+        *e = g ? g->entries : s->entries;
+    
+    while (*e && (*e)->dead)
+        *e = g ? (*e)->by_group_next : (*e)->entries_next;
+        
+    if (!*e)
+        return NULL;
+
+    return flx_record_ref((*e)->record);
 }
 
 void flx_server_dump(flxServer *s, FILE *f) {
@@ -278,194 +599,335 @@ void flx_server_dump(flxServer *s, FILE *f) {
     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, "\n;;; ZONE DUMP FOLLOWS ;;;\n");
+
+    for (e = s->entries; e; e = e->entries_next) {
+        gchar *t;
 
-        t[0] = 0;
+        if (e->dead)
+            continue;
         
-        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);
-                }
-                
-            } else if (e->rr.type == FLX_DNS_TYPE_TXT) {
-                size_t l;
+        t = flx_record_to_string(e->record);
+        fprintf(f, "%s ; iface=%i proto=%i\n", t, e->interface, e->protocol);
+        g_free(t);
+    }
 
-                l = e->rr.size;
-                if (l > sizeof(t)-1)
-                    l = sizeof(t)-1;
+    flx_dump_caches(s->monitor, f);
+}
 
-                memcpy(t, e->rr.data, l);
-                t[l] = 0;
-            }
-        }
-            
-        fprintf(f, "%s\n", t);
-    }
+void flx_server_add_ptr(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    flxEntryFlags flags,
+    const gchar *name,
+    const gchar *dest) {
+
+    flxRecord *r;
+
+    g_assert(dest);
+
+    r = flx_record_new_full(name ? name : s->hostname, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_PTR);
+    r->data.ptr.name = flx_normalize_name(dest);
+    flx_server_add(s, g, interface, protocol, flags, r);
+    flx_record_unref(r);
 }
 
-void flx_server_add_address(flxServer *s, gint id, gint interface, guchar protocol, const gchar *name, flxAddress *a) {
-    gchar *n;
+void flx_server_add_address(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    flxEntryFlags flags,
+    const gchar *name,
+    flxAddress *a) {
+
+    gchar *n = NULL;
     g_assert(s);
     g_assert(a);
 
-    n = flx_normalize_name(name ? name : s->hostname);
+    name = name ? (n = 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));
+        gchar *reverse;
+        flxRecord  *r;
 
-        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);
-        g_free(r);
+        r = flx_record_new_full(name, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_A);
+        r->data.a.address = a->data.ipv4;
+        flx_server_add(s, g, interface, protocol, flags, r);
+        flx_record_unref(r);
+        
+        reverse = flx_reverse_lookup_name_ipv4(&a->data.ipv4);
+        g_assert(reverse);
+        flx_server_add_ptr(s, g, interface, protocol, flags, reverse, name);
+        g_free(reverse);
         
     } else {
-        gchar *r;
+        gchar *reverse;
+        flxRecord *r;
             
-        flx_server_add(s, id, interface, protocol, n, FLX_DNS_TYPE_AAAA, &a->ipv6, sizeof(a->ipv6));
-
-        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);
-        g_free(r);
+        r = flx_record_new_full(name, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_AAAA);
+        r->data.aaaa.address = a->data.ipv6;
+        flx_server_add(s, g, interface, protocol, flags, r);
+        flx_record_unref(r);
+
+        reverse = flx_reverse_lookup_name_ipv6_arpa(&a->data.ipv6);
+        g_assert(reverse);
+        flx_server_add_ptr(s, g, interface, protocol, flags, reverse, name);
+        g_free(reverse);
     
-        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);
-        g_free(r);
+        reverse = flx_reverse_lookup_name_ipv6_int(&a->data.ipv6);
+        g_assert(reverse);
+        flx_server_add_ptr(s, g, interface, protocol, flags, reverse, name);
+        g_free(reverse);
     }
     
     g_free(n);
 }
 
-void flx_server_add_text(flxServer *s, gint id, gint interface, guchar protocol, const gchar *name, const gchar *text) {
-    gchar *n;
-    g_assert(s);
-    g_assert(text);
+void flx_server_add_text_va(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    flxEntryFlags flags,
+    const gchar *name,
+    va_list va) {
 
-    n = flx_normalize_name(name ? name : s->hostname);
-    flx_server_add(s, id, interface, protocol, n, FLX_DNS_TYPE_TXT, text, strlen(text));
-    g_free(n);
+    flxRecord *r;
+    
+    g_assert(s);
+    
+    r = flx_record_new_full(name ? name : s->hostname, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_TXT);
+    r->data.txt.string_list = flx_string_list_new_va(va);
+    flx_server_add(s, g, interface, protocol, flags, r);
+    flx_record_unref(r);
 }
 
+void flx_server_add_text(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    flxEntryFlags flags,
+    const gchar *name,
+    ...) {
 
-flxQueryJob* flx_query_job_new(void) {
-    flxQueryJob *job = g_new(flxQueryJob, 1);
-    job->query.name = NULL;
-    job->query.class = 0;
-    job->query.type = 0;
-    job->ref = 1;
-    job->time.tv_sec = 0;
-    job->time.tv_usec = 0;
-    return job;
-}
+    va_list va;
+    
+    g_assert(s);
 
-flxQueryJob* flx_query_job_ref(flxQueryJob *job) {
-    g_assert(job);
-    g_assert(job->ref >= 1);
-    job->ref++;
-    return job;
+    va_start(va, name);
+    flx_server_add_text_va(s, g, interface, protocol, flags, name, va);
+    va_end(va);
 }
 
-void flx_query_job_unref(flxQueryJob *job) {
-    g_assert(job);
-    g_assert(job->ref >= 1);
-    if (!(--job->ref))
-        g_free(job);
+static void escape_service_name(gchar *d, guint size, const gchar *s) {
+    g_assert(d);
+    g_assert(size);
+    g_assert(s);
+
+    while (*s && size >= 2) {
+        if (*s == '.' || *s == '\\') {
+            if (size < 3)
+                break;
+
+            *(d++) = '\\';
+            size--;
+        }
+            
+        *(d++) = *(s++);
+        size--;
+    }
+
+    g_assert(size > 0);
+    *(d++) = 0;
 }
 
-static gboolean query_job_exists(flxServer *s, gint interface, guchar protocol, flxQuery *q) {
-    flxPrioQueueNode *n;
+
+void flx_server_add_service_va(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    const gchar *type,
+    const gchar *name,
+    const gchar *domain,
+    const gchar *host,
+    guint16 port,
+    va_list va) {
+
+    gchar ptr_name[256], svc_name[256], ename[64], enum_ptr[256];
+    flxRecord *r;
+    
     g_assert(s);
-    g_assert(q);
+    g_assert(type);
+    g_assert(name);
 
-    for (n = s->query_job_queue->root; n; n = n->next)
-        if (flx_query_equal(&((flxQueryJobInstance*) n->data)->job->query, q))
-            return TRUE;
+    escape_service_name(ename, sizeof(ename), name);
 
-    return FALSE;
+    if (domain) {
+        while (domain[0] == '.')
+            domain++;
+    } else
+        domain = "local";
+
+    if (!host)
+        host = s->hostname;
+
+    snprintf(ptr_name, sizeof(ptr_name), "%s.%s", type, domain);
+    snprintf(svc_name, sizeof(svc_name), "%s.%s.%s", ename, type, domain);
+    
+    flx_server_add_ptr(s, g, interface, protocol, FALSE, ptr_name, svc_name);
+
+    r = flx_record_new_full(svc_name, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_SRV);
+    r->data.srv.priority = 0;
+    r->data.srv.weight = 0;
+    r->data.srv.port = port;
+    r->data.srv.name = flx_normalize_name(host);
+    flx_server_add(s, g, interface, protocol, TRUE, r);
+    flx_record_unref(r);
+
+    flx_server_add_text_va(s, g, interface, protocol, FALSE, svc_name, va);
+
+    snprintf(enum_ptr, sizeof(enum_ptr), "_services._dns-sd._udp.%s", domain);
+    flx_server_add_ptr(s, g, interface, protocol, FALSE, enum_ptr, ptr_name);
 }
 
-static void post_query_job(flxServer *s, gint interface, guchar protocol, flxQueryJob *job) {
+void flx_server_add_service(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    const gchar *type,
+    const gchar *name,
+    const gchar *domain,
+    const gchar *host,
+    guint16 port,
+    ... ){
+
+    va_list va;
+    
     g_assert(s);
-    g_assert(job);
+    g_assert(type);
+    g_assert(name);
 
-    if (interface <= 0) {
-        const flxInterface *i;
-        
-        for (i = flx_interface_monitor_get_first(s->monitor); i; i = i->next)
-            post_query_job(s, i->index, protocol, job);
-    } else if (protocol == AF_UNSPEC) {
-        post_query_job(s, interface, AF_INET, job);
-        post_query_job(s, interface, AF_INET6, job);
-    } else {
-        flxQueryJobInstance *i;
+    va_start(va, port);
+    flx_server_add_service_va(s, g, interface, protocol, type, name, domain, host, port, va);
+    va_end(va);
+}
 
-        if (query_job_exists(s, interface, protocol, &job->query))
-            return;
-        
-        i = g_new(flxQueryJobInstance, 1);
-        i->job = flx_query_job_ref(job);
-        i->interface = interface;
-        i->protocol = protocol;
-        i->node = flx_prio_queue_put(s->query_job_queue, i);
-    }
+static void post_query_callback(flxInterfaceMonitor *m, flxInterface *i, gpointer userdata) {
+    flxKey *k = userdata;
+
+    g_assert(m);
+    g_assert(i);
+    g_assert(k);
+
+    flx_interface_post_query(i, k, FALSE);
 }
 
-void flx_server_post_query_job(flxServer *s, gint interface, guchar protocol, const GTimeVal *tv, const flxQuery *q) {
-    flxQueryJob *job;
+void flx_server_post_query(flxServer *s, gint interface, guchar protocol, flxKey *key) {
     g_assert(s);
-    g_assert(q);
+    g_assert(key);
 
-    job = flx_query_job_new();
-    job->query.name = g_strdup(q->name);
-    job->query.class = q->class;
-    job->query.type = q->type;
-    if (tv)
-        job->time = *tv;
-    post_query_job(s, interface, protocol, job);
+    flx_interface_monitor_walk(s->monitor, interface, protocol, post_query_callback, key);
 }
 
-void flx_server_drop_query_job(flxServer *s, gint interface, guchar protocol, const flxQuery *q) {
-    flxPrioQueueNode *n, *next;
-    g_assert(s);
-    g_assert(interface > 0);
-    g_assert(protocol != AF_UNSPEC);
-    g_assert(q);
+struct tmpdata {
+    flxRecord *record;
+    gboolean flush_cache;
+};
+
+static void post_response_callback(flxInterfaceMonitor *m, flxInterface *i, gpointer userdata) {
+    struct tmpdata *tmpdata = userdata;
+
+    g_assert(m);
+    g_assert(i);
+    g_assert(tmpdata);
 
-    for (n = s->query_job_queue->root; n; n = next) {
-        next = n->next;
+    flx_interface_post_response(i, NULL, tmpdata->record, tmpdata->flush_cache, FALSE);
+}
+
+void flx_server_post_response(flxServer *s, gint interface, guchar protocol, flxRecord *record, gboolean flush_cache) {
+    struct tmpdata tmpdata;
     
-        if (flx_query_equal(&((flxQueryJobInstance*) n->data)->job->query, q))
-            flx_server_remove_query_job_instance(s, n->data);
+    g_assert(s);
+    g_assert(record);
+
+    tmpdata.record = record;
+    tmpdata.flush_cache = flush_cache;
+
+    flx_interface_monitor_walk(s->monitor, interface, protocol, post_response_callback, &tmpdata);
+}
+
+void flx_entry_group_run_callback(flxEntryGroup *g, flxEntryGroupStatus status) {
+    g_assert(g);
+
+    if (g->callback) {
+        g->callback(g->server, g, status, g->userdata);
+        return;
     }
+
+    if (status == FLX_ENTRY_GROUP_COLLISION)
+        flx_entry_group_free(g);
+
+    /* Ignore the rest */
 }
 
-void flx_server_remove_query_job_instance(flxServer *s, flxQueryJobInstance *i) {
+flxEntryGroup *flx_entry_group_new(flxServer *s, flxEntryGroupCallback callback, gpointer userdata) {
+    flxEntryGroup *g;
+    
     g_assert(s);
-    g_assert(i);
-    g_assert(i->node);
 
-    flx_prio_queue_remove(s->query_job_queue, i->node);
-    flx_query_job_unref(i->job);
-    g_free(i);
+    g = g_new(flxEntryGroup, 1);
+    g->server = s;
+    g->callback = callback;
+    g->userdata = userdata;
+    g->dead = FALSE;
+    g->status = FLX_ENTRY_GROUP_UNCOMMITED;
+    g->n_probing = 0;
+    FLX_LLIST_HEAD_INIT(flxEntry, g->entries);
+
+    FLX_LLIST_PREPEND(flxEntryGroup, groups, s->groups, g);
+    return g;
+}
+
+void flx_entry_group_free(flxEntryGroup *g) {
+    g_assert(g);
+    g_assert(g->server);
+
+    g->dead = TRUE;
+    g->server->need_group_cleanup = TRUE;
 }
 
-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_entry_group_commit(flxEntryGroup *g) {
+    flxEntry *e;
+    
+    g_assert(g);
+    g_assert(!g->dead);
+
+    if (g->status != FLX_ENTRY_GROUP_UNCOMMITED)
+        return;
+
+    flx_entry_group_run_callback(g, g->status = FLX_ENTRY_GROUP_REGISTERING);
+    flx_announce_group(g->server, g);
+    flx_entry_group_check_probed(g, FALSE);
+}
+
+gboolean flx_entry_commited(flxEntry *e) {
+    g_assert(e);
+    g_assert(!e->dead);
+
+    return !e->group ||
+        e->group->status == FLX_ENTRY_GROUP_REGISTERING ||
+        e->group->status == FLX_ENTRY_GROUP_ESTABLISHED;
 }
 
+flxEntryGroupStatus flx_entry_group_get_status(flxEntryGroup *g) {
+    g_assert(g);
+    g_assert(!g->dead);
+
+    return g->status;
+}