-/* $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 <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
+#include <assert.h>
+
+#include <avahi-common/domain.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/defs.h>
-#include "util.h"
#include "rr.h"
-#include "dns.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 gchar *name, guint16 class, guint16 type) {
+AvahiKey *avahi_key_new(const char *name, uint16_t class, uint16_t type) {
AvahiKey *k;
- g_assert(name);
+ assert(name);
+
+ if (!(k = avahi_new(AvahiKey, 1))) {
+ 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 = g_new(AvahiKey, 1);
k->ref = 1;
- k->name = avahi_normalize_name(name);
- k->class = class;
+ k->clazz = class;
k->type = type;
-/* g_message("%p %% ref=1", k); */
-
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) {
- g_assert(k);
- g_assert(k->ref >= 1);
+ assert(k);
+ assert(k->ref >= 1);
k->ref++;
-/* g_message("%p ++ ref=%i", k, k->ref); */
-
return k;
}
void avahi_key_unref(AvahiKey *k) {
- g_assert(k);
- g_assert(k->ref >= 1);
+ assert(k);
+ assert(k->ref >= 1);
-/* g_message("%p -- ref=%i", k, k->ref-1); */
-
if ((--k->ref) <= 0) {
- g_free(k->name);
- g_free(k);
+ avahi_free(k->name);
+ avahi_free(k);
}
}
-AvahiRecord *avahi_record_new(AvahiKey *k) {
+AvahiRecord *avahi_record_new(AvahiKey *k, uint32_t ttl) {
AvahiRecord *r;
-
- g_assert(k);
-
- r = g_new(AvahiRecord, 1);
+
+ 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);
memset(&r->data, 0, sizeof(r->data));
- r->ttl = AVAHI_DEFAULT_TTL;
+ r->ttl = ttl != (uint32_t) -1 ? ttl : AVAHI_DEFAULT_TTL;
return r;
}
-AvahiRecord *avahi_record_new_full(const gchar *name, guint16 class, guint16 type) {
+AvahiRecord *avahi_record_new_full(const char *name, uint16_t class, uint16_t type, uint32_t ttl) {
AvahiRecord *r;
AvahiKey *k;
- g_assert(name);
-
- k = avahi_key_new(name, class, type);
- r = avahi_record_new(k);
+ assert(name);
+
+ if (!(k = avahi_key_new(name, class, type))) {
+ avahi_log_error("avahi_key_new() failed.");
+ return NULL;
+ }
+
+ r = avahi_record_new(k, ttl);
avahi_key_unref(k);
+ if (!r) {
+ avahi_log_error("avahi_record_new() failed.");
+ return NULL;
+ }
+
return r;
}
AvahiRecord *avahi_record_ref(AvahiRecord *r) {
- g_assert(r);
- g_assert(r->ref >= 1);
+ assert(r);
+ assert(r->ref >= 1);
r->ref++;
return r;
}
void avahi_record_unref(AvahiRecord *r) {
- g_assert(r);
- g_assert(r->ref >= 1);
+ assert(r);
+ assert(r->ref >= 1);
if ((--r->ref) <= 0) {
switch (r->key->type) {
case AVAHI_DNS_TYPE_SRV:
- g_free(r->data.srv.name);
+ avahi_free(r->data.srv.name);
break;
case AVAHI_DNS_TYPE_PTR:
case AVAHI_DNS_TYPE_CNAME:
- g_free(r->data.ptr.name);
+ case AVAHI_DNS_TYPE_NS:
+ avahi_free(r->data.ptr.name);
break;
case AVAHI_DNS_TYPE_HINFO:
- g_free(r->data.hinfo.cpu);
- g_free(r->data.hinfo.os);
+ avahi_free(r->data.hinfo.cpu);
+ avahi_free(r->data.hinfo.os);
break;
case AVAHI_DNS_TYPE_TXT:
case AVAHI_DNS_TYPE_A:
case AVAHI_DNS_TYPE_AAAA:
break;
-
+
default:
- g_free(r->data.generic.data);
+ avahi_free(r->data.generic.data);
}
-
+
avahi_key_unref(r->key);
- g_free(r);
+ avahi_free(r);
}
}
-const gchar *avahi_dns_class_to_string(guint16 class) {
- if (class & AVAHI_DNS_CACHE_FLUSH)
+const char *avahi_dns_class_to_string(uint16_t class) {
+ if (class & AVAHI_DNS_CACHE_FLUSH)
return "FLUSH";
-
- if (class == AVAHI_DNS_CLASS_IN)
- return "IN";
- return NULL;
+ switch (class) {
+ case AVAHI_DNS_CLASS_IN:
+ return "IN";
+ case AVAHI_DNS_CLASS_ANY:
+ return "ANY";
+ default:
+ return NULL;
+ }
}
-const gchar *avahi_dns_type_to_string(guint16 type) {
+const char *avahi_dns_type_to_string(uint16_t type) {
switch (type) {
case AVAHI_DNS_TYPE_CNAME:
return "CNAME";
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);
+
+ /* 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;
+ }
-gchar *avahi_key_to_string(const AvahiKey *k) {
- g_assert(k);
- g_assert(k->ref >= 1);
-
- return g_strdup_printf("%s\t%s\t%s",
- k->name,
- avahi_dns_class_to_string(k->class),
- avahi_dns_type_to_string(k->type));
+ return avahi_strdup_printf("%s\t%s\t%s", k->name, c, t);
}
-gchar *avahi_record_to_string(const AvahiRecord *r) {
- gchar *p, *s;
- char buf[257], *t = NULL, *d = NULL;
+char *avahi_record_to_string(const AvahiRecord *r) {
+ char *p, *s;
+ char buf[1024], *t = NULL, *d = NULL;
+
+ assert(r);
+ assert(r->ref >= 1);
- g_assert(r);
- g_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 = g_strdup_printf("%s %s ; ttl=%u", p, t ? t : "<unparsable>", r->ttl);
- g_free(p);
- g_free(d);
-
+ s = avahi_strdup_printf("%s %s ; ttl=%u", p, t, r->ttl);
+ avahi_free(p);
+ avahi_free(d);
+
return s;
}
-gboolean avahi_key_equal(const AvahiKey *a, const AvahiKey *b) {
- g_assert(a);
- g_assert(b);
+int avahi_key_equal(const AvahiKey *a, const AvahiKey *b) {
+ assert(a);
+ assert(b);
if (a == b)
- return TRUE;
-
-/* g_message("equal: %p %p", a, b); */
-
+ return 1;
+
return avahi_domain_equal(a->name, b->name) &&
a->type == b->type &&
- a->class == b->class;
+ a->clazz == b->clazz;
}
-gboolean avahi_key_pattern_match(const AvahiKey *pattern, const AvahiKey *k) {
- g_assert(pattern);
- g_assert(k);
-
-/* g_message("equal: %p %p", a, b); */
+int avahi_key_pattern_match(const AvahiKey *pattern, const AvahiKey *k) {
+ assert(pattern);
+ assert(k);
- g_assert(!avahi_key_is_pattern(k));
+ assert(!avahi_key_is_pattern(k));
if (pattern == k)
- return TRUE;
-
+ return 1;
+
return avahi_domain_equal(pattern->name, k->name) &&
(pattern->type == k->type || pattern->type == AVAHI_DNS_TYPE_ANY) &&
- pattern->class == k->class;
+ (pattern->clazz == k->clazz || pattern->clazz == AVAHI_DNS_CLASS_ANY);
}
-gboolean avahi_key_is_pattern(const AvahiKey *k) {
- g_assert(k);
+int avahi_key_is_pattern(const AvahiKey *k) {
+ assert(k);
- return k->type == AVAHI_DNS_TYPE_ANY;
+ return
+ k->type == AVAHI_DNS_TYPE_ANY ||
+ k->clazz == AVAHI_DNS_CLASS_ANY;
}
-
-guint avahi_key_hash(const AvahiKey *k) {
- g_assert(k);
+unsigned avahi_key_hash(const AvahiKey *k) {
+ assert(k);
return
- avahi_domain_hash(k->name) +
+ avahi_domain_hash(k->name) +
k->type +
- k->class;
+ k->clazz;
}
-static gboolean rdata_equal(const AvahiRecord *a, const AvahiRecord *b) {
- g_assert(a);
- g_assert(b);
- g_assert(a->key->type == b->key->type);
-
-/* t = avahi_record_to_string(a); */
-/* g_message("comparing %s", t); */
-/* g_free(t); */
+static int rdata_equal(const AvahiRecord *a, const AvahiRecord *b) {
+ assert(a);
+ assert(b);
+ assert(a->key->type == b->key->type);
-/* t = avahi_record_to_string(b); */
-/* g_message("and %s", t); */
-/* g_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
- !g_utf8_collate(a->data.hinfo.cpu, b->data.hinfo.cpu) &&
- !g_utf8_collate(a->data.hinfo.os, b->data.hinfo.os);
+ !strcmp(a->data.hinfo.cpu, b->data.hinfo.cpu) &&
+ !strcmp(a->data.hinfo.os, b->data.hinfo.os);
case AVAHI_DNS_TYPE_TXT:
return avahi_string_list_equal(a->data.txt.string_list, b->data.txt.string_list);
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);
}
-
+
}
-gboolean avahi_record_equal_no_ttl(const AvahiRecord *a, const AvahiRecord *b) {
- g_assert(a);
- g_assert(b);
+int avahi_record_equal_no_ttl(const AvahiRecord *a, const AvahiRecord *b) {
+ assert(a);
+ assert(b);
if (a == b)
- return TRUE;
+ return 1;
return
avahi_key_equal(a->key, b->key) &&
AvahiRecord *avahi_record_copy(AvahiRecord *r) {
AvahiRecord *copy;
- copy = g_new(AvahiRecord, 1);
+ if (!(copy = avahi_new(AvahiRecord, 1))) {
+ 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:
- copy->data.ptr.name = g_strdup(r->data.ptr.name);
+ case AVAHI_DNS_TYPE_NS:
+ if (!(copy->data.ptr.name = avahi_strdup(r->data.ptr.name)))
+ goto fail;
break;
case AVAHI_DNS_TYPE_SRV:
copy->data.srv.priority = r->data.srv.priority;
copy->data.srv.weight = r->data.srv.weight;
copy->data.srv.port = r->data.srv.port;
- copy->data.srv.name = g_strdup(r->data.srv.name);
+ if (!(copy->data.srv.name = avahi_strdup(r->data.srv.name)))
+ goto fail;
break;
case AVAHI_DNS_TYPE_HINFO:
- copy->data.hinfo.os = g_strdup(r->data.hinfo.os);
- copy->data.hinfo.cpu = g_strdup(r->data.hinfo.cpu);
+ if (!(copy->data.hinfo.os = avahi_strdup(r->data.hinfo.os)))
+ goto fail;
+
+ if (!(copy->data.hinfo.cpu = avahi_strdup(r->data.hinfo.cpu))) {
+ avahi_free(r->data.hinfo.os);
+ goto fail;
+ }
break;
case AVAHI_DNS_TYPE_TXT:
break;
default:
- copy->data.generic.data = g_memdup(r->data.generic.data, r->data.generic.size);
+ if (!(copy->data.generic.data = avahi_memdup(r->data.generic.data, r->data.generic.size)))
+ goto fail;
copy->data.generic.size = r->data.generic.size;
break;
-
+
}
return copy;
+
+fail:
+ avahi_log_error("Failed to allocate memory");
+
+ avahi_key_unref(copy->key);
+ avahi_free(copy);
+
+ return NULL;
}
-guint avahi_key_get_estimate_size(AvahiKey *k) {
- g_assert(k);
+size_t avahi_key_get_estimate_size(AvahiKey *k) {
+ assert(k);
return strlen(k->name)+1+4;
}
-guint avahi_record_get_estimate_size(AvahiRecord *r) {
- guint n;
- g_assert(r);
+size_t avahi_record_get_estimate_size(AvahiRecord *r) {
+ size_t n;
+ assert(r);
n = avahi_key_get_estimate_size(r->key) + 4 + 2;
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;
return n;
}
-static gint lexicographical_memcmp(gconstpointer a, size_t al, gconstpointer b, size_t bl) {
+static int lexicographical_memcmp(const void* a, size_t al, const void* b, size_t bl) {
size_t c;
- gint ret;
-
- g_assert(a);
- g_assert(b);
+ int ret;
+
+ assert(a);
+ assert(b);
c = al < bl ? al : bl;
if ((ret = memcmp(a, b, c)))
return al == c ? 1 : -1;
}
-static gint uint16_cmp(guint16 a, guint16 b) {
+static int uint16_cmp(uint16_t a, uint16_t b) {
return a == b ? 0 : (a < b ? -1 : 1);
}
-gint avahi_record_lexicographical_compare(AvahiRecord *a, AvahiRecord *b) {
- gint r;
-/* gchar *t1, *t2; */
+int avahi_record_lexicographical_compare(AvahiRecord *a, AvahiRecord *b) {
+ int r;
+/* char *t1, *t2; */
- g_assert(a);
- g_assert(b);
+ assert(a);
+ assert(b);
/* t1 = avahi_record_to_string(a); */
/* t2 = avahi_record_to_string(b); */
/* g_message("lexicocmp: %s %s", t1, t2); */
-/* g_free(t1); */
-/* g_free(t2); */
+/* avahi_free(t1); */
+/* avahi_free(t2); */
if (a == b)
return 0;
- if ((r = uint16_cmp(a->key->class, b->key->class)) ||
+ if ((r = uint16_cmp(a->key->clazz, b->key->clazz)) ||
(r = uint16_cmp(a->key->type, b->key->type)))
return r;
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;
}
case AVAHI_DNS_TYPE_TXT: {
- guint8 *ma, *mb;
- guint asize, bsize;
+ uint8_t *ma = NULL, *mb = NULL;
+ size_t asize, bsize;
+
+ 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;
+ }
- ma = g_new(guint8, asize = avahi_string_list_serialize(a->data.txt.string_list, NULL, 0));
- mb = g_new(guint8, bsize = avahi_string_list_serialize(b->data.txt.string_list, NULL, 0));
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;
-
- g_free(ma);
- g_free(mb);
+
+ 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));
return lexicographical_memcmp(a->data.generic.data, a->data.generic.size,
b->data.generic.data, b->data.generic.size);
}
-
+
+
+fail:
+ avahi_log_error(__FILE__": Out of memory");
+ return -1; /* or whatever ... */
}
-gboolean avahi_record_is_goodbye(AvahiRecord *r) {
- g_assert(r);
+int avahi_record_is_goodbye(AvahiRecord *r) {
+ assert(r);
return r->ttl == 0;
}
+
+int avahi_key_is_valid(AvahiKey *k) {
+ assert(k);
+
+ if (!avahi_is_valid_domain_name(k->name))
+ return 0;
+
+ return 1;
+}
+
+int avahi_record_is_valid(AvahiRecord *r) {
+ assert(r);
+
+ if (!avahi_key_is_valid(r->key))
+ return 0;
+
+ switch (r->key->type) {
+
+ 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:
+ return avahi_is_valid_domain_name(r->data.srv.name);
+
+ case AVAHI_DNS_TYPE_HINFO:
+ return
+ 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 || 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