diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-04-10 09:57:01 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-04-10 09:57:01 +0000 |
commit | 4465acf38d8cb43d06f45ac631586caa334a5fd8 (patch) | |
tree | 1e372d8f1a85f6b6b3f295141f001994e2fb1b64 /src/peerinfo | |
parent | b3bb9b53fa8c2b34bc5512f3e3c70b9d97102cc8 (diff) | |
download | gnunet-4465acf38d8cb43d06f45ac631586caa334a5fd8.tar.gz gnunet-4465acf38d8cb43d06f45ac631586caa334a5fd8.zip |
fix
Diffstat (limited to 'src/peerinfo')
-rw-r--r-- | src/peerinfo/gnunet-service-peerinfo.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c index 0fe76ac0b..a2a66bd62 100644 --- a/src/peerinfo/gnunet-service-peerinfo.c +++ b/src/peerinfo/gnunet-service-peerinfo.c | |||
@@ -514,7 +514,7 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity) | |||
514 | entry->identity = *identity; | 514 | entry->identity = *identity; |
515 | GNUNET_CONTAINER_multihashmap_put (hostmap, &entry->identity.hashPubKey, entry, | 515 | GNUNET_CONTAINER_multihashmap_put (hostmap, &entry->identity.hashPubKey, entry, |
516 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); | 516 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); |
517 | 517 | notify_all (entry); | |
518 | fn = get_host_filename (identity); | 518 | fn = get_host_filename (identity); |
519 | if (NULL != fn) | 519 | if (NULL != fn) |
520 | { | 520 | { |
@@ -527,7 +527,6 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity) | |||
527 | GNUNET_free_non_null (r.friend_only_hello); | 527 | GNUNET_free_non_null (r.friend_only_hello); |
528 | GNUNET_free (fn); | 528 | GNUNET_free (fn); |
529 | } | 529 | } |
530 | notify_all (entry); | ||
531 | } | 530 | } |
532 | return entry; | 531 | return entry; |
533 | } | 532 | } |
@@ -698,6 +697,8 @@ cron_scan_directory_data_hosts (void *cls, | |||
698 | } | 697 | } |
699 | dsc.matched = 0; | 698 | dsc.matched = 0; |
700 | dsc.remove_files = GNUNET_YES; | 699 | dsc.remove_files = GNUNET_YES; |
700 | GNUNET_log (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK, | ||
701 | _("Scanning directory `%s'\n"), networkIdDirectory); | ||
701 | GNUNET_DISK_directory_scan (networkIdDirectory, | 702 | GNUNET_DISK_directory_scan (networkIdDirectory, |
702 | &hosts_directory_scan_callback, &dsc); | 703 | &hosts_directory_scan_callback, &dsc); |
703 | if ((0 == dsc.matched) && (0 == (++retries & 31))) | 704 | if ((0 == dsc.matched) && (0 == (++retries & 31))) |
@@ -788,6 +789,9 @@ update_hello (const struct GNUNET_PeerIdentity *peer, | |||
788 | if (delta.abs_value == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value) | 789 | if (delta.abs_value == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value) |
789 | { | 790 | { |
790 | /* no differences, just ignore the update */ | 791 | /* no differences, just ignore the update */ |
792 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No change in %s HELLO for `%s'\n", | ||
793 | (GNUNET_YES == friend_hello_type) ? "friend-only" : "public", | ||
794 | GNUNET_i2s (peer)); | ||
791 | GNUNET_free (mrg); | 795 | GNUNET_free (mrg); |
792 | return; | 796 | return; |
793 | } | 797 | } |
@@ -1264,13 +1268,13 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
1264 | "HOSTS", | 1268 | "HOSTS", |
1265 | &networkIdDirectory)); | 1269 | &networkIdDirectory)); |
1266 | GNUNET_DISK_directory_create (networkIdDirectory); | 1270 | GNUNET_DISK_directory_create (networkIdDirectory); |
1267 | #if 0 | 1271 | |
1268 | GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE, | 1272 | GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE, |
1269 | &cron_scan_directory_data_hosts, NULL); /* CHECK */ | 1273 | &cron_scan_directory_data_hosts, NULL); /* CHECK */ |
1270 | 1274 | ||
1271 | GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE, | 1275 | GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE, |
1272 | &cron_clean_data_hosts, NULL); /* CHECK */ | 1276 | &cron_clean_data_hosts, NULL); /* CHECK */ |
1273 | #endif | 1277 | |
1274 | ip = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR); | 1278 | ip = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR); |
1275 | GNUNET_asprintf (&peerdir, | 1279 | GNUNET_asprintf (&peerdir, |
1276 | "%shellos", | 1280 | "%shellos", |