#include <config.h>
#endif
-#include <netinet/in.h>
-
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <assert.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+
#include <avahi-common/defs.h>
#include <avahi-common/domain.h>
#include <avahi-common/malloc.h>
avahi_dns_packet_set_field(p, idx, avahi_dns_packet_get_field(p, idx) + 1);
}
+
+static void name_table_cleanup(void *key, void *value, void *user_data) {
+ AvahiDnsPacket *p = user_data;
+
+ if ((uint8_t*) value >= AVAHI_DNS_PACKET_DATA(p) + p->size)
+ avahi_hashmap_remove(p->name_table, key);
+}
+
+void avahi_dns_packet_cleanup_name_table(AvahiDnsPacket *p) {
+ if (p->name_table)
+ avahi_hashmap_foreach(p->name_table, name_table_cleanup, p);
+}
+
uint8_t* avahi_dns_packet_append_name(AvahiDnsPacket *p, const char *name) {
uint8_t *d, *saved_ptr = NULL;
size_t saved_size;
fail:
p->size = saved_size;
+ avahi_dns_packet_cleanup_name_table(p);
+
return NULL;
}
return 0;
}
-
int avahi_dns_packet_is_query(AvahiDnsPacket *p) {
assert(p);
int ret = 0;
int compressed = 0;
int first_label = 1;
+ unsigned label_ptr;
+ int i;
assert(p && ret_name && l);
- for (;;) {
+ for (i = 0; i < AVAHI_DNS_LABELS_MAX; i++) {
uint8_t n;
if (idx+1 > p->size)
if (idx+2 > p->size)
return -1;
- idx = ((unsigned) (AVAHI_DNS_PACKET_DATA(p)[idx] & ~0xC0)) << 8 | AVAHI_DNS_PACKET_DATA(p)[idx+1];
+ label_ptr = ((unsigned) (AVAHI_DNS_PACKET_DATA(p)[idx] & ~0xC0)) << 8 | AVAHI_DNS_PACKET_DATA(p)[idx+1];
+
+ if ((label_ptr < AVAHI_DNS_PACKET_HEADER_SIZE) || (label_ptr >= idx))
+ return -1;
+
+ idx = label_ptr;
if (!compressed)
ret += 2;
} else
return -1;
}
+
+ return -1;
}
int avahi_dns_packet_consume_name(AvahiDnsPacket *p, char *ret_name, size_t l) {
if (rdlength > 0) {
r->data.generic.data = avahi_memdup(avahi_dns_packet_get_rptr(p), rdlength);
+ r->data.generic.size = rdlength;
if (avahi_dns_packet_skip(p, rdlength) < 0)
return -1;
if (parse_rdata(p, r, rdlength) < 0)
goto fail;
+
+ if (!avahi_record_is_valid(r))
+ goto fail;
return r;
AvahiKey* avahi_dns_packet_consume_key(AvahiDnsPacket *p, int *ret_unicast_response) {
char name[256];
uint16_t type, class;
+ AvahiKey *k;
assert(p);
class &= ~AVAHI_DNS_UNICAST_RESPONSE;
- return avahi_key_new(name, class, type);
+ if (!(k = avahi_key_new(name, class, type)))
+ return NULL;
+
+ if (!avahi_key_is_valid(k)) {
+ avahi_key_unref(k);
+ return NULL;
+ }
+
+ return k;
}
uint8_t* avahi_dns_packet_append_key(AvahiDnsPacket *p, AvahiKey *k, int unicast_response) {
!avahi_dns_packet_append_uint16(p, k->type) ||
!avahi_dns_packet_append_uint16(p, k->clazz | (unicast_response ? AVAHI_DNS_UNICAST_RESPONSE : 0))) {
p->size = size;
+ avahi_dns_packet_cleanup_name_table(p);
+
return NULL;
}
default:
if (r->data.generic.size)
- if (avahi_dns_packet_append_bytes(p, r->data.generic.data, r->data.generic.size))
+ if (!avahi_dns_packet_append_bytes(p, r->data.generic.data, r->data.generic.size))
return -1;
break;
goto fail;
size = avahi_dns_packet_extend(p, 0) - start;
- assert(size <= 0xFFFF);
+ assert(size <= AVAHI_DNS_RDATA_MAX);
/* avahi_log_debug("appended %u", size); */
fail:
p->size = size;
+ avahi_dns_packet_cleanup_name_table(p);
+
return NULL;
}