diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:46:35 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:46:35 +0000 |
commit | 502af2167f7c218366666ca4944bd7cc54b5b19a (patch) | |
tree | a91fec5cc9769d260640bd91c6633cb9cf395524 /src/nat/test_nat.c | |
parent | 03af5a603b7cc53432249d5854cd412aa90dde0d (diff) | |
download | gnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.tar.gz gnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.zip |
indentation
Diffstat (limited to 'src/nat/test_nat.c')
-rw-r--r-- | src/nat/test_nat.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c index c58d83224..12ff30cac 100644 --- a/src/nat/test_nat.c +++ b/src/nat/test_nat.c | |||
@@ -58,11 +58,10 @@ static void | |||
58 | addr_callback (void *cls, int add_remove, | 58 | addr_callback (void *cls, int add_remove, |
59 | const struct sockaddr *addr, socklen_t addrlen) | 59 | const struct sockaddr *addr, socklen_t addrlen) |
60 | { | 60 | { |
61 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 61 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
62 | "Address changed: %s `%s' (%u bytes)\n", | 62 | "Address changed: %s `%s' (%u bytes)\n", |
63 | add_remove == GNUNET_YES ? "added" : "removed", | 63 | add_remove == GNUNET_YES ? "added" : "removed", |
64 | GNUNET_a2s (addr, addrlen), | 64 | GNUNET_a2s (addr, addrlen), (unsigned int) addrlen); |
65 | (unsigned int) addrlen); | ||
66 | } | 65 | } |
67 | 66 | ||
68 | 67 | ||
@@ -74,8 +73,7 @@ stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
74 | { | 73 | { |
75 | struct GNUNET_NAT_Handle *nat = cls; | 74 | struct GNUNET_NAT_Handle *nat = cls; |
76 | 75 | ||
77 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 76 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stopping NAT and quitting...\n"); |
78 | "Stopping NAT and quitting...\n"); | ||
79 | GNUNET_NAT_unregister (nat); | 77 | GNUNET_NAT_unregister (nat); |
80 | } | 78 | } |
81 | 79 | ||
@@ -132,11 +130,11 @@ run (void *cls, | |||
132 | data.addr = NULL; | 130 | data.addr = NULL; |
133 | GNUNET_OS_network_interfaces_list (process_if, &data); | 131 | GNUNET_OS_network_interfaces_list (process_if, &data); |
134 | if (NULL == data.addr) | 132 | if (NULL == data.addr) |
135 | { | 133 | { |
136 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 134 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
137 | "Could not find a valid interface address!\n"); | 135 | "Could not find a valid interface address!\n"); |
138 | exit (GNUNET_SYSERR); | 136 | exit (GNUNET_SYSERR); |
139 | } | 137 | } |
140 | addr = data.addr; | 138 | addr = data.addr; |
141 | GNUNET_assert (addr->sa_family == AF_INET || addr->sa_family == AF_INET6); | 139 | GNUNET_assert (addr->sa_family == AF_INET || addr->sa_family == AF_INET6); |
142 | if (addr->sa_family == AF_INET) | 140 | if (addr->sa_family == AF_INET) |
@@ -148,13 +146,11 @@ run (void *cls, | |||
148 | "Requesting NAT redirection from address %s...\n", | 146 | "Requesting NAT redirection from address %s...\n", |
149 | GNUNET_a2s (addr, data.addrlen)); | 147 | GNUNET_a2s (addr, data.addrlen)); |
150 | 148 | ||
151 | nat = GNUNET_NAT_register (cfg, | 149 | nat = GNUNET_NAT_register (cfg, GNUNET_YES /* tcp */ , |
152 | GNUNET_YES /* tcp */, | 150 | 2086, |
153 | 2086, | 151 | 1, |
154 | 1, | 152 | (const struct sockaddr **) &addr, |
155 | (const struct sockaddr**) &addr, | 153 | &data.addrlen, &addr_callback, NULL, NULL); |
156 | &data.addrlen, | ||
157 | &addr_callback, NULL, NULL); | ||
158 | GNUNET_free (addr); | 154 | GNUNET_free (addr); |
159 | GNUNET_SCHEDULER_add_delayed (TIMEOUT, &stop, nat); | 155 | GNUNET_SCHEDULER_add_delayed (TIMEOUT, &stop, nat); |
160 | } | 156 | } |