aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaximilian Szengel <gnunet@maxsz.de>2012-10-19 16:38:22 +0000
committerMaximilian Szengel <gnunet@maxsz.de>2012-10-19 16:38:22 +0000
commit5de8538388a4cbb8618c568469eb61837a2fcaef (patch)
treef552e48cb18590163ddb7e8897fbc54b95236dde /src
parentd2b7906ca34d860da0dad9c51ae2f6dfa14561ab (diff)
downloadgnunet-5de8538388a4cbb8618c568469eb61837a2fcaef.tar.gz
gnunet-5de8538388a4cbb8618c568469eb61837a2fcaef.zip
regex profiler fix
Diffstat (limited to 'src')
-rw-r--r--src/mesh/gnunet-regex-profiler.c21
1 files changed, 6 insertions, 15 deletions
diff --git a/src/mesh/gnunet-regex-profiler.c b/src/mesh/gnunet-regex-profiler.c
index e5a460dff..7eeac09e5 100644
--- a/src/mesh/gnunet-regex-profiler.c
+++ b/src/mesh/gnunet-regex-profiler.c
@@ -250,7 +250,7 @@ static char * policy_dir;
250/** 250/**
251 * Search string. 251 * Search string.
252 */ 252 */
253static char *search_string = "GNUNETVPN0001000IPEX401110011101100100000111"; 253static char *search_string = "GNUNETVPN0001000IPEX4000110110111101100111";
254 254
255/** 255/**
256 * Search task identifier 256 * Search task identifier
@@ -562,28 +562,19 @@ mesh_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
562void 562void
563mesh_da (void *cls, void *op_result) 563mesh_da (void *cls, void *op_result)
564{ 564{
565 static unsigned int disconnected_mesh_handles;
566 struct Peer *peer = (struct Peer *) cls; 565 struct Peer *peer = (struct Peer *) cls;
567 566
568 GNUNET_assert (peer->mesh_handle == op_result); 567 GNUNET_assert (peer->mesh_handle == op_result);
569 568
570 if (NULL != peer->mesh_tunnel_handle) 569 if (NULL != peer->mesh_tunnel_handle)
571 GNUNET_MESH_tunnel_destroy (peer->mesh_tunnel_handle);
572 GNUNET_MESH_disconnect (peer->mesh_handle);
573 peer->mesh_handle = NULL;
574
575 if (++disconnected_mesh_handles == num_peers)
576 { 570 {
577 printf ("All mesh handles disconnected.\n"); 571 GNUNET_MESH_tunnel_destroy (peer->mesh_tunnel_handle);
578 GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); 572 peer->mesh_tunnel_handle = NULL;
579 } 573 }
580 574 if (NULL != peer->mesh_handle)
581 GNUNET_MESH_disconnect (peer->mesh_handle);
582 peer->mesh_handle = NULL;
583
584 if (++disconnected_mesh_handles == num_peers)
585 { 575 {
586 GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); 576 GNUNET_MESH_disconnect (peer->mesh_handle);
577 peer->mesh_handle = NULL;
587 } 578 }
588} 579}
589 580