aboutsummaryrefslogtreecommitdiff
path: root/src/nat/test_nat.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
commit5746309cb4be2073d550ad7a6885e918631dbc38 (patch)
tree89455bc4aadf977816b38df13f990372cd81d71a /src/nat/test_nat.c
parent6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff)
downloadgnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz
gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip
indentation
Diffstat (limited to 'src/nat/test_nat.c')
-rw-r--r--src/nat/test_nat.c26
1 files changed, 11 insertions, 15 deletions
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index 12ff30cac..6a533798e 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -55,13 +55,13 @@
55 * believes to be valid for the transport. 55 * believes to be valid for the transport.
56 */ 56 */
57static void 57static void
58addr_callback (void *cls, int add_remove, 58addr_callback (void *cls, int add_remove, const struct sockaddr *addr,
59 const struct sockaddr *addr, socklen_t addrlen) 59 socklen_t addrlen)
60{ 60{
61 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 61 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address changed: %s `%s' (%u bytes)\n",
62 "Address changed: %s `%s' (%u bytes)\n", 62 add_remove == GNUNET_YES ? "added" : "removed", GNUNET_a2s (addr,
63 add_remove == GNUNET_YES ? "added" : "removed", 63 addrlen),
64 GNUNET_a2s (addr, addrlen), (unsigned int) addrlen); 64 (unsigned int) addrlen);
65} 65}
66 66
67 67
@@ -97,9 +97,8 @@ struct addr_cls
97 * @return GNUNET_OK to continue iterating 97 * @return GNUNET_OK to continue iterating
98 */ 98 */
99static int 99static int
100process_if (void *cls, 100process_if (void *cls, const char *name, int isDefault,
101 const char *name, 101 const struct sockaddr *addr, socklen_t addrlen)
102 int isDefault, const struct sockaddr *addr, socklen_t addrlen)
103{ 102{
104 struct addr_cls *data = cls; 103 struct addr_cls *data = cls;
105 104
@@ -119,9 +118,8 @@ process_if (void *cls,
119 * Main function run with scheduler. 118 * Main function run with scheduler.
120 */ 119 */
121static void 120static void
122run (void *cls, 121run (void *cls, char *const *args, const char *cfgfile,
123 char *const *args, 122 const struct GNUNET_CONFIGURATION_Handle *cfg)
124 const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
125{ 123{
126 struct GNUNET_NAT_Handle *nat; 124 struct GNUNET_NAT_Handle *nat;
127 struct addr_cls data; 125 struct addr_cls data;
@@ -147,9 +145,7 @@ run (void *cls,
147 GNUNET_a2s (addr, data.addrlen)); 145 GNUNET_a2s (addr, data.addrlen));
148 146
149 nat = GNUNET_NAT_register (cfg, GNUNET_YES /* tcp */ , 147 nat = GNUNET_NAT_register (cfg, GNUNET_YES /* tcp */ ,
150 2086, 148 2086, 1, (const struct sockaddr **) &addr,
151 1,
152 (const struct sockaddr **) &addr,
153 &data.addrlen, &addr_callback, NULL, NULL); 149 &data.addrlen, &addr_callback, NULL, NULL);
154 GNUNET_free (addr); 150 GNUNET_free (addr);
155 GNUNET_SCHEDULER_add_delayed (TIMEOUT, &stop, nat); 151 GNUNET_SCHEDULER_add_delayed (TIMEOUT, &stop, nat);