aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/gnunet-service-testbed.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/gnunet-service-testbed.c')
-rw-r--r--src/testbed/gnunet-service-testbed.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index 21a9d0a51..3ef99ae25 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -550,8 +550,8 @@ handle_add_host (void *cls,
550 GNUNET_strlcpy (hostname, ptr, hostname_length + 1); 550 GNUNET_strlcpy (hostname, ptr, hostname_length + 1);
551 if (NULL == (host_cfg = GNUNET_TESTBED_extract_config_ (&msg->header))) 551 if (NULL == (host_cfg = GNUNET_TESTBED_extract_config_ (&msg->header)))
552 { 552 {
553 GNUNET_free_non_null (username); 553 GNUNET_free (username);
554 GNUNET_free_non_null (hostname); 554 GNUNET_free (hostname);
555 GNUNET_break_op (0); 555 GNUNET_break_op (0);
556 GNUNET_SERVICE_client_drop (client); 556 GNUNET_SERVICE_client_drop (client);
557 return; 557 return;
@@ -570,7 +570,7 @@ handle_add_host (void *cls,
570 username, 570 username,
571 host_cfg, 571 host_cfg,
572 ntohs (msg->ssh_port)); 572 ntohs (msg->ssh_port));
573 GNUNET_free_non_null (username); 573 GNUNET_free (username);
574 GNUNET_free (hostname); 574 GNUNET_free (hostname);
575 GNUNET_CONFIGURATION_destroy (host_cfg); 575 GNUNET_CONFIGURATION_destroy (host_cfg);
576 if (NULL == host) 576 if (NULL == host)
@@ -757,17 +757,17 @@ shutdown_task (void *cls)
757 for (id = 0; id < GST_host_list_size; id++) 757 for (id = 0; id < GST_host_list_size; id++)
758 if (NULL != GST_host_list[id]) 758 if (NULL != GST_host_list[id])
759 GNUNET_TESTBED_host_destroy (GST_host_list[id]); 759 GNUNET_TESTBED_host_destroy (GST_host_list[id]);
760 GNUNET_free_non_null (GST_host_list); 760 GNUNET_free (GST_host_list);
761 if (NULL != GST_context) 761 if (NULL != GST_context)
762 { 762 {
763 GNUNET_free_non_null (GST_context->master_ip); 763 GNUNET_free (GST_context->master_ip);
764 if (NULL != GST_context->system) 764 if (NULL != GST_context->system)
765 GNUNET_TESTING_system_destroy (GST_context->system, 765 GNUNET_TESTING_system_destroy (GST_context->system,
766 GNUNET_YES); 766 GNUNET_YES);
767 GNUNET_free (GST_context); 767 GNUNET_free (GST_context);
768 GST_context = NULL; 768 GST_context = NULL;
769 } 769 }
770 GNUNET_free_non_null (hostname); 770 GNUNET_free (hostname);
771 /* Free hello cache */ 771 /* Free hello cache */
772 GST_cache_clear (); 772 GST_cache_clear ();
773 GST_connection_pool_destroy (); 773 GST_connection_pool_destroy ();