social: guest_enter_by_name(); zone_add_pkey(); join_msg fixes

2 files changed, 8 insertions, 9 deletions

diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c
index 070fd8e47..1f7e7c23c 100644
--- a/src/psyc/gnunet-service-psyc.c
+++ b/src/psyc/gnunet-service-psyc.c
@@ -1792,9 +1792,11 @@ client_recv_slave_join (void *cls, struct GNUNET_SERVER_Client *client,
     if (sizeof (*req) + relay_size + sizeof (struct GNUNET_MessageHeader)
         <= req_size)
     {
-      join_msg_size = ntohs (slv->join_msg->header.size);
+      struct GNUNET_PSYC_Message *
+        join_msg = (struct GNUNET_PSYC_Message *) (((char *) &req[1]) + relay_size);
+      join_msg_size = ntohs (join_msg->header.size);
       slv->join_msg = GNUNET_malloc (join_msg_size);
-      memcpy (slv->join_msg, ((char *) &req[1]) + relay_size, join_msg_size);
+      memcpy (slv->join_msg, join_msg, join_msg_size);
     }
     if (sizeof (*req) + relay_size + join_msg_size != req_size)
     {
diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c
index b862eee9c..6128e4d82 100644
--- a/src/psyc/psyc_api.c
+++ b/src/psyc/psyc_api.c
@@ -669,7 +669,7 @@ GNUNET_PSYC_master_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
   req->channel_key = *channel_key;
   req->policy = policy;
 
-  chn->connect_msg = (struct GNUNET_MessageHeader *) req;
+  chn->connect_msg = &req->header;
   chn->cfg = cfg;
   chn->is_master = GNUNET_YES;
 
@@ -896,8 +896,7 @@ GNUNET_PSYC_slave_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
   else
     join_msg_size = ntohs (join_msg->header.size);
   req = GNUNET_malloc (sizeof (*req) + relay_size + join_msg_size);
-  req->header.size = htons (sizeof (*req)
-                            + relay_count * sizeof (*relays));
+  req->header.size = htons (sizeof (*req) + relay_size + join_msg_size);
   req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN);
   req->channel_key = *channel_key;
   req->slave_key = *slave_key;
@@ -908,11 +907,9 @@ GNUNET_PSYC_slave_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
     memcpy (&req[1], relays, relay_size);
 
   if (NULL != join_msg)
-    memcpy ((char *) &req[1] + relay_size,
-            join_msg,
-            join_msg_size);
+    memcpy ((char *) &req[1] + relay_size, join_msg, join_msg_size);
 
-  chn->connect_msg = (struct GNUNET_MessageHeader *) req;
+  chn->connect_msg = &req->header;
   chn->cfg = cfg;
   chn->is_master = GNUNET_NO;