[GNUnet-SVN] r20217 - gnunet/src/gns

[gnunet]

Author: schanzen
Date: 2012-03-03 11:21:42 +0100 (Sat, 03 Mar 2012)
New Revision: 20217

Modified:
   gnunet/src/gns/gnunet-service-gns.c
   gnunet/src/gns/test_gns_dht_delegated_lookup.c
   gnunet/src/gns/test_gns_simple_lookup.conf
Log:
-fixes


Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2012-03-03 10:05:08 UTC (rev 20216)
+++ gnunet/src/gns/gnunet-service-gns.c 2012-03-03 10:21:42 UTC (rev 20217)
@@ -1179,6 +1179,9 @@
   nrb_data = (char*)&nrb[1];
   nrb_data += strlen(name) + 1;
 
+  rd_payload_length += sizeof(struct GNSNameRecordBlock) +
+    strlen(name) + 1;
+
   if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count,
                                                 rd,
                                                 rd_payload_length,

Modified: gnunet/src/gns/test_gns_dht_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_dht_delegated_lookup.c      2012-03-03 10:05:08 UTC 
(rev 20216)
+++ gnunet/src/gns/test_gns_dht_delegated_lookup.c      2012-03-03 10:21:42 UTC 
(rev 20217)
@@ -117,10 +117,9 @@
   struct hostent *he;
   struct in_addr a;
   char* addr;
-  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "A\n");
+ 
   GNUNET_NAMESTORE_disconnect(namestore_handle, GNUNET_YES);
   GNUNET_DHT_disconnect(dht_handle);
-  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "B\n");
 
   he = gethostbyname (TEST_DOMAIN);
 
@@ -204,8 +203,6 @@
   rd.record_type = GNUNET_DNSPARSER_TYPE_A;
   sig = GNUNET_NAMESTORE_create_signature(bob_key, TEST_RECORD_NAME,
                                           &rd, 1);
-  
-  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "B\n");
   rd_payload_length = GNUNET_NAMESTORE_records_get_size (1, &rd);
   nrb = GNUNET_malloc(rd_payload_length + strlen(TEST_RECORD_NAME) + 1
                       + sizeof(struct GNSNameRecordBlock));
@@ -216,7 +213,6 @@
   memcpy(&nrb[1], TEST_RECORD_NAME, strlen(TEST_RECORD_NAME));
   nrb_data = (char*)&nrb[1];
   nrb_data += strlen(TEST_RECORD_NAME) + 1;
-  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "C\n");
 
   if (-1 == GNUNET_NAMESTORE_records_serialize (1,
                                                 &rd,
@@ -227,13 +223,11 @@
     ok = 3;
     return;
   }
-  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "D\n");
   GNUNET_CRYPTO_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash);
   GNUNET_CRYPTO_hash(&bob_pkey,
                      sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
                      &zone_hash);
   GNUNET_CRYPTO_hash_xor(&zone_hash, &name_hash, &xor_hash);
-  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "E\n");
 
   rd_payload_length += sizeof(struct GNSNameRecordBlock) +
     strlen(TEST_RECORD_NAME) + 1;
@@ -248,7 +242,6 @@
                   NULL,
                   NULL);
   GNUNET_SCHEDULER_add_delayed(TIMEOUT, &finish_testing, NULL);
-  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "F\n");
 }
 
 static void

Modified: gnunet/src/gns/test_gns_simple_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.conf  2012-03-03 10:05:08 UTC (rev 
20216)
+++ gnunet/src/gns/test_gns_simple_lookup.conf  2012-03-03 10:21:42 UTC (rev 
20217)
@@ -71,7 +71,7 @@
 
 [gns]
 AUTOSTART = YES
-BINARY = gnunet-service-gns
+BINARY = ./gnunet-service-gns
 ZONEKEY = zonekey
 HIJACK_DNS = YES
 UNIXPATH = /tmp/gnunet-service-gns.sock