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

[gnunet]

Author: szengel
Date: 2012-10-19 18:38:22 +0200 (Fri, 19 Oct 2012)
New Revision: 24433

Modified:
   gnunet/src/mesh/gnunet-regex-profiler.c
Log:
regex profiler fix

Modified: gnunet/src/mesh/gnunet-regex-profiler.c
===================================================================
--- gnunet/src/mesh/gnunet-regex-profiler.c     2012-10-19 16:25:51 UTC (rev 
24432)
+++ gnunet/src/mesh/gnunet-regex-profiler.c     2012-10-19 16:38:22 UTC (rev 
24433)
@@ -250,7 +250,7 @@
 /**
  * Search string.
  */
-static char *search_string = "GNUNETVPN0001000IPEX401110011101100100000111";
+static char *search_string = "GNUNETVPN0001000IPEX4000110110111101100111";
 
 /**
  * Search task identifier
@@ -562,28 +562,19 @@
 void
 mesh_da (void *cls, void *op_result)
 {
-  static unsigned int disconnected_mesh_handles;
   struct Peer *peer = (struct Peer *) cls;
 
   GNUNET_assert (peer->mesh_handle == op_result);
 
   if (NULL != peer->mesh_tunnel_handle)
+  {
     GNUNET_MESH_tunnel_destroy (peer->mesh_tunnel_handle);
-  GNUNET_MESH_disconnect (peer->mesh_handle);
-  peer->mesh_handle = NULL;
-
-  if (++disconnected_mesh_handles == num_peers)
-  {
-    printf ("All mesh handles disconnected.\n");
-    GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    peer->mesh_tunnel_handle = NULL;
   }
-
-  GNUNET_MESH_disconnect (peer->mesh_handle);
-  peer->mesh_handle = NULL;
-
-  if (++disconnected_mesh_handles == num_peers)
+  if (NULL != peer->mesh_handle)
   {
-    GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    GNUNET_MESH_disconnect (peer->mesh_handle);
+    peer->mesh_handle = NULL;
   }
 }