aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-04-04 22:09:19 +0000
committerChristian Grothoff <christian@grothoff.org>2010-04-04 22:09:19 +0000
commit2efa11e99bec25a3a64c8fae20d7641345c8df9f (patch)
tree6e179797783ce3a122cd8d6fb11eb388a1a346ee
parent5e05cc9a117f5a8073c4f33e628de23de1138014 (diff)
downloadgnunet-2efa11e99bec25a3a64c8fae20d7641345c8df9f.tar.gz
gnunet-2efa11e99bec25a3a64c8fae20d7641345c8df9f.zip
pybld
-rw-r--r--configure.ac12
-rw-r--r--doc/man/gnunet-pseudonym.18
-rw-r--r--src/include/gnunet_datastore_service.h14
-rw-r--r--src/include/gnunet_fs_service.h2
4 files changed, 25 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index aad6e44a4..8a53dd064 100644
--- a/configure.ac
+++ b/configure.ac
@@ -484,6 +484,18 @@ AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
484# restore LIBS 484# restore LIBS
485LIBS=$SAVE_LIBS 485LIBS=$SAVE_LIBS
486 486
487# check for python & pexpect (used for some testcases only)
488AC_MSG_CHECKING([for python and pexpect])
489python -c "import pexpect" &> /dev/null
490PYEX=$?
491AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0)
492if test $PYEX -eq 0
493then
494 AC_MSG_RESULT([yes])
495else
496 AC_MSG_RESULT([not found])
497fi
498
487# libesmtp 499# libesmtp
488esmtp=0 500esmtp=0
489AC_MSG_CHECKING([for libesmtp]) 501AC_MSG_CHECKING([for libesmtp])
diff --git a/doc/man/gnunet-pseudonym.1 b/doc/man/gnunet-pseudonym.1
index f07359bdb..eed1cab62 100644
--- a/doc/man/gnunet-pseudonym.1
+++ b/doc/man/gnunet-pseudonym.1
@@ -49,14 +49,14 @@ Print help page.
49Publish a namespace advertisement under the keyword 'KEYWORD'. Default is 'namespace' (use with \-C). You can specify \-k multiple times. In that case, the namespace will be published under each of those keywords. 49Publish a namespace advertisement under the keyword 'KEYWORD'. Default is 'namespace' (use with \-C). You can specify \-k multiple times. In that case, the namespace will be published under each of those keywords.
50 50
51.TP 51.TP
52\fB\-l\fR, \fB\-\-local\-only\fR
53display names of local namespaces (those that we can extend with content because we created them)
54
55.TP
56\fB\-m \fITYPE:VALUE\fR, \fB\-\-meta=\fITYPE:VALUE\fR 52\fB\-m \fITYPE:VALUE\fR, \fB\-\-meta=\fITYPE:VALUE\fR
57For the main file (or directory), set the metadata of the given TYPE to the given VALUE. Note that this will not add the respective VALUE to the set of keywords under which the file can be found. 53For the main file (or directory), set the metadata of the given TYPE to the given VALUE. Note that this will not add the respective VALUE to the set of keywords under which the file can be found.
58 54
59.TP 55.TP
56\fB\-o\fR, \fB\-\-only\-local\fR
57display names of local namespaces (those that we can extend with content because we created them)
58
59.TP
60\fB\-p \fIPRIORITY\fR, \fB\-\-prio=\fIPRIORITY\fR 60\fB\-p \fIPRIORITY\fR, \fB\-\-prio=\fIPRIORITY\fR
61Set the priority of the namespace advertisement (default: 365). If the local database is full, GNUnet will discard the content with the lowest ranking. Note that ranks change over time depending on popularity. The default should be high enough to preserve the locally inserted content in favor of content that migrates from other peers. 61Set the priority of the namespace advertisement (default: 365). If the local database is full, GNUnet will discard the content with the lowest ranking. Note that ranks change over time depending on popularity. The default should be high enough to preserve the locally inserted content in favor of content that migrates from other peers.
62 62
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index a506362f2..2bf0f8f34 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -42,32 +42,34 @@ extern "C"
42#endif 42#endif
43 43
44/** 44/**
45 * FIXME. 45 * Any type of block, used as a wildcard when searching. Should
46 * never be attached to a specific block.
46 */ 47 */
47#define GNUNET_DATASTORE_BLOCKTYPE_ANY 0 48#define GNUNET_DATASTORE_BLOCKTYPE_ANY 0
48 49
49/** 50/**
50 * FIXME. 51 * Data block (leaf) in the CHK tree.
51 */ 52 */
52#define GNUNET_DATASTORE_BLOCKTYPE_DBLOCK 1 53#define GNUNET_DATASTORE_BLOCKTYPE_DBLOCK 1
53 54
54/** 55/**
55 * FIXME. 56 * Inner block in the CHK tree.
56 */ 57 */
57#define GNUNET_DATASTORE_BLOCKTYPE_IBLOCK 2 58#define GNUNET_DATASTORE_BLOCKTYPE_IBLOCK 2
58 59
59/** 60/**
60 * FIXME. 61 * Type of a block representing a keyword search result.
61 */ 62 */
62#define GNUNET_DATASTORE_BLOCKTYPE_KBLOCK 3 63#define GNUNET_DATASTORE_BLOCKTYPE_KBLOCK 3
63 64
64/** 65/**
65 * FIXME. 66 * Type of a block that is used to advertise content in a namespace.
66 */ 67 */
67#define GNUNET_DATASTORE_BLOCKTYPE_SBLOCK 4 68#define GNUNET_DATASTORE_BLOCKTYPE_SBLOCK 4
68 69
69/** 70/**
70 * FIXME. 71 * Type of a block representing a block to be encoded on demand from disk.
72 * Should never appear on the network directly.
71 */ 73 */
72#define GNUNET_DATASTORE_BLOCKTYPE_ONDEMAND 5 74#define GNUNET_DATASTORE_BLOCKTYPE_ONDEMAND 5
73 75
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 6da6ce43e..e26d6b000 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -1984,7 +1984,7 @@ GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h,
1984 struct GNUNET_FS_Namespace *namespace, 1984 struct GNUNET_FS_Namespace *namespace,
1985 const char *identifier, 1985 const char *identifier,
1986 const char *update, 1986 const char *update,
1987 struct GNUNET_CONTAINER_MetaData *meta, 1987 const struct GNUNET_CONTAINER_MetaData *meta,
1988 const struct GNUNET_FS_Uri *uri, 1988 const struct GNUNET_FS_Uri *uri,
1989 struct GNUNET_TIME_Absolute expirationTime, 1989 struct GNUNET_TIME_Absolute expirationTime,
1990 uint32_t anonymity, 1990 uint32_t anonymity,