diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-03-03 10:21:42 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-03-03 10:21:42 +0000 |
commit | 208a327471b5d0157acaa6c02df1f97405d29a30 (patch) | |
tree | e1586934568b71158a84adcc737506ed3260099e | |
parent | c825e5ad55afd513c570a9a158a3921965768342 (diff) | |
download | gnunet-208a327471b5d0157acaa6c02df1f97405d29a30.tar.gz gnunet-208a327471b5d0157acaa6c02df1f97405d29a30.zip |
-fixes
-rw-r--r-- | src/gns/gnunet-service-gns.c | 3 | ||||
-rw-r--r-- | src/gns/test_gns_dht_delegated_lookup.c | 9 | ||||
-rw-r--r-- | src/gns/test_gns_simple_lookup.conf | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index 4b693440f..c4da41fe6 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c | |||
@@ -1179,6 +1179,9 @@ put_gns_record(void *cls, | |||
1179 | nrb_data = (char*)&nrb[1]; | 1179 | nrb_data = (char*)&nrb[1]; |
1180 | nrb_data += strlen(name) + 1; | 1180 | nrb_data += strlen(name) + 1; |
1181 | 1181 | ||
1182 | rd_payload_length += sizeof(struct GNSNameRecordBlock) + | ||
1183 | strlen(name) + 1; | ||
1184 | |||
1182 | if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count, | 1185 | if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count, |
1183 | rd, | 1186 | rd, |
1184 | rd_payload_length, | 1187 | rd_payload_length, |
diff --git a/src/gns/test_gns_dht_delegated_lookup.c b/src/gns/test_gns_dht_delegated_lookup.c index 8c2224623..581a8f680 100644 --- a/src/gns/test_gns_dht_delegated_lookup.c +++ b/src/gns/test_gns_dht_delegated_lookup.c | |||
@@ -117,10 +117,9 @@ finish_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
117 | struct hostent *he; | 117 | struct hostent *he; |
118 | struct in_addr a; | 118 | struct in_addr a; |
119 | char* addr; | 119 | char* addr; |
120 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "A\n"); | 120 | |
121 | GNUNET_NAMESTORE_disconnect(namestore_handle, GNUNET_YES); | 121 | GNUNET_NAMESTORE_disconnect(namestore_handle, GNUNET_YES); |
122 | GNUNET_DHT_disconnect(dht_handle); | 122 | GNUNET_DHT_disconnect(dht_handle); |
123 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "B\n"); | ||
124 | 123 | ||
125 | he = gethostbyname (TEST_DOMAIN); | 124 | he = gethostbyname (TEST_DOMAIN); |
126 | 125 | ||
@@ -204,8 +203,6 @@ put_dht(void *cls, int32_t success, const char *emsg) | |||
204 | rd.record_type = GNUNET_DNSPARSER_TYPE_A; | 203 | rd.record_type = GNUNET_DNSPARSER_TYPE_A; |
205 | sig = GNUNET_NAMESTORE_create_signature(bob_key, TEST_RECORD_NAME, | 204 | sig = GNUNET_NAMESTORE_create_signature(bob_key, TEST_RECORD_NAME, |
206 | &rd, 1); | 205 | &rd, 1); |
207 | |||
208 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "B\n"); | ||
209 | rd_payload_length = GNUNET_NAMESTORE_records_get_size (1, &rd); | 206 | rd_payload_length = GNUNET_NAMESTORE_records_get_size (1, &rd); |
210 | nrb = GNUNET_malloc(rd_payload_length + strlen(TEST_RECORD_NAME) + 1 | 207 | nrb = GNUNET_malloc(rd_payload_length + strlen(TEST_RECORD_NAME) + 1 |
211 | + sizeof(struct GNSNameRecordBlock)); | 208 | + sizeof(struct GNSNameRecordBlock)); |
@@ -216,7 +213,6 @@ put_dht(void *cls, int32_t success, const char *emsg) | |||
216 | memcpy(&nrb[1], TEST_RECORD_NAME, strlen(TEST_RECORD_NAME)); | 213 | memcpy(&nrb[1], TEST_RECORD_NAME, strlen(TEST_RECORD_NAME)); |
217 | nrb_data = (char*)&nrb[1]; | 214 | nrb_data = (char*)&nrb[1]; |
218 | nrb_data += strlen(TEST_RECORD_NAME) + 1; | 215 | nrb_data += strlen(TEST_RECORD_NAME) + 1; |
219 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "C\n"); | ||
220 | 216 | ||
221 | if (-1 == GNUNET_NAMESTORE_records_serialize (1, | 217 | if (-1 == GNUNET_NAMESTORE_records_serialize (1, |
222 | &rd, | 218 | &rd, |
@@ -227,13 +223,11 @@ put_dht(void *cls, int32_t success, const char *emsg) | |||
227 | ok = 3; | 223 | ok = 3; |
228 | return; | 224 | return; |
229 | } | 225 | } |
230 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "D\n"); | ||
231 | GNUNET_CRYPTO_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash); | 226 | GNUNET_CRYPTO_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash); |
232 | GNUNET_CRYPTO_hash(&bob_pkey, | 227 | GNUNET_CRYPTO_hash(&bob_pkey, |
233 | sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), | 228 | sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), |
234 | &zone_hash); | 229 | &zone_hash); |
235 | GNUNET_CRYPTO_hash_xor(&zone_hash, &name_hash, &xor_hash); | 230 | GNUNET_CRYPTO_hash_xor(&zone_hash, &name_hash, &xor_hash); |
236 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "E\n"); | ||
237 | 231 | ||
238 | rd_payload_length += sizeof(struct GNSNameRecordBlock) + | 232 | rd_payload_length += sizeof(struct GNSNameRecordBlock) + |
239 | strlen(TEST_RECORD_NAME) + 1; | 233 | strlen(TEST_RECORD_NAME) + 1; |
@@ -248,7 +242,6 @@ put_dht(void *cls, int32_t success, const char *emsg) | |||
248 | NULL, | 242 | NULL, |
249 | NULL); | 243 | NULL); |
250 | GNUNET_SCHEDULER_add_delayed(TIMEOUT, &finish_testing, NULL); | 244 | GNUNET_SCHEDULER_add_delayed(TIMEOUT, &finish_testing, NULL); |
251 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "F\n"); | ||
252 | } | 245 | } |
253 | 246 | ||
254 | static void | 247 | static void |
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf index ccc8ef54f..40e1e6ac5 100644 --- a/src/gns/test_gns_simple_lookup.conf +++ b/src/gns/test_gns_simple_lookup.conf | |||
@@ -71,7 +71,7 @@ AUTOSTART = YES | |||
71 | 71 | ||
72 | [gns] | 72 | [gns] |
73 | AUTOSTART = YES | 73 | AUTOSTART = YES |
74 | BINARY = gnunet-service-gns | 74 | BINARY = ./gnunet-service-gns |
75 | ZONEKEY = zonekey | 75 | ZONEKEY = zonekey |
76 | HIJACK_DNS = YES | 76 | HIJACK_DNS = YES |
77 | UNIXPATH = /tmp/gnunet-service-gns.sock | 77 | UNIXPATH = /tmp/gnunet-service-gns.sock |