X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=server.c;h=56e4d813600b53cd656866e1d84a390d98d5828f;hb=0a985aa6c5453fe09bf0a3a79fe66d49c698b309;hp=94c7b1d5aa4965ba130fe68cc4b93a33fff8ad23;hpb=8e7f83aa5b6d910e80c56b31f4eb79b02e7ca67b;p=catta

diff --git a/server.c b/server.c
index 94c7b1d..56e4d81 100644
--- a/server.c
+++ b/server.c
@@ -22,9 +22,24 @@ static void handle_query_key(flxServer *s, flxKey *k, flxInterface *i, const flx
     g_message("Handling query: %s", txt = flx_key_to_string(k));
     g_free(txt);
 
-    for (e = g_hash_table_lookup(s->rrset_by_key, k); e; e = e->by_key_next)
-        if (flx_interface_match(i, e->interface, e->protocol))
-            flx_interface_post_response(i, e->record);
+    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->entry_next)
+            if (flx_key_pattern_match(k, e->record->key))
+                if (flx_interface_match(i, e->interface, e->protocol) && flx_entry_established(s, e, i))
+                    flx_interface_post_response(i, a, e->record, e->flags & FLX_SERVER_ENTRY_UNIQUE, FALSE);
+    } else {
+
+        /* Handle all other queries */
+        
+        for (e = g_hash_table_lookup(s->rrset_by_key, k); e; e = e->by_key_next)
+            if (flx_interface_match(i, e->interface, e->protocol) && flx_entry_established(s, e, i))
+                flx_interface_post_response(i, a, e->record, e->flags & FLX_SERVER_ENTRY_UNIQUE, FALSE);
+    }
 }
 
 static void handle_query(flxServer *s, flxDnsPacket *p, flxInterface *i, const flxAddress *a) {
@@ -35,7 +50,7 @@ static void handle_query(flxServer *s, flxDnsPacket *p, flxInterface *i, const f
     g_assert(i);
     g_assert(a);
 
-    for (n = flx_dns_packet_get_field(p, DNS_FIELD_QDCOUNT); n > 0; n --) {
+    for (n = flx_dns_packet_get_field(p, FLX_DNS_FIELD_QDCOUNT); n > 0; n --) {
         flxKey *key;
 
         if (!(key = flx_dns_packet_consume_key(p))) {
@@ -46,6 +61,20 @@ static void handle_query(flxServer *s, flxDnsPacket *p, flxInterface *i, const f
         handle_query_key(s, key, i, a);
         flx_key_unref(key);
     }
+
+    /* 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);
+    }
 }
 
 static void handle_response(flxServer *s, flxDnsPacket *p, flxInterface *i, const flxAddress *a) {
@@ -56,24 +85,26 @@ static void handle_response(flxServer *s, flxDnsPacket *p, flxInterface *i, cons
     g_assert(i);
     g_assert(a);
     
-    for (n = flx_dns_packet_get_field(p, DNS_FIELD_ANCOUNT) +
-             flx_dns_packet_get_field(p, DNS_FIELD_ARCOUNT); n > 0; n--) {
+    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");
+            g_warning("Packet too short (3)");
             return;
         }
 
+        if (record->key->type == FLX_DNS_TYPE_ANY)
+            continue;
+        
         g_message("Handling response: %s", txt = flx_record_to_string(record));
         g_free(txt);
-
+        
         flx_cache_update(i->cache, record, cache_flush, a);
-
-        if (record->ttl != 0)
-            flx_packet_scheduler_drop_response(i->scheduler, record);
+        
+        flx_packet_scheduler_incoming_response(i->scheduler, record);
         flx_record_unref(record);
     }
 }
@@ -121,9 +152,8 @@ static void dispatch_packet(flxServer *s, flxDnsPacket *p, struct sockaddr *sa,
 
     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) {
+        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;
         }
@@ -131,9 +161,9 @@ static void dispatch_packet(flxServer *s, flxDnsPacket *p, struct sockaddr *sa,
         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) {
+        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;
         }
@@ -202,27 +232,24 @@ static void add_default_entries(flxServer *s) {
     struct utsname utsname;
     gchar *hinfo;
     flxAddress a;
+    flxRecord *r;
     
     g_assert(s);
     
     /* Fill in HINFO rr */
+    r = flx_record_new_full(s->hostname, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_HINFO);
     uname(&utsname);
-    hinfo = g_strdup_printf("%c%s%c%s%n",
-                            strlen(utsname.machine), g_strup(utsname.machine),
-                            strlen(utsname.sysname), 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, FLX_DEFAULT_TTL);
-
-    g_free(hinfo);
+    r->data.hinfo.cpu = g_strdup(g_strup(utsname.machine));
+    r->data.hinfo.os = g_strdup(g_strup(utsname.sysname));
+    flx_server_add(s, 0, 0, AF_UNSPEC, FLX_SERVER_ENTRY_UNIQUE, r);
+    flx_record_unref(r);
 
     /* 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_server_add_address(s, 0, 0, AF_UNSPEC, FLX_SERVER_ENTRY_UNIQUE|FLX_SERVER_ENTRY_NOPROBE|FLX_SERVER_ENTRY_NOANNOUNCE, "localhost", &a);
 
     flx_address_parse("::1", AF_INET6, &a);
-    flx_server_add_address(s, 0, 0, AF_UNSPEC, TRUE, "ip6-localhost", &a);
+    flx_server_add_address(s, 0, 0, AF_UNSPEC, FLX_SERVER_ENTRY_UNIQUE|FLX_SERVER_ENTRY_NOPROBE|FLX_SERVER_ENTRY_NOANNOUNCE, "ip6-localhost", &a);
 }
 
 flxServer *flx_server_new(GMainContext *c) {
@@ -340,19 +367,21 @@ void flx_server_add(
     gint id,
     gint interface,
     guchar protocol,
-    gboolean unique,
+    flxServerEntryFlags flags,
     flxRecord *r) {
     
     flxServerEntry *e, *t;
     g_assert(s);
     g_assert(r);
 
+    g_assert(r->key->type != FLX_DNS_TYPE_ANY);
+
     e = g_new(flxServerEntry, 1);
     e->record = flx_record_ref(r);
     e->id = id;
     e->interface = interface;
     e->protocol = protocol;
-    e->unique = unique;
+    e->flags = flags;
 
     FLX_LLIST_HEAD_INIT(flxAnnouncement, e->announcements);
 
@@ -370,30 +399,6 @@ void flx_server_add(
 
     flx_announce_entry(s, e);
 }
-
-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(data);
-    g_assert(size);
-
-    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) {
     flxServerEntry **e = (flxServerEntry**) state;
     g_assert(s);
@@ -472,73 +477,208 @@ void flx_server_dump(flxServer *s, FILE *f) {
     flx_dump_caches(s->monitor, f);
 }
 
+void flx_server_add_ptr(
+    flxServer *s,
+    gint id,
+    gint interface,
+    guchar protocol,
+    flxServerEntryFlags 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, id, interface, protocol, flags, r);
+    flx_record_unref(r);
+
+}
+
 void flx_server_add_address(
     flxServer *s,
     gint id,
     gint interface,
     guchar protocol,
-    gboolean unique,
+    flxServerEntryFlags flags,
     const gchar *name,
     flxAddress *a) {
 
-    gchar *n;
+    gchar *n = NULL;
     g_assert(s);
     g_assert(a);
 
-    n = name ? flx_normalize_name(name) : s->hostname;
+    name = name ? (n = flx_normalize_name(name)) : s->hostname;
     
     if (a->family == AF_INET) {
-        gchar *r;
-        
-        flx_server_add_full(s, id, interface, protocol, unique, n, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_A, &a->data.ipv4, sizeof(a->data.ipv4), FLX_DEFAULT_TTL);
+        gchar *reverse;
+        flxRecord  *r;
 
-        r = flx_reverse_lookup_name_ipv4(&a->data.ipv4);
-        g_assert(r);
-        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_record_new_full(name, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_A);
+        r->data.a.address = a->data.ipv4;
+        flx_server_add(s, id, 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, id, interface, protocol, flags, reverse, name);
+        g_free(reverse);
         
     } else {
-        gchar *r;
+        gchar *reverse;
+        flxRecord *r;
             
-        flx_server_add_full(s, id, interface, protocol, unique, n, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_AAAA, &a->data.ipv6, sizeof(a->data.ipv6), FLX_DEFAULT_TTL);
-
-        r = flx_reverse_lookup_name_ipv6_arpa(&a->data.ipv6);
-        g_assert(r);
-        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_record_new_full(name, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_AAAA);
+        r->data.aaaa.address = a->data.ipv6;
+        flx_server_add(s, id, 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, id, interface, protocol, flags, reverse, name);
+        g_free(reverse);
     
-        r = flx_reverse_lookup_name_ipv6_int(&a->data.ipv6);
-        g_assert(r);
-        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);
+        reverse = flx_reverse_lookup_name_ipv6_int(&a->data.ipv6);
+        g_assert(reverse);
+        flx_server_add_ptr(s, id, interface, protocol, flags, reverse, name);
+        g_free(reverse);
     }
     
     g_free(n);
 }
 
+void flx_server_add_text_va(
+    flxServer *s,
+    gint id,
+    gint interface,
+    guchar protocol,
+    flxServerEntryFlags flags,
+    const gchar *name,
+    va_list va) {
+
+    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, id, interface, protocol, flags, r);
+    flx_record_unref(r);
+}
+
 void flx_server_add_text(
     flxServer *s,
     gint id,
     gint interface,
     guchar protocol,
-    gboolean unique,
+    flxServerEntryFlags flags,
     const gchar *name,
-    const gchar *text) {
+    ...) {
+
+    va_list va;
     
-    gchar buf[256];
-    guint l;
+    g_assert(s);
+
+    va_start(va, name);
+    flx_server_add_text_va(s, id, interface, protocol, flags, name, va);
+    va_end(va);
+}
+
+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;
+}
+
+
+void flx_server_add_service_va(
+    flxServer *s,
+    gint id,
+    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(text);
+    g_assert(type);
+    g_assert(name);
 
-    if ((l = strlen(text)) > 255)
-        buf[0] = 255;
-    else
-        buf[0] = (gchar) l;
+    escape_service_name(ename, sizeof(ename), name);
+
+    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, id, 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, id, interface, protocol, TRUE, r);
+    flx_record_unref(r);
+
+    flx_server_add_text_va(s, id, interface, protocol, FALSE, svc_name, va);
 
-    memcpy(buf+1, text, l);
+    snprintf(enum_ptr, sizeof(enum_ptr), "_services._dns-sd._udp.%s", domain);
+    flx_server_add_ptr(s, id, interface, protocol, FALSE, enum_ptr, ptr_name);
+}
+
+void flx_server_add_service(
+    flxServer *s,
+    gint id,
+    gint interface,
+    guchar protocol,
+    const gchar *type,
+    const gchar *name,
+    const gchar *domain,
+    const gchar *host,
+    guint16 port,
+    ... ){
 
-    flx_server_add_full(s, id, interface, protocol, unique, name, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_TXT, buf, l+1, FLX_DEFAULT_TTL);
+    va_list va;
+    
+    g_assert(s);
+    g_assert(type);
+    g_assert(name);
+
+    va_start(va, port);
+    flx_server_add_service_va(s, id, interface, protocol, type, name, domain, host, port, va);
+    va_end(va);
 }
 
 static void post_query_callback(flxInterfaceMonitor *m, flxInterface *i, gpointer userdata) {
@@ -548,7 +688,7 @@ static void post_query_callback(flxInterfaceMonitor *m, flxInterface *i, gpointe
     g_assert(i);
     g_assert(k);
 
-    flx_interface_post_query(i, k);
+    flx_interface_post_query(i, k, FALSE);
 }
 
 void flx_server_post_query(flxServer *s, gint interface, guchar protocol, flxKey *key) {
@@ -558,19 +698,29 @@ void flx_server_post_query(flxServer *s, gint interface, guchar protocol, flxKey
     flx_interface_monitor_walk(s->monitor, interface, protocol, post_query_callback, key);
 }
 
+struct tmpdata {
+    flxRecord *record;
+    gboolean flush_cache;
+};
+
 static void post_response_callback(flxInterfaceMonitor *m, flxInterface *i, gpointer userdata) {
-    flxRecord *r = userdata;
+    struct tmpdata *tmpdata = userdata;
 
     g_assert(m);
     g_assert(i);
-    g_assert(r);
+    g_assert(tmpdata);
 
-    flx_interface_post_response(i, r);
+    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) {
+void flx_server_post_response(flxServer *s, gint interface, guchar protocol, flxRecord *record, gboolean flush_cache) {
+    struct tmpdata tmpdata;
+    
     g_assert(s);
     g_assert(record);
 
-    flx_interface_monitor_walk(s->monitor, interface, protocol, post_response_callback, record);
+    tmpdata.record = record;
+    tmpdata.flush_cache = flush_cache;
+
+    flx_interface_monitor_walk(s->monitor, interface, protocol, post_response_callback, &tmpdata);
 }