summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFederico Lucifredi <flucifredi@acm.org>2008-01-10 23:47:15 +0000
committerFederico Lucifredi <flucifredi@acm.org>2008-01-10 23:47:15 +0000
commit246258f778a5e74f2a0d54d971da424c71036e16 (patch)
tree68fddc69235bd3b13141dafab4f9c9e1a8cf3625
parent61741535cdc70c226a593d668c8765fe283dbaaf (diff)
two more (less) cores.
git-svn-id: file:///home/lennart/svn/public/avahi/branches/federico@1688 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
-rw-r--r--avahi-core/dns.c26
-rw-r--r--avahi-core/wide-area.c2
2 files changed, 25 insertions, 3 deletions
diff --git a/avahi-core/dns.c b/avahi-core/dns.c
index 6cd876a..e088c95 100644
--- a/avahi-core/dns.c
+++ b/avahi-core/dns.c
@@ -763,33 +763,53 @@ static int append_rdata(AvahiDnsPacket *p, AvahiRecord *r) {
break;
case AVAHI_DNS_TYPE_TSIG:
+ printf("---mark--- (5)\n");
if (!(avahi_dns_packet_append_name(p, r->data.tsig.algorithm_name)))
return -1;
- if (!avahi_dns_packet_append_bytes(p, r->data.tsig.time_signed, 6)) /* 6 bytes. Order may need fixing? */
+ printf("---mark--- (6)\n");
+
+ if (!avahi_dns_packet_append_bytes(p, &r->data.tsig.time_signed, 6)) /* 6 bytes. Order may need fixing? */
return -1;
+ printf("---mark--- (7)\n");
+
if (!avahi_dns_packet_append_bytes(p, &r->data.tsig.fudge, sizeof(r->data.tsig.fudge)))
return -1;
+ printf("---mark--- (8)\n");
+
if (!avahi_dns_packet_append_bytes(p, &r->data.tsig.mac_size, sizeof(r->data.tsig.mac_size)))
return -1;
+ printf("---mark--- (9)\n");
+
if (!avahi_dns_packet_append_bytes(p, &r->data.tsig.mac, r->data.tsig.mac_size))
return -1;
+ printf("---mark--- (10)\n");
+
if (!avahi_dns_packet_append_bytes(p, &r->data.tsig.original_id, sizeof(r->data.tsig.original_id)))
return -1;
+ printf("---mark--- (11)\n");
+
if (!avahi_dns_packet_append_bytes(p, &r->data.tsig.error, sizeof(r->data.tsig.error)))
return -1;
+ printf("---mark--- (12)\n");
+
if (!avahi_dns_packet_append_bytes(p, &r->data.tsig.other_len, sizeof(r->data.tsig.other_len)))
return -1;
- if (!avahi_dns_packet_append_bytes(p, &r->data.tsig.other_data, r->data.tsig.other_len))
- return -1;
+ printf("---mark--- (13)\n");
+
+ if(r->data.tsig.other_len > 0)
+ if (!avahi_dns_packet_append_bytes(p, &r->data.tsig.other_data, r->data.tsig.other_len))
+ return -1;
+
+ printf("---mark--- (14)\n");
break;
diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c
index 206a5a8..7e19519 100644
--- a/avahi-core/wide-area.c
+++ b/avahi-core/wide-area.c
@@ -884,6 +884,8 @@ void avahi_wide_area_publish(AvahiRecord *r, const char *zone, uint16_t id, int
/* append TSIG record - note the RRset it goes into! */
avahi_dns_packet_append_record(p, tsig, 0, 30); /* NOTE: max TTL irrelevant, record comes with a 0 TTL */
+ printf("---mark--- (E)\n");
+
avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_ADCOUNT, 1); /*increment record count for ADCOUNT */
if (!p) { /*OOM check */