diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-10-12 00:07:33 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-10-12 00:07:33 +0000 |
commit | 27728a48d661e9ee546cc95aae8fa52050eefb29 (patch) | |
tree | 89450fc22b530dc592134ac18405180eeafe13b3 /src/nat | |
parent | 6d38e5b12b460d1d7f0a6eafe1410f7121e04002 (diff) | |
download | gnunet-27728a48d661e9ee546cc95aae8fa52050eefb29.tar.gz gnunet-27728a48d661e9ee546cc95aae8fa52050eefb29.zip |
- change --enable-ll to --enable-supermuc
- define a system wide termination signal GNUNET_TERM_SIG. Set this to SIGUSR1 only when building for SuperMUC
Diffstat (limited to 'src/nat')
-rw-r--r-- | src/nat/nat.c | 4 | ||||
-rw-r--r-- | src/nat/test_nat_test.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nat/nat.c b/src/nat/nat.c index 03a77ddc3..6e55e3bc7 100644 --- a/src/nat/nat.c +++ b/src/nat/nat.c | |||
@@ -789,7 +789,7 @@ nat_server_read (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
789 | { | 789 | { |
790 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 790 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
791 | "Finished reading from server stdout with code: %d\n", bytes); | 791 | "Finished reading from server stdout with code: %d\n", bytes); |
792 | if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) | 792 | if (0 != GNUNET_OS_process_kill (h->server_proc, GNUNET_TERM_SIG)) |
793 | GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); | 793 | GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); |
794 | GNUNET_OS_process_wait (h->server_proc); | 794 | GNUNET_OS_process_wait (h->server_proc); |
795 | GNUNET_OS_process_destroy (h->server_proc); | 795 | GNUNET_OS_process_destroy (h->server_proc); |
@@ -1303,7 +1303,7 @@ GNUNET_NAT_unregister (struct GNUNET_NAT_Handle *h) | |||
1303 | } | 1303 | } |
1304 | if (NULL != h->server_proc) | 1304 | if (NULL != h->server_proc) |
1305 | { | 1305 | { |
1306 | if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) | 1306 | if (0 != GNUNET_OS_process_kill (h->server_proc, GNUNET_TERM_SIG)) |
1307 | GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); | 1307 | GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); |
1308 | GNUNET_OS_process_wait (h->server_proc); | 1308 | GNUNET_OS_process_wait (h->server_proc); |
1309 | GNUNET_OS_process_destroy (h->server_proc); | 1309 | GNUNET_OS_process_destroy (h->server_proc); |
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c index d017dffbd..752c8f145 100644 --- a/src/nat/test_nat_test.c +++ b/src/nat/test_nat_test.c | |||
@@ -107,7 +107,7 @@ main (int argc, char *const argv[]) | |||
107 | GNUNET_assert (NULL != gns); | 107 | GNUNET_assert (NULL != gns); |
108 | GNUNET_PROGRAM_run (3, argv_prog, "test-nat-test", "nohelp", options, &run, | 108 | GNUNET_PROGRAM_run (3, argv_prog, "test-nat-test", "nohelp", options, &run, |
109 | NULL); | 109 | NULL); |
110 | GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM)); | 110 | GNUNET_break (0 == GNUNET_OS_process_kill (gns, GNUNET_TERM_SIG)); |
111 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns)); | 111 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns)); |
112 | GNUNET_OS_process_destroy (gns); | 112 | GNUNET_OS_process_destroy (gns); |
113 | if (0 != ret) | 113 | if (0 != ret) |