[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15689 - in gnunet: doc/man src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r15689 - in gnunet: doc/man src/fs |
Date: |
Fri, 17 Jun 2011 11:51:40 +0200 |
Author: grothoff
Date: 2011-06-17 11:51:39 +0200 (Fri, 17 Jun 2011)
New Revision: 15689
Modified:
gnunet/doc/man/gnunet-search.1
gnunet/src/fs/gnunet-search.c
Log:
fixing 1696
Modified: gnunet/doc/man/gnunet-search.1
===================================================================
--- gnunet/doc/man/gnunet-search.1 2011-06-17 09:46:31 UTC (rev 15688)
+++ gnunet/doc/man/gnunet-search.1 2011-06-17 09:51:39 UTC (rev 15689)
@@ -42,6 +42,10 @@
Only search locally, do not forward requests to other peers.
.TP
+\fB\-t \fIVALUE\fR, \fB\-\-timeout=\fIVALUE\fR
+Automatically timeout search after VALUE ms. Otherwise the search runs until
gnunet\-search is aborted with CTRL\-C.
+
+.TP
\fB\-v\fR, \fB\-\-version\fR
print the version number
Modified: gnunet/src/fs/gnunet-search.c
===================================================================
--- gnunet/src/fs/gnunet-search.c 2011-06-17 09:46:31 UTC (rev 15688)
+++ gnunet/src/fs/gnunet-search.c 2011-06-17 09:51:39 UTC (rev 15689)
@@ -42,6 +42,8 @@
static unsigned int anonymity = 1;
+static unsigned long long timeout;
+
static int verbose;
static int local_only;
@@ -231,6 +233,7 @@
struct GNUNET_FS_Uri *uri;
unsigned int argc;
enum GNUNET_FS_SearchOptions options;
+ struct GNUNET_TIME_Relative delay;
argc = 0;
while (NULL != args[argc])
@@ -242,7 +245,6 @@
fprintf (stderr,
_("Could not create keyword URI from arguments.\n"));
ret = 1;
- GNUNET_FS_uri_destroy (uri);
return;
}
cfg = c;
@@ -280,9 +282,19 @@
ret = 1;
return;
}
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task,
- NULL);
+ if (timeout != 0)
+ {
+ delay.rel_value = timeout;
+ GNUNET_SCHEDULER_add_delayed (delay,
+ &shutdown_task,
+ NULL);
+ }
+ else
+ {
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task,
+ NULL);
+ }
}
@@ -307,11 +319,15 @@
gettext_noop
("write search results to file starting with PREFIX"),
1, &GNUNET_GETOPT_set_string, &output_filename},
+ {'t', "timeout", "VALUE",
+ gettext_noop
+ ("automatically terminate search after VALUE ms"),
+ 1, &GNUNET_GETOPT_set_ulong, &timeout},
{'V', "verbose", NULL,
gettext_noop ("be verbose (print progress information)"),
0, &GNUNET_GETOPT_set_one, &verbose},
GNUNET_GETOPT_OPTION_END
- };
+ };
return (GNUNET_OK ==
GNUNET_PROGRAM_run (argc,
argv,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15689 - in gnunet: doc/man src/fs,
gnunet <=