[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22182 - in gnunet/src: include stream
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22182 - in gnunet/src: include stream |
Date: |
Thu, 21 Jun 2012 12:47:41 +0200 |
Author: harsha
Date: 2012-06-21 12:47:41 +0200 (Thu, 21 Jun 2012)
New Revision: 22182
Modified:
gnunet/src/include/gnunet_stream_lib.h
gnunet/src/stream/stream_api.c
gnunet/src/stream/test_stream_sequence_wraparound.c
Log:
-stream listen timeout option
Modified: gnunet/src/include/gnunet_stream_lib.h
===================================================================
--- gnunet/src/include/gnunet_stream_lib.h 2012-06-21 10:24:08 UTC (rev
22181)
+++ gnunet/src/include/gnunet_stream_lib.h 2012-06-21 10:47:41 UTC (rev
22182)
@@ -109,7 +109,12 @@
* Option to set the write sequence number. Takes a uint32_t as parameter
* to set the value of the write sequence number
*/
- GNUNET_STREAM_OPTION_TESTING_SET_WRITE_SEQUENCE_NUMBER
+ GNUNET_STREAM_OPTION_TESTING_SET_WRITE_SEQUENCE_NUMBER,
+
+ /**
+ * Listen socket timeout in milliseconds
+ */
+ GNUNET_STREAM_OPTION_LISTEN_TIMEOUT
};
Modified: gnunet/src/stream/stream_api.c
===================================================================
--- gnunet/src/stream/stream_api.c 2012-06-21 10:24:08 UTC (rev 22181)
+++ gnunet/src/stream/stream_api.c 2012-06-21 10:47:41 UTC (rev 22182)
@@ -2936,6 +2936,9 @@
socket->testing_set_write_sequence_number_value = va_arg (vargs,
uint32_t);
break;
+ case GNUNET_STREAM_OPTION_LISTEN_TIMEOUT:
+ GNUNET_break (0); /* Option irrelevant in STREAM_open */
+ break;
case GNUNET_STREAM_OPTION_END:
break;
}
@@ -3178,6 +3181,7 @@
{
/* FIXME: Add variable args for passing configration options? */
struct GNUNET_STREAM_ListenSocket *lsocket;
+ struct GNUNET_TIME_Relative listen_timeout;
enum GNUNET_STREAM_Option option;
va_list vargs;
@@ -3196,6 +3200,7 @@
lsocket->retransmit_timeout =
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, default_timeout);
lsocket->testing_active = GNUNET_NO;
+ listen_timeout = TIME_REL_SECS (60); /* A minute for listen timeout */
va_start (vargs, listen_cb_cls);
do {
option = va_arg (vargs, enum GNUNET_STREAM_Option);
@@ -3210,6 +3215,10 @@
lsocket->testing_set_write_sequence_number_value = va_arg (vargs,
uint32_t);
break;
+ case GNUNET_STREAM_OPTION_LISTEN_TIMEOUT:
+ listen_timeout = GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MILLISECONDS, va_arg (vargs, uint32_t));
+ break;
case GNUNET_STREAM_OPTION_END:
break;
}
@@ -3223,7 +3232,7 @@
(uint32_t) lsocket->port,
&lock_status_change_cb, lsocket);
lsocket->lockmanager_acquire_timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (20),
+ GNUNET_SCHEDULER_add_delayed (listen_timeout,
&lockmanager_acquire_timeout, lsocket);
return lsocket;
}
Modified: gnunet/src/stream/test_stream_sequence_wraparound.c
===================================================================
--- gnunet/src/stream/test_stream_sequence_wraparound.c 2012-06-21 10:24:08 UTC
(rev 22181)
+++ gnunet/src/stream/test_stream_sequence_wraparound.c 2012-06-21 10:47:41 UTC
(rev 22182)
@@ -353,12 +353,14 @@
10, /* App port */
&stream_listen_cb,
NULL,
+
GNUNET_STREAM_OPTION_LISTEN_TIMEOUT,
+ 30 * 1000,
GNUNET_STREAM_OPTION_END);
GNUNET_assert (NULL != peer2_listen_socket);
- GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS(2), &stream_connect, &peer1);
+ GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS(10), &stream_connect, &peer1);
abort_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 60), &do_abort,
+ (GNUNET_TIME_UNIT_SECONDS, 100), &do_abort,
NULL);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22182 - in gnunet/src: include stream,
gnunet <=