[GNUnet-SVN] r27873 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-07-10 14:12:11 +0200 (Wed, 10 Jul 2013)
New Revision: 27873

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
Log:
- client can be owner AND destination

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2013-07-10 12:01:41 UTC (rev 
27872)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2013-07-10 12:12:11 UTC (rev 
27873)
@@ -964,17 +964,13 @@
                                                            t->local_tid,
                                                            t));
   }
-  else if (c == t->client)
+  if (c == t->client)
   {
     GNUNET_assert (GNUNET_YES ==
                    GNUNET_CONTAINER_multihashmap32_remove (c->incoming_tunnels,
                                                            t->local_tid_dest,
                                                            t));
   }
-  else
-  {
-    GNUNET_break (0);
-  }
 }
 
 /**
@@ -2688,7 +2684,7 @@
         t->next_hop = 0;
     }
   }
-  else if (c == t->owner)
+  if (c == t->owner)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Client %u is owner.\n", c->id);
     t->owner = NULL;
@@ -2697,10 +2693,7 @@
         t->prev_hop = 0;
     }
   }
-  else
-  {
-    GNUNET_break (0);
-  }
+
   tunnel_destroy_empty (t);
 
   return GNUNET_OK;
@@ -4499,7 +4492,7 @@
   {
     t->client = NULL;
   }
-  else if (c == t->owner)
+  if (c == t->owner)
   {
     peer_info_remove_tunnel (peer_get_short (t->dest), t);
     t->owner = NULL;