aboutsummaryrefslogtreecommitdiff
path: root/src/social
diff options
context:
space:
mode:
authorlurchi <lurchi@strangeplace.net>2017-12-30 20:37:01 +0100
committerlurchi <lurchi@strangeplace.net>2017-12-30 20:42:47 +0100
commit1d6a686ccc73ce02fd6e22decb82425012a82a04 (patch)
tree363428c2e7d91c879fc15a213b7845552bf3e670 /src/social
parent682bf4377d630f63912c0cdc7f612e9df9c82a33 (diff)
downloadgnunet-1d6a686ccc73ce02fd6e22decb82425012a82a04.tar.gz
gnunet-1d6a686ccc73ce02fd6e22decb82425012a82a04.zip
cleanup
Diffstat (limited to 'src/social')
-rw-r--r--src/social/social_api.c16
-rw-r--r--src/social/test_social.c2
2 files changed, 5 insertions, 13 deletions
diff --git a/src/social/social_api.c b/src/social/social_api.c
index 48e376404..96ddfe912 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -397,12 +397,9 @@ guest_cleanup (struct GNUNET_SOCIAL_Guest *gst)
397static void 397static void
398place_cleanup (struct GNUNET_SOCIAL_Place *plc) 398place_cleanup (struct GNUNET_SOCIAL_Place *plc)
399{ 399{
400 struct GNUNET_HashCode place_pub_hash; 400 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
401 401 "cleaning up place %p\n",
402 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 402 plc);
403 "place_cleanup\n");
404
405 GNUNET_CRYPTO_hash (&plc->pub_key, sizeof (plc->pub_key), &place_pub_hash);
406 if (NULL != plc->tmit) 403 if (NULL != plc->tmit)
407 { 404 {
408 GNUNET_PSYC_transmit_destroy (plc->tmit); 405 GNUNET_PSYC_transmit_destroy (plc->tmit);
@@ -433,11 +430,6 @@ place_cleanup (struct GNUNET_SOCIAL_Place *plc)
433static void 430static void
434place_disconnect (struct GNUNET_SOCIAL_Place *plc) 431place_disconnect (struct GNUNET_SOCIAL_Place *plc)
435{ 432{
436 struct GNUNET_HashCode place_pub_hash;
437
438 GNUNET_CRYPTO_hash (&plc->pub_key,
439 sizeof (plc->pub_key),
440 &place_pub_hash);
441 place_cleanup (plc); 433 place_cleanup (plc);
442} 434}
443 435
@@ -1515,7 +1507,7 @@ GNUNET_SOCIAL_host_announce (struct GNUNET_SOCIAL_Host *hst,
1515 void *notify_data_cls, 1507 void *notify_data_cls,
1516 enum GNUNET_SOCIAL_AnnounceFlags flags) 1508 enum GNUNET_SOCIAL_AnnounceFlags flags)
1517{ 1509{
1518 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 1510 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1519 "PSYC_transmit_message for host, method: %s\n", 1511 "PSYC_transmit_message for host, method: %s\n",
1520 method_name); 1512 method_name);
1521 if (GNUNET_OK == 1513 if (GNUNET_OK ==
diff --git a/src/social/test_social.c b/src/social/test_social.c
index 61dbd121c..4d95cf005 100644
--- a/src/social/test_social.c
+++ b/src/social/test_social.c
@@ -359,7 +359,7 @@ host_farewell2 (void *cls,
359 const struct GNUNET_SOCIAL_Nym *nym, 359 const struct GNUNET_SOCIAL_Nym *nym,
360 struct GNUNET_PSYC_Environment *env) 360 struct GNUNET_PSYC_Environment *env)
361{ 361{
362 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 362 GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
363 "Nym left the place again.\n"); 363 "Nym left the place again.\n");
364 GNUNET_SCHEDULER_add_now (&schedule_host_leave, NULL); 364 GNUNET_SCHEDULER_add_now (&schedule_host_leave, NULL);
365} 365}