X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fdns.c;h=941247031ad9b529a44b6312b6309e5fd72c91bf;hb=b2839754a3d1e15a3009561e69b41608014af0cb;hp=cc1463a729b15ea66702bedd2e1134ccfeb4ba9e;hpb=c58379bde376cb2298fca14f83a86626f1b76f2f;p=catta

diff --git a/avahi-core/dns.c b/avahi-core/dns.c
index cc1463a..9412470 100644
--- a/avahi-core/dns.c
+++ b/avahi-core/dns.c
@@ -28,19 +28,31 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <assert.h>
+
+#include <avahi-common/domain.h>
+#include <avahi-common/malloc.h>
 
 #include "dns.h"
-#include "util.h"
+#include "log.h"
 
-AvahiDnsPacket* avahi_dns_packet_new(guint max_size) {
+AvahiDnsPacket* avahi_dns_packet_new(unsigned mtu) {
     AvahiDnsPacket *p;
+    size_t max_size;
 
-    if (max_size <= 0)
+    if (mtu <= 0)
         max_size = AVAHI_DNS_PACKET_MAX_SIZE;
-    else if (max_size < AVAHI_DNS_PACKET_HEADER_SIZE)
+    else if (mtu >= AVAHI_DNS_PACKET_EXTRA_SIZE)
+        max_size = mtu - AVAHI_DNS_PACKET_EXTRA_SIZE;
+    else
+        max_size = 0;
+
+    if (max_size < AVAHI_DNS_PACKET_HEADER_SIZE)
         max_size = AVAHI_DNS_PACKET_HEADER_SIZE;
     
-    p = g_malloc(sizeof(AvahiDnsPacket) + max_size);
+    if (!(p = avahi_malloc(sizeof(AvahiDnsPacket) + max_size)))
+        return p;
+    
     p->size = p->rindex = AVAHI_DNS_PACKET_HEADER_SIZE;
     p->max_size = max_size;
     p->name_table = NULL;
@@ -49,134 +61,147 @@ AvahiDnsPacket* avahi_dns_packet_new(guint max_size) {
     return p;
 }
 
-AvahiDnsPacket* avahi_dns_packet_new_query(guint max_size) {
+AvahiDnsPacket* avahi_dns_packet_new_query(unsigned mtu) {
     AvahiDnsPacket *p;
 
-    p = avahi_dns_packet_new(max_size);
+    if (!(p = avahi_dns_packet_new(mtu)))
+        return NULL;
+    
     avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_FLAGS, AVAHI_DNS_FLAGS(0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
     return p;
 }
 
-AvahiDnsPacket* avahi_dns_packet_new_response(guint max_size) {
+AvahiDnsPacket* avahi_dns_packet_new_response(unsigned mtu, int aa) {
     AvahiDnsPacket *p;
 
-    p = avahi_dns_packet_new(max_size);
-    avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_FLAGS, AVAHI_DNS_FLAGS(1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+    if (!(p = avahi_dns_packet_new(mtu)))
+        return NULL;
+    
+    avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_FLAGS, AVAHI_DNS_FLAGS(1, 0, aa, 0, 0, 0, 0, 0, 0, 0));
     return p;
 }
 
+AvahiDnsPacket* avahi_dns_packet_new_reply(AvahiDnsPacket* p, unsigned mtu, int copy_queries, int aa) {
+    AvahiDnsPacket *r;
+    assert(p);
+
+    if (!(r = avahi_dns_packet_new_response(mtu, aa)))
+        return NULL;
+
+    if (copy_queries) {
+        unsigned saved_rindex;
+        uint32_t n;
+
+        saved_rindex = p->rindex;
+        p->rindex = AVAHI_DNS_PACKET_HEADER_SIZE;
+        
+        for (n = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT); n > 0; n--) {
+            AvahiKey *k;
+            int unicast_response;
+
+            if ((k = avahi_dns_packet_consume_key(p, &unicast_response))) {
+                avahi_dns_packet_append_key(r, k, unicast_response);
+                avahi_key_unref(k);
+            }
+        }
+
+        p->rindex = saved_rindex;
+
+        avahi_dns_packet_set_field(r, AVAHI_DNS_FIELD_QDCOUNT, avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT));
+    }
+
+    avahi_dns_packet_set_field(r, AVAHI_DNS_FIELD_ID, avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ID));
+
+    avahi_dns_packet_set_field(r, AVAHI_DNS_FIELD_FLAGS,
+                               (avahi_dns_packet_get_field(r, AVAHI_DNS_FIELD_FLAGS) & ~AVAHI_DNS_FLAG_OPCODE) |
+                               (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS) & AVAHI_DNS_FLAG_OPCODE));
+
+    return r;
+} 
+
+
 void avahi_dns_packet_free(AvahiDnsPacket *p) {
-    g_assert(p);
+    assert(p);
 
     if (p->name_table)
-        g_hash_table_destroy(p->name_table);
+        avahi_hashmap_free(p->name_table);
     
-    g_free(p);
+    avahi_free(p);
 }
 
-void avahi_dns_packet_set_field(AvahiDnsPacket *p, guint index, guint16 v) {
-    g_assert(p);
-    g_assert(index < AVAHI_DNS_PACKET_HEADER_SIZE);
+void avahi_dns_packet_set_field(AvahiDnsPacket *p, unsigned idx, uint16_t v) {
+    assert(p);
+    assert(idx < AVAHI_DNS_PACKET_HEADER_SIZE);
     
-    ((guint16*) AVAHI_DNS_PACKET_DATA(p))[index] = g_htons(v);
+    ((uint16_t*) AVAHI_DNS_PACKET_DATA(p))[idx] = htons(v);
 }
 
-guint16 avahi_dns_packet_get_field(AvahiDnsPacket *p, guint index) {
-    g_assert(p);
-    g_assert(index < AVAHI_DNS_PACKET_HEADER_SIZE);
+uint16_t avahi_dns_packet_get_field(AvahiDnsPacket *p, unsigned idx) {
+    assert(p);
+    assert(idx < AVAHI_DNS_PACKET_HEADER_SIZE);
 
-    return g_ntohs(((guint16*) AVAHI_DNS_PACKET_DATA(p))[index]);
+    return ntohs(((uint16_t*) AVAHI_DNS_PACKET_DATA(p))[idx]);
 }
 
-/* Read the first label from string *name, unescape "\" and write it to dest */
-gchar *avahi_unescape_label(gchar *dest, guint size, const gchar **name) {
-    guint i = 0;
-    gchar *d;
-    
-    g_assert(dest);
-    g_assert(size > 0);
-    g_assert(name);
-    g_assert(*name);
-
-    d = dest;
-    
-    for (;;) {
-        if (i >= size)
-            return NULL;
+void avahi_dns_packet_inc_field(AvahiDnsPacket *p, unsigned idx) {
+    assert(p);
+    assert(idx < AVAHI_DNS_PACKET_HEADER_SIZE);
 
-        if (**name == '.') {
-            (*name)++;
-            break;
-        }
-        
-        if (**name == 0)
-            break;
-        
-        if (**name == '\\') {
-            (*name) ++;
-            
-            if (**name == 0)
-                break;
-        }
-        
-        *(d++) = *((*name) ++);
-        i++;
-    }
+    avahi_dns_packet_set_field(p, idx, avahi_dns_packet_get_field(p, idx) + 1);
+}   
 
-    g_assert(i < size);
-
-    *d = 0;
-
-    return dest;
-}
-
-guint8* avahi_dns_packet_append_name(AvahiDnsPacket *p, const gchar *name) {
-    guint8 *d, *saved_ptr = NULL;
-    guint saved_size;
+uint8_t* avahi_dns_packet_append_name(AvahiDnsPacket *p, const char *name) {
+    uint8_t *d, *saved_ptr = NULL;
+    size_t saved_size;
     
-    g_assert(p);
-    g_assert(name);
+    assert(p);
+    assert(name);
 
     saved_size = p->size;
     saved_ptr = avahi_dns_packet_extend(p, 0);
     
     while (*name) {
-        guint8* prev;
-        const gchar *pname;
-        gchar label[64];
+        uint8_t* prev;
+        const char *pname;
+        char label[64], *u;
+        
 
         /* Check whether we can compress this name. */
 
-        if (p->name_table && (prev = g_hash_table_lookup(p->name_table, name))) {
-            guint index;
+        if (p->name_table && (prev = avahi_hashmap_lookup(p->name_table, name))) {
+            unsigned idx;
             
-            g_assert(prev >= AVAHI_DNS_PACKET_DATA(p));
-            index = (guint) (prev - AVAHI_DNS_PACKET_DATA(p));
+            assert(prev >= AVAHI_DNS_PACKET_DATA(p));
+            idx = (unsigned) (prev - AVAHI_DNS_PACKET_DATA(p));
 
-            g_assert(index < p->size);
+            assert(idx < p->size);
 
-            if (index < 0x4000) {
-                guint16 *t;
-                if (!(t = (guint16*) avahi_dns_packet_extend(p, sizeof(guint16))))
+            if (idx < 0x4000) {
+                uint16_t *t;
+                if (!(t = (uint16_t*) avahi_dns_packet_extend(p, sizeof(uint16_t))))
                     return NULL;
 
-                *t = g_htons((0xC000 | index));
+                *t = htons((0xC000 | idx));
                 return saved_ptr;
             }
         }
 
         pname = name;
         
-        if (!(avahi_unescape_label(label, sizeof(label), &name)))
+        if (!(avahi_unescape_label(&name, label, sizeof(label))))
             goto fail;
 
         if (!(d = avahi_dns_packet_append_string(p, label)))
             goto fail;
 
         if (!p->name_table)
-            p->name_table = g_hash_table_new_full((GHashFunc) avahi_domain_hash, (GEqualFunc) avahi_domain_equal, g_free, NULL);
+            /* This works only for normalized domain names */
+            p->name_table = avahi_hashmap_new(avahi_string_hash, avahi_string_equal, avahi_free, NULL);
 
-        g_hash_table_insert(p->name_table, g_strdup(pname), d);
+        if (!(u = avahi_strdup(pname)))
+            avahi_log_error("avahi_strdup() failed.");
+        else
+            avahi_hashmap_insert(p->name_table, u, d);
     }
 
     if (!(d = avahi_dns_packet_extend(p, 1)))
@@ -191,35 +216,35 @@ fail:
     return NULL;
 }
 
-guint8* avahi_dns_packet_append_uint16(AvahiDnsPacket *p, guint16 v) {
-    guint8 *d;
-    g_assert(p);
+uint8_t* avahi_dns_packet_append_uint16(AvahiDnsPacket *p, uint16_t v) {
+    uint8_t *d;
+    assert(p);
     
-    if (!(d = avahi_dns_packet_extend(p, sizeof(guint16))))
+    if (!(d = avahi_dns_packet_extend(p, sizeof(uint16_t))))
         return NULL;
     
-    *((guint16*) d) = g_htons(v);
+    *((uint16_t*) d) = htons(v);
     return d;
 }
 
-guint8 *avahi_dns_packet_append_uint32(AvahiDnsPacket *p, guint32 v) {
-    guint8 *d;
-    g_assert(p);
+uint8_t *avahi_dns_packet_append_uint32(AvahiDnsPacket *p, uint32_t v) {
+    uint8_t *d;
+    assert(p);
 
-    if (!(d = avahi_dns_packet_extend(p, sizeof(guint32))))
+    if (!(d = avahi_dns_packet_extend(p, sizeof(uint32_t))))
         return NULL;
     
-    *((guint32*) d) = g_htonl(v);
+    *((uint32_t*) d) = htonl(v);
 
     return d;
 }
 
-guint8 *avahi_dns_packet_append_bytes(AvahiDnsPacket  *p, gconstpointer b, guint l) {
-    guint8* d;
+uint8_t *avahi_dns_packet_append_bytes(AvahiDnsPacket  *p, const void *b, size_t l) {
+    uint8_t* d;
 
-    g_assert(p);
-    g_assert(b);
-    g_assert(l);
+    assert(p);
+    assert(b);
+    assert(l);
 
     if (!(d = avahi_dns_packet_extend(p, l)))
         return NULL;
@@ -228,12 +253,12 @@ guint8 *avahi_dns_packet_append_bytes(AvahiDnsPacket  *p, gconstpointer b, guint
     return d;
 }
 
-guint8* avahi_dns_packet_append_string(AvahiDnsPacket *p, const gchar *s) {
-    guint8* d;
-    guint k;
+uint8_t* avahi_dns_packet_append_string(AvahiDnsPacket *p, const char *s) {
+    uint8_t* d;
+    size_t k;
     
-    g_assert(p);
-    g_assert(s);
+    assert(p);
+    assert(s);
 
     if ((k = strlen(s)) >= 255)
         k = 255;
@@ -241,16 +266,16 @@ guint8* avahi_dns_packet_append_string(AvahiDnsPacket *p, const gchar *s) {
     if (!(d = avahi_dns_packet_extend(p, k+1)))
         return NULL;
 
-    *d = (guint8) k;
+    *d = (uint8_t) k;
     memcpy(d+1, s, k);
 
     return d;
 }
 
-guint8 *avahi_dns_packet_extend(AvahiDnsPacket *p, guint l) {
-    guint8 *d;
+uint8_t *avahi_dns_packet_extend(AvahiDnsPacket *p, size_t l) {
+    uint8_t *d;
     
-    g_assert(p);
+    assert(p);
 
     if (p->size+l > p->max_size)
         return NULL;
@@ -261,79 +286,59 @@ guint8 *avahi_dns_packet_extend(AvahiDnsPacket *p, guint l) {
     return d;
 }
 
-gint avahi_dns_packet_check_valid(AvahiDnsPacket *p) {
-    guint16 flags;
-    g_assert(p);
+int avahi_dns_packet_check_valid(AvahiDnsPacket *p) {
+    uint16_t flags;
+    assert(p);
 
-    if (p->size < 12)
+    if (p->size < AVAHI_DNS_PACKET_HEADER_SIZE)
         return -1;
 
     flags = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS);
-
-    if (flags & AVAHI_DNS_FLAG_OPCODE || flags & AVAHI_DNS_FLAG_RCODE)
+    
+    if (flags & AVAHI_DNS_FLAG_OPCODE)
         return -1;
 
     return 0;
 }
 
-gint avahi_dns_packet_is_query(AvahiDnsPacket *p) {
-    g_assert(p);
-    
-    return !(avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS) & AVAHI_DNS_FLAG_QR);
-}
-
-/* Read a label from a DNS packet, escape "\" and ".", append \0 */
-static gchar *escape_label(guint8* src, guint src_length, gchar **ret_name, guint *ret_name_length) {
-    gchar *r;
-
-    g_assert(src);
-    g_assert(ret_name);
-    g_assert(*ret_name);
-    g_assert(ret_name_length);
-    g_assert(*ret_name_length > 0);
-
-    r = *ret_name;
+int avahi_dns_packet_check_valid_multicast(AvahiDnsPacket *p) {
+    uint16_t flags;
+    assert(p);
 
-    while (src_length > 0) {
-        if (*src == '.' || *src == '\\') {
-            if (*ret_name_length < 3)
-                return NULL;
-            
-            *((*ret_name) ++) = '\\';
-            (*ret_name_length) --;
-        }
-
-        if (*ret_name_length < 2)
-            return NULL;
-        
-        *((*ret_name)++) = *src;
-        (*ret_name_length) --;
+    if (avahi_dns_packet_check_valid(p) < 0)
+        return -1;
+    
+    flags = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS);
+    
+    if (flags & AVAHI_DNS_FLAG_RCODE)
+        return -1;
 
-        src_length --;
-        src++;
-    }
+    return 0;
+}
 
-    **ret_name = 0;
 
-    return r;
+int avahi_dns_packet_is_query(AvahiDnsPacket *p) {
+    assert(p);
+    
+    return !(avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS) & AVAHI_DNS_FLAG_QR);
 }
 
-static gint consume_labels(AvahiDnsPacket *p, guint index, gchar *ret_name, guint l) {
-    gint ret = 0;
+static int consume_labels(AvahiDnsPacket *p, unsigned idx, char *ret_name, size_t l) {
+    int ret = 0;
     int compressed = 0;
     int first_label = 1;
-    g_assert(p && ret_name && l);
+    assert(p && ret_name && l);
     
     for (;;) {
-        guint8 n;
+        uint8_t n;
 
-        if (index+1 > p->size)
+        if (idx+1 > p->size)
             return -1;
 
-        n = AVAHI_DNS_PACKET_DATA(p)[index];
+        n = AVAHI_DNS_PACKET_DATA(p)[idx];
 
         if (!n) {
-            index++;
+            idx++;
             if (!compressed)
                 ret++;
 
@@ -345,14 +350,14 @@ static gint consume_labels(AvahiDnsPacket *p, guint index, gchar *ret_name, guin
             
         } else if (n <= 63) {
             /* Uncompressed label */
-            index++;
+            idx++;
             if (!compressed)
                 ret++;
         
-            if (index + n > p->size)
+            if (idx + n > p->size)
                 return -1;
 
-            if ((guint) n + 1 > l)
+            if ((size_t) n + 1 > l)
                 return -1;
 
             if (!first_label) {
@@ -361,20 +366,20 @@ static gint consume_labels(AvahiDnsPacket *p, guint index, gchar *ret_name, guin
             } else
                 first_label = 0;
 
-            if (!(escape_label(AVAHI_DNS_PACKET_DATA(p) + index, n, &ret_name, &l)))
+            if (!(avahi_escape_label(AVAHI_DNS_PACKET_DATA(p) + idx, n, &ret_name, &l)))
                 return -1;
 
-            index += n;
+            idx += n;
             
             if (!compressed)
                 ret += n;
         } else if ((n & 0xC0) == 0xC0) {
             /* Compressed label */
 
-            if (index+2 > p->size)
+            if (idx+2 > p->size)
                 return -1;
 
-            index = ((guint) (AVAHI_DNS_PACKET_DATA(p)[index] & ~0xC0)) << 8 | AVAHI_DNS_PACKET_DATA(p)[index+1];
+            idx = ((unsigned) (AVAHI_DNS_PACKET_DATA(p)[idx] & ~0xC0)) << 8 | AVAHI_DNS_PACKET_DATA(p)[idx+1];
 
             if (!compressed)
                 ret += 2;
@@ -385,8 +390,8 @@ static gint consume_labels(AvahiDnsPacket *p, guint index, gchar *ret_name, guin
     }
 }
 
-gint avahi_dns_packet_consume_name(AvahiDnsPacket *p, gchar *ret_name, guint l) {
-    gint r;
+int avahi_dns_packet_consume_name(AvahiDnsPacket *p, char *ret_name, size_t l) {
+    int r;
     
     if ((r = consume_labels(p, p->rindex, ret_name, l)) < 0)
         return -1;
@@ -395,36 +400,36 @@ gint avahi_dns_packet_consume_name(AvahiDnsPacket *p, gchar *ret_name, guint l)
     return 0;
 }
 
-gint avahi_dns_packet_consume_uint16(AvahiDnsPacket *p, guint16 *ret_v) {
-    g_assert(p);
-    g_assert(ret_v);
+int avahi_dns_packet_consume_uint16(AvahiDnsPacket *p, uint16_t *ret_v) {
+    assert(p);
+    assert(ret_v);
 
-    if (p->rindex + sizeof(guint16) > p->size)
+    if (p->rindex + sizeof(uint16_t) > p->size)
         return -1;
 
-    *ret_v = g_ntohs(*((guint16*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex)));
-    p->rindex += sizeof(guint16);
+    *ret_v = ntohs(*((uint16_t*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex)));
+    p->rindex += sizeof(uint16_t);
 
     return 0;
 }
 
-gint avahi_dns_packet_consume_uint32(AvahiDnsPacket *p, guint32 *ret_v) {
-    g_assert(p);
-    g_assert(ret_v);
+int avahi_dns_packet_consume_uint32(AvahiDnsPacket *p, uint32_t *ret_v) {
+    assert(p);
+    assert(ret_v);
 
-    if (p->rindex + sizeof(guint32) > p->size)
+    if (p->rindex + sizeof(uint32_t) > p->size)
         return -1;
 
-    *ret_v = g_ntohl(*((guint32*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex)));
-    p->rindex += sizeof(guint32);
+    *ret_v = ntohl(*((uint32_t*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex)));
+    p->rindex += sizeof(uint32_t);
     
     return 0;
 }
 
-gint avahi_dns_packet_consume_bytes(AvahiDnsPacket *p, gpointer ret_data, guint l) {
-    g_assert(p);
-    g_assert(ret_data);
-    g_assert(l > 0);
+int avahi_dns_packet_consume_bytes(AvahiDnsPacket *p, void * ret_data, size_t l) {
+    assert(p);
+    assert(ret_data);
+    assert(l > 0);
     
     if (p->rindex + l > p->size)
         return -1;
@@ -435,12 +440,12 @@ gint avahi_dns_packet_consume_bytes(AvahiDnsPacket *p, gpointer ret_data, guint
     return 0;
 }
 
-gint avahi_dns_packet_consume_string(AvahiDnsPacket *p, gchar *ret_string, guint l) {
-    guint k;
+int avahi_dns_packet_consume_string(AvahiDnsPacket *p, char *ret_string, size_t l) {
+    size_t k;
     
-    g_assert(p);
-    g_assert(ret_string);
-    g_assert(l > 0);
+    assert(p);
+    assert(ret_string);
+    assert(l > 0);
 
     if (p->rindex >= p->size)
         return -1;
@@ -455,16 +460,14 @@ gint avahi_dns_packet_consume_string(AvahiDnsPacket *p, gchar *ret_string, guint
 
     memcpy(ret_string, AVAHI_DNS_PACKET_DATA(p)+p->rindex+1, l-1);
     ret_string[l-1] = 0;
-
     
     p->rindex += 1+k;
 
     return 0;
-    
 }
 
-gconstpointer avahi_dns_packet_get_rptr(AvahiDnsPacket *p) {
-    g_assert(p);
+const void* avahi_dns_packet_get_rptr(AvahiDnsPacket *p) {
+    assert(p);
     
     if (p->rindex > p->size)
         return NULL;
@@ -472,8 +475,8 @@ gconstpointer avahi_dns_packet_get_rptr(AvahiDnsPacket *p) {
     return AVAHI_DNS_PACKET_DATA(p) + p->rindex;
 }
 
-gint avahi_dns_packet_skip(AvahiDnsPacket *p, guint length) {
-    g_assert(p);
+int avahi_dns_packet_skip(AvahiDnsPacket *p, size_t length) {
+    assert(p);
 
     if (p->rindex + length > p->size)
         return -1;
@@ -482,18 +485,17 @@ gint avahi_dns_packet_skip(AvahiDnsPacket *p, guint length) {
     return 0;
 }
 
-AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_cache_flush) {
-    gchar name[257], buf[257];
-    guint16 type, class;
-    guint32 ttl;
-    guint16 rdlength;
+AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, int *ret_cache_flush) {
+    char name[257], buf[257];
+    uint16_t type, class;
+    uint32_t ttl;
+    uint16_t rdlength;
     AvahiRecord *r = NULL;
-    gconstpointer start;
+    const void* start;
 
-    g_assert(p);
-    g_assert(ret_cache_flush);
+    assert(p);
 
-/*     g_message("consume_record()"); */
+/*     avahi_log_debug("consume_record()"); */
 
     if (avahi_dns_packet_consume_name(p, name, sizeof(name)) < 0 ||
         avahi_dns_packet_consume_uint16(p, &type) < 0 ||
@@ -503,31 +505,33 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca
         p->rindex + rdlength > p->size)
         goto fail;
 
-/*     g_message("name = %s, rdlength = %u", name, rdlength); */
+/*     avahi_log_debug("name = %s, rdlength = %u", name, rdlength); */
 
-    *ret_cache_flush = !!(class & AVAHI_DNS_CACHE_FLUSH);
+    if (ret_cache_flush)
+        *ret_cache_flush = !!(class & AVAHI_DNS_CACHE_FLUSH);
     class &= ~AVAHI_DNS_CACHE_FLUSH;
     
     start = avahi_dns_packet_get_rptr(p);
     
-    r = avahi_record_new_full(name, class, type);
+    if (!(r = avahi_record_new_full(name, class, type, ttl)))
+        return NULL;
     
     switch (type) {
         case AVAHI_DNS_TYPE_PTR:
         case AVAHI_DNS_TYPE_CNAME:
 
-/*             g_message("ptr"); */
+/*             avahi_log_debug("ptr"); */
             
             if (avahi_dns_packet_consume_name(p, buf, sizeof(buf)) < 0)
                 goto fail;
 
-            r->data.ptr.name = g_strdup(buf);
+            r->data.ptr.name = avahi_strdup(buf);
             break;
 
             
         case AVAHI_DNS_TYPE_SRV:
 
-/*             g_message("srv"); */
+/*             avahi_log_debug("srv"); */
             
             if (avahi_dns_packet_consume_uint16(p, &r->data.srv.priority) < 0 ||
                 avahi_dns_packet_consume_uint16(p, &r->data.srv.weight) < 0 ||
@@ -535,27 +539,27 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca
                 avahi_dns_packet_consume_name(p, buf, sizeof(buf)) < 0)
                 goto fail;
             
-            r->data.srv.name = g_strdup(buf);
+            r->data.srv.name = avahi_strdup(buf);
             break;
 
         case AVAHI_DNS_TYPE_HINFO:
             
-/*             g_message("hinfo"); */
+/*             avahi_log_debug("hinfo"); */
 
             if (avahi_dns_packet_consume_string(p, buf, sizeof(buf)) < 0)
                 goto fail;
 
-            r->data.hinfo.cpu = g_strdup(buf);
+            r->data.hinfo.cpu = avahi_strdup(buf);
 
             if (avahi_dns_packet_consume_string(p, buf, sizeof(buf)) < 0)
                 goto fail;
 
-            r->data.hinfo.os = g_strdup(buf);
+            r->data.hinfo.os = avahi_strdup(buf);
             break;
 
         case AVAHI_DNS_TYPE_TXT:
 
-/*             g_message("txt"); */
+/*             avahi_log_debug("txt"); */
 
             if (rdlength > 0) {
                 r->data.txt.string_list = avahi_string_list_parse(avahi_dns_packet_get_rptr(p), rdlength);
@@ -569,7 +573,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca
 
         case AVAHI_DNS_TYPE_A:
 
-/*             g_message("A"); */
+/*             avahi_log_debug("A"); */
 
             if (avahi_dns_packet_consume_bytes(p, &r->data.a.address, sizeof(AvahiIPv4Address)) < 0)
                 goto fail;
@@ -578,7 +582,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca
 
         case AVAHI_DNS_TYPE_AAAA:
 
-/*             g_message("aaaa"); */
+/*             avahi_log_debug("aaaa"); */
             
             if (avahi_dns_packet_consume_bytes(p, &r->data.aaaa.address, sizeof(AvahiIPv6Address)) < 0)
                 goto fail;
@@ -587,11 +591,11 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca
             
         default:
 
-/*             g_message("generic"); */
+/*             avahi_log_debug("generic"); */
             
             if (rdlength > 0) {
 
-                r->data.generic.data = g_memdup(avahi_dns_packet_get_rptr(p), rdlength);
+                r->data.generic.data = avahi_memdup(avahi_dns_packet_get_rptr(p), rdlength);
                 
                 if (avahi_dns_packet_skip(p, rdlength) < 0)
                     goto fail;
@@ -600,13 +604,11 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca
             break;
     }
 
-/*     g_message("%i == %u ?", (guint8*) avahi_dns_packet_get_rptr(p) - (guint8*) start, rdlength); */
+/*     avahi_log_debug("%i == %u ?", (uint8_t*) avahi_dns_packet_get_rptr(p) - (uint8_t*) start, rdlength); */
     
     /* Check if we read enough data */
-    if ((guint8*) avahi_dns_packet_get_rptr(p) - (guint8*) start != rdlength)
+    if ((const uint8_t*) avahi_dns_packet_get_rptr(p) - (const uint8_t*) start != rdlength)
         goto fail;
-    
-    r->ttl = ttl;
 
     return r;
 
@@ -617,36 +619,37 @@ fail:
     return NULL;
 }
 
-AvahiKey* avahi_dns_packet_consume_key(AvahiDnsPacket *p, gboolean *ret_unicast_response) {
-    gchar name[256];
-    guint16 type, class;
+AvahiKey* avahi_dns_packet_consume_key(AvahiDnsPacket *p, int *ret_unicast_response) {
+    char name[256];
+    uint16_t type, class;
 
-    g_assert(p);
-    g_assert(ret_unicast_response);
+    assert(p);
 
     if (avahi_dns_packet_consume_name(p, name, sizeof(name)) < 0 ||
         avahi_dns_packet_consume_uint16(p, &type) < 0 ||
         avahi_dns_packet_consume_uint16(p, &class) < 0)
         return NULL;
 
-    *ret_unicast_response = !!(class & AVAHI_DNS_UNICAST_RESPONSE);
-    class &= ~AVAHI_DNS_UNICAST_RESPONSE;
+    if (ret_unicast_response)
+        *ret_unicast_response = !!(class & AVAHI_DNS_UNICAST_RESPONSE);
 
+    class &= ~AVAHI_DNS_UNICAST_RESPONSE;
+    
     return avahi_key_new(name, class, type);
 }
 
-guint8* avahi_dns_packet_append_key(AvahiDnsPacket *p, AvahiKey *k, gboolean unicast_response) {
-    guint8 *t;
-    guint size;
+uint8_t* avahi_dns_packet_append_key(AvahiDnsPacket *p, AvahiKey *k, int unicast_response) {
+    uint8_t *t;
+    size_t size;
     
-    g_assert(p);
-    g_assert(k);
+    assert(p);
+    assert(k);
 
     size = p->size;
     
     if (!(t = avahi_dns_packet_append_name(p, k->name)) ||
         !avahi_dns_packet_append_uint16(p, k->type) ||
-        !avahi_dns_packet_append_uint16(p, k->class | (unicast_response ? AVAHI_DNS_UNICAST_RESPONSE : 0))) {
+        !avahi_dns_packet_append_uint16(p, k->clazz | (unicast_response ? AVAHI_DNS_UNICAST_RESPONSE : 0))) {
         p->size = size;
         return NULL;
     }
@@ -654,19 +657,19 @@ guint8* avahi_dns_packet_append_key(AvahiDnsPacket *p, AvahiKey *k, gboolean uni
     return t;
 }
 
-guint8* avahi_dns_packet_append_record(AvahiDnsPacket *p, AvahiRecord *r, gboolean cache_flush) {
-    guint8 *t, *l, *start;
-    guint size;
+uint8_t* avahi_dns_packet_append_record(AvahiDnsPacket *p, AvahiRecord *r, int cache_flush, unsigned max_ttl) {
+    uint8_t *t, *l, *start;
+    size_t size;
 
-    g_assert(p);
-    g_assert(r);
+    assert(p);
+    assert(r);
 
     size = p->size;
 
     if (!(t = avahi_dns_packet_append_name(p, r->key->name)) ||
         !avahi_dns_packet_append_uint16(p, r->key->type) ||
-        !avahi_dns_packet_append_uint16(p, cache_flush ? (r->key->class | AVAHI_DNS_CACHE_FLUSH) : (r->key->class &~ AVAHI_DNS_CACHE_FLUSH)) ||
-        !avahi_dns_packet_append_uint32(p, r->ttl) ||
+        !avahi_dns_packet_append_uint16(p, cache_flush ? (r->key->clazz | AVAHI_DNS_CACHE_FLUSH) : (r->key->clazz &~ AVAHI_DNS_CACHE_FLUSH)) ||
+        !avahi_dns_packet_append_uint32(p, (max_ttl && r->ttl > max_ttl) ? max_ttl : r->ttl) ||
         !(l = avahi_dns_packet_append_uint16(p, 0)))
         goto fail;
 
@@ -701,17 +704,17 @@ guint8* avahi_dns_packet_append_record(AvahiDnsPacket *p, AvahiRecord *r, gboole
 
         case AVAHI_DNS_TYPE_TXT: {
 
-            guint8 *data;
-            guint size;
+            uint8_t *data;
+            size_t n;
 
-            size = avahi_string_list_serialize(r->data.txt.string_list, NULL, 0);
+            n = avahi_string_list_serialize(r->data.txt.string_list, NULL, 0);
 
-/*             g_message("appending string: %u %p", size, r->data.txt.string_list); */
+/*             avahi_log_debug("appending string: %u %p", n, r->data.txt.string_list); */
 
-            if (!(data = avahi_dns_packet_extend(p, size)))
+            if (!(data = avahi_dns_packet_extend(p, n)))
                 goto fail;
 
-            avahi_string_list_serialize(r->data.txt.string_list, data, size);
+            avahi_string_list_serialize(r->data.txt.string_list, data, n);
             break;
         }
 
@@ -743,11 +746,11 @@ guint8* avahi_dns_packet_append_record(AvahiDnsPacket *p, AvahiRecord *r, gboole
 
     
     size = avahi_dns_packet_extend(p, 0) - start;
-    g_assert(size <= 0xFFFF);
+    assert(size <= 0xFFFF);
 
-/*     g_message("appended %u", size); */
+/*     avahi_log_debug("appended %u", size); */
 
-    * (guint16*) l = g_htons((guint16) size);
+    * (uint16_t*) l = htons((uint16_t) size);
     
     return t;
 
@@ -757,16 +760,16 @@ fail:
     return NULL;
 }
 
-gboolean avahi_dns_packet_is_empty(AvahiDnsPacket *p) {
-    g_assert(p);
+int avahi_dns_packet_is_empty(AvahiDnsPacket *p) {
+    assert(p);
 
     return p->size <= AVAHI_DNS_PACKET_HEADER_SIZE;
 }
 
-guint avahi_dns_packet_space(AvahiDnsPacket *p) {
-    g_assert(p);
+size_t avahi_dns_packet_space(AvahiDnsPacket *p) {
+    assert(p);
 
-    g_assert(p->size <= p->max_size);
+    assert(p->size <= p->max_size);
     
     return p->max_size - p->size;
 }