X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fdns.c;h=f5d4075e99000ca8e6412ff6e920a43de5e55ad1;hb=38b45921cd1d33119f1c06979a57bcfe982e22da;hp=9e19c9e30e40534c4ecd40eef56bfac54eb6e9ee;hpb=b6820898d317c29a31f97018ede6da5195d16bfb;p=catta diff --git a/avahi-core/dns.c b/avahi-core/dns.c index 9e19c9e..f5d4075 100644 --- a/avahi-core/dns.c +++ b/avahi-core/dns.c @@ -432,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) { @@ -465,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 || @@ -475,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; @@ -499,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 || @@ -512,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; @@ -527,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); @@ -541,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; @@ -550,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; @@ -559,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) { @@ -572,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; @@ -618,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; } @@ -637,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; @@ -678,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; @@ -717,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);