-/* $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
#include <avahi-common/domain.h>
#include <avahi-common/malloc.h>
+#include <avahi-common/defs.h>
#include "rr.h"
#include "log.h"
#include "util.h"
#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;
avahi_log_error("avahi_new() failed.");
return NULL;
}
-
- if (!(k->name = avahi_normalize_name(name))) {
+
+ 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;
return k;
}
+AvahiKey *avahi_key_new_cname(AvahiKey *key) {
+ assert(key);
+
+ if (key->clazz != AVAHI_DNS_CLASS_IN)
+ return NULL;
+
+ if (key->type == AVAHI_DNS_TYPE_CNAME)
+ return NULL;
+
+ return avahi_key_new(key->name, key->clazz, AVAHI_DNS_TYPE_CNAME);
+}
+
AvahiKey *avahi_key_ref(AvahiKey *k) {
assert(k);
assert(k->ref >= 1);
void avahi_key_unref(AvahiKey *k) {
assert(k);
assert(k->ref >= 1);
-
+
if ((--k->ref) <= 0) {
avahi_free(k->name);
avahi_free(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);
AvahiKey *k;
assert(name);
-
+
if (!(k = avahi_key_new(name, class, type))) {
avahi_log_error("avahi_key_new() failed.");
return NULL;
case AVAHI_DNS_TYPE_PTR:
case AVAHI_DNS_TYPE_CNAME:
+ case AVAHI_DNS_TYPE_NS:
avahi_free(r->data.ptr.name);
break;
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) {
return "SRV";
case AVAHI_DNS_TYPE_ANY:
return "ANY";
+ case AVAHI_DNS_TYPE_SOA:
+ return "SOA";
+ case AVAHI_DNS_TYPE_NS:
+ return "NS";
default:
return NULL;
}
}
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_CNAME:
+ case AVAHI_DNS_TYPE_NS:
t = r->data.ptr.name;
break;
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;
}
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;
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);
assert(k);
return
- avahi_domain_hash(k->name) +
+ avahi_domain_hash(k->name) +
k->type +
k->clazz;
}
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
case AVAHI_DNS_TYPE_PTR:
case AVAHI_DNS_TYPE_CNAME:
+ case AVAHI_DNS_TYPE_NS:
return avahi_domain_equal(a->data.ptr.name, b->data.ptr.name);
case AVAHI_DNS_TYPE_HINFO:
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) {
avahi_log_error("avahi_new() failed.");
return NULL;
}
-
+
copy->ref = 1;
copy->key = avahi_key_ref(r->key);
copy->ttl = r->ttl;
switch (r->key->type) {
case AVAHI_DNS_TYPE_PTR:
case AVAHI_DNS_TYPE_CNAME:
+ case AVAHI_DNS_TYPE_NS:
if (!(copy->data.ptr.name = avahi_strdup(r->data.ptr.name)))
goto fail;
break;
goto fail;
copy->data.generic.size = r->data.generic.size;
break;
-
+
}
return copy;
avahi_key_unref(copy->key);
avahi_free(copy);
-
+
return NULL;
}
switch (r->key->type) {
case AVAHI_DNS_TYPE_PTR:
case AVAHI_DNS_TYPE_CNAME:
+ case AVAHI_DNS_TYPE_NS:
n += strlen(r->data.ptr.name) + 1;
break;
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);
case AVAHI_DNS_TYPE_PTR:
case AVAHI_DNS_TYPE_CNAME:
+ case AVAHI_DNS_TYPE_NS:
return avahi_binary_domain_cmp(a->data.ptr.name, b->data.ptr.name);
case AVAHI_DNS_TYPE_SRV: {
(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;
}
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);
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));
b->data.generic.data, b->data.generic.size);
}
-
+
fail:
avahi_log_error(__FILE__": Out of memory");
return -1; /* or whatever ... */
if (!avahi_is_valid_domain_name(k->name))
return 0;
-
+
return 1;
}
case AVAHI_DNS_TYPE_PTR:
case AVAHI_DNS_TYPE_CNAME:
+ case AVAHI_DNS_TYPE_NS:
return avahi_is_valid_domain_name(r->data.ptr.name);
case AVAHI_DNS_TYPE_SRV:
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);
+}
projects / catta / blobdiff