diff options
-rw-r--r-- | doc/man/Makefile.am | 1 | ||||
-rw-r--r-- | doc/man/gnunet-core.1 | 35 | ||||
-rw-r--r-- | src/core/Makefile.am | 12 | ||||
-rw-r--r-- | src/core/gnunet-core.c (renamed from src/core/gnunet-core-list-connections.c) | 0 | ||||
-rw-r--r-- | src/include/gnunet_fs_service.h | 6 |
5 files changed, 46 insertions, 8 deletions
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 629ab6d13..c640460c4 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am | |||
@@ -1,5 +1,6 @@ | |||
1 | man_MANS = \ | 1 | man_MANS = \ |
2 | gnunet-arm.1 \ | 2 | gnunet-arm.1 \ |
3 | gnunet-core.1 \ | ||
3 | gnunet-directory.1 \ | 4 | gnunet-directory.1 \ |
4 | gnunet-download.1 \ | 5 | gnunet-download.1 \ |
5 | gnunet-download-manager.1 \ | 6 | gnunet-download-manager.1 \ |
diff --git a/doc/man/gnunet-core.1 b/doc/man/gnunet-core.1 new file mode 100644 index 000000000..0971b423c --- /dev/null +++ b/doc/man/gnunet-core.1 | |||
@@ -0,0 +1,35 @@ | |||
1 | .TH gnunet\-core "1" "1 Apr 2012" "GNUnet" | ||
2 | .SH NAME | ||
3 | gnunet\-core \- measure and control the core subsystem | ||
4 | |||
5 | .SH SYNOPSIS | ||
6 | .B gnunet\-core | ||
7 | [\fIOPTIONS\fR] | ||
8 | .SH DESCRIPTION | ||
9 | .PP | ||
10 | |||
11 | gnunet\-core is a tool to access various functions of GNUnet's core subsystem from the command\-line. The only function right now is to list the peers that are directly connected to this peer (with successful cryptographic handshake). | ||
12 | |||
13 | .TP | ||
14 | \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR | ||
15 | configuration file to use | ||
16 | .TP | ||
17 | \fB\-h\fR, \fB\-\-help\fR | ||
18 | print help page | ||
19 | .TP | ||
20 | \fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR | ||
21 | Change the loglevel. Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG. | ||
22 | .TP | ||
23 | \fB\-v\fR, \fB\-\-version\fR | ||
24 | print the version number | ||
25 | .TP | ||
26 | \fB\-V\fR, \fB\-\-verbose\fR | ||
27 | be verbose | ||
28 | |||
29 | .SH NOTES | ||
30 | |||
31 | |||
32 | .SH "REPORTING BUGS" | ||
33 | Report bugs by using mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org> | ||
34 | .SH "SEE ALSO" | ||
35 | \fBgnunet\-transport\fP(1) | ||
diff --git a/src/core/Makefile.am b/src/core/Makefile.am index ad9bddcb6..b79b6cc6a 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am | |||
@@ -31,7 +31,7 @@ libgnunetcore_la_LDFLAGS = \ | |||
31 | 31 | ||
32 | bin_PROGRAMS = \ | 32 | bin_PROGRAMS = \ |
33 | gnunet-service-core \ | 33 | gnunet-service-core \ |
34 | gnunet-core-list-connections | 34 | gnunet-core |
35 | 35 | ||
36 | gnunet_service_core_SOURCES = \ | 36 | gnunet_service_core_SOURCES = \ |
37 | gnunet-service-core.c gnunet-service-core.h \ | 37 | gnunet-service-core.c gnunet-service-core.h \ |
@@ -49,14 +49,12 @@ gnunet_service_core_LDADD = \ | |||
49 | $(GN_LIBINTL) -lz | 49 | $(GN_LIBINTL) -lz |
50 | 50 | ||
51 | 51 | ||
52 | gnunet_core_list_connections_SOURCES = \ | 52 | gnunet_core_SOURCES = \ |
53 | gnunet-core-list-connections.c | 53 | gnunet-core.c |
54 | gnunet_core_list_connections_LDADD = \ | 54 | gnunet_core_LDADD = \ |
55 | $(top_builddir)/src/core/libgnunetcore.la \ | 55 | $(top_builddir)/src/core/libgnunetcore.la \ |
56 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
57 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
58 | $(top_builddir)/src/util/libgnunetutil.la | 56 | $(top_builddir)/src/util/libgnunetutil.la |
59 | gnunet_core_list_connections_DEPENDENCIES = \ | 57 | gnunet_core_DEPENDENCIES = \ |
60 | libgnunetcore.la | 58 | libgnunetcore.la |
61 | 59 | ||
62 | check_PROGRAMS = \ | 60 | check_PROGRAMS = \ |
diff --git a/src/core/gnunet-core-list-connections.c b/src/core/gnunet-core.c index 4fe0a4f86..4fe0a4f86 100644 --- a/src/core/gnunet-core-list-connections.c +++ b/src/core/gnunet-core.c | |||
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index 3eb58921a..1f1e60f0f 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h | |||
@@ -1820,7 +1820,11 @@ GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h, | |||
1820 | * @param cls closure | 1820 | * @param cls closure |
1821 | * @param offset offset to read from; it is possible | 1821 | * @param offset offset to read from; it is possible |
1822 | * that the caller might need to go backwards | 1822 | * that the caller might need to go backwards |
1823 | * a bit at times | 1823 | * a bit at times; set to UINT64_MAX to tell |
1824 | * the reader that we won't be reading for a while | ||
1825 | * (used to close the file descriptor but NOT fully | ||
1826 | * clean up the reader's state); in this case, | ||
1827 | * a value of '0' for max should be ignored | ||
1824 | * @param max maximum number of bytes that should be | 1828 | * @param max maximum number of bytes that should be |
1825 | * copied to buf; readers are not allowed | 1829 | * copied to buf; readers are not allowed |
1826 | * to provide less data unless there is an error; | 1830 | * to provide less data unless there is an error; |