diff options
author | xrs <xrs@mail36.net> | 2016-07-28 00:31:50 +0000 |
---|---|---|
committer | xrs <xrs@mail36.net> | 2016-07-28 00:31:50 +0000 |
commit | 39d29949c805111f7ce0ba065625f48423815033 (patch) | |
tree | 2da6f892f02cb6fd0337a40068b1c056ad62ae59 /src | |
parent | 00da479663f9b8af36a89e6643fed03f4256ce28 (diff) | |
download | gnunet-39d29949c805111f7ce0ba065625f48423815033.tar.gz gnunet-39d29949c805111f7ce0ba065625f48423815033.zip |
get rid of segfault in gnunet-social
Diffstat (limited to 'src')
-rw-r--r-- | src/social/gnunet-service-social.c | 2 | ||||
-rw-r--r-- | src/social/gnunet-social.c | 8 | ||||
-rw-r--r-- | src/social/social_api.c | 5 |
3 files changed, 6 insertions, 9 deletions
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, | |||
1539 | 1539 | ||
1540 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1540 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
1541 | "%p Client connected as host to place %s.\n", | 1541 | "%p Client connected as host to place %s.\n", |
1542 | hst, GNUNET_h2s (&plc->pub_key_hash)); | 1542 | hst, &plc->pub_key_hash); |
1543 | 1543 | ||
1544 | struct ClientListItem *cli = GNUNET_new (struct ClientListItem); | 1544 | struct ClientListItem *cli = GNUNET_new (struct ClientListItem); |
1545 | cli->client = client; | 1545 | 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 | |||
218 | timeout (void *cls) | 218 | timeout (void *cls) |
219 | { | 219 | { |
220 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "timeout()\n"); | 220 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "timeout()\n"); |
221 | disconnect (); | 221 | //disconnect (); |
222 | } | 222 | } |
223 | 223 | ||
224 | static void | 224 | static void |
225 | schedule_success (void *cls) | 225 | schedule_success (void *cls) |
226 | { | 226 | { |
227 | ret = 0; | 227 | ret = 0; |
228 | disconnect (); | 228 | //disconnect (); |
229 | } | 229 | } |
230 | 230 | ||
231 | 231 | ||
232 | static void | 232 | static void |
233 | schedule_fail (void *cls) | 233 | schedule_fail (void *cls) |
234 | { | 234 | { |
235 | disconnect (); | 235 | //disconnect (); |
236 | } | 236 | } |
237 | 237 | ||
238 | 238 | ||
@@ -931,7 +931,7 @@ guest_reconnected (void *cls, int result, | |||
931 | uint64_t max_message_id) | 931 | uint64_t max_message_id) |
932 | { | 932 | { |
933 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 933 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
934 | "Guest reconnected.\n"); | 934 | "Guest reconnected to place %s.\n", GNUNET_CRYPTO_eddsa_public_key_to_string(place_pub_key)); |
935 | 935 | ||
936 | if (op_guest_leave) { | 936 | if (op_guest_leave) { |
937 | guest_leave (); | 937 | 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) | |||
1157 | * Application handle. | 1157 | * Application handle. |
1158 | * @param ego | 1158 | * @param ego |
1159 | * Identity of the host. | 1159 | * Identity of the host. |
1160 | * @param place_key | ||
1161 | * Private-public key pair of the place. | ||
1162 | * NULL to generate a key. | ||
1163 | * @param policy | 1160 | * @param policy |
1164 | * Policy specifying entry and history restrictions for the place. | 1161 | * Policy specifying entry and history restrictions for the place. |
1165 | * @param slicer | 1162 | * @param slicer |
@@ -1173,7 +1170,7 @@ guest_cleanup (void *cls) | |||
1173 | * @param cls | 1170 | * @param cls |
1174 | * Closure for the callbacks. | 1171 | * Closure for the callbacks. |
1175 | * | 1172 | * |
1176 | * @return Handle for the host. | 1173 | * @return Handle for the host. This handle contains the pubkey. |
1177 | */ | 1174 | */ |
1178 | struct GNUNET_SOCIAL_Host * | 1175 | struct GNUNET_SOCIAL_Host * |
1179 | GNUNET_SOCIAL_host_enter (const struct GNUNET_SOCIAL_App *app, | 1176 | GNUNET_SOCIAL_host_enter (const struct GNUNET_SOCIAL_App *app, |