From 1b95efd9e4491be038c16fd7dca61e9b79dd502b Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 14 Jul 2011 20:26:46 +0000
Subject: [PATCH] fix

---
 src/include/gnunet_protocols.h        | 30 ++-------------------------
 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"
 #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
-
-/**
- * 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
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_ACK 53
 
 /**
  * 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
                                                                       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 @@ typedef void (*GNUNET_TRANSPORT_CostReport) (void *cls,
                                              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 @@ struct GNUNET_TRANSPORT_PluginFunctions
   /**
    * 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;
 
-- 
2.25.1