From 104f06480c5d73cd404fcb012f060ccbc13bd6b9 Mon Sep 17 00:00:00 2001 From: Federico Lucifredi Date: Mon, 14 Jan 2008 04:03:28 +0000 Subject: a bit of cleanup. git-svn-id: file:///home/lennart/svn/public/avahi/branches/federico@1711 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-core/dns.c | 19 ------------------- avahi-core/entry.c | 6 +----- avahi-core/wide-area.c | 33 +++++---------------------------- 3 files changed, 6 insertions(+), 52 deletions(-) diff --git a/avahi-core/dns.c b/avahi-core/dns.c index 2e4b758..2e30e27 100644 --- a/avahi-core/dns.c +++ b/avahi-core/dns.c @@ -769,55 +769,36 @@ 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; - printf("---mark--- (6)\n"); - /* map time to uint48 - needs checking on 64bit archs */ 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"); - if (!avahi_dns_packet_append_uint16(p, r->data.tsig.fudge)) return -1; - printf("---mark--- (8)\n"); - if (!avahi_dns_packet_append_uint16(p, 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_uint16(p, r->data.tsig.original_id)) return -1; - printf("---mark--- (11)\n"); - if (!avahi_dns_packet_append_uint16(p, r->data.tsig.error)) return -1; - printf("---mark--- (12)\n"); - if (!avahi_dns_packet_append_uint16(p, 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; default: diff --git a/avahi-core/entry.c b/avahi-core/entry.c index c73a3bf..a7eff8e 100644 --- a/avahi-core/entry.c +++ b/avahi-core/entry.c @@ -234,11 +234,7 @@ static AvahiEntry * server_add_internal( /* can generate a temporary random ID via rand() / (RAND_MAX / 65536) */ /* call as wide_area_publish(,"dynamic.endorfine.org",, , ) */ - printf("---mark--- (1)\n"); - if (s->wide_area_lookup_engine != NULL) - printf("---!NULL--- (1)\n"); - printf("id: \"%x\", \"%d\"\n", s->wide_area_lookup_engine->next_id, s->wide_area_lookup_engine->fd_ipv4); - printf("---mark--- (1e)\n"); + /* printf("id: \"%x\", \"%d\"\n", s->wide_area_lookup_engine->next_id, s->wide_area_lookup_engine->fd_ipv4); */ /* TODO: in merged version into upstream, zone needs to be an external configurable pulled from /etc */ avahi_wide_area_publish(r, "dynamic.endorfine.org", s->wide_area_lookup_engine->next_id++, s->wide_area_lookup_engine->fd_ipv4, AVAHI_WIDEAREA_PUBLISH); diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c index a8602fb..6417e7f 100644 --- a/avahi-core/wide-area.c +++ b/avahi-core/wide-area.c @@ -677,7 +677,7 @@ AvahiRecord* avahi_tsig_sign_packet(const unsigned char* keyname, const unsigned char *canonic; /*used in conversions */ - int i; /* delete me! */ + int i; /* used in debug runs */ r = avahi_record_new_full(keyname, AVAHI_DNS_CLASS_ANY, AVAHI_DNS_TYPE_TSIG, 0); @@ -690,7 +690,7 @@ 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); + /* printf("TIME:%X:%d\n", r->data.tsig.time_signed, r->data.tsig.time_signed); */ r->data.tsig.fudge = 300; @@ -698,8 +698,6 @@ AvahiRecord* avahi_tsig_sign_packet(const unsigned char* keyname, const unsigned r->data.tsig.original_id = id; /* MUST match DNS transaction ID, but it is not hashed */ - printf("---mark--- (3)\n"); - switch (algorithm){ case AVAHI_TSIG_HMAC_MD5 : @@ -765,21 +763,15 @@ AvahiRecord* avahi_tsig_sign_packet(const unsigned char* keyname, const unsigned return NULL; } - printf("size:%d\n", (unsigned int)p->size); - if ((unsigned char *)AVAHI_DNS_PACKET_DATA(p) == NULL) - printf("---NULL--- (3)\n"); + /* printf("size:%d\n", (unsigned int)p->size); */ /*feed all the data to be hashed in */ /*HMAC_Update(&ctx, , );*/ HMAC_Update(&ctx, (unsigned char *)AVAHI_DNS_PACKET_DATA(p), (unsigned int)p->size); /*packet in wire format*/ - printf("---mark--- (3b)\n"); - canonic = avahi_c_to_canonical_string(keyname); /* key name in canonical wire format (DNS labels) */ HMAC_Update(&ctx, canonic, strlen(canonic) +1); - printf("---mark--- (3c)\n"); - HMAC_Update(&ctx, avahi_uint16_to_canonical_string(AVAHI_DNS_CLASS_ANY), 2); /* class - always ANY for TSIG*/ HMAC_Update(&ctx, avahi_uint32_to_canonical_string(0), 4); /* TTL - always 0 for TSIG */ @@ -787,8 +779,6 @@ AvahiRecord* avahi_tsig_sign_packet(const unsigned char* keyname, const unsigned canonic = avahi_c_to_canonical_string(r->data.tsig.algorithm_name); /* IANA algorithm name in canonical wire format (DNS labels)*/ HMAC_Update(&ctx, canonic, strlen(canonic) +1); - printf("---mark--- (3d)\n"); - HMAC_Update(&ctx, avahi_time_t_to_canonical_string(r->data.tsig.time_signed), 6); /*uint48 representation of unix time */ HMAC_Update(&ctx, avahi_uint16_to_canonical_string(r->data.tsig.fudge), 2); @@ -806,15 +796,11 @@ AvahiRecord* avahi_tsig_sign_packet(const unsigned char* keyname, const unsigned r->data.tsig.mac = avahi_strndup(keyed_hash, hash_length); - printf("original:"); + /* printf("computed MAC:"); for(i=0; idata.tsig.mac[i]); - - printf("\nlength:%d", hash_length); + printf("\nlength:%d", hash_length); */ return r; } @@ -946,17 +932,10 @@ int avahi_wide_area_publish(AvahiRecord *r, const char *zone, uint16_t id, int f assert(result); } - printf("---mark--- (2)\n"); - printf("(2)result=%d\n", result); - if (AVAHI_DNS_PACKET_DATA(p) == NULL) - printf("---NULL--- (2)\n"); - /* get it MAC signed */ tsig = avahi_tsig_sign_packet("dynamic.endorfine.org", key, sizeof(key), p, AVAHI_TSIG_HMAC_MD5, id); /* r = tsig_sign_packet(keyname, key, keylength, packet, hmac_algorithm, id) */ - printf("---mark--- (4)\n"); - if (!tsig) { /*OOM check */ avahi_log_error("tsig record generation failed."); assert(tsig); @@ -965,8 +944,6 @@ int avahi_wide_area_publish(AvahiRecord *r, const char *zone, uint16_t id, int f /* 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 */ -- cgit