* add todo list

[catta] / rr.c

diff --git a/rr.c b/rr.c
index a6ecfbd3903b063e73538b13f28d3596a39a6bcc..294d409ea493e18cf86c51c2dc26c524a1c33205 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -49,14 +49,12 @@ flxRecord *flx_record_new(flxKey *k, gconstpointer data, guint16 size, guint32 t
     flxRecord *r;
     
     g_assert(k);
-    g_assert(data);
-    g_assert(size > 0);
-    g_assert(ttl > 0);
-
+    g_assert(size == 0 || data);
+    
     r = g_new(flxRecord, 1);
     r->ref = 1;
     r->key = flx_key_ref(k);
-    r->data = g_memdup(data, size);
+    r->data = size > 0 ? g_memdup(data, size) : NULL;
     r->size = size;
     r->ttl = ttl;
 
@@ -66,6 +64,9 @@ flxRecord *flx_record_new(flxKey *k, gconstpointer data, guint16 size, guint32 t
 flxRecord *flx_record_new_full(const gchar *name, guint16 class, guint16 type, gconstpointer data, guint16 size, guint32 ttl) {
     flxRecord *r;
     flxKey *k;
+
+    g_assert(name);
+    g_assert(size == 0 || data);
     
     k = flx_key_new(name, class, type);
     r = flx_record_new(k, data, size, ttl);
@@ -142,8 +143,7 @@ gchar *flx_record_to_string(flxRecord *r) {
             inet_ntop(AF_INET6, r->data, t, sizeof(t));
             break;
             
-        case FLX_DNS_TYPE_PTR:
-        case FLX_DNS_TYPE_TXT: {
+        case FLX_DNS_TYPE_PTR: {
             size_t l;
         
             l = r->size;
@@ -155,13 +155,37 @@ gchar *flx_record_to_string(flxRecord *r) {
             break;
         }
 
+        case FLX_DNS_TYPE_TXT: {
+
+            if (r->size == 0)
+                t[0] = 0;
+            else {
+                guchar l = ((guchar*) r->data)[0];
+
+                if ((size_t) l+1 <= r->size) {
+                    memcpy(t, r->data+1, ((guchar*) r->data)[0]);
+                    t[((guchar*) r->data)[0]] = 0;
+                }
+            }
+            break;
+        }
+
         case FLX_DNS_TYPE_HINFO: {
-            char *s2;
-            
-            if ((s2 = memchr(r->data, 0, r->size))) {
-                s2++;
-                if (memchr(s2, 0, r->size - ((char*) s2 - (char*) r->data)))
-                    snprintf(t, sizeof(t), "'%s' '%s'", (char*) r->data, s2);
+            gchar *s2;
+            gchar hi1[256], hi2[256];
+            guchar len;
+
+            if ((size_t) (len = ((guchar*) r->data)[0]) + 2 <= r->size) {
+                guchar len2;
+                memcpy(hi1, (gchar*) r->data +1, len);
+                hi1[len] = 0;
+
+                if ((size_t) (len2 = ((guchar*) r->data)[len+1]) + len + 2 <= r->size) {
+                    memcpy(hi2, (gchar*) r->data+len+2, len2);
+                    hi2[len2] = 0;
+                    snprintf(t, sizeof(t), "'%s' '%s'", hi1, hi2);
+                }
+                
             }
 
             break;
@@ -183,6 +207,7 @@ gchar *flx_record_to_string(flxRecord *r) {
                      ntohs(((guint16*) r->data)[1]),
                      ntohs(((guint16*) r->data)[2]),
                      k);
+            break;
         }
     }
 
@@ -208,12 +233,12 @@ guint flx_key_hash(const flxKey *k) {
     return g_str_hash(k->name) + k->type + k->class;
 }
 
-gboolean flx_record_equal(const flxRecord *a, const flxRecord *b) {
+gboolean flx_record_equal_no_ttl(const flxRecord *a, const flxRecord *b) {
     g_assert(a);
     g_assert(b);
 
     return flx_key_equal(a->key, b->key) &&
-        a->ttl == b->ttl &&
+/*        a->ttl == b->ttl && */
         a->size == b->size &&
-        memcmp(a->data, b->data, a->size) == 0;
+        (a->size == 0 || memcmp(a->data, b->data, a->size) == 0);
 }