diff options
| author | Federico Lucifredi <flucifredi@acm.org> | 2008-01-30 23:40:49 +0000 |
|---|---|---|
| committer | Federico Lucifredi <flucifredi@acm.org> | 2008-01-30 23:40:49 +0000 |
| commit | 36f654c9bc11fb9e9730f9c4ef9fc228696133e3 (patch) | |
| tree | 94cfde9c18aaa5aae90e7a1a568c0b4512728264 | |
| parent | c48dddd46f584d06225638b2cece252de2419c7c (diff) | |
tracing, fixes. Nothing glamorous, it's a branch!
git-svn-id: file:///home/lennart/svn/public/avahi/branches/federico2@1748 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rw-r--r-- | avahi-common/defs.h | 2 | ||||
| -rw-r--r-- | avahi-core/probe-sched.c | 2 | ||||
| -rw-r--r-- | avahi-core/query-sched.c | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/avahi-common/defs.h b/avahi-common/defs.h index cbe20eb..fb8abef 100644 --- a/avahi-common/defs.h +++ b/avahi-common/defs.h @@ -295,7 +295,7 @@ enum { /** DNS record classes, see RFC 1035 */ enum { - AVAHI_DNS_CLASS_IN = 0x01, /**< Probably the only class we will ever use */ + AVAHI_DNS_CLASS_IN = 0x01 /**< Probably the only class we will ever use */ }; /** The default TTL for RRs which contain a host name of some kind. */ diff --git a/avahi-core/probe-sched.c b/avahi-core/probe-sched.c index 8f40d71..88f9f16 100644 --- a/avahi-core/probe-sched.c +++ b/avahi-core/probe-sched.c @@ -235,7 +235,7 @@ static void elapse_callback(AVAHI_GCC_UNUSED AvahiTimeEvent *e, void* data) { return; /* OOM */ n = 1; - printf("appended to record type %d named %s at entrypoint(c)\n", ka->record->key->type, ka->record->key->name); + printf("appended to record type %d named %s at entrypoint(c)\n", pj->record->key->type, pj->record->key->name); /* Add the import probe */ diff --git a/avahi-core/query-sched.c b/avahi-core/query-sched.c index 45465af..4eb4441 100644 --- a/avahi-core/query-sched.c +++ b/avahi-core/query-sched.c @@ -29,6 +29,7 @@ #include <avahi-common/malloc.h> #include <openssl/evp.h> +#include <openssl/pem.h> #include "query-sched.h" #include "log.h" @@ -237,7 +238,7 @@ static void append_known_answers_and_send(AvahiQueryScheduler *s, AvahiDnsPacket FILE *fp; /* used to load the private keys */ EVP_PKEY *private_key; /* key used in signing */ AvahiRecord *r; /* used to handle records */ - AvahiRecord *s; /* used to handle signatures */ + AvahiRecord *rs; /* used to handle signatures */ assert(s); assert(p); @@ -296,10 +297,10 @@ static void append_known_answers_and_send(AvahiQueryScheduler *s, AvahiDnsPacket fclose(fp); /* generate RRSIG record for transitive trust */ - s = avahi_dnssec_sign_record(r, ka->record->ttl, private_key) + rs = avahi_dnssec_sign_record(r, ka->record->ttl, private_key); /*append the transitive trust record RRSIG RR */ - result = avahi_dns_packet_append_record(p, s, 0, 0); + result = avahi_dns_packet_append_record(p, rs, 0, 0); if (!result) { avahi_log_error("appending of rdata failed."); |