X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Frr.c;h=7fa0beebf610eb129b68e960be6f24c3d33549e9;hb=9c0f9c65093cfa53d45f9b68782321eb8063a032;hp=e88d3c6f4004ffa4a310cec9404852a15ccaf6be;hpb=6efe2615e04c6ef664fa9d49b013e261ba1e6e66;p=catta

diff --git a/avahi-core/rr.c b/avahi-core/rr.c
index e88d3c6..7fa0bee 100644
--- a/avahi-core/rr.c
+++ b/avahi-core/rr.c
@@ -1,18 +1,16 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -32,6 +30,7 @@
 
 #include <avahi-common/domain.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/defs.h>
 
 #include "rr.h"
 #include "log.h"
@@ -39,6 +38,7 @@
 #include "hashmap.h"
 #include "domain-util.h"
 #include "rr-util.h"
+#include "addr-util.h"
 
 AvahiKey *avahi_key_new(const char *name, uint16_t class, uint16_t type) {
     AvahiKey *k;
@@ -48,13 +48,13 @@ AvahiKey *avahi_key_new(const char *name, uint16_t class, uint16_t type) {
         avahi_log_error("avahi_new() failed.");
         return NULL;
     }
-    
+
     if (!(k->name = avahi_normalize_name_strdup(name))) {
         avahi_log_error("avahi_normalize_name() failed.");
         avahi_free(k);
         return NULL;
     }
-    
+
     k->ref = 1;
     k->clazz = class;
     k->type = type;
@@ -86,7 +86,7 @@ AvahiKey *avahi_key_ref(AvahiKey *k) {
 void avahi_key_unref(AvahiKey *k) {
     assert(k);
     assert(k->ref >= 1);
-    
+
     if ((--k->ref) <= 0) {
         avahi_free(k->name);
         avahi_free(k);
@@ -95,14 +95,14 @@ void avahi_key_unref(AvahiKey *k) {
 
 AvahiRecord *avahi_record_new(AvahiKey *k, uint32_t ttl) {
     AvahiRecord *r;
-    
+
     assert(k);
-    
+
     if (!(r = avahi_new(AvahiRecord, 1))) {
         avahi_log_error("avahi_new() failed.");
         return NULL;
     }
-        
+
     r->ref = 1;
     r->key = avahi_key_ref(k);
 
@@ -118,7 +118,7 @@ AvahiRecord *avahi_record_new_full(const char *name, uint16_t class, uint16_t ty
     AvahiKey *k;
 
     assert(name);
-    
+
     if (!(k = avahi_key_new(name, class, type))) {
         avahi_log_error("avahi_key_new() failed.");
         return NULL;
@@ -172,18 +172,18 @@ void avahi_record_unref(AvahiRecord *r) {
             case AVAHI_DNS_TYPE_A:
             case AVAHI_DNS_TYPE_AAAA:
                 break;
-            
+
             default:
                 avahi_free(r->data.generic.data);
         }
-        
+
         avahi_key_unref(r->key);
         avahi_free(r);
     }
 }
 
 const char *avahi_dns_class_to_string(uint16_t class) {
-    if (class & AVAHI_DNS_CACHE_FLUSH) 
+    if (class & AVAHI_DNS_CACHE_FLUSH)
         return "FLUSH";
 
     switch (class) {
@@ -224,31 +224,43 @@ const char *avahi_dns_type_to_string(uint16_t type) {
 }
 
 char *avahi_key_to_string(const AvahiKey *k) {
+    char class[16], type[16];
+    const char *c, *t;
+
     assert(k);
     assert(k->ref >= 1);
-    
-    return avahi_strdup_printf("%s\t%s\t%s",
-                               k->name,
-                               avahi_dns_class_to_string(k->clazz),
-                               avahi_dns_type_to_string(k->type));
+
+    /* According to RFC3597 */
+
+    if (!(c = avahi_dns_class_to_string(k->clazz))) {
+        snprintf(class, sizeof(class), "CLASS%u", k->clazz);
+        c = class;
+    }
+
+    if (!(t = avahi_dns_type_to_string(k->type))) {
+        snprintf(type, sizeof(type), "TYPE%u", k->type);
+        t = type;
+    }
+
+    return avahi_strdup_printf("%s\t%s\t%s", k->name, c, t);
 }
 
 char *avahi_record_to_string(const AvahiRecord *r) {
     char *p, *s;
-    char buf[257], *t = NULL, *d = NULL;
+    char buf[1024], *t = NULL, *d = NULL;
 
     assert(r);
     assert(r->ref >= 1);
-    
+
     switch (r->key->type) {
         case AVAHI_DNS_TYPE_A:
             inet_ntop(AF_INET, &r->data.a.address.address, t = buf, sizeof(buf));
             break;
-            
+
         case AVAHI_DNS_TYPE_AAAA:
             inet_ntop(AF_INET6, &r->data.aaaa.address.address, t = buf, sizeof(buf));
             break;
-            
+
         case AVAHI_DNS_TYPE_PTR:
         case AVAHI_DNS_TYPE_CNAME:
         case AVAHI_DNS_TYPE_NS:
@@ -274,13 +286,37 @@ char *avahi_record_to_string(const AvahiRecord *r) {
                      r->data.srv.name);
 
             break;
+
+        default: {
+
+            uint8_t *c;
+            uint16_t n;
+            int i;
+            char *e;
+
+            /* According to RFC3597 */
+
+            snprintf(t = buf, sizeof(buf), "\\# %u", r->data.generic.size);
+
+            e = strchr(t, 0);
+
+            for (c = r->data.generic.data, n = r->data.generic.size, i = 0;
+                 n > 0 && i < 20;
+                 c ++, n --, i++) {
+
+                sprintf(e, " %02X", *c);
+                e = strchr(e, 0);
+            }
+
+            break;
+        }
     }
 
     p = avahi_key_to_string(r->key);
-    s = avahi_strdup_printf("%s %s ; ttl=%u", p, t ? t : "<unparsable>", r->ttl);
+    s = avahi_strdup_printf("%s %s ; ttl=%u", p, t, r->ttl);
     avahi_free(p);
     avahi_free(d);
-    
+
     return s;
 }
 
@@ -290,9 +326,7 @@ int avahi_key_equal(const AvahiKey *a, const AvahiKey *b) {
 
     if (a == b)
         return 1;
-    
-/*     g_message("equal: %p %p", a, b); */
-    
+
     return avahi_domain_equal(a->name, b->name) &&
         a->type == b->type &&
         a->clazz == b->clazz;
@@ -302,13 +336,11 @@ int avahi_key_pattern_match(const AvahiKey *pattern, const AvahiKey *k) {
     assert(pattern);
     assert(k);
 
-/*     g_message("equal: %p %p", a, b); */
-
     assert(!avahi_key_is_pattern(k));
 
     if (pattern == k)
         return 1;
-    
+
     return avahi_domain_equal(pattern->name, k->name) &&
         (pattern->type == k->type || pattern->type == AVAHI_DNS_TYPE_ANY) &&
         (pattern->clazz == k->clazz || pattern->clazz == AVAHI_DNS_CLASS_ANY);
@@ -326,7 +358,7 @@ unsigned avahi_key_hash(const AvahiKey *k) {
     assert(k);
 
     return
-        avahi_domain_hash(k->name) + 
+        avahi_domain_hash(k->name) +
         k->type +
         k->clazz;
 }
@@ -336,15 +368,6 @@ static int rdata_equal(const AvahiRecord *a, const AvahiRecord *b) {
     assert(b);
     assert(a->key->type == b->key->type);
 
-/*     t = avahi_record_to_string(a); */
-/*     g_message("comparing %s", t); */
-/*     avahi_free(t); */
-
-/*     t = avahi_record_to_string(b); */
-/*     g_message("and %s", t); */
-/*     avahi_free(t); */
-
-    
     switch (a->key->type) {
         case AVAHI_DNS_TYPE_SRV:
             return
@@ -376,7 +399,7 @@ static int rdata_equal(const AvahiRecord *a, const AvahiRecord *b) {
             return a->data.generic.size == b->data.generic.size &&
                 (a->data.generic.size == 0 || memcmp(a->data.generic.data, b->data.generic.data, a->data.generic.size) == 0);
     }
-    
+
 }
 
 int avahi_record_equal_no_ttl(const AvahiRecord *a, const AvahiRecord *b) {
@@ -399,7 +422,7 @@ AvahiRecord *avahi_record_copy(AvahiRecord *r) {
         avahi_log_error("avahi_new() failed.");
         return NULL;
     }
-    
+
     copy->ref = 1;
     copy->key = avahi_key_ref(r->key);
     copy->ttl = r->ttl;
@@ -447,7 +470,7 @@ AvahiRecord *avahi_record_copy(AvahiRecord *r) {
                 goto fail;
             copy->data.generic.size = r->data.generic.size;
             break;
-                
+
     }
 
     return copy;
@@ -457,7 +480,7 @@ fail:
 
     avahi_key_unref(copy->key);
     avahi_free(copy);
-    
+
     return NULL;
 }
 
@@ -511,7 +534,7 @@ size_t avahi_record_get_estimate_size(AvahiRecord *r) {
 static int lexicographical_memcmp(const void* a, size_t al, const void* b, size_t bl) {
     size_t c;
     int ret;
-    
+
     assert(a);
     assert(b);
 
@@ -561,7 +584,7 @@ int avahi_record_lexicographical_compare(AvahiRecord *a, AvahiRecord *b) {
                 (r = uint16_cmp(a->data.srv.weight, b->data.srv.weight)) == 0 &&
                 (r = uint16_cmp(a->data.srv.port, b->data.srv.port)) == 0)
                 r = avahi_binary_domain_cmp(a->data.srv.name, b->data.srv.name);
-            
+
             return r;
         }
 
@@ -582,15 +605,15 @@ int avahi_record_lexicographical_compare(AvahiRecord *a, AvahiRecord *b) {
 
             asize = avahi_string_list_serialize(a->data.txt.string_list, NULL, 0);
             bsize = avahi_string_list_serialize(b->data.txt.string_list, NULL, 0);
-            
+
             if (asize > 0 && !(ma = avahi_new(uint8_t, asize)))
                 goto fail;
-            
+
             if (bsize > 0 && !(mb = avahi_new(uint8_t, bsize))) {
                 avahi_free(ma);
                 goto fail;
             }
-            
+
             avahi_string_list_serialize(a->data.txt.string_list, ma, asize);
             avahi_string_list_serialize(b->data.txt.string_list, mb, bsize);
 
@@ -602,13 +625,13 @@ int avahi_record_lexicographical_compare(AvahiRecord *a, AvahiRecord *b) {
                 r = -1;
             else
                 r = 0;
-            
+
             avahi_free(ma);
             avahi_free(mb);
 
             return r;
         }
-        
+
         case AVAHI_DNS_TYPE_A:
             return memcmp(&a->data.a.address, &b->data.a.address, sizeof(AvahiIPv4Address));
 
@@ -620,7 +643,7 @@ int avahi_record_lexicographical_compare(AvahiRecord *a, AvahiRecord *b) {
                                           b->data.generic.data, b->data.generic.size);
     }
 
-    
+
 fail:
     avahi_log_error(__FILE__": Out of memory");
     return -1; /* or whatever ... */
@@ -637,7 +660,7 @@ int avahi_key_is_valid(AvahiKey *k) {
 
     if (!avahi_is_valid_domain_name(k->name))
         return 0;
-    
+
     return 1;
 }
 
@@ -662,19 +685,49 @@ int avahi_record_is_valid(AvahiRecord *r) {
                 strlen(r->data.hinfo.os) <= 255 &&
                 strlen(r->data.hinfo.cpu) <= 255;
 
-            
         case AVAHI_DNS_TYPE_TXT: {
 
             AvahiStringList *strlst;
 
             for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next)
-                if (strlst->size > 255)
+                if (strlst->size > 255 || strlst->size <= 0)
                     return 0;
 
             return 1;
         }
     }
-            
 
     return 1;
 }
+
+static AvahiAddress *get_address(const AvahiRecord *r, AvahiAddress *a) {
+    assert(r);
+
+    switch (r->key->type) {
+        case AVAHI_DNS_TYPE_A:
+            a->proto = AVAHI_PROTO_INET;
+            a->data.ipv4 = r->data.a.address;
+            break;
+
+        case AVAHI_DNS_TYPE_AAAA:
+            a->proto = AVAHI_PROTO_INET6;
+            a->data.ipv6 = r->data.aaaa.address;
+            break;
+
+        default:
+            return NULL;
+    }
+
+    return a;
+}
+
+int avahi_record_is_link_local_address(const AvahiRecord *r) {
+    AvahiAddress a;
+
+    assert(r);
+
+    if (!get_address(r, &a))
+        return 0;
+
+    return avahi_address_is_link_local(&a);
+}