aboutsummaryrefslogtreecommitdiff
path: root/src/testing/testing_group.c
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2011-03-02 13:19:55 +0000
committerNathan S. Evans <evans@in.tum.de>2011-03-02 13:19:55 +0000
commit57f3ffe332661aaa0327c54e9aa725cd011d8d04 (patch)
treee6e0642dd6740dd3864cf714dfbec9fa92e0bbe6 /src/testing/testing_group.c
parent159812ea46c31e6fe403d7da4fc2ba0c7193d8e7 (diff)
downloadgnunet-57f3ffe332661aaa0327c54e9aa725cd011d8d04.tar.gz
gnunet-57f3ffe332661aaa0327c54e9aa725cd011d8d04.zip
Fixes for testing because of my addled brain.
Diffstat (limited to 'src/testing/testing_group.c')
-rw-r--r--src/testing/testing_group.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c
index f237ec030..155acb156 100644
--- a/src/testing/testing_group.c
+++ b/src/testing/testing_group.c
@@ -5845,7 +5845,9 @@ GNUNET_TESTING_daemons_start(
5845 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 5845 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
5846 "Creating remote dir with command ssh %s %s %s\n", arg, 5846 "Creating remote dir with command ssh %s %s %s\n", arg,
5847 " mkdir -p ", baseservicehome); 5847 " mkdir -p ", baseservicehome);
5848 GNUNET_free(arg);
5848 GNUNET_OS_process_wait (proc); 5849 GNUNET_OS_process_wait (proc);
5850 GNUNET_OS_process_close(proc);
5849 } 5851 }
5850 GNUNET_free(baseservicehome); 5852 GNUNET_free(baseservicehome);
5851 5853
@@ -6449,8 +6451,9 @@ void
6449internal_shutdown_callback(void *cls, const char *emsg) 6451internal_shutdown_callback(void *cls, const char *emsg)
6450{ 6452{
6451 struct PeerShutdownContext *peer_shutdown_ctx = cls; 6453 struct PeerShutdownContext *peer_shutdown_ctx = cls;
6452 struct ShutdownContext *shutdown_ctx = cls; 6454 struct ShutdownContext *shutdown_ctx = peer_shutdown_ctx->shutdown_ctx;
6453 unsigned int off; 6455 unsigned int off;
6456 struct OutstandingSSH *ssh_pos;
6454 6457
6455 shutdown_ctx->outstanding--; 6458 shutdown_ctx->outstanding--;
6456 if (peer_shutdown_ctx->daemon->hostname != NULL) 6459 if (peer_shutdown_ctx->daemon->hostname != NULL)
@@ -6483,8 +6486,12 @@ internal_shutdown_callback(void *cls, const char *emsg)
6483 GNUNET_free_non_null (shutdown_ctx->pg->hosts[off].username); 6486 GNUNET_free_non_null (shutdown_ctx->pg->hosts[off].username);
6484 } 6487 }
6485 GNUNET_free_non_null (shutdown_ctx->pg->hosts); 6488 GNUNET_free_non_null (shutdown_ctx->pg->hosts);
6489 while (NULL != (ssh_pos = shutdown_ctx->pg->ssh_head))
6490 {
6491 GNUNET_CONTAINER_DLL_remove(shutdown_ctx->pg->ssh_head, shutdown_ctx->pg->ssh_tail, ssh_pos);
6492 GNUNET_free(ssh_pos);
6493 }
6486 GNUNET_free (shutdown_ctx->pg); 6494 GNUNET_free (shutdown_ctx->pg);
6487
6488 GNUNET_free (shutdown_ctx); 6495 GNUNET_free (shutdown_ctx);
6489 } 6496 }
6490 GNUNET_free(peer_shutdown_ctx); 6497 GNUNET_free(peer_shutdown_ctx);