[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5993 - in GNUnet: . m4 src/applications/dht/module src/set
From: |
gnunet |
Subject: |
[GNUnet-SVN] r5993 - in GNUnet: . m4 src/applications/dht/module src/setup |
Date: |
Thu, 20 Dec 2007 19:06:12 -0700 (MST) |
Author: grothoff
Date: 2007-12-20 19:06:12 -0700 (Thu, 20 Dec 2007)
New Revision: 5993
Modified:
GNUnet/README
GNUnet/m4/Makefile.in
GNUnet/src/applications/dht/module/routing.c
GNUnet/src/setup/gnunet-setup.c
Log:
dht updates and README update
Modified: GNUnet/README
===================================================================
--- GNUnet/README 2007-12-20 18:32:12 UTC (rev 5992)
+++ GNUnet/README 2007-12-21 02:06:12 UTC (rev 5993)
@@ -30,13 +30,24 @@
- libgcrypt >= 1.2
- libgmp >= 4.0
- libcurl >= 7.15.4
-- sqlite >= 3.0
- libltdl >= 1.5 (part of GNU libtool)
-- libguile >= 1.8 (strongly recommended)
-- mysql >= 5.0 (recommended)
-- GNU adns >= 1.0 (recommended)
+- libguile >= 1.8 (required for gnunet-setup)
+- GNU adns >= 1.0 (strongly recommended)
+- mysql >= 5.0 (strongly recommended)
+- sqlite >= 3.0 (alternative to MySQL)
+Certain gnunet-setup plugins would also like to have:
+- GTK >= 2.6.0
+- Qt >= 4.0
+- dialog >= 1.0-20051207
+- ncurses
+Certain transports would also like to have:
+- libmicrohttpd >= 0.1.2 (available from http://gnunet.org/libmicrohttpd/)
+- libcurl >= 7.15.4
+- libesmtp >= 1.0.4
+
+
Recommended autotools for compiling the SVN version are:
- autoconf >= 2.59
- automake >= 1.9.4
@@ -153,8 +164,13 @@
$ gnunet-gtk
-If you want to use the shell, use
+For Qt/KDE users, there is also a QT user interface (also shipped
+separately). If you install gnunet-qt, you can invoke the GUI with:
+$ gnunet-qt
+
+If you want to use the shell (part of this distribution), use
+
$ gnunet-search KEYWORD
This will display a list of results to the console. Then use
@@ -210,11 +226,17 @@
to "80" and "PORT" to 8080.
+Running the SMTP transport
+==========================
+Running GNUnet over SMTP (e-mail) is a bit more involved. Read the
+instructions at http://gnunet.org/smtp.php3
+
+
Stay tuned
==========
-* http://www.gnu.org/software/GNUnet/
+* http://www.gnu.org/software/gnunet/
* http://gnunet.org/
* https://gnunet.org/mantis/
* https://gnunet.org/drupal/
Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in 2007-12-20 18:32:12 UTC (rev 5992)
+++ GNUnet/m4/Makefile.in 2007-12-21 02:06:12 UTC (rev 5993)
@@ -34,8 +34,14 @@
subdir = m4
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcurl.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libxml2.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -77,7 +83,6 @@
F77 = @F77@
FFLAGS = @FFLAGS@
GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
GNUNETGTK_CFLAGS = @GNUNETGTK_CFLAGS@
GNUNETGTK_LIBS = @GNUNETGTK_LIBS@
GREP = @GREP@
@@ -89,7 +94,6 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LDFLAGS = @LDFLAGS@
LIBADD_DL = @LIBADD_DL@
LIBCURL = @LIBCURL@
@@ -111,8 +115,8 @@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
MYSQL_CPPFLAGS = @MYSQL_CPPFLAGS@
MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
@@ -139,7 +143,6 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
XMKMF = @XMKMF@
XML2_CONFIG = @XML2_CONFIG@
XML_CPPFLAGS = @XML_CPPFLAGS@
Modified: GNUnet/src/applications/dht/module/routing.c
===================================================================
--- GNUnet/src/applications/dht/module/routing.c 2007-12-20 18:32:12 UTC
(rev 5992)
+++ GNUnet/src/applications/dht/module/routing.c 2007-12-21 02:06:12 UTC
(rev 5993)
@@ -25,8 +25,7 @@
*
* TODO:
* - implement extra_get_callback
- * - use "reserved" field to communicate information
- * about network size estimate(s)
+ * - use "network_size" field to improve our network size estimate(s)
*/
#include "platform.h"
@@ -135,9 +134,11 @@
unsigned int hop_count;
/**
- * Reserved (use 0).
+ * Network size estimate -- sum of the logs of the
+ * network size estimates of all hops this message
+ * has passed so far.
*/
- unsigned int reserved;
+ unsigned int network_size;
/**
* Search key.
@@ -283,7 +284,7 @@
result->header.type = htons (GNUNET_P2P_PROTO_DHT_RESULT);
result->type = htonl (type);
result->hop_count = htonl (0);
- result->reserved = htonl (0);
+ result->network_size = htonl (GNUNET_DHT_estimate_network_diameter());
result->key = *key;
memcpy (&result[1], data, size);
}
@@ -536,6 +537,7 @@
hop_count = ntohl (get->hop_count);
target_value = get_forward_count (hop_count, GET_TRIES);
aget.hop_count = htonl (1 + hop_count);
+ aget.network_size = htonl(ntohl(get->network_size) +
GNUNET_DHT_estimate_network_diameter());
if (target_value > GET_TRIES)
target_value = GET_TRIES;
for (i = 0; i < target_value; i++)
@@ -604,6 +606,7 @@
aput = GNUNET_malloc (ntohs (msg->size));
memcpy (aput, put, ntohs (msg->size));
aput->hop_count = htons (hop_count + 1);
+ aput->network_size = htonl(ntohl(put->network_size) +
GNUNET_DHT_estimate_network_diameter());
if (target_value > PUT_TRIES)
target_value = PUT_TRIES;
j = 0;
@@ -721,7 +724,7 @@
get.header.type = htons (GNUNET_P2P_PROTO_DHT_GET);
get.type = htonl (type);
get.hop_count = htonl (0);
- get.reserved = htonl (0);
+ get.network_size = htonl (GNUNET_DHT_estimate_network_diameter());
get.key = *key;
#if DEBUG_ROUTING
GNUNET_hash_to_enc (&get.key, &enc);
@@ -809,7 +812,7 @@
put->key = *key;
put->type = htonl (type);
put->hop_count = htonl (0);
- put->reserved = htonl (0);
+ put->network_size = htonl (GNUNET_DHT_estimate_network_diameter());
memcpy (&put[1], data, size);
handlePut (NULL, &put->header);
GNUNET_free (put);
Modified: GNUnet/src/setup/gnunet-setup.c
===================================================================
--- GNUnet/src/setup/gnunet-setup.c 2007-12-20 18:32:12 UTC (rev 5992)
+++ GNUnet/src/setup/gnunet-setup.c 2007-12-21 02:06:12 UTC (rev 5993)
@@ -391,7 +391,7 @@
GNUNET_GE_LOG (ectx,
GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
- _("`%s' is not available."), operation);
+ _("`%s' is not available.\n"), operation);
#if HAVE_GUILE
GNUNET_GNS_free_specification (gns);
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5993 - in GNUnet: . m4 src/applications/dht/module src/setup,
gnunet <=