summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/transport/gnunet-service-transport_neighbours.c12
-rw-r--r--src/transport/test_transport_api.c2
2 files changed, 4 insertions, 10 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 49b026e7a..5fe2f5645 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -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)
-
-/**
- * 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)
+#define FAST_RECONNECT_TIMEOUT GNUNET_TIME_UNIT_SECONDS
/**
* 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
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 239ecdfed..ce6db8ad1 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -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?