X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresponse-sched.c;h=b194ef3f6f009a5b274052051f8cedc3e8500fef;hb=ee4ae75d110322e92a1ee3122fa5d2a20b1f9308;hp=65a32af6e64be71a0e75e4fe40cd143ef64f06d1;hpb=3073103812f0ea376582eb0ff1479945a847b361;p=catta diff --git a/avahi-core/response-sched.c b/avahi-core/response-sched.c index 65a32af..b194ef3 100644 --- a/avahi-core/response-sched.c +++ b/avahi-core/response-sched.c @@ -23,11 +23,14 @@ #include #endif +#include + #include #include #include "response-sched.h" #include "log.h" +#include "rr-util.h" /* Local packets are supressed this long after sending them */ #define AVAHI_RESPONSE_HISTORY_MSEC 500 @@ -187,7 +190,7 @@ void avahi_response_scheduler_clear(AvahiResponseScheduler *s) { job_free(s, s->suppressed); } -static void enumerate_aux_records_callback(AvahiServer *s, AvahiRecord *r, int flush_cache, void* userdata) { +static void enumerate_aux_records_callback(AVAHI_GCC_UNUSED AvahiServer *s, AvahiRecord *r, int flush_cache, void* userdata) { AvahiResponseJob *rj = userdata; assert(r); @@ -244,10 +247,7 @@ static void send_response_packet(AvahiResponseScheduler *s, AvahiResponseJob *rj /* OK, the packet was too small, so create one that fits */ size = avahi_record_get_estimate_size(rj->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_response(size, 1))) + if (!(p = avahi_dns_packet_new_response(size + AVAHI_DNS_PACKET_EXTRA_SIZE, 1))) return; /* OOM */ if (!packet_add_response_job(s, p, rj)) { @@ -264,7 +264,7 @@ static void send_response_packet(AvahiResponseScheduler *s, AvahiResponseJob *rj avahi_dns_packet_free(p); } -static void elapse_callback(AvahiTimeEvent *e, void* data) { +static void elapse_callback(AVAHI_GCC_UNUSED AvahiTimeEvent *e, void* data) { AvahiResponseJob *rj = data; assert(rj);