diff options
| author | Federico Lucifredi <flucifredi@acm.org> | 2008-01-12 01:30:29 +0000 |
|---|---|---|
| committer | Federico Lucifredi <flucifredi@acm.org> | 2008-01-12 01:30:29 +0000 |
| commit | 53a8c75d30ae26483d907bb680120e0aded60668 (patch) | |
| tree | 088d2d26337e89e6b785ed661b7fa6eab6ab5d18 | |
| parent | 200e127dc3d10e925d0a1e9d16c488b117991edf (diff) | |
fixed time_t -> u_int_48 conversion.
git-svn-id: file:///home/lennart/svn/public/avahi/branches/federico@1694 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rw-r--r-- | avahi-core/dns.c | 2 | ||||
| -rw-r--r-- | avahi-core/rr.h | 2 | ||||
| -rw-r--r-- | avahi-core/wide-area.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/avahi-core/dns.c b/avahi-core/dns.c index 1b0ee8b..7be1800 100644 --- a/avahi-core/dns.c +++ b/avahi-core/dns.c @@ -776,7 +776,7 @@ static int append_rdata(AvahiDnsPacket *p, AvahiRecord *r) { printf("---mark--- (6)\n"); - if (!avahi_dns_packet_append_bytes(p, &r->data.tsig.time_signed, 6)) /* 6 bytes. Order may need fixing? */ + if (!avahi_dns_packet_append_uint16(p,0)||(!avahi_dns_packet_append_uint32(p, r->data.tsig.time_signed))) return -1; printf("---mark--- (7)\n"); diff --git a/avahi-core/rr.h b/avahi-core/rr.h index 5ad818c..5dc3352 100644 --- a/avahi-core/rr.h +++ b/avahi-core/rr.h @@ -115,7 +115,7 @@ typedef struct AvahiRecord { struct { char *algorithm_name; - time_t time_signed; /*uint48_t */ + time_t time_signed; /* wire format is unusual uint48_t */ uint16_t fudge; uint16_t mac_size; char *mac; diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c index 88d9077..996da94 100644 --- a/avahi-core/wide-area.c +++ b/avahi-core/wide-area.c @@ -688,6 +688,8 @@ AvahiRecord* avahi_tsig_sign_packet(const unsigned char* keyname, const unsigned r->data.tsig.time_signed = time(NULL); + printf("TIME:%X:%d\n", r->data.tsig.time_signed, r->data.tsig.time_signed); + r->data.tsig.fudge = 300; r->data.tsig.error = 0; /* no error, we are always transmitting */ |