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

diff --git a/server.c b/server.c
index 2fa1275..c31ff80 100644
--- a/server.c
+++ b/server.c
@@ -1,11 +1,52 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <string.h>
+#include <sys/utsname.h>
 
 #include "server.h"
 #include "util.h"
+#include "iface.h"
+
+static gint timeval_cmp(const GTimeVal *a, const GTimeVal *b) {
+    g_assert(a);
+    g_assert(b);
+
+    if (a->tv_sec < b->tv_sec)
+        return -1;
+
+    if (a->tv_sec > b->tv_sec)
+        return 1;
+
+    if (a->tv_usec < b->tv_usec)
+        return -1;
+
+    if (a->tv_usec > b->tv_usec)
+        return 1;
+
+    return 0;
+}
+
+static gint query_job_instance_compare(gpointer a, gpointer b) {
+    flxQueryJobInstance *j = a, *k = b;
+    g_assert(j);
+    g_assert(k);
+
+    return timeval_cmp(&j->job->time, &k->job->time);
+}
+
+static gint response_job_instance_compare(gpointer a, gpointer b) {
+    flxResponseJobInstance *j = a, *k = b;
+    g_assert(j);
+    g_assert(k);
+
+    return timeval_cmp(&j->job->time, &k->job->time);
+}
 
 flxServer *flx_server_new(GMainContext *c) {
+    gchar *hn, *e, *hinfo;
+    struct utsname utsname;
+    gint length;
+    flxAddress a;
     flxServer *s = g_new(flxServer, 1);
 
     if (c) {
@@ -19,21 +60,57 @@ flxServer *flx_server_new(GMainContext *c) {
     s->rrset_by_name = g_hash_table_new(g_str_hash, g_str_equal);
     s->entries = NULL;
 
-    s->monitor = flx_interface_monitor_new(s->context);
+    s->query_job_queue = flx_prio_queue_new(query_job_instance_compare);
+    s->response_job_queue = flx_prio_queue_new(response_job_instance_compare);
+    
+    s->monitor = flx_interface_monitor_new(s);
+
+    /* 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);
+
+    /* Fill in HINFO rr */
+    s->hinfo_rr_id = flx_server_get_next_id(s);
+
+    uname(&utsname);
+    hinfo = g_strdup_printf("%s%c%s%n", g_strup(utsname.machine), 0, g_strup(utsname.sysname), &length);
     
+    flx_server_add(s, s->hinfo_rr_id, 0, AF_UNSPEC,
+                   s->hostname, FLX_DNS_TYPE_HINFO, hinfo, length+1);
+
+
+    /* Add localhost entries */
+    flx_address_parse("127.0.0.1", AF_INET, &a);
+    flx_server_add_address(s, 0, 0, AF_UNSPEC, "localhost", &a);
+
+    flx_address_parse("::1", AF_INET6, &a);
+    flx_server_add_address(s, 0, 0, AF_UNSPEC, "ip6-localhost", &a);
+
     return s;
 }
 
 void flx_server_free(flxServer* s) {
     g_assert(s);
 
-    flx_interface_monitor_free(s->monitor);
+    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);
 
+    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);
     g_main_context_unref(s->context);
+
+    g_free(s->hostname);
     g_free(s);
 }
 
@@ -43,7 +120,7 @@ gint flx_server_get_next_id(flxServer *s) {
     return s->current_id++;
 }
 
-void flx_server_add_rr(flxServer *s, gint id, gint interface, const flxRecord *rr) {
+void flx_server_add_rr(flxServer *s, gint id, gint interface, guchar protocol, const flxRecord *rr) {
     flxEntry *e;
     g_assert(s);
     g_assert(rr);
@@ -55,6 +132,7 @@ void flx_server_add_rr(flxServer *s, gint id, gint interface, const flxRecord *r
     flx_record_copy_normalize(&e->rr, rr);
     e->id = id;
     e->interface = interface;
+    e->protocol = protocol;
 
     /* Insert into linked list */
     e->prev = NULL;
@@ -75,7 +153,7 @@ void flx_server_add_rr(flxServer *s, gint id, gint interface, const flxRecord *r
     g_hash_table_replace(s->rrset_by_name, e->rr.name, e);
 }
 
-void flx_server_add(flxServer *s, gint id, gint interface, const gchar *name, guint16 type, gconstpointer data, guint size) {
+void flx_server_add(flxServer *s, gint id, gint interface, guchar protocol, const gchar *name, guint16 type, gconstpointer data, guint size) {
     flxRecord rr;
     g_assert(s);
     g_assert(name);
@@ -88,7 +166,7 @@ void flx_server_add(flxServer *s, gint id, gint interface, const gchar *name, gu
     rr.data = (gpointer) data;
     rr.size = size;
     rr.ttl = FLX_DEFAULT_TTL;
-    flx_server_add_rr(s, id, interface, &rr);
+    flx_server_add_rr(s, id, interface, protocol, &rr);
 }
 
 const flxRecord *flx_server_iterate(flxServer *s, gint id, void **state) {
@@ -202,7 +280,7 @@ void flx_server_dump(flxServer *s, FILE *f) {
 
     for (e = s->entries; e; e = e->next) {
         char t[256];
-        fprintf(f, "%i: %-40s %-8s %-8s ", e->interface, e->rr.name, dns_class_to_string(e->rr.class), dns_type_to_string(e->rr.type));
+        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));
 
         t[0] = 0;
         
@@ -222,6 +300,15 @@ void flx_server_dump(flxServer *s, FILE *f) {
                         snprintf(t, sizeof(t), "'%s' '%s'", (char*) e->rr.data, s2);
                 }
                 
+            } else if (e->rr.type == FLX_DNS_TYPE_TXT) {
+                size_t l;
+
+                l = e->rr.size;
+                if (l > sizeof(t)-1)
+                    l = sizeof(t)-1;
+
+                memcpy(t, e->rr.data, l);
+                t[l] = 0;
             }
         }
             
@@ -229,39 +316,156 @@ void flx_server_dump(flxServer *s, FILE *f) {
     }
 }
 
-void flx_server_add_address(flxServer *s, gint id, gint interface, const gchar *name, flxAddress *a) {
+void flx_server_add_address(flxServer *s, gint id, gint interface, guchar protocol, const gchar *name, flxAddress *a) {
     gchar *n;
     g_assert(s);
-    g_assert(name);
     g_assert(a);
 
-    n = flx_normalize_name(name);
+    n = flx_normalize_name(name ? name : s->hostname);
     
     if (a->family == AF_INET) {
         gchar *r;
         
-        flx_server_add(s, id, interface, n, FLX_DNS_TYPE_A, &a->ipv4, sizeof(a->ipv4));
+        flx_server_add(s, id, interface, protocol, n, FLX_DNS_TYPE_A, &a->ipv4, sizeof(a->ipv4));
 
         r = flx_reverse_lookup_name_ipv4(&a->ipv4);
         g_assert(r);
-        flx_server_add(s, id, interface, r, FLX_DNS_TYPE_PTR, n, strlen(n)+1);
+        flx_server_add(s, id, interface, protocol, r, FLX_DNS_TYPE_PTR, n, strlen(n)+1);
         g_free(r);
         
     } else {
         gchar *r;
             
-        flx_server_add(s, id, interface, n, FLX_DNS_TYPE_AAAA, &a->ipv6, sizeof(a->ipv6));
+        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, r, FLX_DNS_TYPE_PTR, n, strlen(n)+1);
+        flx_server_add(s, id, interface, protocol, r, FLX_DNS_TYPE_PTR, n, strlen(n)+1);
         g_free(r);
     
         r = flx_reverse_lookup_name_ipv6_int(&a->ipv6);
         g_assert(r);
-        flx_server_add(s, id, interface, r, FLX_DNS_TYPE_PTR, n, strlen(n)+1);
+        flx_server_add(s, id, interface, protocol, r, FLX_DNS_TYPE_PTR, n, strlen(n)+1);
         g_free(r);
     }
     
     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);
+
+    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);
+}
+
+
+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;
+}
+
+flxQueryJob* flx_query_job_ref(flxQueryJob *job) {
+    g_assert(job);
+    g_assert(job->ref >= 1);
+    job->ref++;
+    return job;
+}
+
+void flx_query_job_unref(flxQueryJob *job) {
+    g_assert(job);
+    g_assert(job->ref >= 1);
+    if (!(--job->ref))
+        g_free(job);
+}
+
+static gboolean query_job_exists(flxServer *s, gint interface, guchar protocol, flxQuery *q) {
+    flxPrioQueueNode *n;
+    g_assert(s);
+    g_assert(q);
+
+    for (n = s->query_job_queue->root; n; n = n->next)
+        if (flx_query_equal(&((flxQueryJobInstance*) n->data)->job->query, q))
+            return TRUE;
+
+    return FALSE;
+}
+
+static void post_query_job(flxServer *s, gint interface, guchar protocol, flxQueryJob *job) {
+    g_assert(s);
+    g_assert(job);
+
+    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;
+
+        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);
+    }
+}
+
+void flx_server_post_query_job(flxServer *s, gint interface, guchar protocol, const GTimeVal *tv, 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;
+    if (tv)
+        job->time = *tv;
+    post_query_job(s, interface, protocol, job);
+}
+
+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);
+
+    for (n = s->query_job_queue->root; n; n = next) {
+        next = n->next;
+    
+        if (flx_query_equal(&((flxQueryJobInstance*) n->data)->job->query, q))
+            flx_server_remove_query_job_instance(s, n->data);
+    }
+}
+
+void flx_server_remove_query_job_instance(flxServer *s, flxQueryJobInstance *i) {
+    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);
+}
+
+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;
+}
+