[GNUnet-SVN] r15972 - gnunet/src/include

[gnunet]

Author: grothoff
Date: 2011-07-14 22:26:46 +0200 (Thu, 14 Jul 2011)
New Revision: 15972

Modified:
   gnunet/src/include/gnunet_protocols.h
   gnunet/src/include/gnunet_transport_plugin.h
Log:
fix

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2011-07-14 17:45:45 UTC (rev 
15971)
+++ gnunet/src/include/gnunet_protocols.h       2011-07-14 20:26:46 UTC (rev 
15972)
@@ -273,37 +273,11 @@
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE 52
 
 /**
- * Fragmented part of a UDP message.
+ * UDP ACK.
  */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE_PART 53
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_ACK 53
 
 /**
- * UDP NAT probe message, send from NAT'd peer to
- * other peer to negotiate punched address/port
- */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE 55
-
-/**
- * UDP NAT probe reply, sent from a non-NAT'd peer to
- * a NAT'd one to inform it we got the probe and of the
- * address/port seen
- */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_REPLY 56
-
-/**
- * UDP NAT probe confirmation, sent from a NAT'd peer to
- * a non-NAT'd one to inform it which port to send to us
- * on
- */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_CONFIRM 57
-
-/**
- * UDP NAT probe keepalive, once a hole is punched the NAT'd peer
- * needs to keep the hole alive
- */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_KEEPALIVE 58
-
-/**
  * Request to look up addresses of peers.
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_PEER_ADDRESS_LOOKUP 59

Modified: gnunet/src/include/gnunet_transport_plugin.h
===================================================================
--- gnunet/src/include/gnunet_transport_plugin.h        2011-07-14 17:45:45 UTC 
(rev 15971)
+++ gnunet/src/include/gnunet_transport_plugin.h        2011-07-14 20:26:46 UTC 
(rev 15972)
@@ -155,6 +155,7 @@
                                                                       
GNUNET_PeerIdentity *peer,
                                                                       size_t 
amount_recved);
 
+
 /**
  * Function called whenever the plugin has to notify ATS about costs for using 
this transport
  *
@@ -174,6 +175,7 @@
                                              uint16_t addrlen,
                                             struct 
GNUNET_TRANSPORT_ATS_Information * cost);
 
+
 /**
  * The transport service will pass a pointer to a struct
  * of this type as the first and only argument to the
@@ -440,9 +442,7 @@
   /**
    * Function that can be used to force the plugin to disconnect from
    * the given peer and cancel all previous transmissions (and their
-   * continuations).  Note that if the transport does not have
-   * sessions / persistent connections (for example, UDP), this
-   * function may very well do nothing.
+   * continuations).  
    */
   GNUNET_TRANSPORT_DisconnectFunction disconnect;