From: xrs <xrs@mail36.net>
Date: Thu, 28 Jul 2016 00:31:50 +0000 (+0000)
Subject: get rid of segfault in gnunet-social
X-Git-Tag: initial-import-from-subversion-38251~485
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=39d29949c805111f7ce0ba065625f48423815033;p=oweals%2Fgnunet.git

get rid of segfault in gnunet-social
---

diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c
index e499130d4..73acc870d 100644
--- a/src/social/gnunet-service-social.c
+++ b/src/social/gnunet-service-social.c
@@ -1539,7 +1539,7 @@ client_recv_host_enter (void *cls, struct GNUNET_SERVER_Client *client,
 
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "%p Client connected as host to place %s.\n",
-                hst, GNUNET_h2s (&plc->pub_key_hash));
+                hst, &plc->pub_key_hash);
 
     struct ClientListItem *cli = GNUNET_new (struct ClientListItem);
     cli->client = client;
diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c
index ab08c90f8..9841e83a6 100644
--- a/src/social/gnunet-social.c
+++ b/src/social/gnunet-social.c
@@ -218,21 +218,21 @@ static void
 timeout (void *cls)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "timeout()\n");
-  disconnect ();
+  //disconnect ();
 }
 
 static void
 schedule_success (void *cls)
 {
   ret = 0;
-  disconnect ();
+  //disconnect ();
 }
 
 
 static void
 schedule_fail (void *cls)
 {
-  disconnect ();
+  //disconnect ();
 }
 
 
@@ -931,7 +931,7 @@ guest_reconnected (void *cls, int result,
                    uint64_t max_message_id)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Guest reconnected.\n");
+              "Guest reconnected to place %s.\n", GNUNET_CRYPTO_eddsa_public_key_to_string(place_pub_key));
 
   if (op_guest_leave) {
     guest_leave ();
diff --git a/src/social/social_api.c b/src/social/social_api.c
index a7a4e9dcf..6d77a8e73 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -1157,9 +1157,6 @@ guest_cleanup (void *cls)
  *        Application handle.
  * @param ego
  *        Identity of the host.
- * @param place_key
- *        Private-public key pair of the place.
- *        NULL to generate a key.
  * @param policy
  *        Policy specifying entry and history restrictions for the place.
  * @param slicer
@@ -1173,7 +1170,7 @@ guest_cleanup (void *cls)
  * @param cls
  *        Closure for the callbacks.
  *
- * @return Handle for the host.
+ * @return Handle for the host. This handle contains the pubkey.
  */
 struct GNUNET_SOCIAL_Host *
 GNUNET_SOCIAL_host_enter (const struct GNUNET_SOCIAL_App *app,