/*
This file is part of GNUnet.
- (C) 2009, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2011 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
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.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
*/
#include "platform.h"
-#include "gnunet_common.h"
#include "gnunet_util_lib.h"
#include "gnunet_program_lib.h"
#include "gnunet_scheduler_lib.h"
#include "gnunet_nat_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
-
-
/**
* Time to wait before stopping NAT, in seconds
*/
addr_callback (void *cls, int add_remove, const struct sockaddr *addr,
socklen_t addrlen)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address changed: %s `%s' (%u bytes)\n",
- add_remove == GNUNET_YES ? "added" : "removed", GNUNET_a2s (addr,
- addrlen),
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Address changed: %s `%s' (%u bytes)\n",
+ add_remove == GNUNET_YES ? "added" : "removed",
+ GNUNET_a2s (addr,
+ addrlen),
(unsigned int) addrlen);
}
* Function that terminates the test.
*/
static void
-stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+stop (void *cls)
{
struct GNUNET_NAT_Handle *nat = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stopping NAT and quitting...\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Stopping NAT and quitting...\n");
GNUNET_NAT_unregister (nat);
}
* @param name name of the interface
* @param isDefault do we think this may be our default interface
* @param addr address of the interface
- * @param addrlen number of bytes in addr
- * @return GNUNET_OK to continue iterating
+ * @param addrlen number of bytes in @a addr
+ * @return #GNUNET_OK to continue iterating
*/
static int
-process_if (void *cls, const char *name, int isDefault,
- const struct sockaddr *addr, socklen_t addrlen)
+process_if (void *cls,
+ const char *name,
+ int isDefault,
+ const struct sockaddr *addr,
+ const struct sockaddr *broadcast_addr,
+ const struct sockaddr *netmask,
+ socklen_t addrlen)
{
struct addr_cls *data = cls;
return GNUNET_OK;
GNUNET_free_non_null (data->addr);
data->addr = GNUNET_malloc (addrlen);
- memcpy (data->addr, addr, addrlen);
+ GNUNET_memcpy (data->addr, addr, addrlen);
data->addrlen = addrlen;
if (isDefault)
return GNUNET_SYSERR;
* Main function run with scheduler.
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct GNUNET_NAT_Handle *nat;
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Could not find a valid interface address!\n");
- exit (GNUNET_SYSERR);
+ exit (77); /* marks test as skipped */
}
addr = data.addr;
GNUNET_assert (addr->sa_family == AF_INET || addr->sa_family == AF_INET6);
nat = GNUNET_NAT_register (cfg, GNUNET_YES /* tcp */ ,
2086, 1, (const struct sockaddr **) &addr,
- &data.addrlen, &addr_callback, NULL, NULL);
+ &data.addrlen, &addr_callback, NULL, NULL, NULL);
GNUNET_free (addr);
GNUNET_SCHEDULER_add_delayed (TIMEOUT, &stop, nat);
}
"test-nat",
"-c",
"test_nat_data.conf",
- "-L",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
NULL
};
-
GNUNET_log_setup ("test-nat",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
-
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Testing NAT library, timeout set to %d seconds\n", TIMEOUT);
-
- GNUNET_PROGRAM_run (5, argv_prog, "test-nat", "nohelp", options, &run, NULL);
-
+ "Testing NAT library, timeout set to %s\n",
+ GNUNET_STRINGS_relative_time_to_string (TIMEOUT,
+ GNUNET_YES));
+ GNUNET_PROGRAM_run (3,
+ argv_prog,
+ "test-nat",
+ "nohelp",
+ options,
+ &run, NULL);
return 0;
}