aboutsummaryrefslogtreecommitdiff
path: root/src/nat
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-04-15 15:00:53 +0000
committerChristian Grothoff <christian@grothoff.org>2013-04-15 15:00:53 +0000
commit8a6448fb4f4dbfab07995028ce8f2516c563cac3 (patch)
treeb73a10218990841af0d58f2e433752f8092c4aec /src/nat
parent4e668e13d72a1fc55abfe69578c0486fdf02cd78 (diff)
downloadgnunet-8a6448fb4f4dbfab07995028ce8f2516c563cac3.tar.gz
gnunet-8a6448fb4f4dbfab07995028ce8f2516c563cac3.zip
-no boolean
Diffstat (limited to 'src/nat')
-rw-r--r--src/nat/nat.c4
-rw-r--r--src/nat/nat_auto.c6
-rw-r--r--src/nat/nat_mini.c4
-rw-r--r--src/nat/test_nat_test.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/nat/nat.c b/src/nat/nat.c
index fd9d5eaa0..e1ec88028 100644
--- a/src/nat/nat.c
+++ b/src/nat/nat.c
@@ -1171,7 +1171,7 @@ GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg, int is_tcp,
1171 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server"); 1171 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server");
1172 if ((h->behind_nat == GNUNET_YES) && (GNUNET_YES == h->enable_nat_server) && 1172 if ((h->behind_nat == GNUNET_YES) && (GNUNET_YES == h->enable_nat_server) &&
1173 (GNUNET_YES != 1173 (GNUNET_YES !=
1174 GNUNET_OS_check_helper_binary (binary, TRUE, NULL))) // FIXME: CF: add test-parameters 1174 GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL))) // FIXME: CF: add test-parameters
1175 { 1175 {
1176 h->enable_nat_server = GNUNET_NO; 1176 h->enable_nat_server = GNUNET_NO;
1177 LOG (GNUNET_ERROR_TYPE_WARNING, 1177 LOG (GNUNET_ERROR_TYPE_WARNING,
@@ -1183,7 +1183,7 @@ GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg, int is_tcp,
1183 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-client"); 1183 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-client");
1184 if ((GNUNET_YES == h->enable_nat_client) && 1184 if ((GNUNET_YES == h->enable_nat_client) &&
1185 (GNUNET_YES != 1185 (GNUNET_YES !=
1186 GNUNET_OS_check_helper_binary (binary, TRUE, NULL))) // FIXME: CF: add test-parameters 1186 GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL))) // FIXME: CF: add test-parameters
1187 { 1187 {
1188 h->enable_nat_client = GNUNET_NO; 1188 h->enable_nat_client = GNUNET_NO;
1189 LOG (GNUNET_ERROR_TYPE_WARNING, 1189 LOG (GNUNET_ERROR_TYPE_WARNING,
diff --git a/src/nat/nat_auto.c b/src/nat/nat_auto.c
index f382a9ac6..edb2bb841 100644
--- a/src/nat/nat_auto.c
+++ b/src/nat/nat_auto.c
@@ -392,7 +392,7 @@ test_upnpc (struct GNUNET_NAT_AutoHandle *ah)
392 392
393 /* test if upnpc is available */ 393 /* test if upnpc is available */
394 have_upnpc = (GNUNET_SYSERR != 394 have_upnpc = (GNUNET_SYSERR !=
395 GNUNET_OS_check_helper_binary ("upnpc", FALSE, NULL)); 395 GNUNET_OS_check_helper_binary ("upnpc", GNUNET_NO, NULL));
396 /* FIXME: test if upnpc is actually working, that is, if transports 396 /* FIXME: test if upnpc is actually working, that is, if transports
397 start to work once we use UPnP */ 397 start to work once we use UPnP */
398 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 398 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -426,7 +426,7 @@ test_icmp_server (struct GNUNET_NAT_AutoHandle *ah)
426 (GNUNET_YES == 426 (GNUNET_YES ==
427 GNUNET_CONFIGURATION_get_value_yesno (ah->cfg, "nat", "BEHIND_NAT")) && 427 GNUNET_CONFIGURATION_get_value_yesno (ah->cfg, "nat", "BEHIND_NAT")) &&
428 (GNUNET_YES == 428 (GNUNET_YES ==
429 GNUNET_OS_check_helper_binary (binary, TRUE, NULL))); // FIXME: CF: add test-parameters 429 GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL))); // FIXME: CF: add test-parameters
430 GNUNET_free_non_null (tmp); 430 GNUNET_free_non_null (tmp);
431 GNUNET_free (binary); 431 GNUNET_free (binary);
432 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 432 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -461,7 +461,7 @@ test_icmp_client (struct GNUNET_NAT_AutoHandle *ah)
461 (GNUNET_YES != 461 (GNUNET_YES !=
462 GNUNET_CONFIGURATION_get_value_yesno (ah->cfg, "nat", "BEHIND_NAT")) && 462 GNUNET_CONFIGURATION_get_value_yesno (ah->cfg, "nat", "BEHIND_NAT")) &&
463 (GNUNET_YES == 463 (GNUNET_YES ==
464 GNUNET_OS_check_helper_binary (binary, TRUE, NULL))); // FIXME: CF: add test-parameters 464 GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL))); // FIXME: CF: add test-parameters
465 GNUNET_free_non_null (tmp); 465 GNUNET_free_non_null (tmp);
466 GNUNET_free (binary); 466 GNUNET_free (binary);
467 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 467 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c
index 29b26ee28..dd1aede5e 100644
--- a/src/nat/nat_mini.c
+++ b/src/nat/nat_mini.c
@@ -164,7 +164,7 @@ GNUNET_NAT_mini_get_external_ipv4 (struct GNUNET_TIME_Relative timeout,
164{ 164{
165 struct GNUNET_NAT_ExternalHandle *eh; 165 struct GNUNET_NAT_ExternalHandle *eh;
166 166
167 if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("external-ip", FALSE, NULL)) 167 if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("external-ip", GNUNET_NO, NULL))
168 { 168 {
169 LOG (GNUNET_ERROR_TYPE_INFO, 169 LOG (GNUNET_ERROR_TYPE_INFO,
170 _("`external-ip' command not found\n")); 170 _("`external-ip' command not found\n"));
@@ -499,7 +499,7 @@ GNUNET_NAT_mini_map_start (uint16_t port, int is_tcp,
499 struct GNUNET_NAT_MiniHandle *ret; 499 struct GNUNET_NAT_MiniHandle *ret;
500 char pstr[6]; 500 char pstr[6];
501 501
502 if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("upnpc", FALSE, NULL)) 502 if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("upnpc", GNUNET_NO, NULL))
503 { 503 {
504 LOG (GNUNET_ERROR_TYPE_INFO, 504 LOG (GNUNET_ERROR_TYPE_INFO,
505 _("`upnpc' command not found\n")); 505 _("`upnpc' command not found\n"));
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index 7d4964b5c..41d3a2f09 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -92,7 +92,7 @@ main (int argc, char *const argv[])
92 "WARNING", 92 "WARNING",
93 NULL); 93 NULL);
94 94
95 nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server", FALSE, NULL); 95 nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server", GNUNET_NO, NULL);
96 if (GNUNET_SYSERR == nat_res) 96 if (GNUNET_SYSERR == nat_res)
97 { 97 {
98 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 98 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,