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

[gnunet]

Author: nevans
Date: 2011-07-11 14:56:09 +0200 (Mon, 11 Jul 2011)
New Revision: 15921

Modified:
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/plugin_transport_tcp.c
   gnunet/src/transport/transport.h
Log:
add set delay for TCP send and receive welcome

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2011-07-11 12:47:59 UTC 
(rev 15920)
+++ gnunet/src/transport/gnunet-service-transport.c     2011-07-11 12:56:09 UTC 
(rev 15921)
@@ -138,16 +138,6 @@
 #define HELLO_REVALIDATION_START_TIME GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_HOURS, 1)
 
 /**
- * Maximum frequency for re-evaluating latencies for all transport addresses.
- */
-#define LATENCY_EVALUATION_MAX_DELAY GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_HOURS, 1)
-
-/**
- * Maximum frequency for re-evaluating latencies for connected addresses.
- */
-#define CONNECTED_LATENCY_EVALUATION_MAX_DELAY GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MINUTES, 1)
-
-/**
  * List of addresses of other peers
  */
 struct ForeignAddressList

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2011-07-11 12:47:59 UTC (rev 
15920)
+++ gnunet/src/transport/plugin_transport_tcp.c 2011-07-11 12:56:09 UTC (rev 
15921)
@@ -42,7 +42,6 @@
 
 #define DEBUG_TCP_NAT GNUNET_NO
 
-
 /**
  * Initial handshake message for a session.
  */
@@ -1191,6 +1190,8 @@
     }
   GNUNET_assert (session != NULL);
   GNUNET_assert (session->client != NULL);
+
+  GNUNET_SERVER_client_set_timeout(session->client, 
CONNECTED_LATENCY_EVALUATION_MAX_DELAY);
   GNUNET_STATISTICS_update (plugin->env->stats,
                            gettext_noop ("# bytes currently in TCP buffers"),
                            msgbuf_size,
@@ -1739,6 +1740,7 @@
     }
   session->last_activity = GNUNET_TIME_absolute_get ();
   session->expecting_welcome = GNUNET_NO;
+  GNUNET_SERVER_client_set_timeout(client, 
CONNECTED_LATENCY_EVALUATION_MAX_DELAY);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 

Modified: gnunet/src/transport/transport.h
===================================================================
--- gnunet/src/transport/transport.h    2011-07-11 12:47:59 UTC (rev 15920)
+++ gnunet/src/transport/transport.h    2011-07-11 12:56:09 UTC (rev 15921)
@@ -49,6 +49,16 @@
 #define MIN_QUOTA_REFRESH_TIME 2000
 
 /**
+ * Maximum frequency for re-evaluating latencies for all transport addresses.
+ */
+#define LATENCY_EVALUATION_MAX_DELAY GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_HOURS, 1)
+
+/**
+ * Maximum frequency for re-evaluating latencies for connected addresses.
+ */
+#define CONNECTED_LATENCY_EVALUATION_MAX_DELAY GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MINUTES, 1)
+
+/**
  * Message from the transport service to the library
  * asking to check if both processes agree about this
  * peers identity.