aboutsummaryrefslogtreecommitdiff
path: root/src/mesh
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2013-07-22 16:56:50 +0000
committerBart Polot <bart@net.in.tum.de>2013-07-22 16:56:50 +0000
commite88466837597eb5bdd2615e3745e000658e2b7b4 (patch)
tree88af79810ea493e939a8995eba0ae35aa145a75a /src/mesh
parenta11e002d12f707975bcb116d9e525b7bda67bca3 (diff)
downloadgnunet-e88466837597eb5bdd2615e3745e000658e2b7b4.tar.gz
gnunet-e88466837597eb5bdd2615e3745e000658e2b7b4.zip
- inverted comparison operators
Diffstat (limited to 'src/mesh')
-rw-r--r--src/mesh/gnunet-service-mesh.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index 8c0213ece..e9b5927fa 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -3073,17 +3073,17 @@ tunnel_destroy (struct MeshTunnel *t)
3073 3073
3074 if (NULL != c) 3074 if (NULL != c)
3075 { 3075 {
3076 if (GNUNET_YES != 3076 if (GNUNET_YES != GNUNET_CONTAINER_multihashmap32_remove (c->own_tunnels,
3077 GNUNET_CONTAINER_multihashmap32_remove (c->own_tunnels, t->local_tid, t)) 3077 t->local_tid, t))
3078 { 3078 {
3079 GNUNET_break (0); 3079 GNUNET_break (0);
3080 r = GNUNET_SYSERR; 3080 r = GNUNET_SYSERR;
3081 } 3081 }
3082 } 3082 }
3083 3083
3084 if (NULL != t->client) 3084 c = t->client;
3085 if (NULL != c)
3085 { 3086 {
3086 c = t->client;
3087 if (GNUNET_YES != 3087 if (GNUNET_YES !=
3088 GNUNET_CONTAINER_multihashmap32_remove (c->incoming_tunnels, 3088 GNUNET_CONTAINER_multihashmap32_remove (c->incoming_tunnels,
3089 t->local_tid_dest, t)) 3089 t->local_tid_dest, t))
@@ -4873,8 +4873,8 @@ handle_local_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
4873 c = client_get (client); 4873 c = client_get (client);
4874 if (NULL != c) 4874 if (NULL != c)
4875 { 4875 {
4876 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "matching client found (%u)\n", 4876 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "matching client found (%u, %p)\n",
4877 c->id); 4877 c->id, c);
4878 GNUNET_SERVER_client_drop (c->handle); 4878 GNUNET_SERVER_client_drop (c->handle);
4879 c->shutting_down = GNUNET_YES; 4879 c->shutting_down = GNUNET_YES;
4880 if (NULL != c->own_tunnels) 4880 if (NULL != c->own_tunnels)
@@ -4899,7 +4899,7 @@ handle_local_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
4899 } 4899 }
4900 next = c->next; 4900 next = c->next;
4901 GNUNET_CONTAINER_DLL_remove (clients_head, clients_tail, c); 4901 GNUNET_CONTAINER_DLL_remove (clients_head, clients_tail, c);
4902 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " CLIENT FREE at %p\n", c); 4902 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " client free (%p)\n", c);
4903 GNUNET_free (c); 4903 GNUNET_free (c);
4904 GNUNET_STATISTICS_update (stats, "# clients", -1, GNUNET_NO); 4904 GNUNET_STATISTICS_update (stats, "# clients", -1, GNUNET_NO);
4905 c = next; 4905 c = next;
@@ -5112,11 +5112,11 @@ handle_local_tunnel_destroy (void *cls, struct GNUNET_SERVER_Client *client,
5112 5112
5113 /* Cleanup after the tunnel */ 5113 /* Cleanup after the tunnel */
5114 client_delete_tunnel (c, t); 5114 client_delete_tunnel (c, t);
5115 if (c == t->client && GNUNET_MESH_LOCAL_TUNNEL_ID_SERV >= tid) 5115 if (c == t->client && GNUNET_MESH_LOCAL_TUNNEL_ID_SERV <= tid)
5116 { 5116 {
5117 t->client = NULL; 5117 t->client = NULL;
5118 } 5118 }
5119 else if (c == t->owner && GNUNET_MESH_LOCAL_TUNNEL_ID_SERV < tid) 5119 else if (c == t->owner && GNUNET_MESH_LOCAL_TUNNEL_ID_SERV > tid)
5120 { 5120 {
5121 peer_info_remove_tunnel (peer_get_short (t->dest), t); 5121 peer_info_remove_tunnel (peer_get_short (t->dest), t);
5122 t->owner = NULL; 5122 t->owner = NULL;