aboutsummaryrefslogtreecommitdiff
path: root/src/nat
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2014-02-20 10:35:33 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2014-02-20 10:35:33 +0000
commit2a35e345a204cb357361406f28e07bf9076cb092 (patch)
tree8c51b5dae07a1f3a3a6a13ac6c623e0b0df2a070 /src/nat
parenta06237deeec4aed38b09f633d7ebbeabb7da4c03 (diff)
downloadgnunet-2a35e345a204cb357361406f28e07bf9076cb092.tar.gz
gnunet-2a35e345a204cb357361406f28e07bf9076cb092.zip
Allow redirection of STDERR when starting processes.
Diffstat (limited to 'src/nat')
-rw-r--r--src/nat/nat.c4
-rw-r--r--src/nat/nat_mini.c4
-rw-r--r--src/nat/test_nat_test.c3
3 files changed, 6 insertions, 5 deletions
diff --git a/src/nat/nat.c b/src/nat/nat.c
index ae40a2cd1..bb51f43b2 100644
--- a/src/nat/nat.c
+++ b/src/nat/nat.c
@@ -907,7 +907,7 @@ start_gnunet_nat_server (struct GNUNET_NAT_Handle *h)
907 /* Start the server process */ 907 /* Start the server process */
908 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server"); 908 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server");
909 h->server_proc = 909 h->server_proc =
910 GNUNET_OS_start_process (GNUNET_NO, 0, NULL, h->server_stdout, 910 GNUNET_OS_start_process (GNUNET_NO, 0, NULL, h->server_stdout, NULL,
911 binary, 911 binary,
912 "gnunet-helper-nat-server", 912 "gnunet-helper-nat-server",
913 h->internal_address, NULL); 913 h->internal_address, NULL);
@@ -1445,7 +1445,7 @@ GNUNET_NAT_run_client (struct GNUNET_NAT_Handle *h,
1445 (unsigned int) h->adv_port); 1445 (unsigned int) h->adv_port);
1446 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-client"); 1446 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-client");
1447 proc = 1447 proc =
1448 GNUNET_OS_start_process (GNUNET_NO, 0, NULL, NULL, 1448 GNUNET_OS_start_process (GNUNET_NO, 0, NULL, NULL, NULL,
1449 binary, 1449 binary,
1450 "gnunet-helper-nat-client", 1450 "gnunet-helper-nat-client",
1451 h->internal_address, 1451 h->internal_address,
diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c
index a5ae4ad08..ce4bc6778 100644
--- a/src/nat/nat_mini.c
+++ b/src/nat/nat_mini.c
@@ -213,8 +213,8 @@ GNUNET_NAT_mini_get_external_ipv4 (struct GNUNET_TIME_Relative timeout,
213 return eh; 213 return eh;
214 } 214 }
215 eh->eip = 215 eh->eip =
216 GNUNET_OS_start_process (GNUNET_NO, 0, NULL, eh->opipe, 216 GNUNET_OS_start_process (GNUNET_NO, 0, NULL, eh->opipe, NULL,
217 "external-ip", "external-ip", 217 "external-ip", "external-ip",
218 NULL); 218 NULL);
219 if (NULL == eh->eip) 219 if (NULL == eh->eip)
220 { 220 {
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index 64425ab47..f66773a65 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -107,7 +107,8 @@ main (int argc, char *const argv[])
107 107
108 gns = GNUNET_OS_start_process (GNUNET_YES, 108 gns = GNUNET_OS_start_process (GNUNET_YES,
109 GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 109 GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
110 NULL, NULL, "gnunet-nat-server", 110 NULL, NULL, NULL,
111 "gnunet-nat-server",
111 "gnunet-nat-server", 112 "gnunet-nat-server",
112 "-c", "test_nat_test_data.conf", 113 "-c", "test_nat_test_data.conf",
113 "12345", NULL); 114 "12345", NULL);