Ticket #131: big-record.patch

avahi-core/dns.c

@@ -786 +787 @@
-        goto fail;
-    
-    size = avahi_dns_packet_extend(p, 0) - start;
-0xFFFF
+AVAHI_DNS_MAX_RDATA
-
-/*     avahi_log_debug("appended %u", size); */
-

avahi-core/dns.h

@@ -25 +25 @@
-#include "rr.h"
-#include "hashmap.h"
-
-#define AVAHI_DNS_PACKET_SIZE_MAX 9000
-#define AVAHI_DNS_PACKET_HEADER_SIZE 12
-#define AVAHI_DNS_PACKET_EXTRA_SIZE 48
-#define AVAHI_DNS_LABELS_MAX 127
+#define AVAHI_DNS_MAX_RDATA 0xFFFF
+#define AVAHI_DNS_PACKET_SIZE_MAX \
+  AVAHI_DNS_MAX_RDATA + AVAHI_DNS_PACKET_HEADER_SIZE  + AVAHI_DNS_LABELS_MAX
-
-typedef struct AvahiDnsPacket {
-    size_t size, rindex, max_size;

avahi-core/response-sched.c

@@ -245 +245 @@
-        avahi_dns_packet_free(p);
-
-        /* OK, the packet was too small, so create one that fits */
-
+
+
-
-        if (size > AVAHI_DNS_PACKET_SIZE_MAX)
-            size = AVAHI_DNS_PACKET_SIZE_MAX;
-        
-        if (!(p = avahi_dns_packet_new_response(size, 1)))
-            return; /* OOM */
-

avahi-core/probe-sched.c

@@ -248 +248 @@
-        size =
-            avahi_key_get_estimate_size(pj->record->key) +
-            avahi_record_get_estimate_size(pj->record) +
-
-
-
-
+
-
-        if (!(p = avahi_dns_packet_new_query(size)))
-            return; /* OOM */

avahi-core/server.c

@@ -448 +448 @@
-                        /* The record is too large for one packet, so create a larger packet */
-
-                        avahi_dns_packet_free(reply);
-+ AVAHI_DNS_PACKET_HEADER_SIZE;
-if (size > AVAHI_DNS_PACKET_SIZE_MAX)
-size = AVAHI_DNS_PACKET_SIZE_MAX
+
+        + AVAHI_DNS_PACKET_HEADER_SIZE
+    + AVAHI_DNS_PACKET_EXTRA_SIZE
-
-                        if (!(reply = avahi_dns_packet_new_reply(p, size, 0, 1)))
-                            break; /* OOM */
@@ -458 +458 @@
-                        if (!avahi_dns_packet_append_record(reply, r, flush_cache, 0)) {
-                            char *t;
-                            avahi_dns_packet_free(reply);
+                            reply = NULL;
-                            t = avahi_record_to_string(r);
-                            avahi_log_warn("Record [%s] too large, doesn't fit in any packet!", t);
-                            avahi_free(t);
-                            break;
-
-
+
+
+
+
+
+
+
+
-                    }
-
-                    /* Appending the record didn't succeeed, so let's send this packet, and create a new one */