diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-10-28 15:43:30 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-10-28 15:43:30 +0000 |
commit | 363b7a14f9e07ddbdbf7d3b6e6243b276693222e (patch) | |
tree | bc779bb85411555059b8217b741f2e6b880fdec1 | |
parent | 3a70e67854d7696dfb0de49c7bbd19ab82b42348 (diff) | |
download | gnunet-363b7a14f9e07ddbdbf7d3b6e6243b276693222e.tar.gz gnunet-363b7a14f9e07ddbdbf7d3b6e6243b276693222e.zip |
moving files from dev to final location
-rw-r--r-- | src/transport/Makefile.am | 23 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport.c | 122 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_3way.c | 576 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 1116 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.h | 33 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours_3way.c | 2193 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours_3way.h | 279 |
7 files changed, 1033 insertions, 3309 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index bc116171f..1996e572f 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -130,11 +130,11 @@ gnunet_transport_DEPENDENCIES = \ | |||
130 | libgnunettransport.la | 130 | libgnunettransport.la |
131 | 131 | ||
132 | gnunet_service_transport_SOURCES = \ | 132 | gnunet_service_transport_SOURCES = \ |
133 | gnunet-service-transport_3way.c gnunet-service-transport.h \ | 133 | gnunet-service-transport.c gnunet-service-transport.h \ |
134 | gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \ | 134 | gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \ |
135 | gnunet-service-transport_clients.h gnunet-service-transport_clients.c \ | 135 | gnunet-service-transport_clients.h gnunet-service-transport_clients.c \ |
136 | gnunet-service-transport_hello.h gnunet-service-transport_hello.c \ | 136 | gnunet-service-transport_hello.h gnunet-service-transport_hello.c \ |
137 | gnunet-service-transport_neighbours.h gnunet-service-transport_neighbours_3way.c \ | 137 | gnunet-service-transport_neighbours.h gnunet-service-transport_neighbours.c \ |
138 | gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \ | 138 | gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \ |
139 | gnunet-service-transport_validation.h gnunet-service-transport_validation.c | 139 | gnunet-service-transport_validation.h gnunet-service-transport_validation.c |
140 | gnunet_service_transport_LDADD = \ | 140 | gnunet_service_transport_LDADD = \ |
@@ -146,25 +146,6 @@ gnunet_service_transport_LDADD = \ | |||
146 | $(GN_GLPK) \ | 146 | $(GN_GLPK) \ |
147 | $(GN_LIBINTL) | 147 | $(GN_LIBINTL) |
148 | 148 | ||
149 | |||
150 | #gnunet_service_transport_SOURCES = \ | ||
151 | # gnunet-service-transport.c gnunet-service-transport.h \ | ||
152 | # gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \ | ||
153 | # gnunet-service-transport_clients.h gnunet-service-transport_clients.c \ | ||
154 | # gnunet-service-transport_hello.h gnunet-service-transport_hello.c \ | ||
155 | # gnunet-service-transport_neighbours.h gnunet-service-transport_neighbours.c \ | ||
156 | # gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \ | ||
157 | # gnunet-service-transport_validation.h gnunet-service-transport_validation.c | ||
158 | #gnunet_service_transport_LDADD = \ | ||
159 | # $(top_builddir)/src/ats/libgnunetats.la \ | ||
160 | # $(top_builddir)/src/hello/libgnunethello.la \ | ||
161 | # $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | ||
162 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
163 | # $(top_builddir)/src/util/libgnunetutil.la \ | ||
164 | # $(GN_GLPK) \ | ||
165 | # $(GN_LIBINTL) | ||
166 | |||
167 | |||
168 | plugin_LTLIBRARIES = \ | 149 | plugin_LTLIBRARIES = \ |
169 | libgnunet_plugin_transport_tcp.la \ | 150 | libgnunet_plugin_transport_tcp.la \ |
170 | libgnunet_plugin_transport_udp.la \ | 151 | libgnunet_plugin_transport_udp.la \ |
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 7e75b4499..ef9068c9b 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -116,24 +116,6 @@ process_hello_update (void *cls, const struct GNUNET_MessageHeader *hello) | |||
116 | } | 116 | } |
117 | 117 | ||
118 | 118 | ||
119 | /** | ||
120 | * Try to initiate a connection to the given peer if the blacklist | ||
121 | * allowed it. | ||
122 | * | ||
123 | * @param cls closure (unused, NULL) | ||
124 | * @param peer identity of peer that was tested | ||
125 | * @param result GNUNET_OK if the connection is allowed, | ||
126 | * GNUNET_NO if not | ||
127 | */ | ||
128 | static void | ||
129 | try_connect_if_allowed (void *cls, const struct GNUNET_PeerIdentity *peer, | ||
130 | int result) | ||
131 | { | ||
132 | if (GNUNET_OK != result) | ||
133 | return; /* not allowed */ | ||
134 | GST_neighbours_try_connect (peer); | ||
135 | } | ||
136 | |||
137 | 119 | ||
138 | /** | 120 | /** |
139 | * We received some payload. Prepare to pass it on to our clients. | 121 | * We received some payload. Prepare to pass it on to our clients. |
@@ -154,7 +136,8 @@ process_payload (const struct GNUNET_PeerIdentity *peer, | |||
154 | struct GNUNET_TIME_Relative ret; | 136 | struct GNUNET_TIME_Relative ret; |
155 | int do_forward; | 137 | int do_forward; |
156 | struct InboundMessage *im; | 138 | struct InboundMessage *im; |
157 | size_t size = sizeof (struct InboundMessage) + ntohs (message->size) + sizeof (struct GNUNET_ATS_Information) * ats_count; | 139 | size_t msg_size = ntohs (message->size); |
140 | size_t size = sizeof (struct InboundMessage) + msg_size + sizeof (struct GNUNET_ATS_Information) * ats_count; | ||
158 | char buf[size]; | 141 | char buf[size]; |
159 | struct GNUNET_ATS_Information *ap; | 142 | struct GNUNET_ATS_Information *ap; |
160 | 143 | ||
@@ -164,8 +147,26 @@ process_payload (const struct GNUNET_PeerIdentity *peer, | |||
164 | GST_neighbours_calculate_receive_delay (peer, | 147 | GST_neighbours_calculate_receive_delay (peer, |
165 | (message == | 148 | (message == |
166 | NULL) ? 0 : | 149 | NULL) ? 0 : |
167 | ntohs (message->size), | 150 | msg_size, |
168 | &do_forward); | 151 | &do_forward); |
152 | |||
153 | if (!GST_neighbours_test_connected (peer)) | ||
154 | { | ||
155 | |||
156 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Discarded %u bytes type %u payload from peer `%s'\n", | ||
157 | msg_size, | ||
158 | ntohs (message->type), | ||
159 | GNUNET_i2s (peer)); | ||
160 | |||
161 | GNUNET_STATISTICS_update (GST_stats, | ||
162 | gettext_noop ("# bytes payload discarded due to not connected peer "), | ||
163 | msg_size, | ||
164 | GNUNET_NO); | ||
165 | return ret; | ||
166 | } | ||
167 | |||
168 | if (do_forward != GNUNET_YES) | ||
169 | return ret; | ||
169 | im = (struct InboundMessage*) buf; | 170 | im = (struct InboundMessage*) buf; |
170 | im->header.size = htons (size); | 171 | im->header.size = htons (size); |
171 | im->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_RECV); | 172 | im->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_RECV); |
@@ -175,30 +176,8 @@ process_payload (const struct GNUNET_PeerIdentity *peer, | |||
175 | memcpy (ap, ats, ats_count * sizeof (struct GNUNET_ATS_Information)); | 176 | memcpy (ap, ats, ats_count * sizeof (struct GNUNET_ATS_Information)); |
176 | memcpy (&ap[ats_count], message, ntohs (message->size)); | 177 | memcpy (&ap[ats_count], message, ntohs (message->size)); |
177 | 178 | ||
178 | switch (do_forward) | 179 | GST_clients_broadcast (&im->header, GNUNET_YES); |
179 | { | 180 | |
180 | case GNUNET_YES: | ||
181 | GST_clients_broadcast (&im->header, GNUNET_YES); | ||
182 | break; | ||
183 | case GNUNET_NO: | ||
184 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
185 | _("Discarded %u bytes of type %u from %s: quota violated or no neighbour record!\n"), | ||
186 | ntohs (message->size), | ||
187 | ntohs (message->type), | ||
188 | GNUNET_i2s (peer)); | ||
189 | break; | ||
190 | case GNUNET_SYSERR: | ||
191 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | ||
192 | _("Discarded %u bytes of type %u from %s: connection is down!\n"), | ||
193 | ntohs (message->size), | ||
194 | ntohs (message->type), | ||
195 | GNUNET_i2s (peer)); | ||
196 | /* FIXME: store until connection is up? This is virtually always a SETKEY and a PING... */ | ||
197 | break; | ||
198 | default: | ||
199 | GNUNET_break (0); | ||
200 | break; | ||
201 | } | ||
202 | return ret; | 181 | return ret; |
203 | } | 182 | } |
204 | 183 | ||
@@ -242,6 +221,11 @@ plugin_env_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
242 | if (NULL == message) | 221 | if (NULL == message) |
243 | goto end; | 222 | goto end; |
244 | type = ntohs (message->type); | 223 | type = ntohs (message->type); |
224 | #if DEBUG_TRANSPORT | ||
225 | |||
226 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received Message with type %u\n", type); | ||
227 | #endif | ||
228 | |||
245 | switch (type) | 229 | switch (type) |
246 | { | 230 | { |
247 | case GNUNET_MESSAGE_TYPE_HELLO: | 231 | case GNUNET_MESSAGE_TYPE_HELLO: |
@@ -275,8 +259,18 @@ plugin_env_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
275 | peer, | 259 | peer, |
276 | plugin_name, sender_address, sender_address_len, | 260 | plugin_name, sender_address, sender_address_len, |
277 | session, ats, ats_count); | 261 | session, ats, ats_count); |
278 | (void) GST_blacklist_test_allowed (peer, NULL, &try_connect_if_allowed, | 262 | break; |
279 | NULL); | 263 | case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT_ACK: |
264 | GST_neighbours_handle_connect_ack (message, | ||
265 | peer, | ||
266 | plugin_name, sender_address, sender_address_len, | ||
267 | session, ats, ats_count); | ||
268 | break; | ||
269 | case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_ACK: | ||
270 | GST_neighbours_handle_ack (message, | ||
271 | peer, | ||
272 | plugin_name, sender_address, sender_address_len, | ||
273 | session, ats, ats_count); | ||
280 | break; | 274 | break; |
281 | case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT: | 275 | case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT: |
282 | GST_neighbours_handle_disconnect_message (peer, message); | 276 | GST_neighbours_handle_disconnect_message (peer, message); |
@@ -285,7 +279,6 @@ plugin_env_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
285 | GST_neighbours_keepalive (peer); | 279 | GST_neighbours_keepalive (peer); |
286 | break; | 280 | break; |
287 | default: | 281 | default: |
288 | |||
289 | /* should be payload */ | 282 | /* should be payload */ |
290 | ret = process_payload (peer, | 283 | ret = process_payload (peer, |
291 | message, | 284 | message, |
@@ -393,7 +386,6 @@ ats_request_address_change (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
393 | { | 386 | { |
394 | uint32_t bw_in = ntohl (bandwidth_in.value__); | 387 | uint32_t bw_in = ntohl (bandwidth_in.value__); |
395 | uint32_t bw_out = ntohl (bandwidth_out.value__); | 388 | uint32_t bw_out = ntohl (bandwidth_out.value__); |
396 | struct QuotaSetMessage msg; | ||
397 | 389 | ||
398 | /* ATS tells me to disconnect from peer*/ | 390 | /* ATS tells me to disconnect from peer*/ |
399 | if ((bw_in == 0) && (bw_out == 0)) | 391 | if ((bw_in == 0) && (bw_out == 0)) |
@@ -406,36 +398,10 @@ ats_request_address_change (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
406 | GST_neighbours_force_disconnect(peer); | 398 | GST_neighbours_force_disconnect(peer); |
407 | return; | 399 | return; |
408 | } | 400 | } |
409 | if (GNUNET_YES != | 401 | /* will never return GNUNET_YES since connection is to be established */ |
410 | GST_neighbours_switch_to_address (peer, plugin_name, plugin_addr, | 402 | GST_neighbours_switch_to_address_3way (peer, plugin_name, plugin_addr, |
411 | plugin_addr_len, session, ats, ats_count)) | 403 | plugin_addr_len, session, ats, ats_count, |
412 | { | 404 | bandwidth_in, bandwidth_out); |
413 | #if DEBUG_TRANSPORT | ||
414 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
415 | "Connection is not yet up, ignoring quota for now\n"); | ||
416 | #endif | ||
417 | /* FIXME: maybe we should let ATS know somehow? This is a problem | ||
418 | with the design; ATS may assign bandwidth, but we don't use it; | ||
419 | the current ATS API doesn't give us a good way to sync the | ||
420 | connection status between ATS and TRANSPORT */ | ||
421 | return; | ||
422 | } | ||
423 | #if DEBUG_TRANSPORT | ||
424 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
425 | "Sending outbound quota of %u Bps for peer `%s' to all clients\n", | ||
426 | ntohl (bandwidth_out.value__), GNUNET_i2s (peer)); | ||
427 | #endif | ||
428 | msg.header.size = htons (sizeof (struct QuotaSetMessage)); | ||
429 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA); | ||
430 | msg.quota = bandwidth_out; | ||
431 | msg.peer = (*peer); | ||
432 | GST_clients_broadcast (&msg.header, GNUNET_NO); | ||
433 | #if DEBUG_TRANSPORT | ||
434 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
435 | "Setting inbound quota of %u for peer `%s' to \n", | ||
436 | ntohl (bandwidth_in.value__), GNUNET_i2s (peer)); | ||
437 | #endif | ||
438 | GST_neighbours_set_incoming_quota (peer, bandwidth_in); | ||
439 | } | 405 | } |
440 | 406 | ||
441 | 407 | ||
diff --git a/src/transport/gnunet-service-transport_3way.c b/src/transport/gnunet-service-transport_3way.c deleted file mode 100644 index ef9068c9b..000000000 --- a/src/transport/gnunet-service-transport_3way.c +++ /dev/null | |||
@@ -1,576 +0,0 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | (C) 2010,2011 Christian Grothoff (and other contributing authors) | ||
4 | |||
5 | GNUnet is free software; you can redistribute it and/or modify | ||
6 | it under the terms of the GNU General Public License as published | ||
7 | by the Free Software Foundation; either version 3, or (at your | ||
8 | option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU General Public License | ||
16 | along with GNUnet; see the file COPYING. If not, write to the | ||
17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
18 | Boston, MA 02111-1307, USA. | ||
19 | */ | ||
20 | |||
21 | /** | ||
22 | * @file transport/gnunet-service-transport-new.c | ||
23 | * @brief | ||
24 | * @author Christian Grothoff | ||
25 | */ | ||
26 | #include "platform.h" | ||
27 | #include "gnunet_util_lib.h" | ||
28 | #include "gnunet_statistics_service.h" | ||
29 | #include "gnunet_transport_service.h" | ||
30 | #include "gnunet_peerinfo_service.h" | ||
31 | #include "gnunet_ats_service.h" | ||
32 | #include "gnunet-service-transport.h" | ||
33 | #include "gnunet-service-transport_blacklist.h" | ||
34 | #include "gnunet-service-transport_clients.h" | ||
35 | #include "gnunet-service-transport_hello.h" | ||
36 | #include "gnunet-service-transport_neighbours.h" | ||
37 | #include "gnunet-service-transport_plugins.h" | ||
38 | #include "gnunet-service-transport_validation.h" | ||
39 | #include "transport.h" | ||
40 | |||
41 | /* globals */ | ||
42 | |||
43 | /** | ||
44 | * Statistics handle. | ||
45 | */ | ||
46 | struct GNUNET_STATISTICS_Handle *GST_stats; | ||
47 | |||
48 | /** | ||
49 | * Configuration handle. | ||
50 | */ | ||
51 | const struct GNUNET_CONFIGURATION_Handle *GST_cfg; | ||
52 | |||
53 | /** | ||
54 | * Configuration handle. | ||
55 | */ | ||
56 | struct GNUNET_PeerIdentity GST_my_identity; | ||
57 | |||
58 | /** | ||
59 | * Handle to peerinfo service. | ||
60 | */ | ||
61 | struct GNUNET_PEERINFO_Handle *GST_peerinfo; | ||
62 | |||
63 | /** | ||
64 | * Our public key. | ||
65 | */ | ||
66 | struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded GST_my_public_key; | ||
67 | |||
68 | /** | ||
69 | * Our private key. | ||
70 | */ | ||
71 | struct GNUNET_CRYPTO_RsaPrivateKey *GST_my_private_key; | ||
72 | |||
73 | /** | ||
74 | * ATS handle. | ||
75 | */ | ||
76 | struct GNUNET_ATS_SchedulingHandle *GST_ats; | ||
77 | |||
78 | |||
79 | /** | ||
80 | * Transmit our HELLO message to the given (connected) neighbour. | ||
81 | * | ||
82 | * @param cls the 'HELLO' message | ||
83 | * @param target a connected neighbour | ||
84 | * @param ats performance information (unused) | ||
85 | * @param ats_count number of records in ats (unused) | ||
86 | * @param transport plugin | ||
87 | * @param addr address | ||
88 | * @param addrlen address length | ||
89 | */ | ||
90 | static void | ||
91 | transmit_our_hello (void *cls, const struct GNUNET_PeerIdentity *target, | ||
92 | const struct GNUNET_ATS_Information *ats, | ||
93 | uint32_t ats_count, | ||
94 | const char * transport, | ||
95 | const void * addr, | ||
96 | size_t addrlen) | ||
97 | { | ||
98 | const struct GNUNET_MessageHeader *hello = cls; | ||
99 | |||
100 | GST_neighbours_send (target, (const char *) hello, ntohs (hello->size), | ||
101 | GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION, NULL, NULL); | ||
102 | } | ||
103 | |||
104 | |||
105 | /** | ||
106 | * My HELLO has changed. Tell everyone who should know. | ||
107 | * | ||
108 | * @param cls unused | ||
109 | * @param hello new HELLO | ||
110 | */ | ||
111 | static void | ||
112 | process_hello_update (void *cls, const struct GNUNET_MessageHeader *hello) | ||
113 | { | ||
114 | GST_clients_broadcast (hello, GNUNET_NO); | ||
115 | GST_neighbours_iterate (&transmit_our_hello, (void *) hello); | ||
116 | } | ||
117 | |||
118 | |||
119 | |||
120 | /** | ||
121 | * We received some payload. Prepare to pass it on to our clients. | ||
122 | * | ||
123 | * @param peer (claimed) identity of the other peer | ||
124 | * @param message the message, NULL if we only care about | ||
125 | * learning about the delay until we should receive again -- FIXME! | ||
126 | * @param ats performance information | ||
127 | * @param ats_count number of records in ats | ||
128 | * @return how long the plugin should wait until receiving more data | ||
129 | */ | ||
130 | static struct GNUNET_TIME_Relative | ||
131 | process_payload (const struct GNUNET_PeerIdentity *peer, | ||
132 | const struct GNUNET_MessageHeader *message, | ||
133 | const struct GNUNET_ATS_Information *ats, | ||
134 | uint32_t ats_count) | ||
135 | { | ||
136 | struct GNUNET_TIME_Relative ret; | ||
137 | int do_forward; | ||
138 | struct InboundMessage *im; | ||
139 | size_t msg_size = ntohs (message->size); | ||
140 | size_t size = sizeof (struct InboundMessage) + msg_size + sizeof (struct GNUNET_ATS_Information) * ats_count; | ||
141 | char buf[size]; | ||
142 | struct GNUNET_ATS_Information *ap; | ||
143 | |||
144 | ret = GNUNET_TIME_UNIT_ZERO; | ||
145 | do_forward = GNUNET_SYSERR; | ||
146 | ret = | ||
147 | GST_neighbours_calculate_receive_delay (peer, | ||
148 | (message == | ||
149 | NULL) ? 0 : | ||
150 | msg_size, | ||
151 | &do_forward); | ||
152 | |||
153 | if (!GST_neighbours_test_connected (peer)) | ||
154 | { | ||
155 | |||
156 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Discarded %u bytes type %u payload from peer `%s'\n", | ||
157 | msg_size, | ||
158 | ntohs (message->type), | ||
159 | GNUNET_i2s (peer)); | ||
160 | |||
161 | GNUNET_STATISTICS_update (GST_stats, | ||
162 | gettext_noop ("# bytes payload discarded due to not connected peer "), | ||
163 | msg_size, | ||
164 | GNUNET_NO); | ||
165 | return ret; | ||
166 | } | ||
167 | |||
168 | if (do_forward != GNUNET_YES) | ||
169 | return ret; | ||
170 | im = (struct InboundMessage*) buf; | ||
171 | im->header.size = htons (size); | ||
172 | im->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_RECV); | ||
173 | im->ats_count = htonl (ats_count); | ||
174 | im->peer = *peer; | ||
175 | ap = (struct GNUNET_ATS_Information*) &im[1]; | ||
176 | memcpy (ap, ats, ats_count * sizeof (struct GNUNET_ATS_Information)); | ||
177 | memcpy (&ap[ats_count], message, ntohs (message->size)); | ||
178 | |||
179 | GST_clients_broadcast (&im->header, GNUNET_YES); | ||
180 | |||
181 | return ret; | ||
182 | } | ||
183 | |||
184 | |||
185 | /** | ||
186 | * Function called by the transport for each received message. | ||
187 | * This function should also be called with "NULL" for the | ||
188 | * message to signal that the other peer disconnected. | ||
189 | * | ||
190 | * @param cls closure, const char* with the name of the plugin we received the message from | ||
191 | * @param peer (claimed) identity of the other peer | ||
192 | * @param message the message, NULL if we only care about | ||
193 | * learning about the delay until we should receive again -- FIXME! | ||
194 | * @param ats performance information | ||
195 | * @param ats_count number of records in ats | ||
196 | * @param session identifier used for this session (NULL for plugins | ||
197 | * that do not offer bi-directional communication to the sender | ||
198 | * using the same "connection") | ||
199 | * @param sender_address binary address of the sender (if we established the | ||
200 | * connection or are otherwise sure of it; should be NULL | ||
201 | * for inbound TCP/UDP connections since it it not clear | ||
202 | * that we could establish ourselves a connection to that | ||
203 | * IP address and get the same system) | ||
204 | * @param sender_address_len number of bytes in sender_address | ||
205 | * @return how long the plugin should wait until receiving more data | ||
206 | * (plugins that do not support this, can ignore the return value) | ||
207 | */ | ||
208 | static struct GNUNET_TIME_Relative | ||
209 | plugin_env_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer, | ||
210 | const struct GNUNET_MessageHeader *message, | ||
211 | const struct GNUNET_ATS_Information *ats, | ||
212 | uint32_t ats_count, struct Session *session, | ||
213 | const char *sender_address, | ||
214 | uint16_t sender_address_len) | ||
215 | { | ||
216 | const char *plugin_name = cls; | ||
217 | struct GNUNET_TIME_Relative ret; | ||
218 | uint16_t type; | ||
219 | |||
220 | ret = GNUNET_TIME_UNIT_ZERO; | ||
221 | if (NULL == message) | ||
222 | goto end; | ||
223 | type = ntohs (message->type); | ||
224 | #if DEBUG_TRANSPORT | ||
225 | |||
226 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received Message with type %u\n", type); | ||
227 | #endif | ||
228 | |||
229 | switch (type) | ||
230 | { | ||
231 | case GNUNET_MESSAGE_TYPE_HELLO: | ||
232 | GST_validation_handle_hello (message); | ||
233 | return ret; | ||
234 | case GNUNET_MESSAGE_TYPE_TRANSPORT_PING: | ||
235 | #if DEBUG_TRANSPORT | ||
236 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, | ||
237 | "Processing `%s' from `%s'\n", "PING", | ||
238 | (sender_address != NULL) ? GST_plugins_a2s (plugin_name, | ||
239 | sender_address, | ||
240 | sender_address_len) | ||
241 | : "<inbound>"); | ||
242 | #endif | ||
243 | GST_validation_handle_ping (peer, message, plugin_name, session, | ||
244 | sender_address, sender_address_len); | ||
245 | break; | ||
246 | case GNUNET_MESSAGE_TYPE_TRANSPORT_PONG: | ||
247 | #if DEBUG_TRANSPORT | ||
248 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, | ||
249 | "Processing `%s' from `%s'\n", "PONG", | ||
250 | (sender_address != NULL) ? GST_plugins_a2s (plugin_name, | ||
251 | sender_address, | ||
252 | sender_address_len) | ||
253 | : "<inbound>"); | ||
254 | #endif | ||
255 | GST_validation_handle_pong (peer, message); | ||
256 | break; | ||
257 | case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT: | ||
258 | GST_neighbours_handle_connect (message, | ||
259 | peer, | ||
260 | plugin_name, sender_address, sender_address_len, | ||
261 | session, ats, ats_count); | ||
262 | break; | ||
263 | case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT_ACK: | ||
264 | GST_neighbours_handle_connect_ack (message, | ||
265 | peer, | ||
266 | plugin_name, sender_address, sender_address_len, | ||
267 | session, ats, ats_count); | ||
268 | break; | ||
269 | case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_ACK: | ||
270 | GST_neighbours_handle_ack (message, | ||
271 | peer, | ||
272 | plugin_name, sender_address, sender_address_len, | ||
273 | session, ats, ats_count); | ||
274 | break; | ||
275 | case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT: | ||
276 | GST_neighbours_handle_disconnect_message (peer, message); | ||
277 | break; | ||
278 | case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE: | ||
279 | GST_neighbours_keepalive (peer); | ||
280 | break; | ||
281 | default: | ||
282 | /* should be payload */ | ||
283 | ret = process_payload (peer, | ||
284 | message, | ||
285 | ats, ats_count); | ||
286 | break; | ||
287 | } | ||
288 | end: | ||
289 | #if 1 | ||
290 | /* FIXME: this should not be needed, and not sure it's good to have it, but without | ||
291 | this connections seem to go extra-slow */ | ||
292 | GNUNET_ATS_address_update (GST_ats, peer, | ||
293 | plugin_name, sender_address, sender_address_len, | ||
294 | session, | ||
295 | ats, ats_count); | ||
296 | #endif | ||
297 | #if DEBUG_TRANSPORT | ||
298 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
299 | "Allowing receive from peer %s to continue in %llu ms\n", | ||
300 | GNUNET_i2s (peer), | ||
301 | (unsigned long long) ret.rel_value); | ||
302 | #endif | ||
303 | return ret; | ||
304 | } | ||
305 | |||
306 | |||
307 | /** | ||
308 | * Function that will be called for each address the transport | ||
309 | * is aware that it might be reachable under. Update our HELLO. | ||
310 | * | ||
311 | * @param cls name of the plugin (const char*) | ||
312 | * @param add_remove should the address added (YES) or removed (NO) from the | ||
313 | * set of valid addresses? | ||
314 | * @param addr one of the addresses of the host | ||
315 | * the specific address format depends on the transport | ||
316 | * @param addrlen length of the address | ||
317 | */ | ||
318 | static void | ||
319 | plugin_env_address_change_notification (void *cls, int add_remove, | ||
320 | const void *addr, size_t addrlen) | ||
321 | { | ||
322 | const char *plugin_name = cls; | ||
323 | |||
324 | GST_hello_modify_addresses (add_remove, plugin_name, addr, addrlen); | ||
325 | } | ||
326 | |||
327 | |||
328 | /** | ||
329 | * Function that will be called whenever the plugin internally | ||
330 | * cleans up a session pointer and hence the service needs to | ||
331 | * discard all of those sessions as well. Plugins that do not | ||
332 | * use sessions can simply omit calling this function and always | ||
333 | * use NULL wherever a session pointer is needed. This function | ||
334 | * should be called BEFORE a potential "TransmitContinuation" | ||
335 | * from the "TransmitFunction". | ||
336 | * | ||
337 | * @param cls closure | ||
338 | * @param peer which peer was the session for | ||
339 | * @param session which session is being destoyed | ||
340 | */ | ||
341 | static void | ||
342 | plugin_env_session_end (void *cls, const struct GNUNET_PeerIdentity *peer, | ||
343 | struct Session *session) | ||
344 | { | ||
345 | #if DEBUG_TRANSPORT | ||
346 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
347 | "Session %X to peer `%s' ended \n", | ||
348 | session, GNUNET_i2s (peer)); | ||
349 | #endif | ||
350 | if (NULL != session) | ||
351 | GNUNET_log_from (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK, | ||
352 | "transport-ats", | ||
353 | "Telling ATS to destroy session %p from peer %s\n", | ||
354 | session, | ||
355 | GNUNET_i2s (peer)); | ||
356 | GNUNET_ATS_address_destroyed (GST_ats, peer, NULL, NULL, 0, session); | ||
357 | GST_neighbours_session_terminated (peer, session); | ||
358 | } | ||
359 | |||
360 | |||
361 | /** | ||
362 | * Function called by ATS to notify the callee that the | ||
363 | * assigned bandwidth or address for a given peer was changed. If the | ||
364 | * callback is called with address/bandwidth assignments of zero, the | ||
365 | * ATS disconnect function will still be called once the disconnect | ||
366 | * actually happened. | ||
367 | * | ||
368 | * @param cls closure | ||
369 | * @param peer identity of the peer | ||
370 | * @param plugin_name name of the transport plugin, NULL to disconnect | ||
371 | * @param session session to use (if available) | ||
372 | * @param plugin_addr address to use (if available) | ||
373 | * @param plugin_addr_len number of bytes in addr | ||
374 | * @param bandwidth_out assigned outbound bandwidth for the connection, 0 to disconnect from peer | ||
375 | * @param bandwidth_in assigned inbound bandwidth for the connection, 0 to disconnect from peer | ||
376 | */ | ||
377 | static void | ||
378 | ats_request_address_change (void *cls, const struct GNUNET_PeerIdentity *peer, | ||
379 | const char *plugin_name, | ||
380 | const void *plugin_addr, size_t plugin_addr_len, | ||
381 | struct Session *session, | ||
382 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, | ||
383 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, | ||
384 | const struct GNUNET_ATS_Information * ats, | ||
385 | uint32_t ats_count) | ||
386 | { | ||
387 | uint32_t bw_in = ntohl (bandwidth_in.value__); | ||
388 | uint32_t bw_out = ntohl (bandwidth_out.value__); | ||
389 | |||
390 | /* ATS tells me to disconnect from peer*/ | ||
391 | if ((bw_in == 0) && (bw_out == 0)) | ||
392 | { | ||
393 | #if DEBUG_TRANSPORT | ||
394 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
395 | "ATS tells me to disconnect from peer `%s'\n", | ||
396 | GNUNET_i2s (peer)); | ||
397 | #endif | ||
398 | GST_neighbours_force_disconnect(peer); | ||
399 | return; | ||
400 | } | ||
401 | /* will never return GNUNET_YES since connection is to be established */ | ||
402 | GST_neighbours_switch_to_address_3way (peer, plugin_name, plugin_addr, | ||
403 | plugin_addr_len, session, ats, ats_count, | ||
404 | bandwidth_in, bandwidth_out); | ||
405 | } | ||
406 | |||
407 | |||
408 | /** | ||
409 | * Function called to notify transport users that another | ||
410 | * peer connected to us. | ||
411 | * | ||
412 | * @param cls closure | ||
413 | * @param peer the peer that connected | ||
414 | * @param ats performance data | ||
415 | * @param ats_count number of entries in ats | ||
416 | */ | ||
417 | static void | ||
418 | neighbours_connect_notification (void *cls, | ||
419 | const struct GNUNET_PeerIdentity *peer, | ||
420 | const struct GNUNET_ATS_Information | ||
421 | *ats, uint32_t ats_count) | ||
422 | { | ||
423 | size_t len = sizeof (struct ConnectInfoMessage) + | ||
424 | ats_count * sizeof (struct GNUNET_ATS_Information); | ||
425 | char buf[len]; | ||
426 | struct ConnectInfoMessage *connect_msg = (struct ConnectInfoMessage *) buf; | ||
427 | struct GNUNET_ATS_Information *ap; | ||
428 | |||
429 | connect_msg->header.size = htons (sizeof (buf)); | ||
430 | connect_msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT); | ||
431 | connect_msg->ats_count = htonl (ats_count); | ||
432 | connect_msg->id = *peer; | ||
433 | ap = (struct GNUNET_ATS_Information *) &connect_msg[1]; | ||
434 | memcpy (ap, ats, | ||
435 | ats_count * sizeof (struct GNUNET_ATS_Information)); | ||
436 | GST_clients_broadcast (&connect_msg->header, GNUNET_NO); | ||
437 | } | ||
438 | |||
439 | |||
440 | /** | ||
441 | * Function called to notify transport users that another | ||
442 | * peer disconnected from us. | ||
443 | * | ||
444 | * @param cls closure | ||
445 | * @param peer the peer that disconnected | ||
446 | */ | ||
447 | static void | ||
448 | neighbours_disconnect_notification (void *cls, | ||
449 | const struct GNUNET_PeerIdentity *peer) | ||
450 | { | ||
451 | struct DisconnectInfoMessage disconnect_msg; | ||
452 | |||
453 | disconnect_msg.header.size = htons (sizeof (struct DisconnectInfoMessage)); | ||
454 | disconnect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT); | ||
455 | disconnect_msg.reserved = htonl (0); | ||
456 | disconnect_msg.peer = *peer; | ||
457 | GST_clients_broadcast (&disconnect_msg.header, GNUNET_NO); | ||
458 | } | ||
459 | |||
460 | |||
461 | /** | ||
462 | * Function called when the service shuts down. Unloads our plugins | ||
463 | * and cancels pending validations. | ||
464 | * | ||
465 | * @param cls closure, unused | ||
466 | * @param tc task context (unused) | ||
467 | */ | ||
468 | static void | ||
469 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
470 | { | ||
471 | GST_validation_stop (); | ||
472 | GST_plugins_unload (); | ||
473 | GST_neighbours_stop (); | ||
474 | GNUNET_ATS_scheduling_done (GST_ats); | ||
475 | GST_ats = NULL; | ||
476 | GST_clients_stop (); | ||
477 | GST_blacklist_stop (); | ||
478 | GST_hello_stop (); | ||
479 | |||
480 | if (GST_peerinfo != NULL) | ||
481 | { | ||
482 | GNUNET_PEERINFO_disconnect (GST_peerinfo); | ||
483 | GST_peerinfo = NULL; | ||
484 | } | ||
485 | if (GST_stats != NULL) | ||
486 | { | ||
487 | GNUNET_STATISTICS_destroy (GST_stats, GNUNET_NO); | ||
488 | GST_stats = NULL; | ||
489 | } | ||
490 | if (GST_my_private_key != NULL) | ||
491 | { | ||
492 | GNUNET_CRYPTO_rsa_key_free (GST_my_private_key); | ||
493 | GST_my_private_key = NULL; | ||
494 | } | ||
495 | } | ||
496 | |||
497 | |||
498 | /** | ||
499 | * Initiate transport service. | ||
500 | * | ||
501 | * @param cls closure | ||
502 | * @param server the initialized server | ||
503 | * @param c configuration to use | ||
504 | */ | ||
505 | static void | ||
506 | run (void *cls, struct GNUNET_SERVER_Handle *server, | ||
507 | const struct GNUNET_CONFIGURATION_Handle *c) | ||
508 | { | ||
509 | char *keyfile; | ||
510 | |||
511 | /* setup globals */ | ||
512 | GST_cfg = c; | ||
513 | if (GNUNET_OK != | ||
514 | GNUNET_CONFIGURATION_get_value_filename (c, "GNUNETD", "HOSTKEY", | ||
515 | &keyfile)) | ||
516 | { | ||
517 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
518 | _ | ||
519 | ("Transport service is lacking key configuration settings. Exiting.\n")); | ||
520 | GNUNET_SCHEDULER_shutdown (); | ||
521 | return; | ||
522 | } | ||
523 | GST_my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile); | ||
524 | GNUNET_free (keyfile); | ||
525 | if (GST_my_private_key == NULL) | ||
526 | { | ||
527 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
528 | _("Transport service could not access hostkey. Exiting.\n")); | ||
529 | GNUNET_SCHEDULER_shutdown (); | ||
530 | return; | ||
531 | } | ||
532 | GST_stats = GNUNET_STATISTICS_create ("transport", c); | ||
533 | GST_peerinfo = GNUNET_PEERINFO_connect (c); | ||
534 | GNUNET_CRYPTO_rsa_key_get_public (GST_my_private_key, &GST_my_public_key); | ||
535 | GNUNET_CRYPTO_hash (&GST_my_public_key, sizeof (GST_my_public_key), | ||
536 | &GST_my_identity.hashPubKey); | ||
537 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, | ||
538 | NULL); | ||
539 | if (GST_peerinfo == NULL) | ||
540 | { | ||
541 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
542 | _("Could not access PEERINFO service. Exiting.\n")); | ||
543 | GNUNET_SCHEDULER_shutdown (); | ||
544 | return; | ||
545 | } | ||
546 | |||
547 | /* start subsystems */ | ||
548 | GST_hello_start (&process_hello_update, NULL); | ||
549 | GST_blacklist_start (server); | ||
550 | GST_plugins_load (&plugin_env_receive_callback, | ||
551 | &plugin_env_address_change_notification, | ||
552 | &plugin_env_session_end); | ||
553 | GST_ats = GNUNET_ATS_scheduling_init (GST_cfg, &ats_request_address_change, NULL); | ||
554 | GST_neighbours_start (NULL, &neighbours_connect_notification, | ||
555 | &neighbours_disconnect_notification); | ||
556 | GST_clients_start (server); | ||
557 | GST_validation_start (); | ||
558 | } | ||
559 | |||
560 | |||
561 | /** | ||
562 | * The main function for the transport service. | ||
563 | * | ||
564 | * @param argc number of arguments from the command line | ||
565 | * @param argv command line arguments | ||
566 | * @return 0 ok, 1 on error | ||
567 | */ | ||
568 | int | ||
569 | main (int argc, char *const *argv) | ||
570 | { | ||
571 | return (GNUNET_OK == | ||
572 | GNUNET_SERVICE_run (argc, argv, "transport", | ||
573 | GNUNET_SERVICE_OPTION_NONE, &run, NULL)) ? 0 : 1; | ||
574 | } | ||
575 | |||
576 | /* end of file gnunet-service-transport-new.c */ | ||
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index e9662728a..516ef6b70 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "gnunet-service-transport_clients.h" | 31 | #include "gnunet-service-transport_clients.h" |
32 | #include "gnunet-service-transport.h" | 32 | #include "gnunet-service-transport.h" |
33 | #include "gnunet_peerinfo_service.h" | 33 | #include "gnunet_peerinfo_service.h" |
34 | #include "gnunet-service-transport_blacklist.h" | ||
34 | #include "gnunet_constants.h" | 35 | #include "gnunet_constants.h" |
35 | #include "transport.h" | 36 | #include "transport.h" |
36 | 37 | ||
@@ -55,6 +56,12 @@ | |||
55 | #define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90) | 56 | #define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90) |
56 | 57 | ||
57 | 58 | ||
59 | #define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3) | ||
60 | |||
61 | |||
62 | #define SETUP_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) | ||
63 | |||
64 | |||
58 | /** | 65 | /** |
59 | * Entry in neighbours. | 66 | * Entry in neighbours. |
60 | */ | 67 | */ |
@@ -177,6 +184,21 @@ struct MessageQueue | |||
177 | 184 | ||
178 | }; | 185 | }; |
179 | 186 | ||
187 | enum State | ||
188 | { | ||
189 | /* fresh peer or completely disconnected */ | ||
190 | S_NOT_CONNECTED = 0, | ||
191 | /* sent CONNECT message to other peer, waiting for CONNECT_ACK */ | ||
192 | S_CONNECT_SENT = 1, | ||
193 | /* received CONNECT message to other peer, sending CONNECT_ACK */ | ||
194 | S_CONNECT_RECV = 4, | ||
195 | /* sent CONNECT_ACK message to other peer, wait for ACK or payload */ | ||
196 | S_CONNECT_RECV_ACK_SENT = 8, | ||
197 | /* received ACK or payload */ | ||
198 | S_CONNECTED = 16, | ||
199 | /* Disconnect in progress */ | ||
200 | S_DISCONNECT = 32 | ||
201 | }; | ||
180 | 202 | ||
181 | /** | 203 | /** |
182 | * Entry in neighbours. | 204 | * Entry in neighbours. |
@@ -254,32 +276,45 @@ struct NeighbourMapEntry | |||
254 | struct GNUNET_BANDWIDTH_Tracker in_tracker; | 276 | struct GNUNET_BANDWIDTH_Tracker in_tracker; |
255 | 277 | ||
256 | /** | 278 | /** |
279 | * Inbound bandwidth from ATS, activated when connection is up | ||
280 | */ | ||
281 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in; | ||
282 | |||
283 | /** | ||
284 | * Inbound bandwidth from ATS, activated when connection is up | ||
285 | */ | ||
286 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out; | ||
287 | |||
288 | /** | ||
257 | * Timestamp of the 'SESSION_CONNECT' message we got from the other peer | 289 | * Timestamp of the 'SESSION_CONNECT' message we got from the other peer |
258 | */ | 290 | */ |
259 | struct GNUNET_TIME_Absolute connect_ts; | 291 | struct GNUNET_TIME_Absolute connect_ts; |
260 | 292 | ||
261 | /** | 293 | /** |
262 | * How often has the other peer (recently) violated the inbound | 294 | * Timeout for ATS |
263 | * traffic limit? Incremented by 10 per violation, decremented by 1 | 295 | * We asked ATS for a new address for this peer |
264 | * per non-violation (for each time interval). | ||
265 | */ | 296 | */ |
266 | unsigned int quota_violation_count; | 297 | GNUNET_SCHEDULER_TaskIdentifier ats_suggest; |
267 | 298 | ||
268 | /** | 299 | /** |
269 | * Number of values in 'ats' array. | 300 | * Task the resets the peer state after due to an pending |
301 | * unsuccessful connection setup | ||
270 | */ | 302 | */ |
271 | //unsigned int ats_count; | 303 | GNUNET_SCHEDULER_TaskIdentifier state_reset; |
272 | 304 | ||
273 | /** | 305 | /** |
274 | * Are we already in the process of disconnecting this neighbour? | 306 | * How often has the other peer (recently) violated the inbound |
307 | * traffic limit? Incremented by 10 per violation, decremented by 1 | ||
308 | * per non-violation (for each time interval). | ||
275 | */ | 309 | */ |
276 | int in_disconnect; | 310 | unsigned int quota_violation_count; |
311 | |||
277 | 312 | ||
278 | /** | 313 | /** |
279 | * Do we currently consider this neighbour connected? (as far as | 314 | * The current state of the peer |
280 | * the connect/disconnect callbacks are concerned)? | 315 | * Element of enum State |
281 | */ | 316 | */ |
282 | int is_connected; | 317 | int state; |
283 | 318 | ||
284 | }; | 319 | }; |
285 | 320 | ||
@@ -321,6 +356,254 @@ lookup_neighbour (const struct GNUNET_PeerIdentity *pid) | |||
321 | return GNUNET_CONTAINER_multihashmap_get (neighbours, &pid->hashPubKey); | 356 | return GNUNET_CONTAINER_multihashmap_get (neighbours, &pid->hashPubKey); |
322 | } | 357 | } |
323 | 358 | ||
359 | #define change_state(n, state, ...) change (n, state, __LINE__) | ||
360 | |||
361 | static int | ||
362 | is_connecting (struct NeighbourMapEntry * n) | ||
363 | { | ||
364 | if ((n->state > S_NOT_CONNECTED) && (n->state < S_CONNECTED)) | ||
365 | return GNUNET_YES; | ||
366 | return GNUNET_NO; | ||
367 | } | ||
368 | |||
369 | static int | ||
370 | is_connected (struct NeighbourMapEntry * n) | ||
371 | { | ||
372 | if (n->state == S_CONNECTED) | ||
373 | return GNUNET_YES; | ||
374 | return GNUNET_NO; | ||
375 | } | ||
376 | |||
377 | static int | ||
378 | is_disconnecting (struct NeighbourMapEntry * n) | ||
379 | { | ||
380 | if (n->state == S_DISCONNECT) | ||
381 | return GNUNET_YES; | ||
382 | return GNUNET_NO; | ||
383 | } | ||
384 | |||
385 | static const char * | ||
386 | print_state (int state) | ||
387 | { | ||
388 | switch (state) { | ||
389 | case S_CONNECTED: | ||
390 | return "S_CONNECTED"; | ||
391 | break; | ||
392 | case S_CONNECT_RECV: | ||
393 | return "S_CONNECT_RECV"; | ||
394 | break; | ||
395 | case S_CONNECT_RECV_ACK_SENT: | ||
396 | return"S_CONNECT_RECV_ACK_SENT"; | ||
397 | break; | ||
398 | case S_CONNECT_SENT: | ||
399 | return "S_CONNECT_SENT"; | ||
400 | break; | ||
401 | case S_DISCONNECT: | ||
402 | return "S_DISCONNECT"; | ||
403 | break; | ||
404 | case S_NOT_CONNECTED: | ||
405 | return "S_NOT_CONNECTED"; | ||
406 | break; | ||
407 | default: | ||
408 | GNUNET_break (0); | ||
409 | break; | ||
410 | } | ||
411 | return NULL; | ||
412 | } | ||
413 | |||
414 | static int | ||
415 | change (struct NeighbourMapEntry * n, int state, int line); | ||
416 | |||
417 | static void | ||
418 | ats_suggest_cancel (void *cls, | ||
419 | const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
420 | |||
421 | static void | ||
422 | reset_task (void *cls, | ||
423 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
424 | { | ||
425 | struct NeighbourMapEntry * n = cls; | ||
426 | |||
427 | n->state_reset = GNUNET_SCHEDULER_NO_TASK; | ||
428 | |||
429 | #if DEBUG_TRANSPORT | ||
430 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
431 | "Connection to peer `%s' %s failed in state `%s', resetting connection attempt \n", | ||
432 | GNUNET_i2s (&n->id), GST_plugins_a2s(n->plugin_name, n->addr, n->addrlen), print_state(n->state)); | ||
433 | #endif | ||
434 | GNUNET_STATISTICS_update (GST_stats, | ||
435 | gettext_noop ("# failed connection attempts due to timeout"), | ||
436 | 1, | ||
437 | GNUNET_NO); | ||
438 | |||
439 | /* resetting state */ | ||
440 | n->state = S_NOT_CONNECTED; | ||
441 | |||
442 | /* destroying address */ | ||
443 | GNUNET_ATS_address_destroyed (GST_ats, | ||
444 | &n->id, | ||
445 | n->plugin_name, | ||
446 | n->addr, | ||
447 | n->addrlen, | ||
448 | NULL); | ||
449 | |||
450 | /* request new address */ | ||
451 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | ||
452 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
453 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); | ||
454 | GNUNET_ATS_suggest_address(GST_ats, &n->id); | ||
455 | } | ||
456 | |||
457 | static int | ||
458 | change (struct NeighbourMapEntry * n, int state, int line) | ||
459 | { | ||
460 | char * old = strdup(print_state(n->state)); | ||
461 | char * new = strdup(print_state(state)); | ||
462 | |||
463 | /* allowed transitions */ | ||
464 | int allowed = GNUNET_NO; | ||
465 | switch (n->state) { | ||
466 | case S_NOT_CONNECTED: | ||
467 | if ((state == S_CONNECT_RECV) || (state == S_CONNECT_SENT) || | ||
468 | (state == S_DISCONNECT)) | ||
469 | { | ||
470 | allowed = GNUNET_YES; | ||
471 | |||
472 | /* Schedule reset task */ | ||
473 | if ((state == S_CONNECT_RECV) || (state == S_CONNECT_SENT) ) | ||
474 | { | ||
475 | GNUNET_assert (n->state_reset == GNUNET_SCHEDULER_NO_TASK); | ||
476 | n->state_reset = GNUNET_SCHEDULER_add_delayed (SETUP_CONNECTION_TIMEOUT, &reset_task, n); | ||
477 | } | ||
478 | |||
479 | break; | ||
480 | } | ||
481 | break; | ||
482 | case S_CONNECT_RECV: | ||
483 | if ((state == S_NOT_CONNECTED) || (state == S_DISCONNECT) || | ||
484 | (state == S_CONNECTED) || /* FIXME SENT -> RECV ISSUE!*/ (state == S_CONNECT_SENT)) | ||
485 | { | ||
486 | if ((state == S_CONNECTED) || (state == S_DISCONNECT) || (state == S_NOT_CONNECTED)) | ||
487 | { | ||
488 | #if DEBUG_TRANSPORT | ||
489 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
490 | "Removed reset task for peer `%s' %s failed in state transition `%s' -> `%s' \n", | ||
491 | GNUNET_i2s (&n->id), GST_plugins_a2s(n->plugin_name, n->addr, n->addrlen), print_state(n->state), print_state(state)); | ||
492 | #endif | ||
493 | GNUNET_assert (n->state_reset != GNUNET_SCHEDULER_NO_TASK); | ||
494 | GNUNET_SCHEDULER_cancel (n->state_reset); | ||
495 | n->state_reset = GNUNET_SCHEDULER_NO_TASK; | ||
496 | } | ||
497 | |||
498 | allowed = GNUNET_YES; | ||
499 | break; | ||
500 | } | ||
501 | break; | ||
502 | case S_CONNECT_SENT: | ||
503 | if ((state == S_NOT_CONNECTED) || (state == S_CONNECTED) || | ||
504 | (state == S_DISCONNECT) || /* FIXME SENT -> RECV ISSUE!*/ (state == S_CONNECT_RECV)) | ||
505 | { | ||
506 | if ((state == S_CONNECTED) || (state == S_DISCONNECT) || (state == S_NOT_CONNECTED)) | ||
507 | { | ||
508 | #if DEBUG_TRANSPORT | ||
509 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
510 | "Removed reset task for peer `%s' %s failed in state transition `%s' -> `%s' \n", | ||
511 | GNUNET_i2s (&n->id), GST_plugins_a2s(n->plugin_name, n->addr, n->addrlen), print_state(n->state), print_state(state)); | ||
512 | #endif | ||
513 | GNUNET_assert (n->state_reset != GNUNET_SCHEDULER_NO_TASK); | ||
514 | GNUNET_SCHEDULER_cancel (n->state_reset); | ||
515 | n->state_reset = GNUNET_SCHEDULER_NO_TASK; | ||
516 | } | ||
517 | |||
518 | allowed = GNUNET_YES; | ||
519 | break; | ||
520 | } | ||
521 | break; | ||
522 | case S_CONNECTED: | ||
523 | if (state == S_DISCONNECT) | ||
524 | { | ||
525 | allowed = GNUNET_YES; | ||
526 | break; | ||
527 | } | ||
528 | break; | ||
529 | case S_DISCONNECT: | ||
530 | /* | ||
531 | if (state == S_NOT_CONNECTED) | ||
532 | { | ||
533 | allowed = GNUNET_YES; | ||
534 | break; | ||
535 | }*/ | ||
536 | break; | ||
537 | default: | ||
538 | GNUNET_break (0); | ||
539 | break; | ||
540 | |||
541 | } | ||
542 | |||
543 | if (allowed == GNUNET_NO) | ||
544 | { | ||
545 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
546 | "Illegal state transition from `%s' to `%s' in line %u \n", | ||
547 | old, new, line); | ||
548 | GNUNET_break (0); | ||
549 | GNUNET_free (old); | ||
550 | GNUNET_free (new); | ||
551 | return GNUNET_SYSERR; | ||
552 | } | ||
553 | |||
554 | n->state = state; | ||
555 | #if DEBUG_TRANSPORT | ||
556 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "State for neighbour `%s' %X changed from `%s' to `%s' in line %u\n", | ||
557 | GNUNET_i2s (&n->id), n, old, new, line); | ||
558 | #endif | ||
559 | GNUNET_free (old); | ||
560 | GNUNET_free (new); | ||
561 | return GNUNET_OK; | ||
562 | } | ||
563 | |||
564 | static ssize_t | ||
565 | send_with_plugin ( const struct GNUNET_PeerIdentity * target, | ||
566 | const char *msgbuf, | ||
567 | size_t msgbuf_size, | ||
568 | uint32_t priority, | ||
569 | struct GNUNET_TIME_Relative timeout, | ||
570 | struct Session * session, | ||
571 | const char * plugin_name, | ||
572 | const void *addr, | ||
573 | size_t addrlen, | ||
574 | int force_address, | ||
575 | GNUNET_TRANSPORT_TransmitContinuation cont, | ||
576 | void *cont_cls) | ||
577 | |||
578 | { | ||
579 | struct GNUNET_TRANSPORT_PluginFunctions *papi; | ||
580 | size_t ret = GNUNET_SYSERR; | ||
581 | |||
582 | papi = GST_plugins_find (plugin_name); | ||
583 | if (papi == NULL) | ||
584 | { | ||
585 | if (cont != NULL) | ||
586 | cont (cont_cls, target, GNUNET_SYSERR); | ||
587 | return GNUNET_SYSERR; | ||
588 | } | ||
589 | |||
590 | ret = papi->send (papi->cls, | ||
591 | target, | ||
592 | msgbuf, msgbuf_size, | ||
593 | 0, | ||
594 | timeout, | ||
595 | session, | ||
596 | addr, addrlen, | ||
597 | GNUNET_YES, | ||
598 | cont, cont_cls); | ||
599 | |||
600 | if (ret == -1) | ||
601 | { | ||
602 | if (cont != NULL) | ||
603 | cont (cont_cls, target, GNUNET_SYSERR); | ||
604 | } | ||
605 | return ret; | ||
606 | } | ||
324 | 607 | ||
325 | /** | 608 | /** |
326 | * Task invoked to start a transmission to another peer. | 609 | * Task invoked to start a transmission to another peer. |
@@ -359,6 +642,11 @@ transmit_send_continuation (void *cls, | |||
359 | n->transmission_task = GNUNET_SCHEDULER_add_now (&transmission_task, n); | 642 | n->transmission_task = GNUNET_SCHEDULER_add_now (&transmission_task, n); |
360 | } | 643 | } |
361 | } | 644 | } |
645 | #if DEBUG_TRANSPORT | ||
646 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending message of type %u was %s\n", | ||
647 | ntohs (((struct GNUNET_MessageHeader *) mq->message_buf)->type), | ||
648 | (success == GNUNET_OK) ? "successful" : "FAILED"); | ||
649 | #endif | ||
362 | if (NULL != mq->cont) | 650 | if (NULL != mq->cont) |
363 | mq->cont (mq->cont_cls, success); | 651 | mq->cont (mq->cont_cls, success); |
364 | GNUNET_free (mq); | 652 | GNUNET_free (mq); |
@@ -377,12 +665,17 @@ try_transmission_to_peer (struct NeighbourMapEntry *n) | |||
377 | struct MessageQueue *mq; | 665 | struct MessageQueue *mq; |
378 | struct GNUNET_TIME_Relative timeout; | 666 | struct GNUNET_TIME_Relative timeout; |
379 | ssize_t ret; | 667 | ssize_t ret; |
380 | struct GNUNET_TRANSPORT_PluginFunctions *papi; | ||
381 | 668 | ||
382 | if (n->is_active != NULL) | 669 | if (n->is_active != NULL) |
670 | { | ||
671 | GNUNET_break (0); | ||
383 | return; /* transmission already pending */ | 672 | return; /* transmission already pending */ |
673 | } | ||
384 | if (n->transmission_task != GNUNET_SCHEDULER_NO_TASK) | 674 | if (n->transmission_task != GNUNET_SCHEDULER_NO_TASK) |
675 | { | ||
676 | GNUNET_break (0); | ||
385 | return; /* currently waiting for bandwidth */ | 677 | return; /* currently waiting for bandwidth */ |
678 | } | ||
386 | while (NULL != (mq = n->messages_head)) | 679 | while (NULL != (mq = n->messages_head)) |
387 | { | 680 | { |
388 | timeout = GNUNET_TIME_absolute_get_remaining (mq->timeout); | 681 | timeout = GNUNET_TIME_absolute_get_remaining (mq->timeout); |
@@ -396,8 +689,7 @@ try_transmission_to_peer (struct NeighbourMapEntry *n) | |||
396 | if (NULL == mq) | 689 | if (NULL == mq) |
397 | return; /* no more messages */ | 690 | return; /* no more messages */ |
398 | 691 | ||
399 | papi = GST_plugins_find (n->plugin_name); | 692 | if (GST_plugins_find (n->plugin_name) == NULL) |
400 | if (papi == NULL) | ||
401 | { | 693 | { |
402 | GNUNET_break (0); | 694 | GNUNET_break (0); |
403 | return; | 695 | return; |
@@ -416,17 +708,19 @@ try_transmission_to_peer (struct NeighbourMapEntry *n) | |||
416 | return; | 708 | return; |
417 | } | 709 | } |
418 | 710 | ||
419 | ret = | 711 | ret = send_with_plugin (&n->id, |
420 | papi->send (papi->cls, &n->id, mq->message_buf, mq->message_buf_size, | 712 | mq->message_buf, mq->message_buf_size, 0, |
421 | 0 /* priority -- remove from plugin API? */ , | 713 | timeout, |
422 | timeout, n->session, n->addr, n->addrlen, GNUNET_YES, | 714 | n->session, n->plugin_name, n->addr, n->addrlen, |
423 | &transmit_send_continuation, mq); | 715 | GNUNET_YES, |
716 | &transmit_send_continuation, mq); | ||
424 | if (ret == -1) | 717 | if (ret == -1) |
425 | { | 718 | { |
426 | /* failure, but 'send' would not call continuation in this case, | 719 | /* failure, but 'send' would not call continuation in this case, |
427 | * so we need to do it here! */ | 720 | * so we need to do it here! */ |
428 | transmit_send_continuation (mq, &n->id, GNUNET_SYSERR); | 721 | transmit_send_continuation (mq, &n->id, GNUNET_SYSERR); |
429 | } | 722 | } |
723 | |||
430 | } | 724 | } |
431 | 725 | ||
432 | 726 | ||
@@ -464,6 +758,57 @@ GST_neighbours_start (void *cls, GNUNET_TRANSPORT_NotifyConnect connect_cb, | |||
464 | } | 758 | } |
465 | 759 | ||
466 | 760 | ||
761 | static void | ||
762 | send_disconnect_cont (void *cls, | ||
763 | const struct GNUNET_PeerIdentity * target, | ||
764 | int result) | ||
765 | { | ||
766 | #if DEBUG_TRANSPORT | ||
767 | struct NeighbourMapEntry *n = cls; | ||
768 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending DISCONNECT message to peer `%4s': %i\n", | ||
769 | GNUNET_i2s (&n->id), result); | ||
770 | #endif | ||
771 | } | ||
772 | |||
773 | static int | ||
774 | send_disconnect (struct NeighbourMapEntry *n) | ||
775 | { | ||
776 | size_t ret; | ||
777 | struct SessionDisconnectMessage disconnect_msg; | ||
778 | |||
779 | #if DEBUG_TRANSPORT | ||
780 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending DISCONNECT message to peer `%4s'\n", | ||
781 | GNUNET_i2s (&n->id)); | ||
782 | #endif | ||
783 | |||
784 | disconnect_msg.header.size = htons (sizeof (struct SessionDisconnectMessage)); | ||
785 | disconnect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT); | ||
786 | disconnect_msg.reserved = htonl (0); | ||
787 | disconnect_msg.purpose.size = htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + | ||
788 | sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) + | ||
789 | sizeof (struct GNUNET_TIME_AbsoluteNBO) ); | ||
790 | disconnect_msg.purpose.purpose = htonl (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT); | ||
791 | disconnect_msg.timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); | ||
792 | disconnect_msg.public_key = GST_my_public_key; | ||
793 | GNUNET_assert (GNUNET_OK == | ||
794 | GNUNET_CRYPTO_rsa_sign (GST_my_private_key, | ||
795 | &disconnect_msg.purpose, | ||
796 | &disconnect_msg.signature)); | ||
797 | |||
798 | ret = send_with_plugin(&n->id, (const char *) &disconnect_msg, sizeof (disconnect_msg), | ||
799 | UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, | ||
800 | n->session, n->plugin_name, n->addr, n->addrlen, | ||
801 | GNUNET_YES, &send_disconnect_cont, n); | ||
802 | |||
803 | if (ret == GNUNET_SYSERR) | ||
804 | return GNUNET_SYSERR; | ||
805 | |||
806 | GNUNET_STATISTICS_update (GST_stats, | ||
807 | gettext_noop ("# peers disconnected due to external request"), 1, | ||
808 | GNUNET_NO); | ||
809 | return GNUNET_OK; | ||
810 | } | ||
811 | |||
467 | /** | 812 | /** |
468 | * Disconnect from the given neighbour, clean up the record. | 813 | * Disconnect from the given neighbour, clean up the record. |
469 | * | 814 | * |
@@ -473,10 +818,24 @@ static void | |||
473 | disconnect_neighbour (struct NeighbourMapEntry *n) | 818 | disconnect_neighbour (struct NeighbourMapEntry *n) |
474 | { | 819 | { |
475 | struct MessageQueue *mq; | 820 | struct MessageQueue *mq; |
821 | int was_connected = is_connected(n); | ||
476 | 822 | ||
477 | if (GNUNET_YES == n->in_disconnect) | 823 | /* send DISCONNECT MESSAGE */ |
824 | if (is_connected(n) || is_connecting(n)) | ||
825 | { | ||
826 | if (GNUNET_OK == send_disconnect(n)) | ||
827 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sent DISCONNECT_MSG to `%s'\n", | ||
828 | GNUNET_i2s (&n->id)); | ||
829 | else | ||
830 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could not send DISCONNECT_MSG to `%s'\n", | ||
831 | GNUNET_i2s (&n->id)); | ||
832 | } | ||
833 | |||
834 | |||
835 | if (is_disconnecting(n)) | ||
478 | return; | 836 | return; |
479 | n->in_disconnect = GNUNET_YES; | 837 | change_state (n, S_DISCONNECT); |
838 | |||
480 | while (NULL != (mq = n->messages_head)) | 839 | while (NULL != (mq = n->messages_head)) |
481 | { | 840 | { |
482 | GNUNET_CONTAINER_DLL_remove (n->messages_head, n->messages_tail, mq); | 841 | GNUNET_CONTAINER_DLL_remove (n->messages_head, n->messages_tail, mq); |
@@ -489,9 +848,8 @@ disconnect_neighbour (struct NeighbourMapEntry *n) | |||
489 | n->is_active->n = NULL; | 848 | n->is_active->n = NULL; |
490 | n->is_active = NULL; | 849 | n->is_active = NULL; |
491 | } | 850 | } |
492 | if (GNUNET_YES == n->is_connected) | 851 | if (was_connected) |
493 | { | 852 | { |
494 | n->is_connected = GNUNET_NO; | ||
495 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != n->keepalive_task); | 853 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != n->keepalive_task); |
496 | GNUNET_SCHEDULER_cancel (n->keepalive_task); | 854 | GNUNET_SCHEDULER_cancel (n->keepalive_task); |
497 | n->keepalive_task = GNUNET_SCHEDULER_NO_TASK; | 855 | n->keepalive_task = GNUNET_SCHEDULER_NO_TASK; |
@@ -504,6 +862,11 @@ disconnect_neighbour (struct NeighbourMapEntry *n) | |||
504 | GNUNET_assert (GNUNET_YES == | 862 | GNUNET_assert (GNUNET_YES == |
505 | GNUNET_CONTAINER_multihashmap_remove (neighbours, | 863 | GNUNET_CONTAINER_multihashmap_remove (neighbours, |
506 | &n->id.hashPubKey, n)); | 864 | &n->id.hashPubKey, n)); |
865 | if (GNUNET_SCHEDULER_NO_TASK != n->ats_suggest) | ||
866 | { | ||
867 | GNUNET_SCHEDULER_cancel (n->ats_suggest); | ||
868 | n->ats_suggest = GNUNET_SCHEDULER_NO_TASK; | ||
869 | } | ||
507 | if (GNUNET_SCHEDULER_NO_TASK != n->timeout_task) | 870 | if (GNUNET_SCHEDULER_NO_TASK != n->timeout_task) |
508 | { | 871 | { |
509 | GNUNET_SCHEDULER_cancel (n->timeout_task); | 872 | GNUNET_SCHEDULER_cancel (n->timeout_task); |
@@ -526,6 +889,8 @@ disconnect_neighbour (struct NeighbourMapEntry *n) | |||
526 | n->addrlen = 0; | 889 | n->addrlen = 0; |
527 | } | 890 | } |
528 | n->session = NULL; | 891 | n->session = NULL; |
892 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleting peer `%4s', %X\n", | ||
893 | GNUNET_i2s (&n->id), n); | ||
529 | GNUNET_free (n); | 894 | GNUNET_free (n); |
530 | } | 895 | } |
531 | 896 | ||
@@ -543,8 +908,8 @@ neighbour_timeout_task (void *cls, | |||
543 | struct NeighbourMapEntry *n = cls; | 908 | struct NeighbourMapEntry *n = cls; |
544 | 909 | ||
545 | n->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 910 | n->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
546 | if (GNUNET_YES == n->is_connected) | 911 | |
547 | GNUNET_STATISTICS_update (GST_stats, | 912 | GNUNET_STATISTICS_update (GST_stats, |
548 | gettext_noop ("# peers disconnected due to timeout"), 1, | 913 | gettext_noop ("# peers disconnected due to timeout"), 1, |
549 | GNUNET_NO); | 914 | GNUNET_NO); |
550 | disconnect_neighbour (n); | 915 | disconnect_neighbour (n); |
@@ -563,25 +928,23 @@ neighbour_keepalive_task (void *cls, | |||
563 | { | 928 | { |
564 | struct NeighbourMapEntry *n = cls; | 929 | struct NeighbourMapEntry *n = cls; |
565 | struct GNUNET_MessageHeader m; | 930 | struct GNUNET_MessageHeader m; |
566 | struct GNUNET_TRANSPORT_PluginFunctions *papi; | ||
567 | 931 | ||
568 | n->keepalive_task = GNUNET_SCHEDULER_add_delayed (KEEPALIVE_FREQUENCY, | 932 | n->keepalive_task = GNUNET_SCHEDULER_add_delayed (KEEPALIVE_FREQUENCY, |
569 | &neighbour_keepalive_task, | 933 | &neighbour_keepalive_task, |
570 | n); | 934 | n); |
571 | GNUNET_assert (GNUNET_YES == n->is_connected); | 935 | GNUNET_assert (is_connected(n)); |
572 | GNUNET_STATISTICS_update (GST_stats, | 936 | GNUNET_STATISTICS_update (GST_stats, |
573 | gettext_noop ("# keepalives sent"), 1, | 937 | gettext_noop ("# keepalives sent"), 1, |
574 | GNUNET_NO); | 938 | GNUNET_NO); |
575 | m.size = htons (sizeof (struct GNUNET_MessageHeader)); | 939 | m.size = htons (sizeof (struct GNUNET_MessageHeader)); |
576 | m.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE); | 940 | m.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE); |
577 | papi = GST_plugins_find (n->plugin_name); | 941 | |
578 | if (papi != NULL) | 942 | send_with_plugin(&n->id, (const void *) &m, |
579 | papi->send (papi->cls, | 943 | sizeof (m), |
580 | &n->id, (const void *) &m, | 944 | UINT32_MAX /* priority */ , |
581 | sizeof (m), | 945 | GNUNET_TIME_UNIT_FOREVER_REL, |
582 | UINT32_MAX /* priority */ , | 946 | n->session, n->plugin_name, n->addr, n->addrlen, |
583 | GNUNET_TIME_UNIT_FOREVER_REL, n->session, n->addr, n->addrlen, | 947 | GNUNET_YES, NULL, NULL); |
584 | GNUNET_YES, NULL, NULL); | ||
585 | } | 948 | } |
586 | 949 | ||
587 | 950 | ||
@@ -601,7 +964,7 @@ disconnect_all_neighbours (void *cls, const GNUNET_HashCode * key, void *value) | |||
601 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting peer `%4s', %s\n", | 964 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting peer `%4s', %s\n", |
602 | GNUNET_i2s (&n->id), "SHUTDOWN_TASK"); | 965 | GNUNET_i2s (&n->id), "SHUTDOWN_TASK"); |
603 | #endif | 966 | #endif |
604 | if (GNUNET_YES == n->is_connected) | 967 | if (is_connected(n)) |
605 | GNUNET_STATISTICS_update (GST_stats, | 968 | GNUNET_STATISTICS_update (GST_stats, |
606 | gettext_noop ("# peers disconnected due to global disconnect"), 1, | 969 | gettext_noop ("# peers disconnected due to global disconnect"), 1, |
607 | GNUNET_NO); | 970 | GNUNET_NO); |
@@ -610,6 +973,22 @@ disconnect_all_neighbours (void *cls, const GNUNET_HashCode * key, void *value) | |||
610 | } | 973 | } |
611 | 974 | ||
612 | 975 | ||
976 | static void | ||
977 | ats_suggest_cancel (void *cls, | ||
978 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
979 | { | ||
980 | struct NeighbourMapEntry *n = cls; | ||
981 | |||
982 | n->ats_suggest = GNUNET_SCHEDULER_NO_TASK; | ||
983 | |||
984 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
985 | " ATS did not suggested address to connect to peer `%s'\n", | ||
986 | GNUNET_i2s (&n->id)); | ||
987 | |||
988 | disconnect_neighbour(n); | ||
989 | } | ||
990 | |||
991 | |||
613 | /** | 992 | /** |
614 | * Cleanup the neighbours subsystem. | 993 | * Cleanup the neighbours subsystem. |
615 | */ | 994 | */ |
@@ -631,7 +1010,7 @@ GST_neighbours_stop () | |||
631 | 1010 | ||
632 | /** | 1011 | /** |
633 | * We tried to send a SESSION_CONNECT message to another peer. If this | 1012 | * We tried to send a SESSION_CONNECT message to another peer. If this |
634 | * succeeded, we should mark the peer up. If it failed, we should tell | 1013 | * succeeded, we change the state. If it failed, we should tell |
635 | * ATS to not use this address anymore (until it is re-validated). | 1014 | * ATS to not use this address anymore (until it is re-validated). |
636 | * | 1015 | * |
637 | * @param cls the 'struct NeighbourMapEntry' | 1016 | * @param cls the 'struct NeighbourMapEntry' |
@@ -639,28 +1018,140 @@ GST_neighbours_stop () | |||
639 | */ | 1018 | */ |
640 | static void | 1019 | static void |
641 | send_connect_continuation (void *cls, | 1020 | send_connect_continuation (void *cls, |
642 | int success) | 1021 | const struct GNUNET_PeerIdentity * target, |
1022 | int success) | ||
1023 | |||
643 | { | 1024 | { |
644 | struct NeighbourMapEntry *n = cls; | 1025 | struct NeighbourMapEntry *n = cls; |
645 | 1026 | ||
646 | GNUNET_assert (n != NULL); | 1027 | GNUNET_assert (n != NULL); |
647 | if (GNUNET_YES == n->in_disconnect) | 1028 | GNUNET_assert (!is_connected(n)); |
1029 | |||
1030 | if (is_disconnecting(n)) | ||
648 | return; /* neighbour is going away */ | 1031 | return; /* neighbour is going away */ |
649 | if (GNUNET_YES != success) | 1032 | if (GNUNET_YES != success) |
650 | { | 1033 | { |
1034 | #if DEBUG_TRANSPORT | ||
1035 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1036 | "Failed to send CONNECT_MSG to peer `%4s' with plugin `%s' address '%s' session %X, asking ATS for new address \n", | ||
1037 | GNUNET_i2s (&n->id), n->plugin_name, | ||
1038 | (n->addrlen == 0) ? "<inbound>" : GST_plugins_a2s (n->plugin_name, | ||
1039 | n->addr, | ||
1040 | n->addrlen), | ||
1041 | n->session); | ||
1042 | #endif | ||
1043 | |||
651 | GNUNET_ATS_address_destroyed (GST_ats, | 1044 | GNUNET_ATS_address_destroyed (GST_ats, |
652 | &n->id, | 1045 | &n->id, |
653 | n->plugin_name, | 1046 | n->plugin_name, |
654 | n->addr, | 1047 | n->addr, |
655 | n->addrlen, | 1048 | n->addrlen, |
656 | NULL); | 1049 | NULL); |
657 | disconnect_neighbour (n); | 1050 | |
1051 | if (n->ats_suggest!= GNUNET_SCHEDULER_NO_TASK) | ||
1052 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
1053 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); | ||
1054 | GNUNET_ATS_suggest_address(GST_ats, &n->id); | ||
658 | return; | 1055 | return; |
659 | } | 1056 | } |
1057 | change_state(n, S_CONNECT_SENT); | ||
660 | } | 1058 | } |
661 | 1059 | ||
662 | 1060 | ||
663 | /** | 1061 | /** |
1062 | * We tried to switch addresses with an peer already connected. If it failed, | ||
1063 | * we should tell ATS to not use this address anymore (until it is re-validated). | ||
1064 | * | ||
1065 | * @param cls the 'struct NeighbourMapEntry' | ||
1066 | * @param success GNUNET_OK on success | ||
1067 | */ | ||
1068 | static void | ||
1069 | send_switch_address_continuation (void *cls, | ||
1070 | const struct GNUNET_PeerIdentity * target, | ||
1071 | int success) | ||
1072 | |||
1073 | { | ||
1074 | struct NeighbourMapEntry *n = cls; | ||
1075 | |||
1076 | GNUNET_assert (n != NULL); | ||
1077 | if (is_disconnecting(n)) | ||
1078 | return; /* neighbour is going away */ | ||
1079 | |||
1080 | GNUNET_assert (n->state == S_CONNECTED); | ||
1081 | if (GNUNET_YES != success) | ||
1082 | { | ||
1083 | #if DEBUG_TRANSPORT | ||
1084 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1085 | "Failed to switch connected peer `%s' to plugin `%s' address '%s' session %X, asking ATS for new address \n", | ||
1086 | GNUNET_i2s (&n->id), n->plugin_name, | ||
1087 | (n->addrlen == 0) ? "<inbound>" : GST_plugins_a2s (n->plugin_name, | ||
1088 | n->addr, | ||
1089 | n->addrlen), | ||
1090 | n->session); | ||
1091 | #endif | ||
1092 | |||
1093 | GNUNET_ATS_address_destroyed (GST_ats, | ||
1094 | &n->id, | ||
1095 | n->plugin_name, | ||
1096 | n->addr, | ||
1097 | n->addrlen, | ||
1098 | NULL); | ||
1099 | |||
1100 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | ||
1101 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
1102 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); | ||
1103 | GNUNET_ATS_suggest_address(GST_ats, &n->id); | ||
1104 | return; | ||
1105 | } | ||
1106 | } | ||
1107 | |||
1108 | /** | ||
1109 | * We tried to send a SESSION_CONNECT message to another peer. If this | ||
1110 | * succeeded, we change the state. If it failed, we should tell | ||
1111 | * ATS to not use this address anymore (until it is re-validated). | ||
1112 | * | ||
1113 | * @param cls the 'struct NeighbourMapEntry' | ||
1114 | * @param success GNUNET_OK on success | ||
1115 | */ | ||
1116 | static void | ||
1117 | send_connect_ack_continuation (void *cls, | ||
1118 | const struct GNUNET_PeerIdentity * target, | ||
1119 | int success) | ||
1120 | |||
1121 | { | ||
1122 | struct NeighbourMapEntry *n = cls; | ||
1123 | |||
1124 | GNUNET_assert (n != NULL); | ||
1125 | |||
1126 | if (GNUNET_YES == success) | ||
1127 | return; /* sending successful */ | ||
1128 | |||
1129 | /* sending failed, ask for next address */ | ||
1130 | #if DEBUG_TRANSPORT | ||
1131 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1132 | "Failed to send CONNECT_MSG to peer `%4s' with plugin `%s' address '%s' session %X, asking ATS for new address \n", | ||
1133 | GNUNET_i2s (&n->id), n->plugin_name, | ||
1134 | (n->addrlen == 0) ? "<inbound>" : GST_plugins_a2s (n->plugin_name, | ||
1135 | n->addr, | ||
1136 | n->addrlen), | ||
1137 | n->session); | ||
1138 | #endif | ||
1139 | change_state(n, S_NOT_CONNECTED); | ||
1140 | |||
1141 | GNUNET_ATS_address_destroyed (GST_ats, | ||
1142 | &n->id, | ||
1143 | n->plugin_name, | ||
1144 | n->addr, | ||
1145 | n->addrlen, | ||
1146 | NULL); | ||
1147 | |||
1148 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | ||
1149 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
1150 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); | ||
1151 | GNUNET_ATS_suggest_address(GST_ats, &n->id); | ||
1152 | } | ||
1153 | |||
1154 | /** | ||
664 | * For an existing neighbour record, set the active connection to | 1155 | * For an existing neighbour record, set the active connection to |
665 | * the given address. | 1156 | * the given address. |
666 | * | 1157 | * |
@@ -671,20 +1162,23 @@ send_connect_continuation (void *cls, | |||
671 | * @param address_len number of bytes in address | 1162 | * @param address_len number of bytes in address |
672 | * @param session session to use (or NULL) | 1163 | * @param session session to use (or NULL) |
673 | * @param ats performance data | 1164 | * @param ats performance data |
674 | * @param ats_count number of entries in ats (excluding 0-termination) | 1165 | * @param ats_count number of entries in ats |
675 | * @return GNUNET_YES if we are currently connected, GNUNET_NO if the | 1166 | * @return GNUNET_YES if we are currently connected, GNUNET_NO if the |
676 | * connection is not up (yet) | 1167 | * connection is not up (yet) |
677 | */ | 1168 | */ |
678 | int | 1169 | int |
679 | GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer, | 1170 | GST_neighbours_switch_to_address_3way (const struct GNUNET_PeerIdentity *peer, |
680 | const char *plugin_name, const void *address, | 1171 | const char *plugin_name, const void *address, |
681 | size_t address_len, struct Session *session, | 1172 | size_t address_len, struct Session *session, |
682 | const struct GNUNET_ATS_Information | 1173 | const struct GNUNET_ATS_Information |
683 | *ats, uint32_t ats_count) | 1174 | *ats, uint32_t ats_count, |
1175 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, | ||
1176 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out) | ||
684 | { | 1177 | { |
685 | struct NeighbourMapEntry *n; | 1178 | struct NeighbourMapEntry *n; |
686 | struct SessionConnectMessage connect_msg; | 1179 | struct SessionConnectMessage connect_msg; |
687 | int was_connected; | 1180 | size_t msg_len; |
1181 | size_t ret; | ||
688 | 1182 | ||
689 | GNUNET_assert (neighbours != NULL); | 1183 | GNUNET_assert (neighbours != NULL); |
690 | n = lookup_neighbour (peer); | 1184 | n = lookup_neighbour (peer); |
@@ -697,25 +1191,29 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer, | |||
697 | address_len, NULL); | 1191 | address_len, NULL); |
698 | return GNUNET_NO; | 1192 | return GNUNET_NO; |
699 | } | 1193 | } |
700 | was_connected = n->is_connected; | 1194 | |
701 | n->is_connected = GNUNET_YES; | 1195 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) |
702 | if (GNUNET_YES != was_connected) | 1196 | { |
703 | n->keepalive_task = GNUNET_SCHEDULER_add_delayed (KEEPALIVE_FREQUENCY, | 1197 | GNUNET_SCHEDULER_cancel(n->ats_suggest); |
704 | &neighbour_keepalive_task, | 1198 | n->ats_suggest = GNUNET_SCHEDULER_NO_TASK; |
705 | n); | 1199 | } |
706 | 1200 | ||
707 | #if DEBUG_TRANSPORT | 1201 | #if DEBUG_TRANSPORT |
708 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1202 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
709 | "SWITCH! Peer `%4s' switches to plugin `%s' address '%s' session %X\n", | 1203 | "ATS tells us to switch to plugin `%s' address '%s' session %X for %s peer `%s'\n", |
710 | GNUNET_i2s (peer), plugin_name, | 1204 | plugin_name, |
711 | (address_len == 0) ? "<inbound>" : GST_plugins_a2s (plugin_name, | 1205 | (address_len == 0) ? "<inbound>" : GST_plugins_a2s (plugin_name, |
712 | address, | 1206 | address, |
713 | address_len), | 1207 | address_len), |
714 | session); | 1208 | session, (is_connected(n) ? "CONNECTED" : "NOT CONNECTED"), |
1209 | GNUNET_i2s (peer)); | ||
715 | #endif | 1210 | #endif |
1211 | |||
716 | GNUNET_free_non_null (n->addr); | 1212 | GNUNET_free_non_null (n->addr); |
717 | n->addr = GNUNET_malloc (address_len); | 1213 | n->addr = GNUNET_malloc (address_len); |
718 | memcpy (n->addr, address, address_len); | 1214 | memcpy (n->addr, address, address_len); |
1215 | n->bandwidth_in = bandwidth_in; | ||
1216 | n->bandwidth_out = bandwidth_out; | ||
719 | n->addrlen = address_len; | 1217 | n->addrlen = address_len; |
720 | n->session = session; | 1218 | n->session = session; |
721 | GNUNET_free_non_null (n->plugin_name); | 1219 | GNUNET_free_non_null (n->plugin_name); |
@@ -724,24 +1222,83 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer, | |||
724 | n->timeout_task = | 1222 | n->timeout_task = |
725 | GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 1223 | GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
726 | &neighbour_timeout_task, n); | 1224 | &neighbour_timeout_task, n); |
727 | connect_msg.header.size = htons (sizeof (struct SessionConnectMessage)); | 1225 | |
728 | connect_msg.header.type = | 1226 | if (n->state == S_DISCONNECT) |
729 | htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT); | 1227 | { |
730 | connect_msg.reserved = htonl (0); | 1228 | /* We are disconnecting, nothing to do here */ |
731 | connect_msg.timestamp = | 1229 | return GNUNET_NO; |
732 | GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); | 1230 | } |
733 | GST_neighbours_send (peer, &connect_msg, sizeof (connect_msg), | 1231 | /* We are not connected/connecting and initiate a fresh connect */ |
734 | GNUNET_TIME_UNIT_FOREVER_REL, | 1232 | if (n->state == S_NOT_CONNECTED) |
735 | &send_connect_continuation, | 1233 | { |
736 | n); | 1234 | msg_len = sizeof (struct SessionConnectMessage); |
737 | if (GNUNET_YES == was_connected) | 1235 | connect_msg.header.size = htons (msg_len); |
738 | return GNUNET_YES; | 1236 | connect_msg.header.type = |
739 | /* First tell clients about connected neighbours...*/ | 1237 | htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT); |
740 | neighbours_connected++; | 1238 | connect_msg.reserved = htonl (0); |
741 | GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# peers connected"), 1, | 1239 | connect_msg.timestamp = |
742 | GNUNET_NO); | 1240 | GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); |
743 | connect_notify_cb (callback_cls, peer, ats, ats_count); | 1241 | |
744 | return GNUNET_YES; | 1242 | ret = send_with_plugin (peer, (const char *) &connect_msg, msg_len, UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, |
1243 | session, plugin_name, address, address_len, | ||
1244 | GNUNET_YES, &send_connect_continuation, n); | ||
1245 | |||
1246 | return GNUNET_NO; | ||
1247 | } | ||
1248 | /* We received a CONNECT message and asked ATS for an address */ | ||
1249 | else if (n->state == S_CONNECT_RECV) | ||
1250 | { | ||
1251 | msg_len = sizeof (struct SessionConnectMessage); | ||
1252 | connect_msg.header.size = htons (msg_len); | ||
1253 | connect_msg.header.type = | ||
1254 | htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT_ACK); | ||
1255 | connect_msg.reserved = htonl (0); | ||
1256 | connect_msg.timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); | ||
1257 | |||
1258 | ret = send_with_plugin(&n->id, (const void *) &connect_msg, msg_len, UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, | ||
1259 | session, plugin_name, address, address_len, | ||
1260 | GNUNET_YES, &send_connect_ack_continuation, n); | ||
1261 | if (ret == GNUNET_SYSERR) | ||
1262 | { | ||
1263 | change_state (n, S_NOT_CONNECTED); | ||
1264 | GNUNET_break (0); | ||
1265 | } | ||
1266 | return GNUNET_NO; | ||
1267 | } | ||
1268 | /* connected peer is switching addresses */ | ||
1269 | else if (n->state == S_CONNECTED) | ||
1270 | { | ||
1271 | msg_len = sizeof (struct SessionConnectMessage); | ||
1272 | connect_msg.header.size = htons (msg_len); | ||
1273 | connect_msg.header.type = | ||
1274 | htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT); | ||
1275 | connect_msg.reserved = htonl (0); | ||
1276 | connect_msg.timestamp = | ||
1277 | GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); | ||
1278 | |||
1279 | ret = send_with_plugin (peer, (const char *) &connect_msg, msg_len, UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, | ||
1280 | session, plugin_name, address, address_len, | ||
1281 | GNUNET_YES, &send_switch_address_continuation, n); | ||
1282 | if (ret == GNUNET_SYSERR) | ||
1283 | { | ||
1284 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1285 | "Failed to send CONNECT_MESSAGE to `%4s' using plugin `%s' address '%s' session %X\n", | ||
1286 | GNUNET_i2s (peer), plugin_name, | ||
1287 | (address_len == 0) ? "<inbound>" : GST_plugins_a2s (plugin_name, | ||
1288 | address, | ||
1289 | address_len), | ||
1290 | session); | ||
1291 | } | ||
1292 | return GNUNET_NO; | ||
1293 | } | ||
1294 | else if (n->state == S_CONNECT_SENT) | ||
1295 | { | ||
1296 | //FIXME | ||
1297 | return GNUNET_NO; | ||
1298 | } | ||
1299 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Invalid connection state to switch addresses %u \n", n->state); | ||
1300 | GNUNET_break_op (0); | ||
1301 | return GNUNET_NO; | ||
745 | } | 1302 | } |
746 | 1303 | ||
747 | 1304 | ||
@@ -763,6 +1320,7 @@ setup_neighbour (const struct GNUNET_PeerIdentity *peer) | |||
763 | #endif | 1320 | #endif |
764 | n = GNUNET_malloc (sizeof (struct NeighbourMapEntry)); | 1321 | n = GNUNET_malloc (sizeof (struct NeighbourMapEntry)); |
765 | n->id = *peer; | 1322 | n->id = *peer; |
1323 | n->state = S_NOT_CONNECTED; | ||
766 | GNUNET_BANDWIDTH_tracker_init (&n->in_tracker, | 1324 | GNUNET_BANDWIDTH_tracker_init (&n->in_tracker, |
767 | GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT, | 1325 | GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT, |
768 | MAX_BANDWIDTH_CARRY_S); | 1326 | MAX_BANDWIDTH_CARRY_S); |
@@ -796,8 +1354,16 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target) | |||
796 | memcmp (target, &GST_my_identity, | 1354 | memcmp (target, &GST_my_identity, |
797 | sizeof (struct GNUNET_PeerIdentity))); | 1355 | sizeof (struct GNUNET_PeerIdentity))); |
798 | n = lookup_neighbour (target); | 1356 | n = lookup_neighbour (target); |
799 | if ((NULL != n) && (GNUNET_YES == n->is_connected)) | 1357 | |
800 | return; /* already connected */ | 1358 | if (NULL != n) |
1359 | { | ||
1360 | if ((is_connected(n)) || (is_connecting(n))) | ||
1361 | return; /* already connecting or connected */ | ||
1362 | if (is_disconnecting(n)) | ||
1363 | change_state (n, S_NOT_CONNECTED); | ||
1364 | } | ||
1365 | |||
1366 | |||
801 | if (n == NULL) | 1367 | if (n == NULL) |
802 | n = setup_neighbour (target); | 1368 | n = setup_neighbour (target); |
803 | #if DEBUG_TRANSPORT | 1369 | #if DEBUG_TRANSPORT |
@@ -805,10 +1371,10 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target) | |||
805 | "Asking ATS for suggested address to connect to peer `%s'\n", | 1371 | "Asking ATS for suggested address to connect to peer `%s'\n", |
806 | GNUNET_i2s (&n->id)); | 1372 | GNUNET_i2s (&n->id)); |
807 | #endif | 1373 | #endif |
1374 | |||
808 | GNUNET_ATS_suggest_address (GST_ats, &n->id); | 1375 | GNUNET_ATS_suggest_address (GST_ats, &n->id); |
809 | } | 1376 | } |
810 | 1377 | ||
811 | |||
812 | /** | 1378 | /** |
813 | * Test if we're connected to the given peer. | 1379 | * Test if we're connected to the given peer. |
814 | * | 1380 | * |
@@ -823,7 +1389,8 @@ GST_neighbours_test_connected (const struct GNUNET_PeerIdentity *target) | |||
823 | GNUNET_assert (neighbours != NULL); | 1389 | GNUNET_assert (neighbours != NULL); |
824 | 1390 | ||
825 | n = lookup_neighbour (target); | 1391 | n = lookup_neighbour (target); |
826 | if ((NULL == n) || (n->is_connected != GNUNET_YES)) | 1392 | |
1393 | if ((NULL == n) || (!is_connected(n))) | ||
827 | return GNUNET_NO; /* not connected */ | 1394 | return GNUNET_NO; /* not connected */ |
828 | return GNUNET_YES; | 1395 | return GNUNET_YES; |
829 | } | 1396 | } |
@@ -848,6 +1415,7 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | |||
848 | "Session %X to peer `%s' ended \n", | 1415 | "Session %X to peer `%s' ended \n", |
849 | session, GNUNET_i2s (peer)); | 1416 | session, GNUNET_i2s (peer)); |
850 | #endif | 1417 | #endif |
1418 | |||
851 | n = lookup_neighbour (peer); | 1419 | n = lookup_neighbour (peer); |
852 | if (NULL == n) | 1420 | if (NULL == n) |
853 | return; | 1421 | return; |
@@ -859,15 +1427,19 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | |||
859 | n->addr = NULL; | 1427 | n->addr = NULL; |
860 | n->addrlen = 0; | 1428 | n->addrlen = 0; |
861 | 1429 | ||
1430 | /* not connected anymore anyway, shouldn't matter */ | ||
1431 | if ((!is_connected(n)) && (!is_connecting(n))) | ||
1432 | return; | ||
862 | 1433 | ||
863 | if (GNUNET_YES != n->is_connected) | 1434 | /* We are connected, so ask ATS to switch addresses */ |
864 | return; /* not connected anymore anyway, shouldn't matter */ | ||
865 | /* fast disconnect unless ATS suggests a new address */ | ||
866 | GNUNET_SCHEDULER_cancel (n->timeout_task); | 1435 | GNUNET_SCHEDULER_cancel (n->timeout_task); |
867 | n->timeout_task = | 1436 | n->timeout_task = |
868 | GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_DISCONNECT_SESSION_TIMEOUT, | 1437 | GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_DISCONNECT_SESSION_TIMEOUT, |
869 | &neighbour_timeout_task, n); | 1438 | &neighbour_timeout_task, n); |
870 | /* try QUICKLY to re-establish a connection, reduce timeout! */ | 1439 | /* try QUICKLY to re-establish a connection, reduce timeout! */ |
1440 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | ||
1441 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
1442 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); | ||
871 | GNUNET_ATS_suggest_address (GST_ats, peer); | 1443 | GNUNET_ATS_suggest_address (GST_ats, peer); |
872 | } | 1444 | } |
873 | 1445 | ||
@@ -893,7 +1465,7 @@ GST_neighbours_send (const struct GNUNET_PeerIdentity *target, const void *msg, | |||
893 | GNUNET_assert (neighbours != NULL); | 1465 | GNUNET_assert (neighbours != NULL); |
894 | 1466 | ||
895 | n = lookup_neighbour (target); | 1467 | n = lookup_neighbour (target); |
896 | if ((n == NULL) || (GNUNET_YES != n->is_connected)) | 1468 | if ((n == NULL) || (!is_connected(n))) |
897 | { | 1469 | { |
898 | GNUNET_STATISTICS_update (GST_stats, | 1470 | GNUNET_STATISTICS_update (GST_stats, |
899 | gettext_noop | 1471 | gettext_noop |
@@ -902,9 +1474,9 @@ GST_neighbours_send (const struct GNUNET_PeerIdentity *target, const void *msg, | |||
902 | #if DEBUG_TRANSPORT | 1474 | #if DEBUG_TRANSPORT |
903 | if (n == NULL) | 1475 | if (n == NULL) |
904 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1476 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
905 | "Could not send message to peer `%s': unknown neighbor", | 1477 | "Could not send message to peer `%s': unknown neighbour", |
906 | GNUNET_i2s (target)); | 1478 | GNUNET_i2s (target)); |
907 | else if (GNUNET_YES != n->is_connected) | 1479 | else if (!is_connected(n)) |
908 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1480 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
909 | "Could not send message to peer `%s': not connected\n", | 1481 | "Could not send message to peer `%s': not connected\n", |
910 | GNUNET_i2s (target)); | 1482 | GNUNET_i2s (target)); |
@@ -930,6 +1502,7 @@ GST_neighbours_send (const struct GNUNET_PeerIdentity *target, const void *msg, | |||
930 | cont (cont_cls, GNUNET_SYSERR); | 1502 | cont (cont_cls, GNUNET_SYSERR); |
931 | return; | 1503 | return; |
932 | } | 1504 | } |
1505 | |||
933 | GNUNET_assert (msg_size >= sizeof (struct GNUNET_MessageHeader)); | 1506 | GNUNET_assert (msg_size >= sizeof (struct GNUNET_MessageHeader)); |
934 | GNUNET_STATISTICS_update (GST_stats, | 1507 | GNUNET_STATISTICS_update (GST_stats, |
935 | gettext_noop | 1508 | gettext_noop |
@@ -944,6 +1517,7 @@ GST_neighbours_send (const struct GNUNET_PeerIdentity *target, const void *msg, | |||
944 | mq->message_buf_size = msg_size; | 1517 | mq->message_buf_size = msg_size; |
945 | mq->timeout = GNUNET_TIME_relative_to_absolute (timeout); | 1518 | mq->timeout = GNUNET_TIME_relative_to_absolute (timeout); |
946 | GNUNET_CONTAINER_DLL_insert_tail (n->messages_head, n->messages_tail, mq); | 1519 | GNUNET_CONTAINER_DLL_insert_tail (n->messages_head, n->messages_tail, mq); |
1520 | |||
947 | if ((GNUNET_SCHEDULER_NO_TASK == n->transmission_task) && | 1521 | if ((GNUNET_SCHEDULER_NO_TASK == n->transmission_task) && |
948 | (NULL == n->is_active)) | 1522 | (NULL == n->is_active)) |
949 | n->transmission_task = GNUNET_SCHEDULER_add_now (&transmission_task, n); | 1523 | n->transmission_task = GNUNET_SCHEDULER_add_now (&transmission_task, n); |
@@ -986,11 +1560,8 @@ GST_neighbours_calculate_receive_delay (const struct GNUNET_PeerIdentity | |||
986 | return GNUNET_TIME_UNIT_ZERO; | 1560 | return GNUNET_TIME_UNIT_ZERO; |
987 | } | 1561 | } |
988 | } | 1562 | } |
989 | if (GNUNET_YES != n->is_connected) | 1563 | if (!is_connected(n)) |
990 | { | 1564 | { |
991 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | ||
992 | _("Plugin gave us %d bytes of data but somehow the session is not marked as UP yet!\n"), | ||
993 | (int) size); | ||
994 | *do_forward = GNUNET_SYSERR; | 1565 | *do_forward = GNUNET_SYSERR; |
995 | return GNUNET_TIME_UNIT_ZERO; | 1566 | return GNUNET_TIME_UNIT_ZERO; |
996 | } | 1567 | } |
@@ -1103,7 +1674,7 @@ GST_neighbours_set_incoming_quota (const struct GNUNET_PeerIdentity *neighbour, | |||
1103 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting peer `%4s' due to `%s'\n", | 1674 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting peer `%4s' due to `%s'\n", |
1104 | GNUNET_i2s (&n->id), "SET_QUOTA"); | 1675 | GNUNET_i2s (&n->id), "SET_QUOTA"); |
1105 | #endif | 1676 | #endif |
1106 | if (GNUNET_YES == n->is_connected) | 1677 | if (is_connected(n)) |
1107 | GNUNET_STATISTICS_update (GST_stats, | 1678 | GNUNET_STATISTICS_update (GST_stats, |
1108 | gettext_noop ("# disconnects due to quota of 0"), 1, | 1679 | gettext_noop ("# disconnects due to quota of 0"), 1, |
1109 | GNUNET_NO); | 1680 | GNUNET_NO); |
@@ -1142,7 +1713,7 @@ neighbours_iterate (void *cls, const GNUNET_HashCode * key, void *value) | |||
1142 | struct IteratorContext *ic = cls; | 1713 | struct IteratorContext *ic = cls; |
1143 | struct NeighbourMapEntry *n = value; | 1714 | struct NeighbourMapEntry *n = value; |
1144 | 1715 | ||
1145 | if (GNUNET_YES != n->is_connected) | 1716 | if (is_connected(n)) |
1146 | return GNUNET_OK; | 1717 | return GNUNET_OK; |
1147 | 1718 | ||
1148 | ic->cb (ic->cb_cls, &n->id, NULL, 0, n->plugin_name, n->addr, n->addrlen); | 1719 | ic->cb (ic->cb_cls, &n->id, NULL, 0, n->plugin_name, n->addr, n->addrlen); |
@@ -1168,7 +1739,6 @@ GST_neighbours_iterate (GST_NeighbourIterator cb, void *cb_cls) | |||
1168 | GNUNET_CONTAINER_multihashmap_iterate (neighbours, &neighbours_iterate, &ic); | 1739 | GNUNET_CONTAINER_multihashmap_iterate (neighbours, &neighbours_iterate, &ic); |
1169 | } | 1740 | } |
1170 | 1741 | ||
1171 | |||
1172 | /** | 1742 | /** |
1173 | * If we have an active connection to the given target, it must be shutdown. | 1743 | * If we have an active connection to the given target, it must be shutdown. |
1174 | * | 1744 | * |
@@ -1178,40 +1748,16 @@ void | |||
1178 | GST_neighbours_force_disconnect (const struct GNUNET_PeerIdentity *target) | 1748 | GST_neighbours_force_disconnect (const struct GNUNET_PeerIdentity *target) |
1179 | { | 1749 | { |
1180 | struct NeighbourMapEntry *n; | 1750 | struct NeighbourMapEntry *n; |
1181 | struct GNUNET_TRANSPORT_PluginFunctions *papi; | ||
1182 | struct SessionDisconnectMessage disconnect_msg; | ||
1183 | 1751 | ||
1184 | GNUNET_assert (neighbours != NULL); | 1752 | GNUNET_assert (neighbours != NULL); |
1185 | 1753 | ||
1186 | n = lookup_neighbour (target); | 1754 | n = lookup_neighbour (target); |
1187 | if (NULL == n) | 1755 | if (NULL == n) |
1188 | return; /* not active */ | 1756 | return; /* not active */ |
1189 | if (GNUNET_YES == n->is_connected) | 1757 | if (is_connected(n)) |
1190 | { | 1758 | { |
1191 | /* we're actually connected, send DISCONNECT message */ | 1759 | send_disconnect(n); |
1192 | disconnect_msg.header.size = htons (sizeof (struct SessionDisconnectMessage)); | 1760 | |
1193 | disconnect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT); | ||
1194 | disconnect_msg.reserved = htonl (0); | ||
1195 | disconnect_msg.purpose.size = htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + | ||
1196 | sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) + | ||
1197 | sizeof (struct GNUNET_TIME_AbsoluteNBO) ); | ||
1198 | disconnect_msg.purpose.purpose = htonl (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT); | ||
1199 | disconnect_msg.timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); | ||
1200 | disconnect_msg.public_key = GST_my_public_key; | ||
1201 | GNUNET_assert (GNUNET_OK == | ||
1202 | GNUNET_CRYPTO_rsa_sign (GST_my_private_key, | ||
1203 | &disconnect_msg.purpose, | ||
1204 | &disconnect_msg.signature)); | ||
1205 | papi = GST_plugins_find (n->plugin_name); | ||
1206 | if (papi != NULL) | ||
1207 | papi->send (papi->cls, target, (const void *) &disconnect_msg, | ||
1208 | sizeof (disconnect_msg), | ||
1209 | UINT32_MAX /* priority */ , | ||
1210 | GNUNET_TIME_UNIT_FOREVER_REL, n->session, n->addr, n->addrlen, | ||
1211 | GNUNET_YES, NULL, NULL); | ||
1212 | GNUNET_STATISTICS_update (GST_stats, | ||
1213 | gettext_noop ("# peers disconnected due to external request"), 1, | ||
1214 | GNUNET_NO); | ||
1215 | n = lookup_neighbour (target); | 1761 | n = lookup_neighbour (target); |
1216 | if (NULL == n) | 1762 | if (NULL == n) |
1217 | return; /* gone already */ | 1763 | return; /* gone already */ |
@@ -1235,6 +1781,11 @@ GST_neighbours_handle_disconnect_message (const struct GNUNET_PeerIdentity *peer | |||
1235 | const struct SessionDisconnectMessage *sdm; | 1781 | const struct SessionDisconnectMessage *sdm; |
1236 | GNUNET_HashCode hc; | 1782 | GNUNET_HashCode hc; |
1237 | 1783 | ||
1784 | #if DEBUG_TRANSPORT | ||
1785 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1786 | "Received DISCONNECT message from peer `%s'\n", GNUNET_i2s (peer)); | ||
1787 | #endif | ||
1788 | |||
1238 | if (ntohs (msg->size) != sizeof (struct SessionDisconnectMessage)) | 1789 | if (ntohs (msg->size) != sizeof (struct SessionDisconnectMessage)) |
1239 | { | 1790 | { |
1240 | // GNUNET_break_op (0); | 1791 | // GNUNET_break_op (0); |
@@ -1285,6 +1836,281 @@ GST_neighbours_handle_disconnect_message (const struct GNUNET_PeerIdentity *peer | |||
1285 | GST_neighbours_force_disconnect (peer); | 1836 | GST_neighbours_force_disconnect (peer); |
1286 | } | 1837 | } |
1287 | 1838 | ||
1839 | /** | ||
1840 | * We received a 'SESSION_CONNECT_ACK' message from the other peer. | ||
1841 | * Consider switching to it. | ||
1842 | * | ||
1843 | * @param message possibly a 'struct SessionConnectMessage' (check format) | ||
1844 | * @param peer identity of the peer to switch the address for | ||
1845 | * @param plugin_name name of transport that delivered the PONG | ||
1846 | * @param address address of the other peer, NULL if other peer | ||
1847 | * connected to us | ||
1848 | * @param address_len number of bytes in address | ||
1849 | * @param session session to use (or NULL) | ||
1850 | * @param ats performance data | ||
1851 | * @param ats_count number of entries in ats | ||
1852 | */ | ||
1853 | void | ||
1854 | GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, | ||
1855 | const struct GNUNET_PeerIdentity *peer, | ||
1856 | const char *plugin_name, | ||
1857 | const char *sender_address, uint16_t sender_address_len, | ||
1858 | struct Session *session, | ||
1859 | const struct GNUNET_ATS_Information *ats, | ||
1860 | uint32_t ats_count) | ||
1861 | { | ||
1862 | const struct SessionConnectMessage *scm; | ||
1863 | struct QuotaSetMessage q_msg; | ||
1864 | struct GNUNET_MessageHeader msg; | ||
1865 | struct NeighbourMapEntry *n; | ||
1866 | size_t msg_len; | ||
1867 | size_t ret; | ||
1868 | int was_connected; | ||
1869 | |||
1870 | #if DEBUG_TRANSPORT | ||
1871 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1872 | "Received CONNECT_ACK message from peer `%s'\n", GNUNET_i2s (peer)); | ||
1873 | #endif | ||
1874 | |||
1875 | if (ntohs (message->size) != sizeof (struct SessionConnectMessage)) | ||
1876 | { | ||
1877 | GNUNET_break_op (0); | ||
1878 | return; | ||
1879 | } | ||
1880 | |||
1881 | scm = (const struct SessionConnectMessage *) message; | ||
1882 | GNUNET_break_op (ntohl (scm->reserved) == 0); | ||
1883 | n = lookup_neighbour (peer); | ||
1884 | if (NULL == n) | ||
1885 | n = setup_neighbour (peer); | ||
1886 | /* | ||
1887 | if (n->state != S_CONNECT_SENT) | ||
1888 | { | ||
1889 | GNUNET_break (0); | ||
1890 | send_disconnect(n); | ||
1891 | return; | ||
1892 | } | ||
1893 | */ | ||
1894 | if (NULL != session) | ||
1895 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, | ||
1896 | "transport-ats", | ||
1897 | "Giving ATS session %p of plugin %s for peer %s\n", | ||
1898 | session, | ||
1899 | plugin_name, | ||
1900 | GNUNET_i2s (peer)); | ||
1901 | GNUNET_ATS_address_update (GST_ats, | ||
1902 | peer, | ||
1903 | plugin_name, sender_address, sender_address_len, | ||
1904 | session, ats, ats_count); | ||
1905 | |||
1906 | was_connected = is_connected(n); | ||
1907 | if (!is_connected(n)) | ||
1908 | change_state (n, S_CONNECTED); | ||
1909 | |||
1910 | #if DEBUG_TRANSPORT | ||
1911 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
1912 | "Setting inbound quota of %u for peer `%s' to \n", | ||
1913 | ntohl (n->bandwidth_in.value__), GNUNET_i2s (&n->id)); | ||
1914 | #endif | ||
1915 | GST_neighbours_set_incoming_quota(&n->id, n->bandwidth_in); | ||
1916 | |||
1917 | /* send ACK (ACK)*/ | ||
1918 | msg_len = sizeof (msg); | ||
1919 | msg.size = htons (msg_len); | ||
1920 | msg.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_ACK); | ||
1921 | |||
1922 | ret = send_with_plugin (&n->id, (const char *) &msg, msg_len, UINT32_MAX, | ||
1923 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
1924 | n->session, n->plugin_name, n->addr, n->addrlen, | ||
1925 | GNUNET_YES, NULL, NULL); | ||
1926 | |||
1927 | if (ret == GNUNET_SYSERR) | ||
1928 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1929 | "Failed to send SESSION_ACK to `%4s' using plugin `%s' address '%s' session %X\n", | ||
1930 | GNUNET_i2s (&n->id), n->plugin_name, | ||
1931 | (n->addrlen == 0) ? "<inbound>" : GST_plugins_a2s (n->plugin_name, | ||
1932 | n->addr, | ||
1933 | n->addrlen), | ||
1934 | n->session); | ||
1935 | |||
1936 | |||
1937 | if (!was_connected) | ||
1938 | { | ||
1939 | if (n->keepalive_task == GNUNET_SCHEDULER_NO_TASK) | ||
1940 | n->keepalive_task = GNUNET_SCHEDULER_add_delayed (KEEPALIVE_FREQUENCY, | ||
1941 | &neighbour_keepalive_task, | ||
1942 | n); | ||
1943 | |||
1944 | neighbours_connected++; | ||
1945 | GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# peers connected"), 1, | ||
1946 | GNUNET_NO); | ||
1947 | connect_notify_cb (callback_cls, &n->id, ats, ats_count); | ||
1948 | |||
1949 | #if DEBUG_TRANSPORT | ||
1950 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1951 | "Sending outbound quota of %u Bps for peer `%s' to all clients\n", | ||
1952 | ntohl (n->bandwidth_out.value__), GNUNET_i2s (peer)); | ||
1953 | #endif | ||
1954 | q_msg.header.size = htons (sizeof (struct QuotaSetMessage)); | ||
1955 | q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA); | ||
1956 | q_msg.quota = n->bandwidth_out; | ||
1957 | q_msg.peer = (*peer); | ||
1958 | GST_clients_broadcast (&q_msg.header, GNUNET_NO); | ||
1959 | } | ||
1960 | } | ||
1961 | |||
1962 | void | ||
1963 | GST_neighbours_handle_ack (const struct GNUNET_MessageHeader *message, | ||
1964 | const struct GNUNET_PeerIdentity *peer, | ||
1965 | const char *plugin_name, | ||
1966 | const char *sender_address, uint16_t sender_address_len, | ||
1967 | struct Session *session, | ||
1968 | const struct GNUNET_ATS_Information *ats, | ||
1969 | uint32_t ats_count) | ||
1970 | { | ||
1971 | struct NeighbourMapEntry *n; | ||
1972 | struct QuotaSetMessage q_msg; | ||
1973 | |||
1974 | #if DEBUG_TRANSPORT | ||
1975 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1976 | "Received ACK message from peer `%s'\n", GNUNET_i2s (peer)); | ||
1977 | #endif | ||
1978 | |||
1979 | if (ntohs (message->size) != sizeof (struct GNUNET_MessageHeader)) | ||
1980 | { | ||
1981 | GNUNET_break_op (0); | ||
1982 | return; | ||
1983 | } | ||
1984 | |||
1985 | n = lookup_neighbour (peer); | ||
1986 | if (NULL == n) | ||
1987 | { | ||
1988 | send_disconnect(n); | ||
1989 | GNUNET_break (0); | ||
1990 | } | ||
1991 | // FIXME check this | ||
1992 | // if (n->state != S_CONNECT_RECV) | ||
1993 | /* if (is_connecting(n)) | ||
1994 | { | ||
1995 | send_disconnect (n); | ||
1996 | change_state (n, S_DISCONNECT); | ||
1997 | GNUNET_break (0); | ||
1998 | return; | ||
1999 | } | ||
2000 | */ | ||
2001 | if (is_connected(n)) | ||
2002 | return; | ||
2003 | |||
2004 | if (NULL != session) | ||
2005 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, | ||
2006 | "transport-ats", | ||
2007 | "Giving ATS session %p of plugin %s for peer %s\n", | ||
2008 | session, | ||
2009 | plugin_name, | ||
2010 | GNUNET_i2s (peer)); | ||
2011 | GNUNET_ATS_address_update (GST_ats, | ||
2012 | peer, | ||
2013 | plugin_name, sender_address, sender_address_len, | ||
2014 | session, ats, ats_count); | ||
2015 | |||
2016 | change_state (n, S_CONNECTED); | ||
2017 | |||
2018 | GST_neighbours_set_incoming_quota(&n->id, n->bandwidth_in); | ||
2019 | |||
2020 | if (n->keepalive_task == GNUNET_SCHEDULER_NO_TASK) | ||
2021 | n->keepalive_task = GNUNET_SCHEDULER_add_delayed (KEEPALIVE_FREQUENCY, | ||
2022 | &neighbour_keepalive_task, | ||
2023 | n); | ||
2024 | |||
2025 | neighbours_connected++; | ||
2026 | GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# peers connected"), 1, | ||
2027 | GNUNET_NO); | ||
2028 | connect_notify_cb (callback_cls, &n->id, ats, ats_count); | ||
2029 | |||
2030 | #if DEBUG_TRANSPORT | ||
2031 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2032 | "Sending outbound quota of %u Bps for peer `%s' to all clients\n", | ||
2033 | ntohl (n->bandwidth_out.value__), GNUNET_i2s (peer)); | ||
2034 | #endif | ||
2035 | |||
2036 | q_msg.header.size = htons (sizeof (struct QuotaSetMessage)); | ||
2037 | q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA); | ||
2038 | q_msg.quota = n->bandwidth_out; | ||
2039 | q_msg.peer = (*peer); | ||
2040 | GST_clients_broadcast (&q_msg.header, GNUNET_NO); | ||
2041 | } | ||
2042 | |||
2043 | struct BlackListCheckContext | ||
2044 | { | ||
2045 | struct GNUNET_ATS_Information *ats; | ||
2046 | |||
2047 | uint32_t ats_count; | ||
2048 | |||
2049 | struct Session *session; | ||
2050 | |||
2051 | char *sender_address; | ||
2052 | |||
2053 | uint16_t sender_address_len; | ||
2054 | |||
2055 | char *plugin_name; | ||
2056 | |||
2057 | struct GNUNET_TIME_Absolute ts; | ||
2058 | }; | ||
2059 | |||
2060 | |||
2061 | static void | ||
2062 | handle_connect_blacklist_cont (void *cls, | ||
2063 | const struct GNUNET_PeerIdentity | ||
2064 | * peer, int result) | ||
2065 | { | ||
2066 | struct NeighbourMapEntry *n; | ||
2067 | struct BlackListCheckContext * bcc = cls; | ||
2068 | |||
2069 | #if DEBUG_TRANSPORT | ||
2070 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2071 | "Blacklist check due to CONNECT message: `%s'\n", GNUNET_i2s (peer), (result == GNUNET_OK) ? "ALLOWED" : "FORBIDDEN"); | ||
2072 | #endif | ||
2073 | |||
2074 | /* not allowed */ | ||
2075 | if (GNUNET_OK != result) | ||
2076 | { | ||
2077 | GNUNET_free (bcc); | ||
2078 | return; | ||
2079 | } | ||
2080 | |||
2081 | n = lookup_neighbour (peer); | ||
2082 | if (NULL == n) | ||
2083 | n = setup_neighbour (peer); | ||
2084 | |||
2085 | if (bcc->ts.abs_value > n->connect_ts.abs_value) | ||
2086 | { | ||
2087 | if (NULL != bcc->session) | ||
2088 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, | ||
2089 | "transport-ats", | ||
2090 | "Giving ATS session %p of plugin %s address `%s' for peer %s\n", | ||
2091 | bcc->session, | ||
2092 | bcc->plugin_name, | ||
2093 | GST_plugins_a2s (bcc->plugin_name, bcc->sender_address, bcc->sender_address_len), | ||
2094 | GNUNET_i2s (peer)); | ||
2095 | GNUNET_ATS_address_update (GST_ats, | ||
2096 | peer, | ||
2097 | bcc->plugin_name, bcc->sender_address, bcc->sender_address_len, | ||
2098 | bcc->session, bcc->ats, bcc->ats_count); | ||
2099 | n->connect_ts = bcc->ts; | ||
2100 | } | ||
2101 | |||
2102 | GNUNET_free (bcc); | ||
2103 | /* | ||
2104 | if (n->state != S_NOT_CONNECTED) | ||
2105 | return;*/ | ||
2106 | change_state (n, S_CONNECT_RECV); | ||
2107 | |||
2108 | /* Ask ATS for an address to connect via that address */ | ||
2109 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | ||
2110 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
2111 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); | ||
2112 | GNUNET_ATS_suggest_address(GST_ats, peer); | ||
2113 | } | ||
1288 | 2114 | ||
1289 | /** | 2115 | /** |
1290 | * We received a 'SESSION_CONNECT' message from the other peer. | 2116 | * We received a 'SESSION_CONNECT' message from the other peer. |
@@ -1310,35 +2136,57 @@ GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, | |||
1310 | uint32_t ats_count) | 2136 | uint32_t ats_count) |
1311 | { | 2137 | { |
1312 | const struct SessionConnectMessage *scm; | 2138 | const struct SessionConnectMessage *scm; |
1313 | struct GNUNET_TIME_Absolute ts; | 2139 | struct NeighbourMapEntry * n; |
1314 | struct NeighbourMapEntry *n; | 2140 | struct BlackListCheckContext * bcc = NULL; |
2141 | |||
2142 | #if DEBUG_TRANSPORT | ||
2143 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2144 | "Received CONNECT message from peer `%s'\n", GNUNET_i2s (peer)); | ||
2145 | #endif | ||
1315 | 2146 | ||
1316 | if (ntohs (message->size) != sizeof (struct SessionConnectMessage)) | 2147 | if (ntohs (message->size) != sizeof (struct SessionConnectMessage)) |
1317 | { | 2148 | { |
1318 | GNUNET_break_op (0); | 2149 | GNUNET_break_op (0); |
1319 | return; | 2150 | return; |
1320 | } | 2151 | } |
2152 | |||
1321 | scm = (const struct SessionConnectMessage *) message; | 2153 | scm = (const struct SessionConnectMessage *) message; |
1322 | GNUNET_break_op (ntohl (scm->reserved) == 0); | 2154 | GNUNET_break_op (ntohl (scm->reserved) == 0); |
1323 | ts = GNUNET_TIME_absolute_ntoh (scm->timestamp); | 2155 | |
1324 | n = lookup_neighbour (peer); | 2156 | n = lookup_neighbour(peer); |
1325 | if (NULL == n) | 2157 | if (n != NULL) |
1326 | n = setup_neighbour (peer); | ||
1327 | if (ts.abs_value > n->connect_ts.abs_value) | ||
1328 | { | 2158 | { |
1329 | if (NULL != session) | 2159 | /* connected peer switches addresses */ |
1330 | GNUNET_log_from (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK, | 2160 | if (is_connected(n)) |
1331 | "transport-ats", | 2161 | { |
1332 | "Giving ATS session %p of plugin %s for peer %s\n", | 2162 | GNUNET_ATS_address_update(GST_ats, peer, plugin_name, sender_address, sender_address_len, session, ats, ats_count); |
1333 | session, | 2163 | return; |
1334 | plugin_name, | 2164 | } |
1335 | GNUNET_i2s (peer)); | ||
1336 | GNUNET_ATS_address_update (GST_ats, | ||
1337 | peer, | ||
1338 | plugin_name, sender_address, sender_address_len, | ||
1339 | session, ats, ats_count); | ||
1340 | n->connect_ts = ts; | ||
1341 | } | 2165 | } |
2166 | |||
2167 | /* we are not connected to this peer */ | ||
2168 | /* do blacklist check*/ | ||
2169 | bcc = GNUNET_malloc (sizeof (struct BlackListCheckContext) + | ||
2170 | sizeof (struct GNUNET_ATS_Information) * ats_count + | ||
2171 | sender_address_len + | ||
2172 | strlen (plugin_name)+1); | ||
2173 | |||
2174 | bcc->ts = GNUNET_TIME_absolute_ntoh (scm->timestamp); | ||
2175 | |||
2176 | bcc->ats_count = ats_count; | ||
2177 | bcc->sender_address_len = sender_address_len; | ||
2178 | bcc->session = session; | ||
2179 | |||
2180 | bcc->ats = (struct GNUNET_ATS_Information *) &bcc[1]; | ||
2181 | memcpy (bcc->ats, ats,sizeof (struct GNUNET_ATS_Information) * ats_count ); | ||
2182 | |||
2183 | bcc->sender_address = (char *) &bcc->ats[ats_count]; | ||
2184 | memcpy (bcc->sender_address, sender_address , sender_address_len); | ||
2185 | |||
2186 | bcc->plugin_name = &bcc->sender_address[sender_address_len]; | ||
2187 | strcpy (bcc->plugin_name, plugin_name); | ||
2188 | |||
2189 | GST_blacklist_test_allowed (peer, plugin_name, handle_connect_blacklist_cont, bcc); | ||
1342 | } | 2190 | } |
1343 | 2191 | ||
1344 | 2192 | ||
diff --git a/src/transport/gnunet-service-transport_neighbours.h b/src/transport/gnunet-service-transport_neighbours.h index 272f059dd..3868ef2cf 100644 --- a/src/transport/gnunet-service-transport_neighbours.h +++ b/src/transport/gnunet-service-transport_neighbours.h | |||
@@ -199,7 +199,9 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | |||
199 | * @param address_len number of bytes in address | 199 | * @param address_len number of bytes in address |
200 | * @param session session to use (or NULL) | 200 | * @param session session to use (or NULL) |
201 | * @param ats performance data | 201 | * @param ats performance data |
202 | * @param ats_count number of entries in ats (excluding 0-termination) | 202 | * @param ats_count number of entries in ats |
203 | * @param bandwidth_in inbound quota to be used when connection is up | ||
204 | * @param bandwidth_out outbound quota to be used when connection is up | ||
203 | * @return GNUNET_YES if we are currently connected, GNUNET_NO if the | 205 | * @return GNUNET_YES if we are currently connected, GNUNET_NO if the |
204 | * connection is not up (yet) | 206 | * connection is not up (yet) |
205 | */ | 207 | */ |
@@ -219,6 +221,7 @@ GST_neighbours_switch_to_address_3way (const struct GNUNET_PeerIdentity *peer, | |||
219 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, | 221 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, |
220 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out); | 222 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out); |
221 | 223 | ||
224 | |||
222 | /** | 225 | /** |
223 | * We received a 'SESSION_CONNECT' message from the other peer. | 226 | * We received a 'SESSION_CONNECT' message from the other peer. |
224 | * Consider switching to it. | 227 | * Consider switching to it. |
@@ -231,7 +234,7 @@ GST_neighbours_switch_to_address_3way (const struct GNUNET_PeerIdentity *peer, | |||
231 | * @param address_len number of bytes in address | 234 | * @param address_len number of bytes in address |
232 | * @param session session to use (or NULL) | 235 | * @param session session to use (or NULL) |
233 | * @param ats performance data | 236 | * @param ats performance data |
234 | * @param ats_count number of entries in ats | 237 | * @param ats_count number of entries in ats (excluding 0-termination) |
235 | */ | 238 | */ |
236 | void | 239 | void |
237 | GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, | 240 | GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, |
@@ -242,19 +245,6 @@ GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, | |||
242 | const struct GNUNET_ATS_Information *ats, | 245 | const struct GNUNET_ATS_Information *ats, |
243 | uint32_t ats_count); | 246 | uint32_t ats_count); |
244 | 247 | ||
245 | /** | ||
246 | * We received a 'SESSION_CONNECT_ACK' message from the other peer. | ||
247 | * | ||
248 | * @param message possibly a 'struct SessionConnectMessage' (check format) | ||
249 | * @param peer identity of the peer to switch the address for | ||
250 | * @param plugin_name name of transport that delivered the PONG | ||
251 | * @param address address of the other peer, NULL if other peer | ||
252 | * connected to us | ||
253 | * @param address_len number of bytes in address | ||
254 | * @param session session to use (or NULL) | ||
255 | * @param ats performance data | ||
256 | * @param ats_count number of entries in ats | ||
257 | */ | ||
258 | void | 248 | void |
259 | GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, | 249 | GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, |
260 | const struct GNUNET_PeerIdentity *peer, | 250 | const struct GNUNET_PeerIdentity *peer, |
@@ -264,19 +254,6 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, | |||
264 | const struct GNUNET_ATS_Information *ats, | 254 | const struct GNUNET_ATS_Information *ats, |
265 | uint32_t ats_count); | 255 | uint32_t ats_count); |
266 | 256 | ||
267 | /** | ||
268 | * We received a 'SESSION_ACK' message from the other peer. | ||
269 | * | ||
270 | * @param message possibly a 'struct SessionConnectMessage' (check format) | ||
271 | * @param peer identity of the peer to switch the address for | ||
272 | * @param plugin_name name of transport that delivered the PONG | ||
273 | * @param address address of the other peer, NULL if other peer | ||
274 | * connected to us | ||
275 | * @param address_len number of bytes in address | ||
276 | * @param session session to use (or NULL) | ||
277 | * @param ats performance data | ||
278 | * @param ats_count number of entries in ats | ||
279 | */ | ||
280 | void | 257 | void |
281 | GST_neighbours_handle_ack (const struct GNUNET_MessageHeader *message, | 258 | GST_neighbours_handle_ack (const struct GNUNET_MessageHeader *message, |
282 | const struct GNUNET_PeerIdentity *peer, | 259 | const struct GNUNET_PeerIdentity *peer, |
diff --git a/src/transport/gnunet-service-transport_neighbours_3way.c b/src/transport/gnunet-service-transport_neighbours_3way.c deleted file mode 100644 index 516ef6b70..000000000 --- a/src/transport/gnunet-service-transport_neighbours_3way.c +++ /dev/null | |||
@@ -1,2193 +0,0 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | (C) 2010,2011 Christian Grothoff (and other contributing authors) | ||
4 | |||
5 | GNUnet is free software; you can redistribute it and/or modify | ||
6 | it under the terms of the GNU General Public License as published | ||
7 | by the Free Software Foundation; either version 3, or (at your | ||
8 | option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU General Public License | ||
16 | along with GNUnet; see the file COPYING. If not, write to the | ||
17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
18 | Boston, MA 02111-1307, USA. | ||
19 | */ | ||
20 | |||
21 | /** | ||
22 | * @file transport/gnunet-service-transport_neighbours.c | ||
23 | * @brief neighbour management | ||
24 | * @author Christian Grothoff | ||
25 | */ | ||
26 | #include "platform.h" | ||
27 | #include "gnunet_ats_service.h" | ||
28 | #include "gnunet-service-transport_neighbours.h" | ||
29 | #include "gnunet-service-transport_plugins.h" | ||
30 | #include "gnunet-service-transport_validation.h" | ||
31 | #include "gnunet-service-transport_clients.h" | ||
32 | #include "gnunet-service-transport.h" | ||
33 | #include "gnunet_peerinfo_service.h" | ||
34 | #include "gnunet-service-transport_blacklist.h" | ||
35 | #include "gnunet_constants.h" | ||
36 | #include "transport.h" | ||
37 | |||
38 | |||
39 | /** | ||
40 | * Size of the neighbour hash map. | ||
41 | */ | ||
42 | #define NEIGHBOUR_TABLE_SIZE 256 | ||
43 | |||
44 | /** | ||
45 | * How often must a peer violate bandwidth quotas before we start | ||
46 | * to simply drop its messages? | ||
47 | */ | ||
48 | #define QUOTA_VIOLATION_DROP_THRESHOLD 10 | ||
49 | |||
50 | /** | ||
51 | * How often do we send KEEPALIVE messages to each of our neighbours? | ||
52 | * (idle timeout is 5 minutes or 300 seconds, so with 90s interval we | ||
53 | * send 3 keepalives in each interval, so 3 messages would need to be | ||
54 | * lost in a row for a disconnect). | ||
55 | */ | ||
56 | #define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90) | ||
57 | |||
58 | |||
59 | #define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3) | ||
60 | |||
61 | |||
62 | #define SETUP_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) | ||
63 | |||
64 | |||
65 | /** | ||
66 | * Entry in neighbours. | ||
67 | */ | ||
68 | struct NeighbourMapEntry; | ||
69 | |||
70 | /** | ||
71 | * Message a peer sends to another to indicate its | ||
72 | * preference for communicating via a particular | ||
73 | * session (and the desire to establish a real | ||
74 | * connection). | ||
75 | */ | ||
76 | struct SessionConnectMessage | ||
77 | { | ||
78 | /** | ||
79 | * Header of type 'GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT' | ||
80 | */ | ||
81 | struct GNUNET_MessageHeader header; | ||
82 | |||
83 | /** | ||
84 | * Always zero. | ||
85 | */ | ||
86 | uint32_t reserved GNUNET_PACKED; | ||
87 | |||
88 | /** | ||
89 | * Absolute time at the sender. Only the most recent connect | ||
90 | * message implies which session is preferred by the sender. | ||
91 | */ | ||
92 | struct GNUNET_TIME_AbsoluteNBO timestamp; | ||
93 | |||
94 | }; | ||
95 | |||
96 | |||
97 | struct SessionDisconnectMessage | ||
98 | { | ||
99 | /** | ||
100 | * Header of type 'GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT' | ||
101 | */ | ||
102 | struct GNUNET_MessageHeader header; | ||
103 | |||
104 | /** | ||
105 | * Always zero. | ||
106 | */ | ||
107 | uint32_t reserved GNUNET_PACKED; | ||
108 | |||
109 | /** | ||
110 | * Purpose of the signature. Extends over the timestamp. | ||
111 | * Purpose should be GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DISCONNECT. | ||
112 | */ | ||
113 | struct GNUNET_CRYPTO_RsaSignaturePurpose purpose; | ||
114 | |||
115 | /** | ||
116 | * Absolute time at the sender. Only the most recent connect | ||
117 | * message implies which session is preferred by the sender. | ||
118 | */ | ||
119 | struct GNUNET_TIME_AbsoluteNBO timestamp; | ||
120 | |||
121 | /** | ||
122 | * Public key of the sender. | ||
123 | */ | ||
124 | struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded public_key; | ||
125 | |||
126 | /** | ||
127 | * Signature of the peer that sends us the disconnect. Only | ||
128 | * valid if the timestamp is AFTER the timestamp from the | ||
129 | * corresponding 'CONNECT' message. | ||
130 | */ | ||
131 | struct GNUNET_CRYPTO_RsaSignature signature; | ||
132 | |||
133 | }; | ||
134 | |||
135 | |||
136 | /** | ||
137 | * For each neighbour we keep a list of messages | ||
138 | * that we still want to transmit to the neighbour. | ||
139 | */ | ||
140 | struct MessageQueue | ||
141 | { | ||
142 | |||
143 | /** | ||
144 | * This is a doubly linked list. | ||
145 | */ | ||
146 | struct MessageQueue *next; | ||
147 | |||
148 | /** | ||
149 | * This is a doubly linked list. | ||
150 | */ | ||
151 | struct MessageQueue *prev; | ||
152 | |||
153 | /** | ||
154 | * Once this message is actively being transmitted, which | ||
155 | * neighbour is it associated with? | ||
156 | */ | ||
157 | struct NeighbourMapEntry *n; | ||
158 | |||
159 | /** | ||
160 | * Function to call once we're done. | ||
161 | */ | ||
162 | GST_NeighbourSendContinuation cont; | ||
163 | |||
164 | /** | ||
165 | * Closure for 'cont' | ||
166 | */ | ||
167 | void *cont_cls; | ||
168 | |||
169 | /** | ||
170 | * The message(s) we want to transmit, GNUNET_MessageHeader(s) | ||
171 | * stuck together in memory. Allocated at the end of this struct. | ||
172 | */ | ||
173 | const char *message_buf; | ||
174 | |||
175 | /** | ||
176 | * Size of the message buf | ||
177 | */ | ||
178 | size_t message_buf_size; | ||
179 | |||
180 | /** | ||
181 | * At what time should we fail? | ||
182 | */ | ||
183 | struct GNUNET_TIME_Absolute timeout; | ||
184 | |||
185 | }; | ||
186 | |||
187 | enum State | ||
188 | { | ||
189 | /* fresh peer or completely disconnected */ | ||
190 | S_NOT_CONNECTED = 0, | ||
191 | /* sent CONNECT message to other peer, waiting for CONNECT_ACK */ | ||
192 | S_CONNECT_SENT = 1, | ||
193 | /* received CONNECT message to other peer, sending CONNECT_ACK */ | ||
194 | S_CONNECT_RECV = 4, | ||
195 | /* sent CONNECT_ACK message to other peer, wait for ACK or payload */ | ||
196 | S_CONNECT_RECV_ACK_SENT = 8, | ||
197 | /* received ACK or payload */ | ||
198 | S_CONNECTED = 16, | ||
199 | /* Disconnect in progress */ | ||
200 | S_DISCONNECT = 32 | ||
201 | }; | ||
202 | |||
203 | /** | ||
204 | * Entry in neighbours. | ||
205 | */ | ||
206 | struct NeighbourMapEntry | ||
207 | { | ||
208 | |||
209 | /** | ||
210 | * Head of list of messages we would like to send to this peer; | ||
211 | * must contain at most one message per client. | ||
212 | */ | ||
213 | struct MessageQueue *messages_head; | ||
214 | |||
215 | /** | ||
216 | * Tail of list of messages we would like to send to this peer; must | ||
217 | * contain at most one message per client. | ||
218 | */ | ||
219 | struct MessageQueue *messages_tail; | ||
220 | |||
221 | /** | ||
222 | * Performance data for the peer. | ||
223 | */ | ||
224 | //struct GNUNET_ATS_Information *ats; | ||
225 | |||
226 | /** | ||
227 | * Are we currently trying to send a message? If so, which one? | ||
228 | */ | ||
229 | struct MessageQueue *is_active; | ||
230 | |||
231 | /** | ||
232 | * Active session for communicating with the peer. | ||
233 | */ | ||
234 | struct Session *session; | ||
235 | |||
236 | /** | ||
237 | * Name of the plugin we currently use. | ||
238 | */ | ||
239 | char *plugin_name; | ||
240 | |||
241 | /** | ||
242 | * Address used for communicating with the peer, NULL for inbound connections. | ||
243 | */ | ||
244 | void *addr; | ||
245 | |||
246 | /** | ||
247 | * Number of bytes in 'addr'. | ||
248 | */ | ||
249 | size_t addrlen; | ||
250 | |||
251 | /** | ||
252 | * Identity of this neighbour. | ||
253 | */ | ||
254 | struct GNUNET_PeerIdentity id; | ||
255 | |||
256 | /** | ||
257 | * ID of task scheduled to run when this peer is about to | ||
258 | * time out (will free resources associated with the peer). | ||
259 | */ | ||
260 | GNUNET_SCHEDULER_TaskIdentifier timeout_task; | ||
261 | |||
262 | /** | ||
263 | * ID of task scheduled to send keepalives. | ||
264 | */ | ||
265 | GNUNET_SCHEDULER_TaskIdentifier keepalive_task; | ||
266 | |||
267 | /** | ||
268 | * ID of task scheduled to run when we should try transmitting | ||
269 | * the head of the message queue. | ||
270 | */ | ||
271 | GNUNET_SCHEDULER_TaskIdentifier transmission_task; | ||
272 | |||
273 | /** | ||
274 | * Tracker for inbound bandwidth. | ||
275 | */ | ||
276 | struct GNUNET_BANDWIDTH_Tracker in_tracker; | ||
277 | |||
278 | /** | ||
279 | * Inbound bandwidth from ATS, activated when connection is up | ||
280 | */ | ||
281 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in; | ||
282 | |||
283 | /** | ||
284 | * Inbound bandwidth from ATS, activated when connection is up | ||
285 | */ | ||
286 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out; | ||
287 | |||
288 | /** | ||
289 | * Timestamp of the 'SESSION_CONNECT' message we got from the other peer | ||
290 | */ | ||
291 | struct GNUNET_TIME_Absolute connect_ts; | ||
292 | |||
293 | /** | ||
294 | * Timeout for ATS | ||
295 | * We asked ATS for a new address for this peer | ||
296 | */ | ||
297 | GNUNET_SCHEDULER_TaskIdentifier ats_suggest; | ||
298 | |||
299 | /** | ||
300 | * Task the resets the peer state after due to an pending | ||
301 | * unsuccessful connection setup | ||
302 | */ | ||
303 | GNUNET_SCHEDULER_TaskIdentifier state_reset; | ||
304 | |||
305 | /** | ||
306 | * How often has the other peer (recently) violated the inbound | ||
307 | * traffic limit? Incremented by 10 per violation, decremented by 1 | ||
308 | * per non-violation (for each time interval). | ||
309 | */ | ||
310 | unsigned int quota_violation_count; | ||
311 | |||
312 | |||
313 | /** | ||
314 | * The current state of the peer | ||
315 | * Element of enum State | ||
316 | */ | ||
317 | int state; | ||
318 | |||
319 | }; | ||
320 | |||
321 | |||
322 | /** | ||
323 | * All known neighbours and their HELLOs. | ||
324 | */ | ||
325 | static struct GNUNET_CONTAINER_MultiHashMap *neighbours; | ||
326 | |||
327 | /** | ||
328 | * Closure for connect_notify_cb and disconnect_notify_cb | ||
329 | */ | ||
330 | static void *callback_cls; | ||
331 | |||
332 | /** | ||
333 | * Function to call when we connected to a neighbour. | ||
334 | */ | ||
335 | static GNUNET_TRANSPORT_NotifyConnect connect_notify_cb; | ||
336 | |||
337 | /** | ||
338 | * Function to call when we disconnected from a neighbour. | ||
339 | */ | ||
340 | static GNUNET_TRANSPORT_NotifyDisconnect disconnect_notify_cb; | ||
341 | |||
342 | /** | ||
343 | * counter for connected neighbours | ||
344 | */ | ||
345 | static int neighbours_connected; | ||
346 | |||
347 | /** | ||
348 | * Lookup a neighbour entry in the neighbours hash map. | ||
349 | * | ||
350 | * @param pid identity of the peer to look up | ||
351 | * @return the entry, NULL if there is no existing record | ||
352 | */ | ||
353 | static struct NeighbourMapEntry * | ||
354 | lookup_neighbour (const struct GNUNET_PeerIdentity *pid) | ||
355 | { | ||
356 | return GNUNET_CONTAINER_multihashmap_get (neighbours, &pid->hashPubKey); | ||
357 | } | ||
358 | |||
359 | #define change_state(n, state, ...) change (n, state, __LINE__) | ||
360 | |||
361 | static int | ||
362 | is_connecting (struct NeighbourMapEntry * n) | ||
363 | { | ||
364 | if ((n->state > S_NOT_CONNECTED) && (n->state < S_CONNECTED)) | ||
365 | return GNUNET_YES; | ||
366 | return GNUNET_NO; | ||
367 | } | ||
368 | |||
369 | static int | ||
370 | is_connected (struct NeighbourMapEntry * n) | ||
371 | { | ||
372 | if (n->state == S_CONNECTED) | ||
373 | return GNUNET_YES; | ||
374 | return GNUNET_NO; | ||
375 | } | ||
376 | |||
377 | static int | ||
378 | is_disconnecting (struct NeighbourMapEntry * n) | ||
379 | { | ||
380 | if (n->state == S_DISCONNECT) | ||
381 | return GNUNET_YES; | ||
382 | return GNUNET_NO; | ||
383 | } | ||
384 | |||
385 | static const char * | ||
386 | print_state (int state) | ||
387 | { | ||
388 | switch (state) { | ||
389 | case S_CONNECTED: | ||
390 | return "S_CONNECTED"; | ||
391 | break; | ||
392 | case S_CONNECT_RECV: | ||
393 | return "S_CONNECT_RECV"; | ||
394 | break; | ||
395 | case S_CONNECT_RECV_ACK_SENT: | ||
396 | return"S_CONNECT_RECV_ACK_SENT"; | ||
397 | break; | ||
398 | case S_CONNECT_SENT: | ||
399 | return "S_CONNECT_SENT"; | ||
400 | break; | ||
401 | case S_DISCONNECT: | ||
402 | return "S_DISCONNECT"; | ||
403 | break; | ||
404 | case S_NOT_CONNECTED: | ||
405 | return "S_NOT_CONNECTED"; | ||
406 | break; | ||
407 | default: | ||
408 | GNUNET_break (0); | ||
409 | break; | ||
410 | } | ||
411 | return NULL; | ||
412 | } | ||
413 | |||
414 | static int | ||
415 | change (struct NeighbourMapEntry * n, int state, int line); | ||
416 | |||
417 | static void | ||
418 | ats_suggest_cancel (void *cls, | ||
419 | const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
420 | |||
421 | static void | ||
422 | reset_task (void *cls, | ||
423 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
424 | { | ||
425 | struct NeighbourMapEntry * n = cls; | ||
426 | |||
427 | n->state_reset = GNUNET_SCHEDULER_NO_TASK; | ||
428 | |||
429 | #if DEBUG_TRANSPORT | ||
430 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
431 | "Connection to peer `%s' %s failed in state `%s', resetting connection attempt \n", | ||
432 | GNUNET_i2s (&n->id), GST_plugins_a2s(n->plugin_name, n->addr, n->addrlen), print_state(n->state)); | ||
433 | #endif | ||
434 | GNUNET_STATISTICS_update (GST_stats, | ||
435 | gettext_noop ("# failed connection attempts due to timeout"), | ||
436 | 1, | ||
437 | GNUNET_NO); | ||
438 | |||
439 | /* resetting state */ | ||
440 | n->state = S_NOT_CONNECTED; | ||
441 | |||
442 | /* destroying address */ | ||
443 | GNUNET_ATS_address_destroyed (GST_ats, | ||
444 | &n->id, | ||
445 | n->plugin_name, | ||
446 | n->addr, | ||
447 | n->addrlen, | ||
448 | NULL); | ||
449 | |||
450 | /* request new address */ | ||
451 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | ||
452 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
453 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); | ||
454 | GNUNET_ATS_suggest_address(GST_ats, &n->id); | ||
455 | } | ||
456 | |||
457 | static int | ||
458 | change (struct NeighbourMapEntry * n, int state, int line) | ||
459 | { | ||
460 | char * old = strdup(print_state(n->state)); | ||
461 | char * new = strdup(print_state(state)); | ||
462 | |||
463 | /* allowed transitions */ | ||
464 | int allowed = GNUNET_NO; | ||
465 | switch (n->state) { | ||
466 | case S_NOT_CONNECTED: | ||
467 | if ((state == S_CONNECT_RECV) || (state == S_CONNECT_SENT) || | ||
468 | (state == S_DISCONNECT)) | ||
469 | { | ||
470 | allowed = GNUNET_YES; | ||
471 | |||
472 | /* Schedule reset task */ | ||
473 | if ((state == S_CONNECT_RECV) || (state == S_CONNECT_SENT) ) | ||
474 | { | ||
475 | GNUNET_assert (n->state_reset == GNUNET_SCHEDULER_NO_TASK); | ||
476 | n->state_reset = GNUNET_SCHEDULER_add_delayed (SETUP_CONNECTION_TIMEOUT, &reset_task, n); | ||
477 | } | ||
478 | |||
479 | break; | ||
480 | } | ||
481 | break; | ||
482 | case S_CONNECT_RECV: | ||
483 | if ((state == S_NOT_CONNECTED) || (state == S_DISCONNECT) || | ||
484 | (state == S_CONNECTED) || /* FIXME SENT -> RECV ISSUE!*/ (state == S_CONNECT_SENT)) | ||
485 | { | ||
486 | if ((state == S_CONNECTED) || (state == S_DISCONNECT) || (state == S_NOT_CONNECTED)) | ||
487 | { | ||
488 | #if DEBUG_TRANSPORT | ||
489 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
490 | "Removed reset task for peer `%s' %s failed in state transition `%s' -> `%s' \n", | ||
491 | GNUNET_i2s (&n->id), GST_plugins_a2s(n->plugin_name, n->addr, n->addrlen), print_state(n->state), print_state(state)); | ||
492 | #endif | ||
493 | GNUNET_assert (n->state_reset != GNUNET_SCHEDULER_NO_TASK); | ||
494 | GNUNET_SCHEDULER_cancel (n->state_reset); | ||
495 | n->state_reset = GNUNET_SCHEDULER_NO_TASK; | ||
496 | } | ||
497 | |||
498 | allowed = GNUNET_YES; | ||
499 | break; | ||
500 | } | ||
501 | break; | ||
502 | case S_CONNECT_SENT: | ||
503 | if ((state == S_NOT_CONNECTED) || (state == S_CONNECTED) || | ||
504 | (state == S_DISCONNECT) || /* FIXME SENT -> RECV ISSUE!*/ (state == S_CONNECT_RECV)) | ||
505 | { | ||
506 | if ((state == S_CONNECTED) || (state == S_DISCONNECT) || (state == S_NOT_CONNECTED)) | ||
507 | { | ||
508 | #if DEBUG_TRANSPORT | ||
509 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
510 | "Removed reset task for peer `%s' %s failed in state transition `%s' -> `%s' \n", | ||
511 | GNUNET_i2s (&n->id), GST_plugins_a2s(n->plugin_name, n->addr, n->addrlen), print_state(n->state), print_state(state)); | ||
512 | #endif | ||
513 | GNUNET_assert (n->state_reset != GNUNET_SCHEDULER_NO_TASK); | ||
514 | GNUNET_SCHEDULER_cancel (n->state_reset); | ||
515 | n->state_reset = GNUNET_SCHEDULER_NO_TASK; | ||
516 | } | ||
517 | |||
518 | allowed = GNUNET_YES; | ||
519 | break; | ||
520 | } | ||
521 | break; | ||
522 | case S_CONNECTED: | ||
523 | if (state == S_DISCONNECT) | ||
524 | { | ||
525 | allowed = GNUNET_YES; | ||
526 | break; | ||
527 | } | ||
528 | break; | ||
529 | case S_DISCONNECT: | ||
530 | /* | ||
531 | if (state == S_NOT_CONNECTED) | ||
532 | { | ||
533 | allowed = GNUNET_YES; | ||
534 | break; | ||
535 | }*/ | ||
536 | break; | ||
537 | default: | ||
538 | GNUNET_break (0); | ||
539 | break; | ||
540 | |||
541 | } | ||
542 | |||
543 | if (allowed == GNUNET_NO) | ||
544 | { | ||
545 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
546 | "Illegal state transition from `%s' to `%s' in line %u \n", | ||
547 | old, new, line); | ||
548 | GNUNET_break (0); | ||
549 | GNUNET_free (old); | ||
550 | GNUNET_free (new); | ||
551 | return GNUNET_SYSERR; | ||
552 | } | ||
553 | |||
554 | n->state = state; | ||
555 | #if DEBUG_TRANSPORT | ||
556 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "State for neighbour `%s' %X changed from `%s' to `%s' in line %u\n", | ||
557 | GNUNET_i2s (&n->id), n, old, new, line); | ||
558 | #endif | ||
559 | GNUNET_free (old); | ||
560 | GNUNET_free (new); | ||
561 | return GNUNET_OK; | ||
562 | } | ||
563 | |||
564 | static ssize_t | ||
565 | send_with_plugin ( const struct GNUNET_PeerIdentity * target, | ||
566 | const char *msgbuf, | ||
567 | size_t msgbuf_size, | ||
568 | uint32_t priority, | ||
569 | struct GNUNET_TIME_Relative timeout, | ||
570 | struct Session * session, | ||
571 | const char * plugin_name, | ||
572 | const void *addr, | ||
573 | size_t addrlen, | ||
574 | int force_address, | ||
575 | GNUNET_TRANSPORT_TransmitContinuation cont, | ||
576 | void *cont_cls) | ||
577 | |||
578 | { | ||
579 | struct GNUNET_TRANSPORT_PluginFunctions *papi; | ||
580 | size_t ret = GNUNET_SYSERR; | ||
581 | |||
582 | papi = GST_plugins_find (plugin_name); | ||
583 | if (papi == NULL) | ||
584 | { | ||
585 | if (cont != NULL) | ||
586 | cont (cont_cls, target, GNUNET_SYSERR); | ||
587 | return GNUNET_SYSERR; | ||
588 | } | ||
589 | |||
590 | ret = papi->send (papi->cls, | ||
591 | target, | ||
592 | msgbuf, msgbuf_size, | ||
593 | 0, | ||
594 | timeout, | ||
595 | session, | ||
596 | addr, addrlen, | ||
597 | GNUNET_YES, | ||
598 | cont, cont_cls); | ||
599 | |||
600 | if (ret == -1) | ||
601 | { | ||
602 | if (cont != NULL) | ||
603 | cont (cont_cls, target, GNUNET_SYSERR); | ||
604 | } | ||
605 | return ret; | ||
606 | } | ||
607 | |||
608 | /** | ||
609 | * Task invoked to start a transmission to another peer. | ||
610 | * | ||
611 | * @param cls the 'struct NeighbourMapEntry' | ||
612 | * @param tc scheduler context | ||
613 | */ | ||
614 | static void | ||
615 | transmission_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
616 | |||
617 | |||
618 | /** | ||
619 | * We're done with our transmission attempt, continue processing. | ||
620 | * | ||
621 | * @param cls the 'struct MessageQueue' of the message | ||
622 | * @param receiver intended receiver | ||
623 | * @param success whether it worked or not | ||
624 | */ | ||
625 | static void | ||
626 | transmit_send_continuation (void *cls, | ||
627 | const struct GNUNET_PeerIdentity *receiver, | ||
628 | int success) | ||
629 | { | ||
630 | struct MessageQueue *mq; | ||
631 | struct NeighbourMapEntry *n; | ||
632 | |||
633 | mq = cls; | ||
634 | n = mq->n; | ||
635 | if (NULL != n) | ||
636 | { | ||
637 | GNUNET_assert (n->is_active == mq); | ||
638 | n->is_active = NULL; | ||
639 | if (success == GNUNET_YES) | ||
640 | { | ||
641 | GNUNET_assert (n->transmission_task == GNUNET_SCHEDULER_NO_TASK); | ||
642 | n->transmission_task = GNUNET_SCHEDULER_add_now (&transmission_task, n); | ||
643 | } | ||
644 | } | ||
645 | #if DEBUG_TRANSPORT | ||
646 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending message of type %u was %s\n", | ||
647 | ntohs (((struct GNUNET_MessageHeader *) mq->message_buf)->type), | ||
648 | (success == GNUNET_OK) ? "successful" : "FAILED"); | ||
649 | #endif | ||
650 | if (NULL != mq->cont) | ||
651 | mq->cont (mq->cont_cls, success); | ||
652 | GNUNET_free (mq); | ||
653 | } | ||
654 | |||
655 | |||
656 | /** | ||
657 | * Check the ready list for the given neighbour and if a plugin is | ||
658 | * ready for transmission (and if we have a message), do so! | ||
659 | * | ||
660 | * @param n target peer for which to transmit | ||
661 | */ | ||
662 | static void | ||
663 | try_transmission_to_peer (struct NeighbourMapEntry *n) | ||
664 | { | ||
665 | struct MessageQueue *mq; | ||
666 | struct GNUNET_TIME_Relative timeout; | ||
667 | ssize_t ret; | ||
668 | |||
669 | if (n->is_active != NULL) | ||
670 | { | ||
671 | GNUNET_break (0); | ||
672 | return; /* transmission already pending */ | ||
673 | } | ||
674 | if (n->transmission_task != GNUNET_SCHEDULER_NO_TASK) | ||
675 | { | ||
676 | GNUNET_break (0); | ||
677 | return; /* currently waiting for bandwidth */ | ||
678 | } | ||
679 | while (NULL != (mq = n->messages_head)) | ||
680 | { | ||
681 | timeout = GNUNET_TIME_absolute_get_remaining (mq->timeout); | ||
682 | if (timeout.rel_value > 0) | ||
683 | break; | ||
684 | GNUNET_CONTAINER_DLL_remove (n->messages_head, n->messages_tail, mq); | ||
685 | n->is_active = mq; | ||
686 | mq->n = n; | ||
687 | transmit_send_continuation (mq, &n->id, GNUNET_SYSERR); /* timeout */ | ||
688 | } | ||
689 | if (NULL == mq) | ||
690 | return; /* no more messages */ | ||
691 | |||
692 | if (GST_plugins_find (n->plugin_name) == NULL) | ||
693 | { | ||
694 | GNUNET_break (0); | ||
695 | return; | ||
696 | } | ||
697 | GNUNET_CONTAINER_DLL_remove (n->messages_head, n->messages_tail, mq); | ||
698 | n->is_active = mq; | ||
699 | mq->n = n; | ||
700 | |||
701 | if ((n->session == NULL) && (n->addr == NULL) && (n->addrlen == 0)) | ||
702 | { | ||
703 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No address for peer `%s'\n", | ||
704 | GNUNET_i2s (&n->id)); | ||
705 | transmit_send_continuation (mq, &n->id, GNUNET_SYSERR); | ||
706 | GNUNET_assert (n->transmission_task == GNUNET_SCHEDULER_NO_TASK); | ||
707 | n->transmission_task = GNUNET_SCHEDULER_add_now (&transmission_task, n); | ||
708 | return; | ||
709 | } | ||
710 | |||
711 | ret = send_with_plugin (&n->id, | ||
712 | mq->message_buf, mq->message_buf_size, 0, | ||
713 | timeout, | ||
714 | n->session, n->plugin_name, n->addr, n->addrlen, | ||
715 | GNUNET_YES, | ||
716 | &transmit_send_continuation, mq); | ||
717 | if (ret == -1) | ||
718 | { | ||
719 | /* failure, but 'send' would not call continuation in this case, | ||
720 | * so we need to do it here! */ | ||
721 | transmit_send_continuation (mq, &n->id, GNUNET_SYSERR); | ||
722 | } | ||
723 | |||
724 | } | ||
725 | |||
726 | |||
727 | /** | ||
728 | * Task invoked to start a transmission to another peer. | ||
729 | * | ||
730 | * @param cls the 'struct NeighbourMapEntry' | ||
731 | * @param tc scheduler context | ||
732 | */ | ||
733 | static void | ||
734 | transmission_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
735 | { | ||
736 | struct NeighbourMapEntry *n = cls; | ||
737 | GNUNET_assert (NULL != lookup_neighbour(&n->id)); | ||
738 | n->transmission_task = GNUNET_SCHEDULER_NO_TASK; | ||
739 | try_transmission_to_peer (n); | ||
740 | } | ||
741 | |||
742 | |||
743 | /** | ||
744 | * Initialize the neighbours subsystem. | ||
745 | * | ||
746 | * @param cls closure for callbacks | ||
747 | * @param connect_cb function to call if we connect to a peer | ||
748 | * @param disconnect_cb function to call if we disconnect from a peer | ||
749 | */ | ||
750 | void | ||
751 | GST_neighbours_start (void *cls, GNUNET_TRANSPORT_NotifyConnect connect_cb, | ||
752 | GNUNET_TRANSPORT_NotifyDisconnect disconnect_cb) | ||
753 | { | ||
754 | callback_cls = cls; | ||
755 | connect_notify_cb = connect_cb; | ||
756 | disconnect_notify_cb = disconnect_cb; | ||
757 | neighbours = GNUNET_CONTAINER_multihashmap_create (NEIGHBOUR_TABLE_SIZE); | ||
758 | } | ||
759 | |||
760 | |||
761 | static void | ||
762 | send_disconnect_cont (void *cls, | ||
763 | const struct GNUNET_PeerIdentity * target, | ||
764 | int result) | ||
765 | { | ||
766 | #if DEBUG_TRANSPORT | ||
767 | struct NeighbourMapEntry *n = cls; | ||
768 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending DISCONNECT message to peer `%4s': %i\n", | ||
769 | GNUNET_i2s (&n->id), result); | ||
770 | #endif | ||
771 | } | ||
772 | |||
773 | static int | ||
774 | send_disconnect (struct NeighbourMapEntry *n) | ||
775 | { | ||
776 | size_t ret; | ||
777 | struct SessionDisconnectMessage disconnect_msg; | ||
778 | |||
779 | #if DEBUG_TRANSPORT | ||
780 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending DISCONNECT message to peer `%4s'\n", | ||
781 | GNUNET_i2s (&n->id)); | ||
782 | #endif | ||
783 | |||
784 | disconnect_msg.header.size = htons (sizeof (struct SessionDisconnectMessage)); | ||
785 | disconnect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT); | ||
786 | disconnect_msg.reserved = htonl (0); | ||
787 | disconnect_msg.purpose.size = htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + | ||
788 | sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) + | ||
789 | sizeof (struct GNUNET_TIME_AbsoluteNBO) ); | ||
790 | disconnect_msg.purpose.purpose = htonl (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT); | ||
791 | disconnect_msg.timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); | ||
792 | disconnect_msg.public_key = GST_my_public_key; | ||
793 | GNUNET_assert (GNUNET_OK == | ||
794 | GNUNET_CRYPTO_rsa_sign (GST_my_private_key, | ||
795 | &disconnect_msg.purpose, | ||
796 | &disconnect_msg.signature)); | ||
797 | |||
798 | ret = send_with_plugin(&n->id, (const char *) &disconnect_msg, sizeof (disconnect_msg), | ||
799 | UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, | ||
800 | n->session, n->plugin_name, n->addr, n->addrlen, | ||
801 | GNUNET_YES, &send_disconnect_cont, n); | ||
802 | |||
803 | if (ret == GNUNET_SYSERR) | ||
804 | return GNUNET_SYSERR; | ||
805 | |||
806 | GNUNET_STATISTICS_update (GST_stats, | ||
807 | gettext_noop ("# peers disconnected due to external request"), 1, | ||
808 | GNUNET_NO); | ||
809 | return GNUNET_OK; | ||
810 | } | ||
811 | |||
812 | /** | ||
813 | * Disconnect from the given neighbour, clean up the record. | ||
814 | * | ||
815 | * @param n neighbour to disconnect from | ||
816 | */ | ||
817 | static void | ||
818 | disconnect_neighbour (struct NeighbourMapEntry *n) | ||
819 | { | ||
820 | struct MessageQueue *mq; | ||
821 | int was_connected = is_connected(n); | ||
822 | |||
823 | /* send DISCONNECT MESSAGE */ | ||
824 | if (is_connected(n) || is_connecting(n)) | ||
825 | { | ||
826 | if (GNUNET_OK == send_disconnect(n)) | ||
827 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sent DISCONNECT_MSG to `%s'\n", | ||
828 | GNUNET_i2s (&n->id)); | ||
829 | else | ||
830 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could not send DISCONNECT_MSG to `%s'\n", | ||
831 | GNUNET_i2s (&n->id)); | ||
832 | } | ||
833 | |||
834 | |||
835 | if (is_disconnecting(n)) | ||
836 | return; | ||
837 | change_state (n, S_DISCONNECT); | ||
838 | |||
839 | while (NULL != (mq = n->messages_head)) | ||
840 | { | ||
841 | GNUNET_CONTAINER_DLL_remove (n->messages_head, n->messages_tail, mq); | ||
842 | if (NULL != mq->cont) | ||
843 | mq->cont (mq->cont_cls, GNUNET_SYSERR); | ||
844 | GNUNET_free (mq); | ||
845 | } | ||
846 | if (NULL != n->is_active) | ||
847 | { | ||
848 | n->is_active->n = NULL; | ||
849 | n->is_active = NULL; | ||
850 | } | ||
851 | if (was_connected) | ||
852 | { | ||
853 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != n->keepalive_task); | ||
854 | GNUNET_SCHEDULER_cancel (n->keepalive_task); | ||
855 | n->keepalive_task = GNUNET_SCHEDULER_NO_TASK; | ||
856 | GNUNET_assert (neighbours_connected > 0); | ||
857 | neighbours_connected--; | ||
858 | GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# peers connected"), -1, | ||
859 | GNUNET_NO); | ||
860 | disconnect_notify_cb (callback_cls, &n->id); | ||
861 | } | ||
862 | GNUNET_assert (GNUNET_YES == | ||
863 | GNUNET_CONTAINER_multihashmap_remove (neighbours, | ||
864 | &n->id.hashPubKey, n)); | ||
865 | if (GNUNET_SCHEDULER_NO_TASK != n->ats_suggest) | ||
866 | { | ||
867 | GNUNET_SCHEDULER_cancel (n->ats_suggest); | ||
868 | n->ats_suggest = GNUNET_SCHEDULER_NO_TASK; | ||
869 | } | ||
870 | if (GNUNET_SCHEDULER_NO_TASK != n->timeout_task) | ||
871 | { | ||
872 | GNUNET_SCHEDULER_cancel (n->timeout_task); | ||
873 | n->timeout_task = GNUNET_SCHEDULER_NO_TASK; | ||
874 | } | ||
875 | if (GNUNET_SCHEDULER_NO_TASK != n->transmission_task) | ||
876 | { | ||
877 | GNUNET_SCHEDULER_cancel (n->transmission_task); | ||
878 | n->transmission_task = GNUNET_SCHEDULER_NO_TASK; | ||
879 | } | ||
880 | if (NULL != n->plugin_name) | ||
881 | { | ||
882 | GNUNET_free (n->plugin_name); | ||
883 | n->plugin_name = NULL; | ||
884 | } | ||
885 | if (NULL != n->addr) | ||
886 | { | ||
887 | GNUNET_free (n->addr); | ||
888 | n->addr = NULL; | ||
889 | n->addrlen = 0; | ||
890 | } | ||
891 | n->session = NULL; | ||
892 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleting peer `%4s', %X\n", | ||
893 | GNUNET_i2s (&n->id), n); | ||
894 | GNUNET_free (n); | ||
895 | } | ||
896 | |||
897 | |||
898 | /** | ||
899 | * Peer has been idle for too long. Disconnect. | ||
900 | * | ||
901 | * @param cls the 'struct NeighbourMapEntry' of the neighbour that went idle | ||
902 | * @param tc scheduler context | ||
903 | */ | ||
904 | static void | ||
905 | neighbour_timeout_task (void *cls, | ||
906 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
907 | { | ||
908 | struct NeighbourMapEntry *n = cls; | ||
909 | |||
910 | n->timeout_task = GNUNET_SCHEDULER_NO_TASK; | ||
911 | |||
912 | GNUNET_STATISTICS_update (GST_stats, | ||
913 | gettext_noop ("# peers disconnected due to timeout"), 1, | ||
914 | GNUNET_NO); | ||
915 | disconnect_neighbour (n); | ||
916 | } | ||
917 | |||
918 | |||
919 | /** | ||
920 | * Send another keepalive message. | ||
921 | * | ||
922 | * @param cls the 'struct NeighbourMapEntry' of the neighbour that went idle | ||
923 | * @param tc scheduler context | ||
924 | */ | ||
925 | static void | ||
926 | neighbour_keepalive_task (void *cls, | ||
927 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
928 | { | ||
929 | struct NeighbourMapEntry *n = cls; | ||
930 | struct GNUNET_MessageHeader m; | ||
931 | |||
932 | n->keepalive_task = GNUNET_SCHEDULER_add_delayed (KEEPALIVE_FREQUENCY, | ||
933 | &neighbour_keepalive_task, | ||
934 | n); | ||
935 | GNUNET_assert (is_connected(n)); | ||
936 | GNUNET_STATISTICS_update (GST_stats, | ||
937 | gettext_noop ("# keepalives sent"), 1, | ||
938 | GNUNET_NO); | ||
939 | m.size = htons (sizeof (struct GNUNET_MessageHeader)); | ||
940 | m.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE); | ||
941 | |||
942 | send_with_plugin(&n->id, (const void *) &m, | ||
943 | sizeof (m), | ||
944 | UINT32_MAX /* priority */ , | ||
945 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
946 | n->session, n->plugin_name, n->addr, n->addrlen, | ||
947 | GNUNET_YES, NULL, NULL); | ||
948 | } | ||
949 | |||
950 | |||
951 | /** | ||
952 | * Disconnect from the given neighbour. | ||
953 | * | ||
954 | * @param cls unused | ||
955 | * @param key hash of neighbour's public key (not used) | ||
956 | * @param value the 'struct NeighbourMapEntry' of the neighbour | ||
957 | */ | ||
958 | static int | ||
959 | disconnect_all_neighbours (void *cls, const GNUNET_HashCode * key, void *value) | ||
960 | { | ||
961 | struct NeighbourMapEntry *n = value; | ||
962 | |||
963 | #if DEBUG_TRANSPORT | ||
964 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting peer `%4s', %s\n", | ||
965 | GNUNET_i2s (&n->id), "SHUTDOWN_TASK"); | ||
966 | #endif | ||
967 | if (is_connected(n)) | ||
968 | GNUNET_STATISTICS_update (GST_stats, | ||
969 | gettext_noop ("# peers disconnected due to global disconnect"), 1, | ||
970 | GNUNET_NO); | ||
971 | disconnect_neighbour (n); | ||
972 | return GNUNET_OK; | ||
973 | } | ||
974 | |||
975 | |||
976 | static void | ||
977 | ats_suggest_cancel (void *cls, | ||
978 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
979 | { | ||
980 | struct NeighbourMapEntry *n = cls; | ||
981 | |||
982 | n->ats_suggest = GNUNET_SCHEDULER_NO_TASK; | ||
983 | |||
984 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
985 | " ATS did not suggested address to connect to peer `%s'\n", | ||
986 | GNUNET_i2s (&n->id)); | ||
987 | |||
988 | disconnect_neighbour(n); | ||
989 | } | ||
990 | |||
991 | |||
992 | /** | ||
993 | * Cleanup the neighbours subsystem. | ||
994 | */ | ||
995 | void | ||
996 | GST_neighbours_stop () | ||
997 | { | ||
998 | GNUNET_assert (neighbours != NULL); | ||
999 | |||
1000 | GNUNET_CONTAINER_multihashmap_iterate (neighbours, &disconnect_all_neighbours, | ||
1001 | NULL); | ||
1002 | GNUNET_CONTAINER_multihashmap_destroy (neighbours); | ||
1003 | GNUNET_assert (neighbours_connected == 0); | ||
1004 | neighbours = NULL; | ||
1005 | callback_cls = NULL; | ||
1006 | connect_notify_cb = NULL; | ||
1007 | disconnect_notify_cb = NULL; | ||
1008 | } | ||
1009 | |||
1010 | |||
1011 | /** | ||
1012 | * We tried to send a SESSION_CONNECT message to another peer. If this | ||
1013 | * succeeded, we change the state. If it failed, we should tell | ||
1014 | * ATS to not use this address anymore (until it is re-validated). | ||
1015 | * | ||
1016 | * @param cls the 'struct NeighbourMapEntry' | ||
1017 | * @param success GNUNET_OK on success | ||
1018 | */ | ||
1019 | static void | ||
1020 | send_connect_continuation (void *cls, | ||
1021 | const struct GNUNET_PeerIdentity * target, | ||
1022 | int success) | ||
1023 | |||
1024 | { | ||
1025 | struct NeighbourMapEntry *n = cls; | ||
1026 | |||
1027 | GNUNET_assert (n != NULL); | ||
1028 | GNUNET_assert (!is_connected(n)); | ||
1029 | |||
1030 | if (is_disconnecting(n)) | ||
1031 | return; /* neighbour is going away */ | ||
1032 | if (GNUNET_YES != success) | ||
1033 | { | ||
1034 | #if DEBUG_TRANSPORT | ||
1035 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1036 | "Failed to send CONNECT_MSG to peer `%4s' with plugin `%s' address '%s' session %X, asking ATS for new address \n", | ||
1037 | GNUNET_i2s (&n->id), n->plugin_name, | ||
1038 | (n->addrlen == 0) ? "<inbound>" : GST_plugins_a2s (n->plugin_name, | ||
1039 | n->addr, | ||
1040 | n->addrlen), | ||
1041 | n->session); | ||
1042 | #endif | ||
1043 | |||
1044 | GNUNET_ATS_address_destroyed (GST_ats, | ||
1045 | &n->id, | ||
1046 | n->plugin_name, | ||
1047 | n->addr, | ||
1048 | n->addrlen, | ||
1049 | NULL); | ||
1050 | |||
1051 | if (n->ats_suggest!= GNUNET_SCHEDULER_NO_TASK) | ||
1052 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
1053 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); | ||
1054 | GNUNET_ATS_suggest_address(GST_ats, &n->id); | ||
1055 | return; | ||
1056 | } | ||
1057 | change_state(n, S_CONNECT_SENT); | ||
1058 | } | ||
1059 | |||
1060 | |||
1061 | /** | ||
1062 | * We tried to switch addresses with an peer already connected. If it failed, | ||
1063 | * we should tell ATS to not use this address anymore (until it is re-validated). | ||
1064 | * | ||
1065 | * @param cls the 'struct NeighbourMapEntry' | ||
1066 | * @param success GNUNET_OK on success | ||
1067 | */ | ||
1068 | static void | ||
1069 | send_switch_address_continuation (void *cls, | ||
1070 | const struct GNUNET_PeerIdentity * target, | ||
1071 | int success) | ||
1072 | |||
1073 | { | ||
1074 | struct NeighbourMapEntry *n = cls; | ||
1075 | |||
1076 | GNUNET_assert (n != NULL); | ||
1077 | if (is_disconnecting(n)) | ||
1078 | return; /* neighbour is going away */ | ||
1079 | |||
1080 | GNUNET_assert (n->state == S_CONNECTED); | ||
1081 | if (GNUNET_YES != success) | ||
1082 | { | ||
1083 | #if DEBUG_TRANSPORT | ||
1084 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1085 | "Failed to switch connected peer `%s' to plugin `%s' address '%s' session %X, asking ATS for new address \n", | ||
1086 | GNUNET_i2s (&n->id), n->plugin_name, | ||
1087 | (n->addrlen == 0) ? "<inbound>" : GST_plugins_a2s (n->plugin_name, | ||
1088 | n->addr, | ||
1089 | n->addrlen), | ||
1090 | n->session); | ||
1091 | #endif | ||
1092 | |||
1093 | GNUNET_ATS_address_destroyed (GST_ats, | ||
1094 | &n->id, | ||
1095 | n->plugin_name, | ||
1096 | n->addr, | ||
1097 | n->addrlen, | ||
1098 | NULL); | ||
1099 | |||
1100 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | ||
1101 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
1102 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); | ||
1103 | GNUNET_ATS_suggest_address(GST_ats, &n->id); | ||
1104 | return; | ||
1105 | } | ||
1106 | } | ||
1107 | |||
1108 | /** | ||
1109 | * We tried to send a SESSION_CONNECT message to another peer. If this | ||
1110 | * succeeded, we change the state. If it failed, we should tell | ||
1111 | * ATS to not use this address anymore (until it is re-validated). | ||
1112 | * | ||
1113 | * @param cls the 'struct NeighbourMapEntry' | ||
1114 | * @param success GNUNET_OK on success | ||
1115 | */ | ||
1116 | static void | ||
1117 | send_connect_ack_continuation (void *cls, | ||
1118 | const struct GNUNET_PeerIdentity * target, | ||
1119 | int success) | ||
1120 | |||
1121 | { | ||
1122 | struct NeighbourMapEntry *n = cls; | ||
1123 | |||
1124 | GNUNET_assert (n != NULL); | ||
1125 | |||
1126 | if (GNUNET_YES == success) | ||
1127 | return; /* sending successful */ | ||
1128 | |||
1129 | /* sending failed, ask for next address */ | ||
1130 | #if DEBUG_TRANSPORT | ||
1131 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1132 | "Failed to send CONNECT_MSG to peer `%4s' with plugin `%s' address '%s' session %X, asking ATS for new address \n", | ||
1133 | GNUNET_i2s (&n->id), n->plugin_name, | ||
1134 | (n->addrlen == 0) ? "<inbound>" : GST_plugins_a2s (n->plugin_name, | ||
1135 | n->addr, | ||
1136 | n->addrlen), | ||
1137 | n->session); | ||
1138 | #endif | ||
1139 | change_state(n, S_NOT_CONNECTED); | ||
1140 | |||
1141 | GNUNET_ATS_address_destroyed (GST_ats, | ||
1142 | &n->id, | ||
1143 | n->plugin_name, | ||
1144 | n->addr, | ||
1145 | n->addrlen, | ||
1146 | NULL); | ||
1147 | |||
1148 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | ||
1149 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
1150 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); | ||
1151 | GNUNET_ATS_suggest_address(GST_ats, &n->id); | ||
1152 | } | ||
1153 | |||
1154 | /** | ||
1155 | * For an existing neighbour record, set the active connection to | ||
1156 | * the given address. | ||
1157 | * | ||
1158 | * @param peer identity of the peer to switch the address for | ||
1159 | * @param plugin_name name of transport that delivered the PONG | ||
1160 | * @param address address of the other peer, NULL if other peer | ||
1161 | * connected to us | ||
1162 | * @param address_len number of bytes in address | ||
1163 | * @param session session to use (or NULL) | ||
1164 | * @param ats performance data | ||
1165 | * @param ats_count number of entries in ats | ||
1166 | * @return GNUNET_YES if we are currently connected, GNUNET_NO if the | ||
1167 | * connection is not up (yet) | ||
1168 | */ | ||
1169 | int | ||
1170 | GST_neighbours_switch_to_address_3way (const struct GNUNET_PeerIdentity *peer, | ||
1171 | const char *plugin_name, const void *address, | ||
1172 | size_t address_len, struct Session *session, | ||
1173 | const struct GNUNET_ATS_Information | ||
1174 | *ats, uint32_t ats_count, | ||
1175 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, | ||
1176 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out) | ||
1177 | { | ||
1178 | struct NeighbourMapEntry *n; | ||
1179 | struct SessionConnectMessage connect_msg; | ||
1180 | size_t msg_len; | ||
1181 | size_t ret; | ||
1182 | |||
1183 | GNUNET_assert (neighbours != NULL); | ||
1184 | n = lookup_neighbour (peer); | ||
1185 | if (NULL == n) | ||
1186 | { | ||
1187 | if (NULL == session) | ||
1188 | GNUNET_ATS_address_destroyed (GST_ats, | ||
1189 | peer, | ||
1190 | plugin_name, address, | ||
1191 | address_len, NULL); | ||
1192 | return GNUNET_NO; | ||
1193 | } | ||
1194 | |||
1195 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | ||
1196 | { | ||
1197 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
1198 | n->ats_suggest = GNUNET_SCHEDULER_NO_TASK; | ||
1199 | } | ||
1200 | |||
1201 | #if DEBUG_TRANSPORT | ||
1202 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1203 | "ATS tells us to switch to plugin `%s' address '%s' session %X for %s peer `%s'\n", | ||
1204 | plugin_name, | ||
1205 | (address_len == 0) ? "<inbound>" : GST_plugins_a2s (plugin_name, | ||
1206 | address, | ||
1207 | address_len), | ||
1208 | session, (is_connected(n) ? "CONNECTED" : "NOT CONNECTED"), | ||
1209 | GNUNET_i2s (peer)); | ||
1210 | #endif | ||
1211 | |||
1212 | GNUNET_free_non_null (n->addr); | ||
1213 | n->addr = GNUNET_malloc (address_len); | ||
1214 | memcpy (n->addr, address, address_len); | ||
1215 | n->bandwidth_in = bandwidth_in; | ||
1216 | n->bandwidth_out = bandwidth_out; | ||
1217 | n->addrlen = address_len; | ||
1218 | n->session = session; | ||
1219 | GNUNET_free_non_null (n->plugin_name); | ||
1220 | n->plugin_name = GNUNET_strdup (plugin_name); | ||
1221 | GNUNET_SCHEDULER_cancel (n->timeout_task); | ||
1222 | n->timeout_task = | ||
1223 | GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | ||
1224 | &neighbour_timeout_task, n); | ||
1225 | |||
1226 | if (n->state == S_DISCONNECT) | ||
1227 | { | ||
1228 | /* We are disconnecting, nothing to do here */ | ||
1229 | return GNUNET_NO; | ||
1230 | } | ||
1231 | /* We are not connected/connecting and initiate a fresh connect */ | ||
1232 | if (n->state == S_NOT_CONNECTED) | ||
1233 | { | ||
1234 | msg_len = sizeof (struct SessionConnectMessage); | ||
1235 | connect_msg.header.size = htons (msg_len); | ||
1236 | connect_msg.header.type = | ||
1237 | htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT); | ||
1238 | connect_msg.reserved = htonl (0); | ||
1239 | connect_msg.timestamp = | ||
1240 | GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); | ||
1241 | |||
1242 | ret = send_with_plugin (peer, (const char *) &connect_msg, msg_len, UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, | ||
1243 | session, plugin_name, address, address_len, | ||
1244 | GNUNET_YES, &send_connect_continuation, n); | ||
1245 | |||
1246 | return GNUNET_NO; | ||
1247 | } | ||
1248 | /* We received a CONNECT message and asked ATS for an address */ | ||
1249 | else if (n->state == S_CONNECT_RECV) | ||
1250 | { | ||
1251 | msg_len = sizeof (struct SessionConnectMessage); | ||
1252 | connect_msg.header.size = htons (msg_len); | ||
1253 | connect_msg.header.type = | ||
1254 | htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT_ACK); | ||
1255 | connect_msg.reserved = htonl (0); | ||
1256 | connect_msg.timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); | ||
1257 | |||
1258 | ret = send_with_plugin(&n->id, (const void *) &connect_msg, msg_len, UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, | ||
1259 | session, plugin_name, address, address_len, | ||
1260 | GNUNET_YES, &send_connect_ack_continuation, n); | ||
1261 | if (ret == GNUNET_SYSERR) | ||
1262 | { | ||
1263 | change_state (n, S_NOT_CONNECTED); | ||
1264 | GNUNET_break (0); | ||
1265 | } | ||
1266 | return GNUNET_NO; | ||
1267 | } | ||
1268 | /* connected peer is switching addresses */ | ||
1269 | else if (n->state == S_CONNECTED) | ||
1270 | { | ||
1271 | msg_len = sizeof (struct SessionConnectMessage); | ||
1272 | connect_msg.header.size = htons (msg_len); | ||
1273 | connect_msg.header.type = | ||
1274 | htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT); | ||
1275 | connect_msg.reserved = htonl (0); | ||
1276 | connect_msg.timestamp = | ||
1277 | GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); | ||
1278 | |||
1279 | ret = send_with_plugin (peer, (const char *) &connect_msg, msg_len, UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, | ||
1280 | session, plugin_name, address, address_len, | ||
1281 | GNUNET_YES, &send_switch_address_continuation, n); | ||
1282 | if (ret == GNUNET_SYSERR) | ||
1283 | { | ||
1284 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1285 | "Failed to send CONNECT_MESSAGE to `%4s' using plugin `%s' address '%s' session %X\n", | ||
1286 | GNUNET_i2s (peer), plugin_name, | ||
1287 | (address_len == 0) ? "<inbound>" : GST_plugins_a2s (plugin_name, | ||
1288 | address, | ||
1289 | address_len), | ||
1290 | session); | ||
1291 | } | ||
1292 | return GNUNET_NO; | ||
1293 | } | ||
1294 | else if (n->state == S_CONNECT_SENT) | ||
1295 | { | ||
1296 | //FIXME | ||
1297 | return GNUNET_NO; | ||
1298 | } | ||
1299 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Invalid connection state to switch addresses %u \n", n->state); | ||
1300 | GNUNET_break_op (0); | ||
1301 | return GNUNET_NO; | ||
1302 | } | ||
1303 | |||
1304 | |||
1305 | /** | ||
1306 | * Create an entry in the neighbour map for the given peer | ||
1307 | * | ||
1308 | * @param peer peer to create an entry for | ||
1309 | * @return new neighbour map entry | ||
1310 | */ | ||
1311 | static struct NeighbourMapEntry * | ||
1312 | setup_neighbour (const struct GNUNET_PeerIdentity *peer) | ||
1313 | { | ||
1314 | struct NeighbourMapEntry *n; | ||
1315 | |||
1316 | #if DEBUG_TRANSPORT | ||
1317 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1318 | "Unknown peer `%s', creating new neighbour\n", | ||
1319 | GNUNET_i2s (peer)); | ||
1320 | #endif | ||
1321 | n = GNUNET_malloc (sizeof (struct NeighbourMapEntry)); | ||
1322 | n->id = *peer; | ||
1323 | n->state = S_NOT_CONNECTED; | ||
1324 | GNUNET_BANDWIDTH_tracker_init (&n->in_tracker, | ||
1325 | GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT, | ||
1326 | MAX_BANDWIDTH_CARRY_S); | ||
1327 | n->timeout_task = | ||
1328 | GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | ||
1329 | &neighbour_timeout_task, n); | ||
1330 | GNUNET_assert (GNUNET_OK == | ||
1331 | GNUNET_CONTAINER_multihashmap_put (neighbours, | ||
1332 | &n->id.hashPubKey, n, | ||
1333 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | ||
1334 | return n; | ||
1335 | } | ||
1336 | |||
1337 | |||
1338 | /** | ||
1339 | * Try to create a connection to the given target (eventually). | ||
1340 | * | ||
1341 | * @param target peer to try to connect to | ||
1342 | */ | ||
1343 | void | ||
1344 | GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target) | ||
1345 | { | ||
1346 | struct NeighbourMapEntry *n; | ||
1347 | |||
1348 | GNUNET_assert (neighbours != NULL); | ||
1349 | #if DEBUG_TRANSPORT | ||
1350 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Trying to connect to peer `%s'\n", | ||
1351 | GNUNET_i2s (target)); | ||
1352 | #endif | ||
1353 | GNUNET_assert (0 != | ||
1354 | memcmp (target, &GST_my_identity, | ||
1355 | sizeof (struct GNUNET_PeerIdentity))); | ||
1356 | n = lookup_neighbour (target); | ||
1357 | |||
1358 | if (NULL != n) | ||
1359 | { | ||
1360 | if ((is_connected(n)) || (is_connecting(n))) | ||
1361 | return; /* already connecting or connected */ | ||
1362 | if (is_disconnecting(n)) | ||
1363 | change_state (n, S_NOT_CONNECTED); | ||
1364 | } | ||
1365 | |||
1366 | |||
1367 | if (n == NULL) | ||
1368 | n = setup_neighbour (target); | ||
1369 | #if DEBUG_TRANSPORT | ||
1370 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1371 | "Asking ATS for suggested address to connect to peer `%s'\n", | ||
1372 | GNUNET_i2s (&n->id)); | ||
1373 | #endif | ||
1374 | |||
1375 | GNUNET_ATS_suggest_address (GST_ats, &n->id); | ||
1376 | } | ||
1377 | |||
1378 | /** | ||
1379 | * Test if we're connected to the given peer. | ||
1380 | * | ||
1381 | * @param target peer to test | ||
1382 | * @return GNUNET_YES if we are connected, GNUNET_NO if not | ||
1383 | */ | ||
1384 | int | ||
1385 | GST_neighbours_test_connected (const struct GNUNET_PeerIdentity *target) | ||
1386 | { | ||
1387 | struct NeighbourMapEntry *n; | ||
1388 | |||
1389 | GNUNET_assert (neighbours != NULL); | ||
1390 | |||
1391 | n = lookup_neighbour (target); | ||
1392 | |||
1393 | if ((NULL == n) || (!is_connected(n))) | ||
1394 | return GNUNET_NO; /* not connected */ | ||
1395 | return GNUNET_YES; | ||
1396 | } | ||
1397 | |||
1398 | |||
1399 | /** | ||
1400 | * A session was terminated. Take note. | ||
1401 | * | ||
1402 | * @param peer identity of the peer where the session died | ||
1403 | * @param session session that is gone | ||
1404 | */ | ||
1405 | void | ||
1406 | GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | ||
1407 | struct Session *session) | ||
1408 | { | ||
1409 | struct NeighbourMapEntry *n; | ||
1410 | |||
1411 | GNUNET_assert (neighbours != NULL); | ||
1412 | |||
1413 | #if DEBUG_TRANSPORT | ||
1414 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1415 | "Session %X to peer `%s' ended \n", | ||
1416 | session, GNUNET_i2s (peer)); | ||
1417 | #endif | ||
1418 | |||
1419 | n = lookup_neighbour (peer); | ||
1420 | if (NULL == n) | ||
1421 | return; | ||
1422 | if (session != n->session) | ||
1423 | return; /* doesn't affect us */ | ||
1424 | |||
1425 | n->session = NULL; | ||
1426 | GNUNET_free (n->addr); | ||
1427 | n->addr = NULL; | ||
1428 | n->addrlen = 0; | ||
1429 | |||
1430 | /* not connected anymore anyway, shouldn't matter */ | ||
1431 | if ((!is_connected(n)) && (!is_connecting(n))) | ||
1432 | return; | ||
1433 | |||
1434 | /* We are connected, so ask ATS to switch addresses */ | ||
1435 | GNUNET_SCHEDULER_cancel (n->timeout_task); | ||
1436 | n->timeout_task = | ||
1437 | GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_DISCONNECT_SESSION_TIMEOUT, | ||
1438 | &neighbour_timeout_task, n); | ||
1439 | /* try QUICKLY to re-establish a connection, reduce timeout! */ | ||
1440 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | ||
1441 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
1442 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); | ||
1443 | GNUNET_ATS_suggest_address (GST_ats, peer); | ||
1444 | } | ||
1445 | |||
1446 | |||
1447 | /** | ||
1448 | * Transmit a message to the given target using the active connection. | ||
1449 | * | ||
1450 | * @param target destination | ||
1451 | * @param msg message to send | ||
1452 | * @param msg_size number of bytes in msg | ||
1453 | * @param timeout when to fail with timeout | ||
1454 | * @param cont function to call when done | ||
1455 | * @param cont_cls closure for 'cont' | ||
1456 | */ | ||
1457 | void | ||
1458 | GST_neighbours_send (const struct GNUNET_PeerIdentity *target, const void *msg, | ||
1459 | size_t msg_size, struct GNUNET_TIME_Relative timeout, | ||
1460 | GST_NeighbourSendContinuation cont, void *cont_cls) | ||
1461 | { | ||
1462 | struct NeighbourMapEntry *n; | ||
1463 | struct MessageQueue *mq; | ||
1464 | |||
1465 | GNUNET_assert (neighbours != NULL); | ||
1466 | |||
1467 | n = lookup_neighbour (target); | ||
1468 | if ((n == NULL) || (!is_connected(n))) | ||
1469 | { | ||
1470 | GNUNET_STATISTICS_update (GST_stats, | ||
1471 | gettext_noop | ||
1472 | ("# messages not sent (no such peer or not connected)"), | ||
1473 | 1, GNUNET_NO); | ||
1474 | #if DEBUG_TRANSPORT | ||
1475 | if (n == NULL) | ||
1476 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1477 | "Could not send message to peer `%s': unknown neighbour", | ||
1478 | GNUNET_i2s (target)); | ||
1479 | else if (!is_connected(n)) | ||
1480 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1481 | "Could not send message to peer `%s': not connected\n", | ||
1482 | GNUNET_i2s (target)); | ||
1483 | #endif | ||
1484 | if (NULL != cont) | ||
1485 | cont (cont_cls, GNUNET_SYSERR); | ||
1486 | return; | ||
1487 | } | ||
1488 | |||
1489 | if ((n->session == NULL) && (n->addr == NULL) && (n->addrlen ==0)) | ||
1490 | { | ||
1491 | GNUNET_STATISTICS_update (GST_stats, | ||
1492 | gettext_noop | ||
1493 | ("# messages not sent (no such peer or not connected)"), | ||
1494 | 1, GNUNET_NO); | ||
1495 | #if DEBUG_TRANSPORT | ||
1496 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1497 | "Could not send message to peer `%s': no address available\n", | ||
1498 | GNUNET_i2s (target)); | ||
1499 | #endif | ||
1500 | |||
1501 | if (NULL != cont) | ||
1502 | cont (cont_cls, GNUNET_SYSERR); | ||
1503 | return; | ||
1504 | } | ||
1505 | |||
1506 | GNUNET_assert (msg_size >= sizeof (struct GNUNET_MessageHeader)); | ||
1507 | GNUNET_STATISTICS_update (GST_stats, | ||
1508 | gettext_noop | ||
1509 | ("# bytes in message queue for other peers"), | ||
1510 | msg_size, GNUNET_NO); | ||
1511 | mq = GNUNET_malloc (sizeof (struct MessageQueue) + msg_size); | ||
1512 | mq->cont = cont; | ||
1513 | mq->cont_cls = cont_cls; | ||
1514 | /* FIXME: this memcpy can be up to 7% of our total runtime! */ | ||
1515 | memcpy (&mq[1], msg, msg_size); | ||
1516 | mq->message_buf = (const char *) &mq[1]; | ||
1517 | mq->message_buf_size = msg_size; | ||
1518 | mq->timeout = GNUNET_TIME_relative_to_absolute (timeout); | ||
1519 | GNUNET_CONTAINER_DLL_insert_tail (n->messages_head, n->messages_tail, mq); | ||
1520 | |||
1521 | if ((GNUNET_SCHEDULER_NO_TASK == n->transmission_task) && | ||
1522 | (NULL == n->is_active)) | ||
1523 | n->transmission_task = GNUNET_SCHEDULER_add_now (&transmission_task, n); | ||
1524 | } | ||
1525 | |||
1526 | |||
1527 | /** | ||
1528 | * We have received a message from the given sender. How long should | ||
1529 | * we delay before receiving more? (Also used to keep the peer marked | ||
1530 | * as live). | ||
1531 | * | ||
1532 | * @param sender sender of the message | ||
1533 | * @param size size of the message | ||
1534 | * @param do_forward set to GNUNET_YES if the message should be forwarded to clients | ||
1535 | * GNUNET_NO if the neighbour is not connected or violates the quota, | ||
1536 | * GNUNET_SYSERR if the connection is not fully up yet | ||
1537 | * @return how long to wait before reading more from this sender | ||
1538 | */ | ||
1539 | struct GNUNET_TIME_Relative | ||
1540 | GST_neighbours_calculate_receive_delay (const struct GNUNET_PeerIdentity | ||
1541 | *sender, ssize_t size, int *do_forward) | ||
1542 | { | ||
1543 | struct NeighbourMapEntry *n; | ||
1544 | struct GNUNET_TIME_Relative ret; | ||
1545 | |||
1546 | GNUNET_assert (neighbours != NULL); | ||
1547 | |||
1548 | n = lookup_neighbour (sender); | ||
1549 | if (n == NULL) | ||
1550 | { | ||
1551 | GST_neighbours_try_connect (sender); | ||
1552 | n = lookup_neighbour (sender); | ||
1553 | if (NULL == n) | ||
1554 | { | ||
1555 | GNUNET_STATISTICS_update (GST_stats, | ||
1556 | gettext_noop | ||
1557 | ("# messages discarded due to lack of neighbour record"), | ||
1558 | 1, GNUNET_NO); | ||
1559 | *do_forward = GNUNET_NO; | ||
1560 | return GNUNET_TIME_UNIT_ZERO; | ||
1561 | } | ||
1562 | } | ||
1563 | if (!is_connected(n)) | ||
1564 | { | ||
1565 | *do_forward = GNUNET_SYSERR; | ||
1566 | return GNUNET_TIME_UNIT_ZERO; | ||
1567 | } | ||
1568 | if (GNUNET_YES == GNUNET_BANDWIDTH_tracker_consume (&n->in_tracker, size)) | ||
1569 | { | ||
1570 | n->quota_violation_count++; | ||
1571 | #if DEBUG_TRANSPORT | ||
1572 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1573 | "Bandwidth quota (%u b/s) violation detected (total of %u).\n", | ||
1574 | n->in_tracker.available_bytes_per_s__, | ||
1575 | n->quota_violation_count); | ||
1576 | #endif | ||
1577 | /* Discount 32k per violation */ | ||
1578 | GNUNET_BANDWIDTH_tracker_consume (&n->in_tracker, -32 * 1024); | ||
1579 | } | ||
1580 | else | ||
1581 | { | ||
1582 | if (n->quota_violation_count > 0) | ||
1583 | { | ||
1584 | /* try to add 32k back */ | ||
1585 | GNUNET_BANDWIDTH_tracker_consume (&n->in_tracker, 32 * 1024); | ||
1586 | n->quota_violation_count--; | ||
1587 | } | ||
1588 | } | ||
1589 | if (n->quota_violation_count > QUOTA_VIOLATION_DROP_THRESHOLD) | ||
1590 | { | ||
1591 | GNUNET_STATISTICS_update (GST_stats, | ||
1592 | gettext_noop | ||
1593 | ("# bandwidth quota violations by other peers"), | ||
1594 | 1, GNUNET_NO); | ||
1595 | *do_forward = GNUNET_NO; | ||
1596 | return GNUNET_CONSTANTS_QUOTA_VIOLATION_TIMEOUT; | ||
1597 | } | ||
1598 | *do_forward = GNUNET_YES; | ||
1599 | ret = GNUNET_BANDWIDTH_tracker_get_delay (&n->in_tracker, 32 * 1024); | ||
1600 | if (ret.rel_value > 0) | ||
1601 | { | ||
1602 | #if DEBUG_TRANSPORT | ||
1603 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1604 | "Throttling read (%llu bytes excess at %u b/s), waiting %llu ms before reading more.\n", | ||
1605 | (unsigned long long) n->in_tracker. | ||
1606 | consumption_since_last_update__, | ||
1607 | (unsigned int) n->in_tracker.available_bytes_per_s__, | ||
1608 | (unsigned long long) ret.rel_value); | ||
1609 | #endif | ||
1610 | GNUNET_STATISTICS_update (GST_stats, | ||
1611 | gettext_noop ("# ms throttling suggested"), | ||
1612 | (int64_t) ret.rel_value, GNUNET_NO); | ||
1613 | } | ||
1614 | return ret; | ||
1615 | } | ||
1616 | |||
1617 | |||
1618 | /** | ||
1619 | * Keep the connection to the given neighbour alive longer, | ||
1620 | * we received a KEEPALIVE (or equivalent). | ||
1621 | * | ||
1622 | * @param neighbour neighbour to keep alive | ||
1623 | */ | ||
1624 | void | ||
1625 | GST_neighbours_keepalive (const struct GNUNET_PeerIdentity *neighbour) | ||
1626 | { | ||
1627 | struct NeighbourMapEntry *n; | ||
1628 | |||
1629 | GNUNET_assert (neighbours != NULL); | ||
1630 | |||
1631 | n = lookup_neighbour (neighbour); | ||
1632 | if (NULL == n) | ||
1633 | { | ||
1634 | GNUNET_STATISTICS_update (GST_stats, | ||
1635 | gettext_noop | ||
1636 | ("# KEEPALIVE messages discarded (not connected)"), | ||
1637 | 1, GNUNET_NO); | ||
1638 | return; | ||
1639 | } | ||
1640 | GNUNET_SCHEDULER_cancel (n->timeout_task); | ||
1641 | n->timeout_task = | ||
1642 | GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | ||
1643 | &neighbour_timeout_task, n); | ||
1644 | } | ||
1645 | |||
1646 | |||
1647 | /** | ||
1648 | * Change the incoming quota for the given peer. | ||
1649 | * | ||
1650 | * @param neighbour identity of peer to change qutoa for | ||
1651 | * @param quota new quota | ||
1652 | */ | ||
1653 | void | ||
1654 | GST_neighbours_set_incoming_quota (const struct GNUNET_PeerIdentity *neighbour, | ||
1655 | struct GNUNET_BANDWIDTH_Value32NBO quota) | ||
1656 | { | ||
1657 | struct NeighbourMapEntry *n; | ||
1658 | |||
1659 | GNUNET_assert (neighbours != NULL); | ||
1660 | |||
1661 | n = lookup_neighbour (neighbour); | ||
1662 | if (n == NULL) | ||
1663 | { | ||
1664 | GNUNET_STATISTICS_update (GST_stats, | ||
1665 | gettext_noop | ||
1666 | ("# SET QUOTA messages ignored (no such peer)"), | ||
1667 | 1, GNUNET_NO); | ||
1668 | return; | ||
1669 | } | ||
1670 | GNUNET_BANDWIDTH_tracker_update_quota (&n->in_tracker, quota); | ||
1671 | if (0 != ntohl (quota.value__)) | ||
1672 | return; | ||
1673 | #if DEBUG_TRANSPORT | ||
1674 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting peer `%4s' due to `%s'\n", | ||
1675 | GNUNET_i2s (&n->id), "SET_QUOTA"); | ||
1676 | #endif | ||
1677 | if (is_connected(n)) | ||
1678 | GNUNET_STATISTICS_update (GST_stats, | ||
1679 | gettext_noop ("# disconnects due to quota of 0"), 1, | ||
1680 | GNUNET_NO); | ||
1681 | disconnect_neighbour (n); | ||
1682 | } | ||
1683 | |||
1684 | |||
1685 | /** | ||
1686 | * Closure for the neighbours_iterate function. | ||
1687 | */ | ||
1688 | struct IteratorContext | ||
1689 | { | ||
1690 | /** | ||
1691 | * Function to call on each connected neighbour. | ||
1692 | */ | ||
1693 | GST_NeighbourIterator cb; | ||
1694 | |||
1695 | /** | ||
1696 | * Closure for 'cb'. | ||
1697 | */ | ||
1698 | void *cb_cls; | ||
1699 | }; | ||
1700 | |||
1701 | |||
1702 | /** | ||
1703 | * Call the callback from the closure for each connected neighbour. | ||
1704 | * | ||
1705 | * @param cls the 'struct IteratorContext' | ||
1706 | * @param key the hash of the public key of the neighbour | ||
1707 | * @param value the 'struct NeighbourMapEntry' | ||
1708 | * @return GNUNET_OK (continue to iterate) | ||
1709 | */ | ||
1710 | static int | ||
1711 | neighbours_iterate (void *cls, const GNUNET_HashCode * key, void *value) | ||
1712 | { | ||
1713 | struct IteratorContext *ic = cls; | ||
1714 | struct NeighbourMapEntry *n = value; | ||
1715 | |||
1716 | if (is_connected(n)) | ||
1717 | return GNUNET_OK; | ||
1718 | |||
1719 | ic->cb (ic->cb_cls, &n->id, NULL, 0, n->plugin_name, n->addr, n->addrlen); | ||
1720 | return GNUNET_OK; | ||
1721 | } | ||
1722 | |||
1723 | |||
1724 | /** | ||
1725 | * Iterate over all connected neighbours. | ||
1726 | * | ||
1727 | * @param cb function to call | ||
1728 | * @param cb_cls closure for cb | ||
1729 | */ | ||
1730 | void | ||
1731 | GST_neighbours_iterate (GST_NeighbourIterator cb, void *cb_cls) | ||
1732 | { | ||
1733 | struct IteratorContext ic; | ||
1734 | |||
1735 | GNUNET_assert (neighbours != NULL); | ||
1736 | |||
1737 | ic.cb = cb; | ||
1738 | ic.cb_cls = cb_cls; | ||
1739 | GNUNET_CONTAINER_multihashmap_iterate (neighbours, &neighbours_iterate, &ic); | ||
1740 | } | ||
1741 | |||
1742 | /** | ||
1743 | * If we have an active connection to the given target, it must be shutdown. | ||
1744 | * | ||
1745 | * @param target peer to disconnect from | ||
1746 | */ | ||
1747 | void | ||
1748 | GST_neighbours_force_disconnect (const struct GNUNET_PeerIdentity *target) | ||
1749 | { | ||
1750 | struct NeighbourMapEntry *n; | ||
1751 | |||
1752 | GNUNET_assert (neighbours != NULL); | ||
1753 | |||
1754 | n = lookup_neighbour (target); | ||
1755 | if (NULL == n) | ||
1756 | return; /* not active */ | ||
1757 | if (is_connected(n)) | ||
1758 | { | ||
1759 | send_disconnect(n); | ||
1760 | |||
1761 | n = lookup_neighbour (target); | ||
1762 | if (NULL == n) | ||
1763 | return; /* gone already */ | ||
1764 | } | ||
1765 | disconnect_neighbour (n); | ||
1766 | } | ||
1767 | |||
1768 | |||
1769 | /** | ||
1770 | * We received a disconnect message from the given peer, | ||
1771 | * validate and process. | ||
1772 | * | ||
1773 | * @param peer sender of the message | ||
1774 | * @param msg the disconnect message | ||
1775 | */ | ||
1776 | void | ||
1777 | GST_neighbours_handle_disconnect_message (const struct GNUNET_PeerIdentity *peer, | ||
1778 | const struct GNUNET_MessageHeader *msg) | ||
1779 | { | ||
1780 | struct NeighbourMapEntry *n; | ||
1781 | const struct SessionDisconnectMessage *sdm; | ||
1782 | GNUNET_HashCode hc; | ||
1783 | |||
1784 | #if DEBUG_TRANSPORT | ||
1785 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1786 | "Received DISCONNECT message from peer `%s'\n", GNUNET_i2s (peer)); | ||
1787 | #endif | ||
1788 | |||
1789 | if (ntohs (msg->size) != sizeof (struct SessionDisconnectMessage)) | ||
1790 | { | ||
1791 | // GNUNET_break_op (0); | ||
1792 | GNUNET_STATISTICS_update (GST_stats, | ||
1793 | gettext_noop ("# disconnect messages ignored (old format)"), 1, | ||
1794 | GNUNET_NO); | ||
1795 | return; | ||
1796 | } | ||
1797 | sdm = (const struct SessionDisconnectMessage* ) msg; | ||
1798 | n = lookup_neighbour (peer); | ||
1799 | if (NULL == n) | ||
1800 | return; /* gone already */ | ||
1801 | if (GNUNET_TIME_absolute_ntoh (sdm->timestamp).abs_value <= | ||
1802 | n->connect_ts.abs_value) | ||
1803 | { | ||
1804 | GNUNET_STATISTICS_update (GST_stats, | ||
1805 | gettext_noop ("# disconnect messages ignored (timestamp)"), 1, | ||
1806 | GNUNET_NO); | ||
1807 | return; | ||
1808 | } | ||
1809 | GNUNET_CRYPTO_hash (&sdm->public_key, | ||
1810 | sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), | ||
1811 | &hc); | ||
1812 | if (0 != memcmp (peer, | ||
1813 | &hc, | ||
1814 | sizeof (struct GNUNET_PeerIdentity))) | ||
1815 | { | ||
1816 | GNUNET_break_op (0); | ||
1817 | return; | ||
1818 | } | ||
1819 | if (ntohl (sdm->purpose.size) != | ||
1820 | sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + | ||
1821 | sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) + | ||
1822 | sizeof (struct GNUNET_TIME_AbsoluteNBO)) | ||
1823 | { | ||
1824 | GNUNET_break_op (0); | ||
1825 | return; | ||
1826 | } | ||
1827 | if (GNUNET_OK != | ||
1828 | GNUNET_CRYPTO_rsa_verify (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT, | ||
1829 | &sdm->purpose, | ||
1830 | &sdm->signature, | ||
1831 | &sdm->public_key)) | ||
1832 | { | ||
1833 | GNUNET_break_op (0); | ||
1834 | return; | ||
1835 | } | ||
1836 | GST_neighbours_force_disconnect (peer); | ||
1837 | } | ||
1838 | |||
1839 | /** | ||
1840 | * We received a 'SESSION_CONNECT_ACK' message from the other peer. | ||
1841 | * Consider switching to it. | ||
1842 | * | ||
1843 | * @param message possibly a 'struct SessionConnectMessage' (check format) | ||
1844 | * @param peer identity of the peer to switch the address for | ||
1845 | * @param plugin_name name of transport that delivered the PONG | ||
1846 | * @param address address of the other peer, NULL if other peer | ||
1847 | * connected to us | ||
1848 | * @param address_len number of bytes in address | ||
1849 | * @param session session to use (or NULL) | ||
1850 | * @param ats performance data | ||
1851 | * @param ats_count number of entries in ats | ||
1852 | */ | ||
1853 | void | ||
1854 | GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, | ||
1855 | const struct GNUNET_PeerIdentity *peer, | ||
1856 | const char *plugin_name, | ||
1857 | const char *sender_address, uint16_t sender_address_len, | ||
1858 | struct Session *session, | ||
1859 | const struct GNUNET_ATS_Information *ats, | ||
1860 | uint32_t ats_count) | ||
1861 | { | ||
1862 | const struct SessionConnectMessage *scm; | ||
1863 | struct QuotaSetMessage q_msg; | ||
1864 | struct GNUNET_MessageHeader msg; | ||
1865 | struct NeighbourMapEntry *n; | ||
1866 | size_t msg_len; | ||
1867 | size_t ret; | ||
1868 | int was_connected; | ||
1869 | |||
1870 | #if DEBUG_TRANSPORT | ||
1871 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1872 | "Received CONNECT_ACK message from peer `%s'\n", GNUNET_i2s (peer)); | ||
1873 | #endif | ||
1874 | |||
1875 | if (ntohs (message->size) != sizeof (struct SessionConnectMessage)) | ||
1876 | { | ||
1877 | GNUNET_break_op (0); | ||
1878 | return; | ||
1879 | } | ||
1880 | |||
1881 | scm = (const struct SessionConnectMessage *) message; | ||
1882 | GNUNET_break_op (ntohl (scm->reserved) == 0); | ||
1883 | n = lookup_neighbour (peer); | ||
1884 | if (NULL == n) | ||
1885 | n = setup_neighbour (peer); | ||
1886 | /* | ||
1887 | if (n->state != S_CONNECT_SENT) | ||
1888 | { | ||
1889 | GNUNET_break (0); | ||
1890 | send_disconnect(n); | ||
1891 | return; | ||
1892 | } | ||
1893 | */ | ||
1894 | if (NULL != session) | ||
1895 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, | ||
1896 | "transport-ats", | ||
1897 | "Giving ATS session %p of plugin %s for peer %s\n", | ||
1898 | session, | ||
1899 | plugin_name, | ||
1900 | GNUNET_i2s (peer)); | ||
1901 | GNUNET_ATS_address_update (GST_ats, | ||
1902 | peer, | ||
1903 | plugin_name, sender_address, sender_address_len, | ||
1904 | session, ats, ats_count); | ||
1905 | |||
1906 | was_connected = is_connected(n); | ||
1907 | if (!is_connected(n)) | ||
1908 | change_state (n, S_CONNECTED); | ||
1909 | |||
1910 | #if DEBUG_TRANSPORT | ||
1911 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
1912 | "Setting inbound quota of %u for peer `%s' to \n", | ||
1913 | ntohl (n->bandwidth_in.value__), GNUNET_i2s (&n->id)); | ||
1914 | #endif | ||
1915 | GST_neighbours_set_incoming_quota(&n->id, n->bandwidth_in); | ||
1916 | |||
1917 | /* send ACK (ACK)*/ | ||
1918 | msg_len = sizeof (msg); | ||
1919 | msg.size = htons (msg_len); | ||
1920 | msg.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_ACK); | ||
1921 | |||
1922 | ret = send_with_plugin (&n->id, (const char *) &msg, msg_len, UINT32_MAX, | ||
1923 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
1924 | n->session, n->plugin_name, n->addr, n->addrlen, | ||
1925 | GNUNET_YES, NULL, NULL); | ||
1926 | |||
1927 | if (ret == GNUNET_SYSERR) | ||
1928 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1929 | "Failed to send SESSION_ACK to `%4s' using plugin `%s' address '%s' session %X\n", | ||
1930 | GNUNET_i2s (&n->id), n->plugin_name, | ||
1931 | (n->addrlen == 0) ? "<inbound>" : GST_plugins_a2s (n->plugin_name, | ||
1932 | n->addr, | ||
1933 | n->addrlen), | ||
1934 | n->session); | ||
1935 | |||
1936 | |||
1937 | if (!was_connected) | ||
1938 | { | ||
1939 | if (n->keepalive_task == GNUNET_SCHEDULER_NO_TASK) | ||
1940 | n->keepalive_task = GNUNET_SCHEDULER_add_delayed (KEEPALIVE_FREQUENCY, | ||
1941 | &neighbour_keepalive_task, | ||
1942 | n); | ||
1943 | |||
1944 | neighbours_connected++; | ||
1945 | GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# peers connected"), 1, | ||
1946 | GNUNET_NO); | ||
1947 | connect_notify_cb (callback_cls, &n->id, ats, ats_count); | ||
1948 | |||
1949 | #if DEBUG_TRANSPORT | ||
1950 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1951 | "Sending outbound quota of %u Bps for peer `%s' to all clients\n", | ||
1952 | ntohl (n->bandwidth_out.value__), GNUNET_i2s (peer)); | ||
1953 | #endif | ||
1954 | q_msg.header.size = htons (sizeof (struct QuotaSetMessage)); | ||
1955 | q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA); | ||
1956 | q_msg.quota = n->bandwidth_out; | ||
1957 | q_msg.peer = (*peer); | ||
1958 | GST_clients_broadcast (&q_msg.header, GNUNET_NO); | ||
1959 | } | ||
1960 | } | ||
1961 | |||
1962 | void | ||
1963 | GST_neighbours_handle_ack (const struct GNUNET_MessageHeader *message, | ||
1964 | const struct GNUNET_PeerIdentity *peer, | ||
1965 | const char *plugin_name, | ||
1966 | const char *sender_address, uint16_t sender_address_len, | ||
1967 | struct Session *session, | ||
1968 | const struct GNUNET_ATS_Information *ats, | ||
1969 | uint32_t ats_count) | ||
1970 | { | ||
1971 | struct NeighbourMapEntry *n; | ||
1972 | struct QuotaSetMessage q_msg; | ||
1973 | |||
1974 | #if DEBUG_TRANSPORT | ||
1975 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1976 | "Received ACK message from peer `%s'\n", GNUNET_i2s (peer)); | ||
1977 | #endif | ||
1978 | |||
1979 | if (ntohs (message->size) != sizeof (struct GNUNET_MessageHeader)) | ||
1980 | { | ||
1981 | GNUNET_break_op (0); | ||
1982 | return; | ||
1983 | } | ||
1984 | |||
1985 | n = lookup_neighbour (peer); | ||
1986 | if (NULL == n) | ||
1987 | { | ||
1988 | send_disconnect(n); | ||
1989 | GNUNET_break (0); | ||
1990 | } | ||
1991 | // FIXME check this | ||
1992 | // if (n->state != S_CONNECT_RECV) | ||
1993 | /* if (is_connecting(n)) | ||
1994 | { | ||
1995 | send_disconnect (n); | ||
1996 | change_state (n, S_DISCONNECT); | ||
1997 | GNUNET_break (0); | ||
1998 | return; | ||
1999 | } | ||
2000 | */ | ||
2001 | if (is_connected(n)) | ||
2002 | return; | ||
2003 | |||
2004 | if (NULL != session) | ||
2005 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, | ||
2006 | "transport-ats", | ||
2007 | "Giving ATS session %p of plugin %s for peer %s\n", | ||
2008 | session, | ||
2009 | plugin_name, | ||
2010 | GNUNET_i2s (peer)); | ||
2011 | GNUNET_ATS_address_update (GST_ats, | ||
2012 | peer, | ||
2013 | plugin_name, sender_address, sender_address_len, | ||
2014 | session, ats, ats_count); | ||
2015 | |||
2016 | change_state (n, S_CONNECTED); | ||
2017 | |||
2018 | GST_neighbours_set_incoming_quota(&n->id, n->bandwidth_in); | ||
2019 | |||
2020 | if (n->keepalive_task == GNUNET_SCHEDULER_NO_TASK) | ||
2021 | n->keepalive_task = GNUNET_SCHEDULER_add_delayed (KEEPALIVE_FREQUENCY, | ||
2022 | &neighbour_keepalive_task, | ||
2023 | n); | ||
2024 | |||
2025 | neighbours_connected++; | ||
2026 | GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# peers connected"), 1, | ||
2027 | GNUNET_NO); | ||
2028 | connect_notify_cb (callback_cls, &n->id, ats, ats_count); | ||
2029 | |||
2030 | #if DEBUG_TRANSPORT | ||
2031 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2032 | "Sending outbound quota of %u Bps for peer `%s' to all clients\n", | ||
2033 | ntohl (n->bandwidth_out.value__), GNUNET_i2s (peer)); | ||
2034 | #endif | ||
2035 | |||
2036 | q_msg.header.size = htons (sizeof (struct QuotaSetMessage)); | ||
2037 | q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA); | ||
2038 | q_msg.quota = n->bandwidth_out; | ||
2039 | q_msg.peer = (*peer); | ||
2040 | GST_clients_broadcast (&q_msg.header, GNUNET_NO); | ||
2041 | } | ||
2042 | |||
2043 | struct BlackListCheckContext | ||
2044 | { | ||
2045 | struct GNUNET_ATS_Information *ats; | ||
2046 | |||
2047 | uint32_t ats_count; | ||
2048 | |||
2049 | struct Session *session; | ||
2050 | |||
2051 | char *sender_address; | ||
2052 | |||
2053 | uint16_t sender_address_len; | ||
2054 | |||
2055 | char *plugin_name; | ||
2056 | |||
2057 | struct GNUNET_TIME_Absolute ts; | ||
2058 | }; | ||
2059 | |||
2060 | |||
2061 | static void | ||
2062 | handle_connect_blacklist_cont (void *cls, | ||
2063 | const struct GNUNET_PeerIdentity | ||
2064 | * peer, int result) | ||
2065 | { | ||
2066 | struct NeighbourMapEntry *n; | ||
2067 | struct BlackListCheckContext * bcc = cls; | ||
2068 | |||
2069 | #if DEBUG_TRANSPORT | ||
2070 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2071 | "Blacklist check due to CONNECT message: `%s'\n", GNUNET_i2s (peer), (result == GNUNET_OK) ? "ALLOWED" : "FORBIDDEN"); | ||
2072 | #endif | ||
2073 | |||
2074 | /* not allowed */ | ||
2075 | if (GNUNET_OK != result) | ||
2076 | { | ||
2077 | GNUNET_free (bcc); | ||
2078 | return; | ||
2079 | } | ||
2080 | |||
2081 | n = lookup_neighbour (peer); | ||
2082 | if (NULL == n) | ||
2083 | n = setup_neighbour (peer); | ||
2084 | |||
2085 | if (bcc->ts.abs_value > n->connect_ts.abs_value) | ||
2086 | { | ||
2087 | if (NULL != bcc->session) | ||
2088 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, | ||
2089 | "transport-ats", | ||
2090 | "Giving ATS session %p of plugin %s address `%s' for peer %s\n", | ||
2091 | bcc->session, | ||
2092 | bcc->plugin_name, | ||
2093 | GST_plugins_a2s (bcc->plugin_name, bcc->sender_address, bcc->sender_address_len), | ||
2094 | GNUNET_i2s (peer)); | ||
2095 | GNUNET_ATS_address_update (GST_ats, | ||
2096 | peer, | ||
2097 | bcc->plugin_name, bcc->sender_address, bcc->sender_address_len, | ||
2098 | bcc->session, bcc->ats, bcc->ats_count); | ||
2099 | n->connect_ts = bcc->ts; | ||
2100 | } | ||
2101 | |||
2102 | GNUNET_free (bcc); | ||
2103 | /* | ||
2104 | if (n->state != S_NOT_CONNECTED) | ||
2105 | return;*/ | ||
2106 | change_state (n, S_CONNECT_RECV); | ||
2107 | |||
2108 | /* Ask ATS for an address to connect via that address */ | ||
2109 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | ||
2110 | GNUNET_SCHEDULER_cancel(n->ats_suggest); | ||
2111 | n->ats_suggest = GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel, n); | ||
2112 | GNUNET_ATS_suggest_address(GST_ats, peer); | ||
2113 | } | ||
2114 | |||
2115 | /** | ||
2116 | * We received a 'SESSION_CONNECT' message from the other peer. | ||
2117 | * Consider switching to it. | ||
2118 | * | ||
2119 | * @param message possibly a 'struct SessionConnectMessage' (check format) | ||
2120 | * @param peer identity of the peer to switch the address for | ||
2121 | * @param plugin_name name of transport that delivered the PONG | ||
2122 | * @param address address of the other peer, NULL if other peer | ||
2123 | * connected to us | ||
2124 | * @param address_len number of bytes in address | ||
2125 | * @param session session to use (or NULL) | ||
2126 | * @param ats performance data | ||
2127 | * @param ats_count number of entries in ats (excluding 0-termination) | ||
2128 | */ | ||
2129 | void | ||
2130 | GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, | ||
2131 | const struct GNUNET_PeerIdentity *peer, | ||
2132 | const char *plugin_name, | ||
2133 | const char *sender_address, uint16_t sender_address_len, | ||
2134 | struct Session *session, | ||
2135 | const struct GNUNET_ATS_Information *ats, | ||
2136 | uint32_t ats_count) | ||
2137 | { | ||
2138 | const struct SessionConnectMessage *scm; | ||
2139 | struct NeighbourMapEntry * n; | ||
2140 | struct BlackListCheckContext * bcc = NULL; | ||
2141 | |||
2142 | #if DEBUG_TRANSPORT | ||
2143 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2144 | "Received CONNECT message from peer `%s'\n", GNUNET_i2s (peer)); | ||
2145 | #endif | ||
2146 | |||
2147 | if (ntohs (message->size) != sizeof (struct SessionConnectMessage)) | ||
2148 | { | ||
2149 | GNUNET_break_op (0); | ||
2150 | return; | ||
2151 | } | ||
2152 | |||
2153 | scm = (const struct SessionConnectMessage *) message; | ||
2154 | GNUNET_break_op (ntohl (scm->reserved) == 0); | ||
2155 | |||
2156 | n = lookup_neighbour(peer); | ||
2157 | if (n != NULL) | ||
2158 | { | ||
2159 | /* connected peer switches addresses */ | ||
2160 | if (is_connected(n)) | ||
2161 | { | ||
2162 | GNUNET_ATS_address_update(GST_ats, peer, plugin_name, sender_address, sender_address_len, session, ats, ats_count); | ||
2163 | return; | ||
2164 | } | ||
2165 | } | ||
2166 | |||
2167 | /* we are not connected to this peer */ | ||
2168 | /* do blacklist check*/ | ||
2169 | bcc = GNUNET_malloc (sizeof (struct BlackListCheckContext) + | ||
2170 | sizeof (struct GNUNET_ATS_Information) * ats_count + | ||
2171 | sender_address_len + | ||
2172 | strlen (plugin_name)+1); | ||
2173 | |||
2174 | bcc->ts = GNUNET_TIME_absolute_ntoh (scm->timestamp); | ||
2175 | |||
2176 | bcc->ats_count = ats_count; | ||
2177 | bcc->sender_address_len = sender_address_len; | ||
2178 | bcc->session = session; | ||
2179 | |||
2180 | bcc->ats = (struct GNUNET_ATS_Information *) &bcc[1]; | ||
2181 | memcpy (bcc->ats, ats,sizeof (struct GNUNET_ATS_Information) * ats_count ); | ||
2182 | |||
2183 | bcc->sender_address = (char *) &bcc->ats[ats_count]; | ||
2184 | memcpy (bcc->sender_address, sender_address , sender_address_len); | ||
2185 | |||
2186 | bcc->plugin_name = &bcc->sender_address[sender_address_len]; | ||
2187 | strcpy (bcc->plugin_name, plugin_name); | ||
2188 | |||
2189 | GST_blacklist_test_allowed (peer, plugin_name, handle_connect_blacklist_cont, bcc); | ||
2190 | } | ||
2191 | |||
2192 | |||
2193 | /* end of file gnunet-service-transport_neighbours.c */ | ||
diff --git a/src/transport/gnunet-service-transport_neighbours_3way.h b/src/transport/gnunet-service-transport_neighbours_3way.h deleted file mode 100644 index 3868ef2cf..000000000 --- a/src/transport/gnunet-service-transport_neighbours_3way.h +++ /dev/null | |||
@@ -1,279 +0,0 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | (C) 2010,2011 Christian Grothoff (and other contributing authors) | ||
4 | |||
5 | GNUnet is free software; you can redistribute it and/or modify | ||
6 | it under the terms of the GNU General Public License as published | ||
7 | by the Free Software Foundation; either version 3, or (at your | ||
8 | option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU General Public License | ||
16 | along with GNUnet; see the file COPYING. If not, write to the | ||
17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
18 | Boston, MA 02111-1307, USA. | ||
19 | */ | ||
20 | |||
21 | /** | ||
22 | * @file transport/gnunet-service-transport_neighbours.h | ||
23 | * @brief neighbour management API | ||
24 | * @author Christian Grothoff | ||
25 | */ | ||
26 | #ifndef GNUNET_SERVICE_TRANSPORT_NEIGHBOURS_H | ||
27 | #define GNUNET_SERVICE_TRANSPORT_NEIGHBOURS_H | ||
28 | |||
29 | #include "gnunet_statistics_service.h" | ||
30 | #include "gnunet_transport_service.h" | ||
31 | #include "gnunet_transport_plugin.h" | ||
32 | #include "gnunet_util_lib.h" | ||
33 | |||
34 | // TODO: | ||
35 | // - ATS and similar info is a bit lacking in the API right now... | ||
36 | |||
37 | |||
38 | |||
39 | /** | ||
40 | * Initialize the neighbours subsystem. | ||
41 | * | ||
42 | * @param cls closure for callbacks | ||
43 | * @param connect_cb function to call if we connect to a peer | ||
44 | * @param disconnect_cb function to call if we disconnect from a peer | ||
45 | */ | ||
46 | void | ||
47 | GST_neighbours_start (void *cls, GNUNET_TRANSPORT_NotifyConnect connect_cb, | ||
48 | GNUNET_TRANSPORT_NotifyDisconnect disconnect_cb); | ||
49 | |||
50 | |||
51 | /** | ||
52 | * Cleanup the neighbours subsystem. | ||
53 | */ | ||
54 | void | ||
55 | GST_neighbours_stop (void); | ||
56 | |||
57 | |||
58 | /** | ||
59 | * Try to create a connection to the given target (eventually). | ||
60 | * | ||
61 | * @param target peer to try to connect to | ||
62 | */ | ||
63 | void | ||
64 | GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target); | ||
65 | |||
66 | |||
67 | /** | ||
68 | * Test if we're connected to the given peer. | ||
69 | * | ||
70 | * @param target peer to test | ||
71 | * @return GNUNET_YES if we are connected, GNUNET_NO if not | ||
72 | */ | ||
73 | int | ||
74 | GST_neighbours_test_connected (const struct GNUNET_PeerIdentity *target); | ||
75 | |||
76 | |||
77 | /** | ||
78 | * Function called after the transmission is done. | ||
79 | * | ||
80 | * @param cls closure | ||
81 | * @param success GNUNET_OK on success, GNUNET_NO on failure, GNUNET_SYSERR if we're not connected | ||
82 | */ | ||
83 | typedef void (*GST_NeighbourSendContinuation) (void *cls, int success); | ||
84 | |||
85 | |||
86 | /** | ||
87 | * Transmit a message to the given target using the active connection. | ||
88 | * | ||
89 | * @param target destination | ||
90 | * @param msg message to send | ||
91 | * @param msg_size number of bytes in msg | ||
92 | * @param timeout when to fail with timeout | ||
93 | * @param cont function to call when done | ||
94 | * @param cont_cls closure for 'cont' | ||
95 | */ | ||
96 | void | ||
97 | GST_neighbours_send (const struct GNUNET_PeerIdentity *target, const void *msg, | ||
98 | size_t msg_size, struct GNUNET_TIME_Relative timeout, | ||
99 | GST_NeighbourSendContinuation cont, void *cont_cls); | ||
100 | |||
101 | |||
102 | /** | ||
103 | * We have received a message from the given sender. | ||
104 | * How long should we delay before receiving more? | ||
105 | * (Also used to keep the peer marked as live). | ||
106 | * | ||
107 | * @param sender sender of the message | ||
108 | * @param size size of the message | ||
109 | * @param do_forward set to GNUNET_YES if the message should be forwarded to clients | ||
110 | * GNUNET_NO if the neighbour is not connected or violates the quota | ||
111 | * @return how long to wait before reading more from this sender | ||
112 | */ | ||
113 | struct GNUNET_TIME_Relative | ||
114 | GST_neighbours_calculate_receive_delay (const struct GNUNET_PeerIdentity | ||
115 | *sender, ssize_t size, int *do_forward); | ||
116 | |||
117 | |||
118 | /** | ||
119 | * Keep the connection to the given neighbour alive longer, | ||
120 | * we received a KEEPALIVE (or equivalent). | ||
121 | * | ||
122 | * @param neighbour neighbour to keep alive | ||
123 | */ | ||
124 | void | ||
125 | GST_neighbours_keepalive (const struct GNUNET_PeerIdentity *neighbour); | ||
126 | |||
127 | |||
128 | /** | ||
129 | * Change the incoming quota for the given peer. | ||
130 | * | ||
131 | * @param neighbour identity of peer to change qutoa for | ||
132 | * @param quota new quota | ||
133 | */ | ||
134 | void | ||
135 | GST_neighbours_set_incoming_quota (const struct GNUNET_PeerIdentity *neighbour, | ||
136 | struct GNUNET_BANDWIDTH_Value32NBO quota); | ||
137 | |||
138 | |||
139 | /** | ||
140 | * If we have an active connection to the given target, it must be shutdown. | ||
141 | * | ||
142 | * @param target peer to disconnect from | ||
143 | */ | ||
144 | void | ||
145 | GST_neighbours_force_disconnect (const struct GNUNET_PeerIdentity *target); | ||
146 | |||
147 | |||
148 | /** | ||
149 | * Function called for each connected neighbour. | ||
150 | * | ||
151 | * @param cls closure | ||
152 | * @param neighbour identity of the neighbour | ||
153 | * @param ats performance data | ||
154 | * @param ats_count number of entries in ats (including 0-termination) | ||
155 | * @param transport plugin | ||
156 | * @param addr address | ||
157 | * @param addrlen address length | ||
158 | */ | ||
159 | typedef void (*GST_NeighbourIterator) (void *cls, | ||
160 | const struct GNUNET_PeerIdentity * | ||
161 | neighbour, | ||
162 | const struct | ||
163 | GNUNET_ATS_Information * ats, | ||
164 | uint32_t ats_count, | ||
165 | const char * transport, | ||
166 | const void * addr, | ||
167 | size_t addrlen); | ||
168 | |||
169 | |||
170 | /** | ||
171 | * Iterate over all connected neighbours. | ||
172 | * | ||
173 | * @param cb function to call | ||
174 | * @param cb_cls closure for cb | ||
175 | */ | ||
176 | void | ||
177 | GST_neighbours_iterate (GST_NeighbourIterator cb, void *cb_cls); | ||
178 | |||
179 | |||
180 | /** | ||
181 | * A session was terminated. Take note. | ||
182 | * | ||
183 | * @param peer identity of the peer where the session died | ||
184 | * @param session session that is gone | ||
185 | */ | ||
186 | void | ||
187 | GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | ||
188 | struct Session *session); | ||
189 | |||
190 | |||
191 | /** | ||
192 | * For an existing neighbour record, set the active connection to | ||
193 | * use the given address. | ||
194 | * | ||
195 | * @param peer identity of the peer to switch the address for | ||
196 | * @param plugin_name name of transport that delivered the PONG | ||
197 | * @param address address of the other peer, NULL if other peer | ||
198 | * connected to us | ||
199 | * @param address_len number of bytes in address | ||
200 | * @param session session to use (or NULL) | ||
201 | * @param ats performance data | ||
202 | * @param ats_count number of entries in ats | ||
203 | * @param bandwidth_in inbound quota to be used when connection is up | ||
204 | * @param bandwidth_out outbound quota to be used when connection is up | ||
205 | * @return GNUNET_YES if we are currently connected, GNUNET_NO if the | ||
206 | * connection is not up (yet) | ||
207 | */ | ||
208 | int | ||
209 | GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer, | ||
210 | const char *plugin_name, const void *address, | ||
211 | size_t address_len, struct Session *session, | ||
212 | const struct GNUNET_ATS_Information | ||
213 | *ats, uint32_t ats_count); | ||
214 | |||
215 | int | ||
216 | GST_neighbours_switch_to_address_3way (const struct GNUNET_PeerIdentity *peer, | ||
217 | const char *plugin_name, const void *address, | ||
218 | size_t address_len, struct Session *session, | ||
219 | const struct GNUNET_ATS_Information | ||
220 | *ats, uint32_t ats_count, | ||
221 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, | ||
222 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out); | ||
223 | |||
224 | |||
225 | /** | ||
226 | * We received a 'SESSION_CONNECT' message from the other peer. | ||
227 | * Consider switching to it. | ||
228 | * | ||
229 | * @param message possibly a 'struct SessionConnectMessage' (check format) | ||
230 | * @param peer identity of the peer to switch the address for | ||
231 | * @param plugin_name name of transport that delivered the PONG | ||
232 | * @param address address of the other peer, NULL if other peer | ||
233 | * connected to us | ||
234 | * @param address_len number of bytes in address | ||
235 | * @param session session to use (or NULL) | ||
236 | * @param ats performance data | ||
237 | * @param ats_count number of entries in ats (excluding 0-termination) | ||
238 | */ | ||
239 | void | ||
240 | GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, | ||
241 | const struct GNUNET_PeerIdentity *peer, | ||
242 | const char *plugin_name, | ||
243 | const char *sender_address, uint16_t sender_address_len, | ||
244 | struct Session *session, | ||
245 | const struct GNUNET_ATS_Information *ats, | ||
246 | uint32_t ats_count); | ||
247 | |||
248 | void | ||
249 | GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, | ||
250 | const struct GNUNET_PeerIdentity *peer, | ||
251 | const char *plugin_name, | ||
252 | const char *sender_address, uint16_t sender_address_len, | ||
253 | struct Session *session, | ||
254 | const struct GNUNET_ATS_Information *ats, | ||
255 | uint32_t ats_count); | ||
256 | |||
257 | void | ||
258 | GST_neighbours_handle_ack (const struct GNUNET_MessageHeader *message, | ||
259 | const struct GNUNET_PeerIdentity *peer, | ||
260 | const char *plugin_name, | ||
261 | const char *sender_address, uint16_t sender_address_len, | ||
262 | struct Session *session, | ||
263 | const struct GNUNET_ATS_Information *ats, | ||
264 | uint32_t ats_count); | ||
265 | |||
266 | /** | ||
267 | * We received a disconnect message from the given peer, | ||
268 | * validate and process. | ||
269 | * | ||
270 | * @param peer sender of the message | ||
271 | * @param msg the disconnect message | ||
272 | */ | ||
273 | void | ||
274 | GST_neighbours_handle_disconnect_message (const struct GNUNET_PeerIdentity *peer, | ||
275 | const struct GNUNET_MessageHeader *msg); | ||
276 | |||
277 | |||
278 | #endif | ||
279 | /* end of file gnunet-service-transport_neighbours.h */ | ||