X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fdns.c;h=5addf53c4139a7d68495b36fd97ccbec0b861644;hb=ad7b145ebe82c3a53632eaa6ec75b014d91a7bea;hp=cc1463a729b15ea66702bedd2e1134ccfeb4ba9e;hpb=c58379bde376cb2298fca14f83a86626f1b76f2f;p=catta diff --git a/avahi-core/dns.c b/avahi-core/dns.c index cc1463a..5addf53 100644 --- a/avahi-core/dns.c +++ b/avahi-core/dns.c @@ -32,12 +32,18 @@ #include "dns.h" #include "util.h" -AvahiDnsPacket* avahi_dns_packet_new(guint max_size) { +AvahiDnsPacket* avahi_dns_packet_new(guint mtu) { AvahiDnsPacket *p; + guint max_size; - if (max_size <= 0) + if (mtu <= 0) max_size = AVAHI_DNS_PACKET_MAX_SIZE; - else if (max_size < AVAHI_DNS_PACKET_HEADER_SIZE) + else if (mtu >= AVAHI_DNS_PACKET_EXTRA_SIZE) + max_size = mtu - AVAHI_DNS_PACKET_EXTRA_SIZE; + else + max_size = 0; + + if (max_size < AVAHI_DNS_PACKET_HEADER_SIZE) max_size = AVAHI_DNS_PACKET_HEADER_SIZE; p = g_malloc(sizeof(AvahiDnsPacket) + max_size); @@ -49,22 +55,59 @@ AvahiDnsPacket* avahi_dns_packet_new(guint max_size) { return p; } -AvahiDnsPacket* avahi_dns_packet_new_query(guint max_size) { +AvahiDnsPacket* avahi_dns_packet_new_query(guint mtu) { AvahiDnsPacket *p; - p = avahi_dns_packet_new(max_size); + p = avahi_dns_packet_new(mtu); avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_FLAGS, AVAHI_DNS_FLAGS(0, 0, 0, 0, 0, 0, 0, 0, 0, 0)); return p; } -AvahiDnsPacket* avahi_dns_packet_new_response(guint max_size) { +AvahiDnsPacket* avahi_dns_packet_new_response(guint mtu, gboolean aa) { AvahiDnsPacket *p; - p = avahi_dns_packet_new(max_size); - avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_FLAGS, AVAHI_DNS_FLAGS(1, 0, 0, 0, 0, 0, 0, 0, 0, 0)); + p = avahi_dns_packet_new(mtu); + avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_FLAGS, AVAHI_DNS_FLAGS(1, 0, aa, 0, 0, 0, 0, 0, 0, 0)); return p; } +AvahiDnsPacket* avahi_dns_packet_new_reply(AvahiDnsPacket* p, guint mtu, gboolean copy_queries, gboolean aa) { + AvahiDnsPacket *r; + g_assert(p); + + r = avahi_dns_packet_new_response(mtu, aa); + + if (copy_queries) { + guint n, saved_rindex; + + saved_rindex = p->rindex; + p->rindex = AVAHI_DNS_PACKET_HEADER_SIZE; + + for (n = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT); n > 0; n--) { + AvahiKey *k; + gboolean unicast_response; + + if ((k = avahi_dns_packet_consume_key(p, &unicast_response))) { + avahi_dns_packet_append_key(r, k, unicast_response); + avahi_key_unref(k); + } + } + + p->rindex = saved_rindex; + + avahi_dns_packet_set_field(r, AVAHI_DNS_FIELD_QDCOUNT, avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT)); + } + + avahi_dns_packet_set_field(r, AVAHI_DNS_FIELD_ID, avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ID)); + + avahi_dns_packet_set_field(r, AVAHI_DNS_FIELD_FLAGS, + (avahi_dns_packet_get_field(r, AVAHI_DNS_FIELD_FLAGS) & ~AVAHI_DNS_FLAG_OPCODE) | + (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS) & AVAHI_DNS_FLAG_OPCODE)); + + return r; +} + + void avahi_dns_packet_free(AvahiDnsPacket *p) { g_assert(p); @@ -88,47 +131,11 @@ guint16 avahi_dns_packet_get_field(AvahiDnsPacket *p, guint index) { return g_ntohs(((guint16*) AVAHI_DNS_PACKET_DATA(p))[index]); } -/* 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 index) { + g_assert(p); - return dest; -} + avahi_dns_packet_set_field(p, index, avahi_dns_packet_get_field(p, index) + 1); +} guint8* avahi_dns_packet_append_name(AvahiDnsPacket *p, const gchar *name) { guint8 *d, *saved_ptr = NULL; @@ -167,14 +174,15 @@ guint8* avahi_dns_packet_append_name(AvahiDnsPacket *p, const gchar *name) { 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); } @@ -282,42 +290,6 @@ gint avahi_dns_packet_is_query(AvahiDnsPacket *p) { 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) { gint ret = 0; int compressed = 0; @@ -361,7 +333,7 @@ static gint consume_labels(AvahiDnsPacket *p, guint index, gchar *ret_name, guin } 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) + index, n, &ret_name, &l))) return -1; index += n; @@ -493,7 +465,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca 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 || @@ -503,7 +475,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca 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; @@ -516,7 +488,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca 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; @@ -527,7 +499,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca 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 || @@ -540,7 +512,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca 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; @@ -555,7 +527,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca 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); @@ -569,7 +541,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca 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; @@ -578,7 +550,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca 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; @@ -587,7 +559,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca default: -/* g_message("generic"); */ +/* avahi_log_debug("generic"); */ if (rdlength > 0) { @@ -600,7 +572,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca 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) @@ -654,7 +626,7 @@ guint8* avahi_dns_packet_append_key(AvahiDnsPacket *p, AvahiKey *k, gboolean uni return t; } -guint8* avahi_dns_packet_append_record(AvahiDnsPacket *p, AvahiRecord *r, gboolean cache_flush) { +guint8* avahi_dns_packet_append_record(AvahiDnsPacket *p, AvahiRecord *r, gboolean cache_flush, guint max_ttl) { guint8 *t, *l, *start; guint size; @@ -666,7 +638,7 @@ guint8* avahi_dns_packet_append_record(AvahiDnsPacket *p, AvahiRecord *r, gboole 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_uint32(p, r->ttl) || + !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; @@ -706,7 +678,7 @@ guint8* avahi_dns_packet_append_record(AvahiDnsPacket *p, AvahiRecord *r, gboole size = 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", size, r->data.txt.string_list); */ if (!(data = avahi_dns_packet_extend(p, size))) goto fail; @@ -745,7 +717,7 @@ guint8* avahi_dns_packet_append_record(AvahiDnsPacket *p, AvahiRecord *r, gboole 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);