* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet_common.h"
#include "gnunet_util_lib.h"
#include "gnunet_nat_lib.h"
-
-#define VERBOSE GNUNET_NO
-
-
/**
- * Time to wait before stopping NAT test, in seconds
+ * Time to wait before stopping NAT test, in seconds
*/
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
* Main function run with scheduler.
*/
static void
-run (void *cls,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- tst = GNUNET_NAT_test_start (cfg, GNUNET_YES,
- 1285, 1285, &report_success, NULL);
+ tst =
+ GNUNET_NAT_test_start (cfg, GNUNET_YES, 1285, 1285, &report_success,
+ NULL);
if (NULL == tst)
return;
end = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_test, NULL);
GNUNET_GETOPT_OPTION_END
};
struct GNUNET_OS_Process *gns;
-
+ int nat_res;
char *const argv_prog[] = {
"test-nat-test",
"-c",
"test_nat_test_data.conf",
- "-L",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
NULL
};
GNUNET_log_setup ("test-nat-test",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
- gns = GNUNET_OS_start_process (NULL, NULL,
- "gnunet-nat-server", "gnunet-nat-server",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- "-c", "test_nat_test_data.conf",
- "12345", NULL);
+
+ nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server", GNUNET_NO, NULL);
+ if (GNUNET_SYSERR == nat_res)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Cannot run NAT test: `%s' file not found\n",
+ "gnunet-nat-server");
+ return 0;
+ }
+
+ gns =
+ GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-nat-server",
+ "gnunet-nat-server",
+ "-c", "test_nat_test_data.conf", "12345", NULL);
GNUNET_assert (NULL != gns);
- GNUNET_PROGRAM_run (5, argv_prog,
- "test-nat-test", "nohelp", options, &run, NULL);
+ GNUNET_PROGRAM_run (3, argv_prog, "test-nat-test", "nohelp", options, &run,
+ 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);
+ if (0 != ret)
+ fprintf (stderr, "NAT test failed to report success\n");
return ret;
}