* @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
*/
GNUNET_NAT_test_stop (tst);
}
+
static void
-report_success (void *cls, int success)
+report_success (void *cls,
+ enum GNUNET_NAT_FailureCode aret)
{
- GNUNET_assert (GNUNET_OK == success);
+ GNUNET_assert (GNUNET_NAT_ERROR_SUCCESS == aret);
ret = 0;
GNUNET_SCHEDULER_cancel (end);
end = GNUNET_SCHEDULER_add_now (&end_test, NULL);
}
+
/**
* Main function run with scheduler.
*/
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
tst =
- GNUNET_NAT_test_start (cfg, GNUNET_YES, 1285, 1285, &report_success,
+ GNUNET_NAT_test_start (cfg, GNUNET_YES, 1285, 1285,
+ &report_success,
NULL);
if (NULL == tst)
return;
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);
- nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
+ nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server", GNUNET_NO, NULL);
if (GNUNET_SYSERR == nat_res)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
return 0;
}
- gns =
- GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-nat-server",
- "gnunet-nat-server",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- "-c", "test_nat_test_data.conf", "12345", NULL);
+ gns = GNUNET_OS_start_process (GNUNET_YES,
+ GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ NULL, 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,
+ GNUNET_PROGRAM_run (3, argv_prog, "test-nat-test", "nohelp", options, &run,
NULL);
- GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM));
+ GNUNET_break (0 == GNUNET_OS_process_kill (gns, GNUNET_TERM_SIG));
GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns));
GNUNET_OS_process_destroy (gns);
+ if (0 != ret)
+ fprintf (stderr,
+ "NAT test failed to report success\n");
return ret;
}