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

[gnunet]

Author: grothoff
Date: 2015-02-03 16:04:47 +0100 (Tue, 03 Feb 2015)
New Revision: 35082

Modified:
   gnunet/src/transport/gnunet-service-transport_neighbours.c
   gnunet/src/transport/test_transport_api.c
Log:
-dead code elimination

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2015-02-03 
14:40:45 UTC (rev 35081)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2015-02-03 
15:04:47 UTC (rev 35082)
@@ -59,7 +59,7 @@
 /**
  * How long are we willing to wait for a response from ATS before timing out?
  */
-#define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MILLISECONDS, 5000)
+#define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 5)
 
 /**
  * How long are we willing to wait for an ACK from the other peer before
@@ -73,18 +73,12 @@
  * usual SETUP_CONNECTION_TIMEOUT as we do not inform the
  * higher layers about the disconnect during this period.
  */
-#define FAST_RECONNECT_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 1)
+#define FAST_RECONNECT_TIMEOUT GNUNET_TIME_UNIT_SECONDS
 
 /**
- * How long are we willing to wait for a response from the blacklist
- * subsystem before timing out?
- */
-#define BLACKLIST_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MILLISECONDS, 500)
-
-/**
  * Interval to send utilization data
  */
-#define UTIL_TRANSMISSION_INTERVAL GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 1)
+#define UTIL_TRANSMISSION_INTERVAL GNUNET_TIME_UNIT_SECONDS
 
 /**
  * State describing which kind a reply this neighbour should send

Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c   2015-02-03 14:40:45 UTC (rev 
35081)
+++ gnunet/src/transport/test_transport_api.c   2015-02-03 15:04:47 UTC (rev 
35082)
@@ -33,7 +33,7 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
 
 /**
  * How long until we give up on transmitting the message?