diff options
author | Gabor X Toth <*@tg-x.net> | 2015-09-08 01:36:44 +0000 |
---|---|---|
committer | Gabor X Toth <*@tg-x.net> | 2015-09-08 01:36:44 +0000 |
commit | b5e08fdd9c1663e81afef784a6e3bd6b4552e23e (patch) | |
tree | cae60510ffa95f024e63327734f809dd3d929b02 /src/psyc/gnunet-service-psyc.c | |
parent | a86a539258282bedabd24919e8af9bd113a6538a (diff) | |
download | gnunet-b5e08fdd9c1663e81afef784a6e3bd6b4552e23e.tar.gz gnunet-b5e08fdd9c1663e81afef784a6e3bd6b4552e23e.zip |
social: guest_enter_by_name(); zone_add_pkey(); join_msg fixes
Diffstat (limited to 'src/psyc/gnunet-service-psyc.c')
-rw-r--r-- | src/psyc/gnunet-service-psyc.c | 6 |
1 files changed, 4 insertions, 2 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, | |||
1792 | if (sizeof (*req) + relay_size + sizeof (struct GNUNET_MessageHeader) | 1792 | if (sizeof (*req) + relay_size + sizeof (struct GNUNET_MessageHeader) |
1793 | <= req_size) | 1793 | <= req_size) |
1794 | { | 1794 | { |
1795 | join_msg_size = ntohs (slv->join_msg->header.size); | 1795 | struct GNUNET_PSYC_Message * |
1796 | join_msg = (struct GNUNET_PSYC_Message *) (((char *) &req[1]) + relay_size); | ||
1797 | join_msg_size = ntohs (join_msg->header.size); | ||
1796 | slv->join_msg = GNUNET_malloc (join_msg_size); | 1798 | slv->join_msg = GNUNET_malloc (join_msg_size); |
1797 | memcpy (slv->join_msg, ((char *) &req[1]) + relay_size, join_msg_size); | 1799 | memcpy (slv->join_msg, join_msg, join_msg_size); |
1798 | } | 1800 | } |
1799 | if (sizeof (*req) + relay_size + join_msg_size != req_size) | 1801 | if (sizeof (*req) + relay_size + join_msg_size != req_size) |
1800 | { | 1802 | { |