* add DNS packet name compression

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@27 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/dns.c b/dns.c
index 073eaba57de5549ac5a6455bfbf02e59a050d60b..11eb005d83844060540e80bd0f37a2ceac168dac 100644 (file)
--- a/dns.c
+++ b/dns.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 
 #include "dns.h"
+#include "util.h"
 
 flxDnsPacket* flx_dns_packet_new(guint max_size) {
     flxDnsPacket *p;
@@ -17,6 +18,7 @@ flxDnsPacket* flx_dns_packet_new(guint max_size) {
     p = g_malloc(sizeof(flxDnsPacket) + max_size);
     p->size = p->rindex = FLX_DNS_PACKET_HEADER_SIZE;
     p->max_size = max_size;
+    p->name_table = NULL;
 
     memset(FLX_DNS_PACKET_DATA(p), 0, p->size);
     return p;
@@ -40,6 +42,10 @@ flxDnsPacket* flx_dns_packet_new_response(guint max_size) {
 
 void flx_dns_packet_free(flxDnsPacket *p) {
     g_assert(p);
+
+    if (p->name_table)
+        g_hash_table_destroy(p->name_table);
+    
     g_free(p);
 }
 
@@ -67,7 +73,33 @@ guint8* flx_dns_packet_append_name(flxDnsPacket *p, const gchar *name) {
     saved_size = p->size;
 
     for (;;) {
-        guint n = strcspn(name, ".");
+        guint n;
+        guint8* prev;
+
+        /* Check whether we can compress this name. */
+
+        if (p->name_table && (prev = g_hash_table_lookup(p->name_table, name))) {
+            guint index;
+            
+            g_assert(prev >= FLX_DNS_PACKET_DATA(p));
+            index = (guint) (prev - FLX_DNS_PACKET_DATA(p));
+
+            g_assert(index < p->size);
+
+            if (index < 0x4000) {
+                guint16 *t;
+                if (!(t = (guint16*) flx_dns_packet_extend(p, sizeof(guint16))))
+                    return NULL;
+
+                if (!f)
+                    f = (guint8*) t;
+    
+                *t = g_htons((0xC000 | index));
+                return f;
+            }
+        }
+        
+        n = strcspn(name, ".");
         if (!n || n > 63)
             goto fail;
         
@@ -79,6 +111,11 @@ guint8* flx_dns_packet_append_name(flxDnsPacket *p, const gchar *name) {
         d[0] = n;
         memcpy(d+1, name, n);
 
+        if (!p->name_table)
+            p->name_table = g_hash_table_new_full((GHashFunc) flx_domain_hash, (GEqualFunc) flx_domain_equal, g_free, NULL);
+
+        g_hash_table_insert(p->name_table, g_strdup(name), d);
+
         name += n;
 
         /* no trailing dot */
@@ -104,6 +141,25 @@ fail:
     return NULL;
 }
 
+guint8 *flx_dns_packet_append_name_compressed(flxDnsPacket *p, const gchar *name, guint8 *prev) {
+    guint16 *d;
+    signed long k;
+    g_assert(p);
+
+    if (!prev)
+        return flx_dns_packet_append_name(p, name);
+    
+    k = prev - FLX_DNS_PACKET_DATA(p);
+    if (k < 0 || k >= 0x4000 || (guint) k >= p->size)
+        return flx_dns_packet_append_name(p, name);
+
+    if (!(d = (guint16*) flx_dns_packet_extend(p, sizeof(guint16))))
+        return NULL;
+    
+    *d = g_htons((0xC000 | k));
+    return prev;
+}
+
 guint8* flx_dns_packet_append_uint16(flxDnsPacket *p, guint16 v) {
     guint8 *d;
     g_assert(p);
@@ -174,25 +230,6 @@ guint8 *flx_dns_packet_extend(flxDnsPacket *p, guint l) {
     return d;
 }
 
-guint8 *flx_dns_packet_append_name_compressed(flxDnsPacket *p, const gchar *name, guint8 *prev) {
-    guint16 *d;
-    signed long k;
-    g_assert(p);
-
-    if (!prev)
-        return flx_dns_packet_append_name(p, name);
-    
-    k = prev - FLX_DNS_PACKET_DATA(p);
-    if (k < 0 || k >= 0x4000 || (guint) k >= p->size)
-        return flx_dns_packet_append_name(p, name);
-
-    if (!(d = (guint16*) flx_dns_packet_extend(p, sizeof(guint16))))
-        return NULL;
-    
-    *d = g_htons((0xC000 | k));
-    return prev;
-}
-
 gint flx_dns_packet_check_valid(flxDnsPacket *p) {
     guint16 flags;
     g_assert(p);

diff --git a/dns.h b/dns.h
index 45151322d291a677389d8fe80ce7737243aae10f..706b8c6fce4390b22f695e0d71d35a14025b1465 100644 (file)
--- a/dns.h
+++ b/dns.h
@@ -10,6 +10,7 @@
 
 typedef struct _flxDnsPacket {
     guint size, rindex, max_size;
+    GHashTable *name_table; /* for name compression */
 } flxDnsPacket;
 
 

diff --git a/todo b/todo
index 50df1c051e28ea19ca72f9dad240fc362de68105..a28560262031332bae4998747debad0716143082 100644 (file)
--- a/todo
+++ b/todo
@@ -12,8 +12,6 @@ todo:
 * add SRV and TXT records referenced from PTR records automatically to packet
 * add A and AAAA records referenced from SRV records automatically to packet
 
-* name compression
-
 * respect escaping in name serialization
 
 * allow NULL bytes in TXT records
@@ -25,4 +23,6 @@ done:
 * Known-Answer suppression client part
 * Known-Answer suppression server part
 * make flx_server_add_text() and flx_server_add_service() variadic functions
+* name compression
+
 

diff --git a/util.c b/util.c
index 3edaa8878398166b13e36bfc3efdba6a404cabc5..0fcedc71c0fee844ba99015c4b5a6fcd421bb883 100644 (file)
--- a/util.c
+++ b/util.c
@@ -125,3 +125,34 @@ gint flx_age(const GTimeVal *a) {
 
     return flx_timeval_diff(&now, a);
 }
+
+gboolean flx_domain_equal(const gchar *a, const gchar *b) {
+    g_assert(a);
+    g_assert(b);
+
+    for (;;) {
+        if (*a == 0 && *b == 0)
+            return TRUE;
+        
+        if (*a == 0 && *b == '.' && *(b+1) == 0)
+            return TRUE;
+
+        if (*a == '.' && *(a+1) == 0 && *b == 0)
+            return TRUE;
+
+        if (*a != *b)
+            return FALSE;
+
+        a++;
+        b++;
+    }
+}
+
+guint flx_domain_hash(const gchar *p) {
+    char t[256];
+    strncpy(t, p, sizeof(t)-1);
+    t[sizeof(t)-1] = 0;
+
+    return g_int_hash(t);
+}
+

diff --git a/util.h b/util.h
index 36987a7d37b98e99454475c80c19d46922fd2c05..53884cb38242925e8e563d7582f46315bb2f1b28 100644 (file)
--- a/util.h
+++ b/util.h
@@ -17,4 +17,7 @@ GTimeVal *flx_elapse_time(GTimeVal *tv, guint msec, guint jitter);
 
 gint flx_age(const GTimeVal *a);
 
+guint flx_domain_hash(const gchar *p);
+gboolean flx_domain_equal(const gchar *a, const gchar *b);
+
 #endif