diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-07-14 20:26:46 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-07-14 20:26:46 +0000 |
commit | 1b95efd9e4491be038c16fd7dca61e9b79dd502b (patch) | |
tree | 53bce3808e2be55838898d85c23772a496e3a5aa /src/include | |
parent | 245187d11cba38164d73afdcb6ddd2a09d701eed (diff) | |
download | gnunet-1b95efd9e4491be038c16fd7dca61e9b79dd502b.tar.gz gnunet-1b95efd9e4491be038c16fd7dca61e9b79dd502b.zip |
fix
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_protocols.h | 30 | ||||
-rw-r--r-- | src/include/gnunet_transport_plugin.h | 6 |
2 files changed, 5 insertions, 31 deletions
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 7cc8e7239..36cfe0535 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h | |||
@@ -273,35 +273,9 @@ extern "C" | |||
273 | #define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE 52 | 273 | #define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE 52 |
274 | 274 | ||
275 | /** | 275 | /** |
276 | * Fragmented part of a UDP message. | 276 | * UDP ACK. |
277 | */ | 277 | */ |
278 | #define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE_PART 53 | 278 | #define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_ACK 53 |
279 | |||
280 | /** | ||
281 | * UDP NAT probe message, send from NAT'd peer to | ||
282 | * other peer to negotiate punched address/port | ||
283 | */ | ||
284 | #define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE 55 | ||
285 | |||
286 | /** | ||
287 | * UDP NAT probe reply, sent from a non-NAT'd peer to | ||
288 | * a NAT'd one to inform it we got the probe and of the | ||
289 | * address/port seen | ||
290 | */ | ||
291 | #define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_REPLY 56 | ||
292 | |||
293 | /** | ||
294 | * UDP NAT probe confirmation, sent from a NAT'd peer to | ||
295 | * a non-NAT'd one to inform it which port to send to us | ||
296 | * on | ||
297 | */ | ||
298 | #define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_CONFIRM 57 | ||
299 | |||
300 | /** | ||
301 | * UDP NAT probe keepalive, once a hole is punched the NAT'd peer | ||
302 | * needs to keep the hole alive | ||
303 | */ | ||
304 | #define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_KEEPALIVE 58 | ||
305 | 279 | ||
306 | /** | 280 | /** |
307 | * Request to look up addresses of peers. | 281 | * Request to look up addresses of peers. |
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h index 40f134db0..7704d2b0c 100644 --- a/src/include/gnunet_transport_plugin.h +++ b/src/include/gnunet_transport_plugin.h | |||
@@ -155,6 +155,7 @@ typedef struct GNUNET_TIME_Relative (*GNUNET_TRANSPORT_TrafficReport) (void *cls | |||
155 | GNUNET_PeerIdentity *peer, | 155 | GNUNET_PeerIdentity *peer, |
156 | size_t amount_recved); | 156 | size_t amount_recved); |
157 | 157 | ||
158 | |||
158 | /** | 159 | /** |
159 | * Function called whenever the plugin has to notify ATS about costs for using this transport | 160 | * Function called whenever the plugin has to notify ATS about costs for using this transport |
160 | * | 161 | * |
@@ -174,6 +175,7 @@ typedef void (*GNUNET_TRANSPORT_CostReport) (void *cls, | |||
174 | uint16_t addrlen, | 175 | uint16_t addrlen, |
175 | struct GNUNET_TRANSPORT_ATS_Information * cost); | 176 | struct GNUNET_TRANSPORT_ATS_Information * cost); |
176 | 177 | ||
178 | |||
177 | /** | 179 | /** |
178 | * The transport service will pass a pointer to a struct | 180 | * The transport service will pass a pointer to a struct |
179 | * of this type as the first and only argument to the | 181 | * of this type as the first and only argument to the |
@@ -440,9 +442,7 @@ struct GNUNET_TRANSPORT_PluginFunctions | |||
440 | /** | 442 | /** |
441 | * Function that can be used to force the plugin to disconnect from | 443 | * Function that can be used to force the plugin to disconnect from |
442 | * the given peer and cancel all previous transmissions (and their | 444 | * the given peer and cancel all previous transmissions (and their |
443 | * continuations). Note that if the transport does not have | 445 | * continuations). |
444 | * sessions / persistent connections (for example, UDP), this | ||
445 | * function may very well do nothing. | ||
446 | */ | 446 | */ |
447 | GNUNET_TRANSPORT_DisconnectFunction disconnect; | 447 | GNUNET_TRANSPORT_DisconnectFunction disconnect; |
448 | 448 | ||