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) | |
download | gnunet-16546613251edfcd595e4f584b1a2d2a414d0b1a.tar.gz gnunet-16546613251edfcd595e4f584b1a2d2a414d0b1a.zip |
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 1b6556cbf..79604da7d 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) | |||
753 | if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) | 753 | if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) |
754 | GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); | 754 | GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); |
755 | GNUNET_OS_process_wait (h->server_proc); | 755 | GNUNET_OS_process_wait (h->server_proc); |
756 | GNUNET_OS_process_close (h->server_proc); | 756 | GNUNET_OS_process_destroy (h->server_proc); |
757 | h->server_proc = NULL; | 757 | h->server_proc = NULL; |
758 | GNUNET_DISK_pipe_close (h->server_stdout); | 758 | GNUNET_DISK_pipe_close (h->server_stdout); |
759 | h->server_stdout = NULL; | 759 | h->server_stdout = NULL; |
@@ -1263,7 +1263,7 @@ GNUNET_NAT_unregister (struct GNUNET_NAT_Handle *h) | |||
1263 | if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) | 1263 | if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) |
1264 | GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); | 1264 | GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); |
1265 | GNUNET_OS_process_wait (h->server_proc); | 1265 | GNUNET_OS_process_wait (h->server_proc); |
1266 | GNUNET_OS_process_close (h->server_proc); | 1266 | GNUNET_OS_process_destroy (h->server_proc); |
1267 | h->server_proc = NULL; | 1267 | h->server_proc = NULL; |
1268 | GNUNET_DISK_pipe_close (h->server_stdout); | 1268 | GNUNET_DISK_pipe_close (h->server_stdout); |
1269 | h->server_stdout = NULL; | 1269 | h->server_stdout = NULL; |
@@ -1341,7 +1341,7 @@ GNUNET_NAT_run_client (struct GNUNET_NAT_Handle *h, | |||
1341 | /* we know that the gnunet-helper-nat-client will terminate virtually | 1341 | /* we know that the gnunet-helper-nat-client will terminate virtually |
1342 | * instantly */ | 1342 | * instantly */ |
1343 | GNUNET_OS_process_wait (proc); | 1343 | GNUNET_OS_process_wait (proc); |
1344 | GNUNET_OS_process_close (proc); | 1344 | GNUNET_OS_process_destroy (proc); |
1345 | return GNUNET_OK; | 1345 | return GNUNET_OK; |
1346 | } | 1346 | } |
1347 | 1347 | ||
diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c index 864a7f04e..82697a971 100644 --- a/src/nat/nat_mini.c +++ b/src/nat/nat_mini.c | |||
@@ -202,7 +202,7 @@ void | |||
202 | GNUNET_NAT_mini_get_external_ipv4_cancel (struct GNUNET_NAT_ExternalHandle *eh) | 202 | GNUNET_NAT_mini_get_external_ipv4_cancel (struct GNUNET_NAT_ExternalHandle *eh) |
203 | { | 203 | { |
204 | (void) GNUNET_OS_process_kill (eh->eip, SIGKILL); | 204 | (void) GNUNET_OS_process_kill (eh->eip, SIGKILL); |
205 | GNUNET_OS_process_close (eh->eip); | 205 | GNUNET_OS_process_destroy (eh->eip); |
206 | GNUNET_DISK_pipe_close (eh->opipe); | 206 | GNUNET_DISK_pipe_close (eh->opipe); |
207 | if (GNUNET_SCHEDULER_NO_TASK != eh->task) | 207 | if (GNUNET_SCHEDULER_NO_TASK != eh->task) |
208 | GNUNET_SCHEDULER_cancel (eh->task); | 208 | GNUNET_SCHEDULER_cancel (eh->task); |
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c index 64617880a..846d9b08e 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[]) | |||
129 | NULL); | 129 | NULL); |
130 | GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM)); | 130 | GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM)); |
131 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns)); | 131 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns)); |
132 | GNUNET_OS_process_close (gns); | 132 | GNUNET_OS_process_destroy (gns); |
133 | return ret; | 133 | return ret; |
134 | } | 134 | } |
135 | 135 | ||