projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added helper for handling the "view" in rps
[oweals/gnunet.git]
/
src
/
nat
/
test_nat_mini.c
diff --git
a/src/nat/test_nat_mini.c
b/src/nat/test_nat_mini.c
index 2c6da3b57416286ec707075592fee9131e2db410..bb0fa07a0ee2aa35762ccc935ecfbcad38b6bf54 100644
(file)
--- a/
src/nat/test_nat_mini.c
+++ b/
src/nat/test_nat_mini.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009, 2011 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2009, 2011 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-29,15
+29,11
@@
*/
#include "platform.h"
*/
#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"
#include "gnunet_util_lib.h"
#include "gnunet_program_lib.h"
#include "gnunet_scheduler_lib.h"
#include "gnunet_nat_lib.h"
-
-#define VERBOSE GNUNET_NO
-
/* Time to wait before stopping NAT, in seconds */
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
/* Time to wait before stopping NAT, in seconds */
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
@@
-46,13
+42,24
@@
* believes to be valid for the transport.
*/
static void
* 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,
+ enum GNUNET_NAT_StatusCode ret)
{
{
- fprintf (stderr, "Address changed: %s `%s' (%u bytes)\n",
- add_remove == GNUNET_YES ? "added" : "removed", GNUNET_a2s (addr,
- addrlen),
+ if (GNUNET_NAT_ERROR_SUCCESS == ret)
+ {
+ fprintf (stderr,
+ "Address changed: %s `%s' (%u bytes)\n",
+ add_remove == GNUNET_YES
+ ? "added" : "removed",
+ GNUNET_a2s (addr,
+ addrlen),
(unsigned int) addrlen);
(unsigned int) addrlen);
+ }
+ else
+ ;
+ //TODO: proper error handling!
}
}
@@
-80,7
+87,8
@@
run (void *cls, char *const *args, const char *cfgfile,
struct GNUNET_NAT_MiniHandle *mini;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
struct GNUNET_NAT_MiniHandle *mini;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Requesting NAT redirection for port %u...\n", PORT);
+ "Requesting NAT redirection for port %u...\n",
+ PORT);
mini = GNUNET_NAT_mini_map_start (PORT, GNUNET_YES /* tcp */ ,
&addr_callback, NULL);
if (NULL == mini)
mini = GNUNET_NAT_mini_map_start (PORT, GNUNET_YES /* tcp */ ,
&addr_callback, NULL);
if (NULL == mini)
@@
-104,20
+112,12
@@
main (int argc, char *const argv[])
"-c",
"test_nat_data.conf",
"-L",
"-c",
"test_nat_data.conf",
"-L",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
"WARNING",
-#endif
NULL
};
GNUNET_log_setup ("test-nat-mini",
NULL
};
GNUNET_log_setup ("test-nat-mini",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
"WARNING",
-#endif
NULL);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
NULL);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,