From fdd4aa4f08dc06c2ccca28cf90010be8cc9d60f2 Mon Sep 17 00:00:00 2001 From: Federico Lucifredi Date: Sat, 5 Jan 2008 23:38:54 +0000 Subject: being anal about typing. git-svn-id: file:///home/lennart/svn/public/avahi/branches/federico@1675 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-core/wide-area.c | 8 ++++---- avahi-core/wide-area.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c index 49117d3..565b5e7 100644 --- a/avahi-core/wide-area.c +++ b/avahi-core/wide-area.c @@ -729,7 +729,7 @@ int avahi_wide_area_has_servers(AvahiWideAreaLookupEngine *e) { /* TODO: should this be located in this file? */ /* r = tsig_sign_packet("dynamic.endorfine.org", key, 16, p, AVAHI_TSIG_HMAC_MD5, id) */ /* check for NULL on return */ -AvahiRecord* tsig_sign_packet(const unsigned char* keyname, const unsigned char* key, unsigned keylength, AvahiDnsPacket *p, unsigned algorithm, unsigned id) { +AvahiRecord* tsig_sign_packet(const unsigned char* keyname, const unsigned char* key, unsigned keylength, AvahiDnsPacket *p, unsigned algorithm, uint16_t id) { AvahiRecord *r; unsigned char keyed_hash[EVP_MAX_MD_SIZE]; /*used for signing */ @@ -753,7 +753,7 @@ AvahiRecord* tsig_sign_packet(const unsigned char* keyname, const unsigned char* r->data.tsig.error = 0; /* no error, we are always transmitting */ - r->data.tsig.original_id = id; /* MUST match DNS transaction ID, but it is not hashed */ + r->data.tsig.original_id = id; /* MUST match DNS transaction ID, but it is not hashed */ switch (algorithm){ @@ -914,8 +914,8 @@ void wide_area_publish(AvahiRecord *r, char *zone, uint16_t id) { assert(tsig); } - /* append TSIG record - note the RR group it goes into! */ - avahi_dns_packet_append_record(p, tsig, 0, 30); /* TODO: revisit max TTL from 30 */ + /* 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 */ avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_ADCOUNT, 1); /*increment record count for ADCOUNT */ diff --git a/avahi-core/wide-area.h b/avahi-core/wide-area.h index dbee3d4..fac943f 100644 --- a/avahi-core/wide-area.h +++ b/avahi-core/wide-area.h @@ -45,7 +45,7 @@ void avahi_wide_area_clear_cache(AvahiWideAreaLookupEngine *e); void avahi_wide_area_cleanup(AvahiWideAreaLookupEngine *e); int avahi_wide_area_has_servers(AvahiWideAreaLookupEngine *e); -AvahiRecord* tsig_sign_packet(const unsigned char* keyname, const unsigned char* key, unsigned keylength, AvahiDnsPacket *p, unsigned algorithm, unsigned id); +AvahiRecord* tsig_sign_packet(const unsigned char* keyname, const unsigned char* key, unsigned keylength, AvahiDnsPacket *p, unsigned algorithm, uint16_t id); void wide_area_publish(AvahiRecord *r, char *zone, uint16_t id); AvahiWideAreaLookup *avahi_wide_area_lookup_new(AvahiWideAreaLookupEngine *e, AvahiKey *key, AvahiWideAreaLookupCallback callback, void *userdata); -- cgit