if (mtu <= 0)
max_size = AVAHI_DNS_PACKET_MAX_SIZE;
- else if (mtu >= 48)
- max_size = mtu - 48;
+ else if (mtu >= AVAHI_DNS_PACKET_EXTRA_SIZE)
+ max_size = mtu - AVAHI_DNS_PACKET_EXTRA_SIZE;
else
max_size = 0;
g_free(p);
}
-void avahi_dns_packet_set_field(AvahiDnsPacket *p, guint index, guint16 v) {
+void avahi_dns_packet_set_field(AvahiDnsPacket *p, guint idx, guint16 v) {
g_assert(p);
- g_assert(index < AVAHI_DNS_PACKET_HEADER_SIZE);
+ g_assert(idx < AVAHI_DNS_PACKET_HEADER_SIZE);
- ((guint16*) AVAHI_DNS_PACKET_DATA(p))[index] = g_htons(v);
+ ((guint16*) AVAHI_DNS_PACKET_DATA(p))[idx] = g_htons(v);
}
-guint16 avahi_dns_packet_get_field(AvahiDnsPacket *p, guint index) {
+guint16 avahi_dns_packet_get_field(AvahiDnsPacket *p, guint idx) {
g_assert(p);
- g_assert(index < AVAHI_DNS_PACKET_HEADER_SIZE);
+ g_assert(idx < AVAHI_DNS_PACKET_HEADER_SIZE);
- return g_ntohs(((guint16*) AVAHI_DNS_PACKET_DATA(p))[index]);
+ return g_ntohs(((guint16*) 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;
-
- if (**name == '.') {
- (*name)++;
- break;
- }
-
- if (**name == 0)
- break;
-
- if (**name == '\\') {
- (*name) ++;
-
- if (**name == 0)
- break;
- }
-
- *(d++) = *((*name) ++);
- i++;
- }
-
- g_assert(i < size);
-
- *d = 0;
+void avahi_dns_packet_inc_field(AvahiDnsPacket *p, guint idx) {
+ g_assert(p);
+ g_assert(idx < AVAHI_DNS_PACKET_HEADER_SIZE);
- return dest;
-}
+ avahi_dns_packet_set_field(p, idx, avahi_dns_packet_get_field(p, idx) + 1);
+}
guint8* avahi_dns_packet_append_name(AvahiDnsPacket *p, const gchar *name) {
guint8 *d, *saved_ptr = NULL;
/* Check whether we can compress this name. */
if (p->name_table && (prev = g_hash_table_lookup(p->name_table, name))) {
- guint index;
+ guint idx;
g_assert(prev >= AVAHI_DNS_PACKET_DATA(p));
- index = (guint) (prev - AVAHI_DNS_PACKET_DATA(p));
+ idx = (guint) (prev - AVAHI_DNS_PACKET_DATA(p));
- g_assert(index < p->size);
+ g_assert(idx < p->size);
- if (index < 0x4000) {
+ if (idx < 0x4000) {
guint16 *t;
if (!(t = (guint16*) avahi_dns_packet_extend(p, sizeof(guint16))))
return NULL;
- *t = g_htons((0xC000 | index));
+ *t = g_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 = g_hash_table_new_full((GHashFunc) g_str_hash, (GEqualFunc) g_str_equal, g_free, NULL);
g_hash_table_insert(p->name_table, g_strdup(pname), d);
}
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;
-
- 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) --;
-
- src_length --;
- src++;
- }
-
- **ret_name = 0;
-
- return r;
-}
-
-static gint consume_labels(AvahiDnsPacket *p, guint index, gchar *ret_name, guint l) {
+static gint consume_labels(AvahiDnsPacket *p, guint idx, gchar *ret_name, guint l) {
gint ret = 0;
int compressed = 0;
int first_label = 1;
for (;;) {
guint8 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++;
} 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)
} 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 = ((guint) (AVAHI_DNS_PACKET_DATA(p)[idx] & ~0xC0)) << 8 | AVAHI_DNS_PACKET_DATA(p)[idx+1];
if (!compressed)
ret += 2;
p->rindex += 1+k;
return 0;
-
}
gconstpointer avahi_dns_packet_get_rptr(AvahiDnsPacket *p) {
g_assert(p);
g_assert(ret_cache_flush);
-/* 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 ||
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);
class &= ~AVAHI_DNS_CACHE_FLUSH;
start = avahi_dns_packet_get_rptr(p);
- r = avahi_record_new_full(name, class, type);
+ r = avahi_record_new_full(name, class, type, ttl);
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;
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 ||
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;
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);
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;
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;
default:
-/* g_message("generic"); */
+/* avahi_log_debug("generic"); */
if (rdlength > 0) {
break;
}
-/* g_message("%i == %u ?", (guint8*) avahi_dns_packet_get_rptr(p) - (guint8*) start, rdlength); */
+/* avahi_log_debug("%i == %u ?", (guint8*) avahi_dns_packet_get_rptr(p) - (guint8*) start, rdlength); */
/* Check if we read enough data */
- if ((guint8*) avahi_dns_packet_get_rptr(p) - (guint8*) start != rdlength)
+ if ((const guint8*) avahi_dns_packet_get_rptr(p) - (const guint8*) start != rdlength)
goto fail;
-
- r->ttl = ttl;
return r;
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;
}
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_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;
case AVAHI_DNS_TYPE_TXT: {
guint8 *data;
- guint size;
+ guint 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;
}
size = avahi_dns_packet_extend(p, 0) - start;
g_assert(size <= 0xFFFF);
-/* g_message("appended %u", size); */
+/* avahi_log_debug("appended %u", size); */
* (guint16*) l = g_htons((guint16) size);
projects / catta / blobdiff