[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10527 - in gnunet/src: fs transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10527 - in gnunet/src: fs transport |
Date: |
Tue, 9 Mar 2010 21:05:24 +0100 |
Author: grothoff
Date: 2010-03-09 21:05:24 +0100 (Tue, 09 Mar 2010)
New Revision: 10527
Modified:
gnunet/src/fs/test_gnunet_service_fs_p2p.c
gnunet/src/transport/gnunet-service-transport.c
Log:
longer timeout, disconnect on zero quota
Modified: gnunet/src/fs/test_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_p2p.c 2010-03-09 17:25:38 UTC (rev
10526)
+++ gnunet/src/fs/test_gnunet_service_fs_p2p.c 2010-03-09 20:05:24 UTC (rev
10527)
@@ -36,7 +36,7 @@
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
#define NUM_DAEMONS 2
@@ -46,7 +46,9 @@
static struct GNUNET_SCHEDULER_Handle *sched;
+static int ok;
+
static void
do_stop (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -54,10 +56,18 @@
GNUNET_FS_TEST_daemons_stop (sched,
NUM_DAEMONS,
daemons);
- GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Finished download, shutting down\n",
- (unsigned long long) FILESIZE);
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Finished download, shutting down\n",
+ (unsigned long long) FILESIZE);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout during download, shutting down with error\n");
+ ok = 1;
+ }
}
@@ -156,7 +166,7 @@
argvx, "test-gnunet-service-fs-p2p",
"nohelp", options, &run, NULL);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
- return 0;
+ return ok;
}
/* end of test_gnunet_service_fs_p2p.c */
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2010-03-09 17:25:38 UTC
(rev 10526)
+++ gnunet/src/transport/gnunet-service-transport.c 2010-03-09 20:05:24 UTC
(rev 10527)
@@ -3009,6 +3009,8 @@
#endif
GNUNET_BANDWIDTH_tracker_update_quota (&n->in_tracker,
qsm->quota);
+ if (0 == ntohl (qsm->quota.value__))
+ disconnect_neighbour (n, GNUNET_NO);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10527 - in gnunet/src: fs transport,
gnunet <=