X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fdns.c;h=f5d4075e99000ca8e6412ff6e920a43de5e55ad1;hb=38b45921cd1d33119f1c06979a57bcfe982e22da;hp=7a99192b0e56b667e697e87f7c8a9cd1c537106c;hpb=8d8c0255f0f0242a067b577747740bab1b1021ea;p=catta diff --git a/avahi-core/dns.c b/avahi-core/dns.c index 7a99192..f5d4075 100644 --- a/avahi-core/dns.c +++ b/avahi-core/dns.c @@ -38,8 +38,8 @@ AvahiDnsPacket* avahi_dns_packet_new(guint mtu) { 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; @@ -131,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; @@ -210,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); } @@ -325,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; @@ -404,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; @@ -503,7 +432,6 @@ gint avahi_dns_packet_consume_string(AvahiDnsPacket *p, gchar *ret_string, guint p->rindex += 1+k; return 0; - } gconstpointer avahi_dns_packet_get_rptr(AvahiDnsPacket *p) { @@ -536,7 +464,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 || @@ -546,20 +474,20 @@ 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; 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; @@ -570,7 +498,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 || @@ -583,7 +511,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; @@ -598,7 +526,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); @@ -612,7 +540,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; @@ -621,7 +549,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; @@ -630,7 +558,7 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_ca default: -/* g_message("generic"); */ +/* avahi_log_debug("generic"); */ if (rdlength > 0) { @@ -643,13 +571,11 @@ 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) goto fail; - - r->ttl = ttl; return r; @@ -689,7 +615,7 @@ guint8* avahi_dns_packet_append_key(AvahiDnsPacket *p, AvahiKey *k, gboolean uni 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; } @@ -708,7 +634,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_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; @@ -749,7 +675,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; @@ -788,7 +714,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);