[GNUnet-SVN] r17820 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-10-27 21:46:53 +0200 (Thu, 27 Oct 2011)
New Revision: 17820

Modified:
   gnunet/src/transport/gnunet-service-transport_3way.c
   gnunet/src/transport/gnunet-service-transport_neighbours.h
   gnunet/src/transport/gnunet-service-transport_neighbours_3way.h
Log:


Modified: gnunet/src/transport/gnunet-service-transport_3way.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_3way.c        2011-10-27 
19:16:27 UTC (rev 17819)
+++ gnunet/src/transport/gnunet-service-transport_3way.c        2011-10-27 
19:46:53 UTC (rev 17820)
@@ -403,7 +403,7 @@
     return;
   }
   /* will never return GNUNET_YES since connection is to be established */
-  GST_neighbours_switch_to_address (peer, plugin_name, plugin_addr,
+  GST_neighbours_switch_to_address_3way (peer, plugin_name, plugin_addr,
                                    plugin_addr_len, session, ats, ats_count,
                                    bandwidth_in, bandwidth_out);
 }

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.h
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.h  2011-10-27 
19:16:27 UTC (rev 17819)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.h  2011-10-27 
19:46:53 UTC (rev 17820)
@@ -210,6 +210,14 @@
                                   const struct GNUNET_ATS_Information
                                   *ats, uint32_t ats_count);
 
+int
+GST_neighbours_switch_to_address_3way (const struct GNUNET_PeerIdentity *peer,
+                                  const char *plugin_name, const void *address,
+                                  size_t address_len, struct Session *session,
+                                  const struct GNUNET_ATS_Information
+                                  *ats, uint32_t ats_count,
+                                  struct GNUNET_BANDWIDTH_Value32NBO 
bandwidth_in,
+                                  struct GNUNET_BANDWIDTH_Value32NBO 
bandwidth_out);
 
 /**
  * We received a 'SESSION_CONNECT' message from the other peer.
@@ -223,7 +231,7 @@
  * @param address_len number of bytes in address
  * @param session session to use (or NULL)
  * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
+ * @param ats_count number of entries in ats
   */
 void
 GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message,
@@ -235,6 +243,50 @@
                               uint32_t ats_count);
 
 /**
+ * We received a 'SESSION_CONNECT_ACK' message from the other peer.
+ *
+ * @param message possibly a 'struct SessionConnectMessage' (check format)
+ * @param peer identity of the peer to switch the address for
+ * @param plugin_name name of transport that delivered the PONG
+ * @param address address of the other peer, NULL if other peer
+ *                       connected to us
+ * @param address_len number of bytes in address
+ * @param session session to use (or NULL)
+ * @param ats performance data
+ * @param ats_count number of entries in ats
+  */
+void
+GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message,
+                               const struct GNUNET_PeerIdentity *peer,
+                               const char *plugin_name,
+                               const char *sender_address, uint16_t 
sender_address_len,
+                               struct Session *session,
+                               const struct GNUNET_ATS_Information *ats,
+                               uint32_t ats_count);
+
+/**
+ * We received a 'SESSION_ACK' message from the other peer.
+ *
+ * @param message possibly a 'struct SessionConnectMessage' (check format)
+ * @param peer identity of the peer to switch the address for
+ * @param plugin_name name of transport that delivered the PONG
+ * @param address address of the other peer, NULL if other peer
+ *                       connected to us
+ * @param address_len number of bytes in address
+ * @param session session to use (or NULL)
+ * @param ats performance data
+ * @param ats_count number of entries in ats
+  */
+void
+GST_neighbours_handle_ack (const struct GNUNET_MessageHeader *message,
+    const struct GNUNET_PeerIdentity *peer,
+    const char *plugin_name,
+    const char *sender_address, uint16_t sender_address_len,
+    struct Session *session,
+    const struct GNUNET_ATS_Information *ats,
+    uint32_t ats_count);
+
+/**
  * We received a disconnect message from the given peer,
  * validate and process.
  * 

Modified: gnunet/src/transport/gnunet-service-transport_neighbours_3way.h
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours_3way.h     
2011-10-27 19:16:27 UTC (rev 17819)
+++ gnunet/src/transport/gnunet-service-transport_neighbours_3way.h     
2011-10-27 19:46:53 UTC (rev 17820)
@@ -210,6 +210,13 @@
                                   const char *plugin_name, const void *address,
                                   size_t address_len, struct Session *session,
                                   const struct GNUNET_ATS_Information
+                                  *ats, uint32_t ats_count);
+
+int
+GST_neighbours_switch_to_address_3way (const struct GNUNET_PeerIdentity *peer,
+                                  const char *plugin_name, const void *address,
+                                  size_t address_len, struct Session *session,
+                                  const struct GNUNET_ATS_Information
                                   *ats, uint32_t ats_count,
                                   struct GNUNET_BANDWIDTH_Value32NBO 
bandwidth_in,
                                   struct GNUNET_BANDWIDTH_Value32NBO 
bandwidth_out);