diff options
author | Bart Polot <bart@net.in.tum.de> | 2011-10-27 01:29:44 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2011-10-27 01:29:44 +0000 |
commit | 19780f69c439907bbe4d35265ac1b7ad092c50cd (patch) | |
tree | ad474a2cd18aded43d91cc9cadc403db24670ab4 /src/mesh | |
parent | a5777dcaa4cd80af1f0a25475e74feec41793218 (diff) | |
download | gnunet-19780f69c439907bbe4d35265ac1b7ad092c50cd.tar.gz gnunet-19780f69c439907bbe4d35265ac1b7ad092c50cd.zip |
Attempt to fix assertion failures on buildbot related to RC of client (keep/drop)
Diffstat (limited to 'src/mesh')
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 40f1d139b..59c5174ac 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -3248,7 +3248,6 @@ handle_local_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) | |||
3248 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (SERVER DOWN)\n"); | 3248 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (SERVER DOWN)\n"); |
3249 | return; | 3249 | return; |
3250 | } | 3250 | } |
3251 | GNUNET_SERVER_client_drop (client); | ||
3252 | c = clients; | 3251 | c = clients; |
3253 | while (NULL != c) | 3252 | while (NULL != c) |
3254 | { | 3253 | { |
@@ -3259,6 +3258,7 @@ handle_local_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) | |||
3259 | continue; | 3258 | continue; |
3260 | } | 3259 | } |
3261 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: matching client found\n"); | 3260 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: matching client found\n"); |
3261 | GNUNET_SERVER_client_drop (c->handle); | ||
3262 | if (NULL != c->tunnels) | 3262 | if (NULL != c->tunnels) |
3263 | { | 3263 | { |
3264 | GNUNET_CONTAINER_multihashmap_iterate (c->tunnels, | 3264 | GNUNET_CONTAINER_multihashmap_iterate (c->tunnels, |
@@ -3314,7 +3314,6 @@ handle_local_new_client (void *cls, struct GNUNET_SERVER_Client *client, | |||
3314 | uint16_t i; | 3314 | uint16_t i; |
3315 | 3315 | ||
3316 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: new client connected\n"); | 3316 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: new client connected\n"); |
3317 | GNUNET_SERVER_client_keep (client); | ||
3318 | /* Check data sanity */ | 3317 | /* Check data sanity */ |
3319 | size = ntohs (message->size) - sizeof (struct GNUNET_MESH_ClientConnect); | 3318 | size = ntohs (message->size) - sizeof (struct GNUNET_MESH_ClientConnect); |
3320 | cc_msg = (struct GNUNET_MESH_ClientConnect *) message; | 3319 | cc_msg = (struct GNUNET_MESH_ClientConnect *) message; |
@@ -3335,6 +3334,7 @@ handle_local_new_client (void *cls, struct GNUNET_SERVER_Client *client, | |||
3335 | #endif | 3334 | #endif |
3336 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: CLIENT NEW %u at %p\n", c->id, c); | 3335 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: CLIENT NEW %u at %p\n", c->id, c); |
3337 | c->handle = client; | 3336 | c->handle = client; |
3337 | GNUNET_SERVER_client_keep (client); | ||
3338 | a = (GNUNET_MESH_ApplicationType *) &cc_msg[1]; | 3338 | a = (GNUNET_MESH_ApplicationType *) &cc_msg[1]; |
3339 | if (napps > 0) | 3339 | if (napps > 0) |
3340 | { | 3340 | { |