/*
This file is part of GNUnet.
- (C) 2009, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2011, 2014 GNUnet e.V.
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
/**
- * Testcase for the NAT testing code.
- *
* @file nat/test_nat_test.c
* @brief Testcase for NAT testing functions
* @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
*/
static struct GNUNET_NAT_Test *tst;
-static GNUNET_SCHEDULER_TaskIdentifier end;
+static struct GNUNET_SCHEDULER_Task * tsk;
+
static void
-end_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+report_result (void *cls,
+ enum GNUNET_NAT_StatusCode aret)
{
+ if (GNUNET_NAT_ERROR_TIMEOUT == aret)
+ fprintf (stderr,
+ "NAT test timed out\n");
+ else if (GNUNET_NAT_ERROR_SUCCESS != aret)
+ fprintf (stderr,
+ "NAT test reported error %d\n", aret);
+ else
+ ret = 0;
GNUNET_NAT_test_stop (tst);
+ tst = NULL;
+ GNUNET_SCHEDULER_cancel (tsk);
+ tsk = NULL;
}
+
static void
-report_success (void *cls, int success)
+failed_timeout (void *cls)
{
- GNUNET_assert (GNUNET_OK == success);
- ret = 0;
- GNUNET_SCHEDULER_cancel (end);
- end = GNUNET_SCHEDULER_add_now (&end_test, NULL);
+ tsk = NULL;
+ fprintf (stderr,
+ "NAT test failed to terminate on timeout\n");
+ ret = 2;
+ GNUNET_NAT_test_stop (tst);
+ tst = 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, TIMEOUT,
+ &report_result,
NULL);
- if (NULL == tst)
- return;
- end = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_test, NULL);
+ tsk = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (TIMEOUT,
+ 2),
+ &failed_timeout,
+ 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);
- nat_res = GNUNET_OS_check_helper_binary ("gnunet-helper-nat-server");
- if (GNUNET_NO == nat_res)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
- "gnunet-helper-nat-server", "SUID not set");
- return 0;
- }
+ 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' %s \n",
- "gnunet-helper-nat-server", "file not found");
+ 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 (NULL, NULL, "gnunet-helper-nat-server",
- "gnunet-helper-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_close (gns);
+ GNUNET_OS_process_destroy (gns);
+ if (0 != ret)
+ fprintf (stderr,
+ "NAT test failed to report success\n");
return ret;
}
projects / oweals / gnunet.git / blobdiff