more tracing.

git-svn-id: file:///home/lennart/svn/public/avahi/branches/federico@1703 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

2 files changed, 11 insertions, 7 deletions

diff --git a/avahi-core/entry.c b/avahi-core/entry.c
index f6287cb..1a372d4 100644
--- a/avahi-core/entry.c
+++ b/avahi-core/entry.c
@@ -237,7 +237,7 @@ static AvahiEntry * server_add_internal(
     printf("---mark--- (1)\n");
     if (s->wide_area_lookup_engine != NULL)
        printf("---!NULL--- (1)\n");
-    printf("id: \"%d\", \"%d\"\n", s->wide_area_lookup_engine->next_id, s->wide_area_lookup_engine->fd_ipv4);
+    printf("id: \"%x\", \"%d\"\n", s->wide_area_lookup_engine->next_id, s->wide_area_lookup_engine->fd_ipv4);
     printf("---mark--- (1e)\n");
 
     avahi_wide_area_publish(r, "dynamic.endorfine.org", s->wide_area_lookup_engine->next_id++, s->wide_area_lookup_engine->fd_ipv4);
diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c
index 8b1b253..e855884 100644
--- a/avahi-core/wide-area.c
+++ b/avahi-core/wide-area.c
@@ -677,6 +677,8 @@ AvahiRecord* avahi_tsig_sign_packet(const unsigned char* keyname, const unsigned
 
     char *canonic; /*used in conversions */
 
+    int i; /* delete me! */
+
     r = avahi_record_new_full(keyname, AVAHI_DNS_CLASS_ANY, AVAHI_DNS_TYPE_TSIG, 0);
 
     if (!r) {
@@ -795,20 +797,22 @@ AvahiRecord* avahi_tsig_sign_packet(const unsigned char* keyname, const unsigned
 
     HMAC_Update(&ctx, avahi_uint16_to_canonical_string(r->data.tsig.other_len), 2);
 
-    HMAC_Update(&ctx, r->data.tsig.other_data, r->data.tsig.other_len); /* should still work if other_len =0 can be passed to the HMAC */
-                                                                        /* but no standard cypher uses this to date */
+    /* but no standard keyed hash uses this section to date */
+    if (r->data.tsig.other_len > 0)
+       HMAC_Update(&ctx, r->data.tsig.other_data, r->data.tsig.other_len);
+
     HMAC_Final(&ctx, keyed_hash, &hash_length);
     HMAC_cleanup(&ctx);
 
     r->data.tsig.mac = avahi_strndup(keyed_hash, hash_length);
 
     printf("original:");
-    for(int i=0; i<hash_length; i++)
-        printf("%02x", keyed_hash[i];
+    for(i=0; i<hash_length; i++)
+        printf("%02x", keyed_hash[i]);
 
     printf("\ncopy:");
-    for(int i=0; i<hash_length; i++)
-        printf("%02x", keyed_hash[i];
+    for(i=0; i<hash_length; i++)
+        printf("%02x", keyed_hash[i]);
 
     printf("\nlength:%d", hash_length);