#include "gnunet_nat_lib.h"
-#define VERBOSE GNUNET_YES
-
-
-/* Time to wait before stopping NAT, in seconds */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+/**
+ * Time to wait before stopping NAT, in seconds
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
/**
* believes to be valid for the transport.
*/
static void
-addr_callback (void *cls, int add_remove,
- const struct sockaddr *addr, socklen_t addrlen)
+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),
- (unsigned int) 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);
}
{
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);
}
/**
* Return the address of the default interface,
- * or any interface with a valid address if the default is not valid
+ * or any interface with a valid address if the default is not valid
*
* @param cls the 'struct addr_cls'
* @param name name of the interface
* @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;
* 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)
{
struct GNUNET_NAT_Handle *nat;
struct addr_cls data;
struct sockaddr *addr;
- GNUNET_log_setup ("test-nat", "DEBUG", NULL);
data.addr = NULL;
GNUNET_OS_network_interfaces_list (process_if, &data);
if (NULL == data.addr)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Could not find a valid interface address!\n");
- exit (GNUNET_SYSERR);
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not find a valid interface address!\n");
+ exit (GNUNET_SYSERR);
+ }
addr = data.addr;
GNUNET_assert (addr->sa_family == AF_INET || addr->sa_family == AF_INET6);
if (addr->sa_family == AF_INET)
"Requesting NAT redirection from address %s...\n",
GNUNET_a2s (addr, data.addrlen));
- nat = GNUNET_NAT_register (cfg,
- GNUNET_YES /* tcp */,
- 2086,
- 1,
- (const struct sockaddr**) &addr,
- &data.addrlen,
- &addr_callback, NULL, NULL);
+ nat = GNUNET_NAT_register (cfg, GNUNET_YES /* tcp */ ,
+ 2086, 1, (const struct sockaddr **) &addr,
+ &data.addrlen, &addr_callback, 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);
-
+ GNUNET_PROGRAM_run (3, argv_prog, "test-nat", "nohelp", options, &run, NULL);
return 0;
}