diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-07-03 10:45:12 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-07-03 10:45:12 +0000 |
commit | 568d10629e917224cb77e7eecde0c4c619334f7f (patch) | |
tree | 074f129fe90de5e1a891654df224ad11494339f0 /src/gns/gnunet-service-gns.c | |
parent | 78022d58c9fb5568d611dba2efeaf316b04bccde (diff) | |
download | gnunet-568d10629e917224cb77e7eecde0c4c619334f7f.tar.gz gnunet-568d10629e917224cb77e7eecde0c4c619334f7f.zip |
-fix
Diffstat (limited to 'src/gns/gnunet-service-gns.c')
-rw-r--r-- | src/gns/gnunet-service-gns.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index b8ee3d180..c790b11f2 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c | |||
@@ -338,6 +338,7 @@ put_gns_record(void *cls, | |||
338 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 338 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
339 | "Zone iteration finished. Rescheduling put in %llus\n", | 339 | "Zone iteration finished. Rescheduling put in %llus\n", |
340 | (unsigned long long) dht_max_update_interval.rel_value / 1000LL); | 340 | (unsigned long long) dht_max_update_interval.rel_value / 1000LL); |
341 | |||
341 | namestore_iter = NULL; | 342 | namestore_iter = NULL; |
342 | zone_update_taskid = GNUNET_SCHEDULER_add_delayed (dht_max_update_interval, | 343 | zone_update_taskid = GNUNET_SCHEDULER_add_delayed (dht_max_update_interval, |
343 | &update_zone_dht_start, | 344 | &update_zone_dht_start, |
@@ -348,6 +349,16 @@ put_gns_record(void *cls, | |||
348 | } | 349 | } |
349 | 350 | ||
350 | namelen = strlen(name) + 1; | 351 | namelen = strlen(name) + 1; |
352 | |||
353 | if (rd_count == 0) | ||
354 | { | ||
355 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | ||
356 | "No records given for name %s! Skipping...\n", | ||
357 | name); | ||
358 | zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_next, | ||
359 | NULL); | ||
360 | return; | ||
361 | } | ||
351 | 362 | ||
352 | if (signature == NULL) | 363 | if (signature == NULL) |
353 | { | 364 | { |
@@ -410,14 +421,16 @@ put_gns_record(void *cls, | |||
410 | "zone identity: %s\n", GNUNET_h2s (&zone_hash_double)); | 421 | "zone identity: %s\n", GNUNET_h2s (&zone_hash_double)); |
411 | 422 | ||
412 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 423 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
413 | "putting records for %s under key: %s with size %d\n", | 424 | "putting %d records for %s under key: %s with size %d\n", |
414 | name, GNUNET_h2s (&xor_hash), rd_payload_length); | 425 | rd_count, name, GNUNET_h2s (&xor_hash), rd_payload_length); |
415 | 426 | ||
416 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 427 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
417 | "DHT req to %d\n", DHT_OPERATION_TIMEOUT.rel_value); | 428 | "DHT req to %d\n", DHT_OPERATION_TIMEOUT.rel_value); |
418 | 429 | ||
419 | GNUNET_STATISTICS_update (statistics, | 430 | GNUNET_STATISTICS_update (statistics, |
420 | "Record data set put into DHT", 1, GNUNET_NO); | 431 | "Records put into DHT", rd_count, GNUNET_NO); |
432 | GNUNET_STATISTICS_update (statistics, | ||
433 | "Record bytes put into DHT", rd_payload_length, GNUNET_NO); | ||
421 | 434 | ||
422 | /* FIXME: keep return value to possibly cancel? */ | 435 | /* FIXME: keep return value to possibly cancel? */ |
423 | GNUNET_DHT_put (dht_handle, &xor_hash, | 436 | GNUNET_DHT_put (dht_handle, &xor_hash, |
@@ -1277,6 +1290,12 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
1277 | "DHT zone update interval: %llu\n", | 1290 | "DHT zone update interval: %llu\n", |
1278 | (unsigned long long) dht_max_update_interval.rel_value); | 1291 | (unsigned long long) dht_max_update_interval.rel_value); |
1279 | } | 1292 | } |
1293 | |||
1294 | |||
1295 | GNUNET_STATISTICS_set (statistics, | ||
1296 | "Zone update interval (secs)", | ||
1297 | (unsigned long long) dht_max_update_interval.rel_value / 1000LL, | ||
1298 | GNUNET_NO); | ||
1280 | 1299 | ||
1281 | max_record_put_interval = 1; | 1300 | max_record_put_interval = 1; |
1282 | 1301 | ||