[GNUnet-SVN] r37597 - gnunet/src/social

[gnunet]

Author: xrs
Date: 2016-07-28 02:31:50 +0200 (Thu, 28 Jul 2016)
New Revision: 37597

Modified:
   gnunet/src/social/gnunet-service-social.c
   gnunet/src/social/gnunet-social.c
   gnunet/src/social/social_api.c
Log:
get rid of segfault in gnunet-social


Modified: gnunet/src/social/gnunet-service-social.c
===================================================================
--- gnunet/src/social/gnunet-service-social.c   2016-07-28 00:22:43 UTC (rev 
37596)
+++ gnunet/src/social/gnunet-service-social.c   2016-07-28 00:31:50 UTC (rev 
37597)
@@ -1539,7 +1539,7 @@
 
     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;

Modified: gnunet/src/social/gnunet-social.c
===================================================================
--- gnunet/src/social/gnunet-social.c   2016-07-28 00:22:43 UTC (rev 37596)
+++ gnunet/src/social/gnunet-social.c   2016-07-28 00:31:50 UTC (rev 37597)
@@ -218,7 +218,7 @@
 timeout (void *cls)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "timeout()\n");
-  disconnect ();
+  //disconnect ();
 }
 
 static void
@@ -225,7 +225,7 @@
 schedule_success (void *cls)
 {
   ret = 0;
-  disconnect ();
+  //disconnect ();
 }
 
 
@@ -232,7 +232,7 @@
 static void
 schedule_fail (void *cls)
 {
-  disconnect ();
+  //disconnect ();
 }
 
 
@@ -931,7 +931,7 @@
                    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 ();

Modified: gnunet/src/social/social_api.c
===================================================================
--- gnunet/src/social/social_api.c      2016-07-28 00:22:43 UTC (rev 37596)
+++ gnunet/src/social/social_api.c      2016-07-28 00:31:50 UTC (rev 37597)
@@ -1157,9 +1157,6 @@
  *        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 @@
  * @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,