diff options
| author | Bart Polot <bart@net.in.tum.de> | 2012-05-08 17:10:10 +0000 |
|---|---|---|
| committer | Bart Polot <bart@net.in.tum.de> | 2012-05-08 17:10:10 +0000 |
| commit | 16546613251edfcd595e4f584b1a2d2a414d0b1a (patch) | |
| tree | 0a01bd8afdcb9501ee7f9be6d2ecc59648e40392 /src/nat | |
| parent | 9d268909fe579e36510ef03055c6cec9baa7d07a (diff) | |
Renamed GNUNET_OS_process_close to GNUNET_OS_process_destroy
Diffstat (limited to 'src/nat')
| -rw-r--r-- | src/nat/nat.c | 6 | ||||
| -rw-r--r-- | src/nat/nat_mini.c | 2 | ||||
| -rw-r--r-- | src/nat/test_nat_test.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/nat/nat.c b/src/nat/nat.c index 1b6556cbf7..79604da7d2 100644 --- a/src/nat/nat.c +++ b/src/nat/nat.c @@ -753,7 +753,7 @@ nat_server_read (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); GNUNET_OS_process_wait (h->server_proc); - GNUNET_OS_process_close (h->server_proc); + GNUNET_OS_process_destroy (h->server_proc); h->server_proc = NULL; GNUNET_DISK_pipe_close (h->server_stdout); h->server_stdout = NULL; @@ -1263,7 +1263,7 @@ GNUNET_NAT_unregister (struct GNUNET_NAT_Handle *h) if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); GNUNET_OS_process_wait (h->server_proc); - GNUNET_OS_process_close (h->server_proc); + GNUNET_OS_process_destroy (h->server_proc); h->server_proc = NULL; GNUNET_DISK_pipe_close (h->server_stdout); h->server_stdout = NULL; @@ -1341,7 +1341,7 @@ GNUNET_NAT_run_client (struct GNUNET_NAT_Handle *h, /* we know that the gnunet-helper-nat-client will terminate virtually * instantly */ GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); return GNUNET_OK; } diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c index 864a7f04e6..82697a971a 100644 --- a/src/nat/nat_mini.c +++ b/src/nat/nat_mini.c @@ -202,7 +202,7 @@ void GNUNET_NAT_mini_get_external_ipv4_cancel (struct GNUNET_NAT_ExternalHandle *eh) { (void) GNUNET_OS_process_kill (eh->eip, SIGKILL); - GNUNET_OS_process_close (eh->eip); + GNUNET_OS_process_destroy (eh->eip); GNUNET_DISK_pipe_close (eh->opipe); if (GNUNET_SCHEDULER_NO_TASK != eh->task) GNUNET_SCHEDULER_cancel (eh->task); diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c index 64617880aa..846d9b08e9 100644 --- a/src/nat/test_nat_test.c +++ b/src/nat/test_nat_test.c @@ -129,7 +129,7 @@ main (int argc, char *const argv[]) NULL); GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM)); GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns)); - GNUNET_OS_process_close (gns); + GNUNET_OS_process_destroy (gns); return ret; } |