X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fprobe-sched.c;h=106bb8135fda21b15bac6aa9744b036f4095e721;hb=a4572037763c65ec34ac921a6e15b936c6525b5d;hp=7a302c32bc2f6a6d489b7660305f516dc6c43028;hpb=6efe2615e04c6ef664fa9d49b013e261ba1e6e66;p=catta diff --git a/avahi-core/probe-sched.c b/avahi-core/probe-sched.c index 7a302c3..106bb81 100644 --- a/avahi-core/probe-sched.c +++ b/avahi-core/probe-sched.c @@ -23,6 +23,8 @@ #include #endif +#include + #include #include #include @@ -214,7 +216,7 @@ static int packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p, Ava return 1; } -static void elapse_callback(AvahiTimeEvent *e, void* data) { +static void elapse_callback(AVAHI_GCC_UNUSED AvahiTimeEvent *e, void* data) { AvahiProbeJob *pj = data, *next; AvahiProbeScheduler *s; AvahiDnsPacket *p; @@ -248,10 +250,7 @@ static void elapse_callback(AvahiTimeEvent *e, void* data) { avahi_record_get_estimate_size(pj->record) + AVAHI_DNS_PACKET_HEADER_SIZE; - if (size > AVAHI_DNS_PACKET_SIZE_MAX) - size = AVAHI_DNS_PACKET_SIZE_MAX; - - if (!(p = avahi_dns_packet_new_query(size))) + if (!(p = avahi_dns_packet_new_query(size + AVAHI_DNS_PACKET_EXTRA_SIZE))) return; /* OOM */ if (!(k = avahi_key_new(pj->record->key->name, pj->record->key->clazz, AVAHI_DNS_TYPE_ANY))) { @@ -300,7 +299,7 @@ static void elapse_callback(AvahiTimeEvent *e, void* data) { continue; if (!avahi_dns_packet_append_record(p, pj->record, 0, 0)) { - avahi_log_warn("Bad probe size estimate!"); +/* avahi_log_warn("Bad probe size estimate!"); */ /* Unmark all following jobs */ for (; pj; pj = pj->jobs_next)