[VCS] gnunet branch, debian, updated. debian/0.8.1-1-5-ga84d4be
Daniel Baumann
daniel at debian.org
Mon Feb 15 12:15:56 UTC 2010
The following commit has been merged in the debian branch:
commit 8e92beee015e2781f9a9f614c6cd28b9e38716c3
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Feb 15 13:10:56 2010 +0100
Merging upstream version 0.8.1a.
diff --git a/ChangeLog b/ChangeLog
index 5200ad2..bdf53cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Fri Feb 12 22:30:44 CET 2010
+ Releasing 0.8.1a.
+
Tue Dec 29 12:23:36 CET 2009
Releasing 0.8.1.
diff --git a/Makefile.in b/Makefile.in
index b92d8b7..8284bad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -398,7 +398,7 @@ distclean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -423,7 +423,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -587,7 +587,8 @@ distdir: $(DISTFILES)
fi; \
done
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -631,17 +632,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff --git a/README b/README
index d9b584f..98af362 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ Dependencies:
For the impatient, here is the list of immediate dependencies for
running GNUnet:
-- libextractor >= 0.5.20b
+- libextractor >= 0.5.20b and < 0.6.0
- libgcrypt >= 1.2
- libgmp >= 4.0
- libcurl >= 7.15.4
@@ -43,7 +43,7 @@ Certain gnunet-setup plugins would also like to have:
- ncurses
Certain transports would also like to have:
-- libmicrohttpd >= 0.3.1
+- libmicrohttpd >= 0.4.4
- libcurl >= 7.15.4
- libesmtp >= 1.0.4
diff --git a/aclocal.m4 b/aclocal.m4
index 585410d..4368d02 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/configure b/configure
index d24121b..7123f9c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for GNUnet 0.8.1.
+# Generated by GNU Autoconf 2.64 for GNUnet 0.8.1a.
#
# Report bugs to <bug-gnunet at gnu.org>.
#
@@ -700,8 +700,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GNUnet'
PACKAGE_TARNAME='gnunet'
-PACKAGE_VERSION='0.8.1'
-PACKAGE_STRING='GNUnet 0.8.1'
+PACKAGE_VERSION='0.8.1a'
+PACKAGE_STRING='GNUnet 0.8.1a'
PACKAGE_BUGREPORT='bug-gnunet at gnu.org'
PACKAGE_URL=''
@@ -1586,7 +1586,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNUnet 0.8.1 to adapt to many kinds of systems.
+\`configure' configures GNUnet 0.8.1a to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1660,7 +1660,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNUnet 0.8.1:";;
+ short | recursive ) echo "Configuration of GNUnet 0.8.1a:";;
esac
cat <<\_ACEOF
@@ -1814,7 +1814,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNUnet configure 0.8.1
+GNUnet configure 0.8.1a
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2587,7 +2587,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNUnet $as_me 0.8.1, which was
+It was created by GNUnet $as_me 0.8.1a, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
@@ -3396,7 +3396,7 @@ fi
# Define the identity of the package.
PACKAGE=GNUnet
- VERSION=0.8.1
+ VERSION=0.8.1a
cat >>confdefs.h <<_ACEOF
@@ -26531,7 +26531,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNUnet $as_me 0.8.1, which was
+This file was extended by GNUnet $as_me 0.8.1a, which was
generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26595,7 +26595,7 @@ Report bugs to <bug-gnunet at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-GNUnet config.status 0.8.1
+GNUnet config.status 0.8.1a
configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 13211f5..5147288 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,8 @@
#
#
AC_PREREQ(2.61)
-AC_INIT([GNUnet], [0.8.1],[bug-gnunet at gnu.org])
-AM_INIT_AUTOMAKE([GNUnet], [0.8.1])
+AC_INIT([GNUnet], [0.8.1a],[bug-gnunet at gnu.org])
+AM_INIT_AUTOMAKE([GNUnet], [0.8.1a])
AC_CONFIG_HEADERS([config.h])
AH_TOP([#define _GNU_SOURCE 1])
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index d2a1cb7..aba6f00 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6ee4dc5..25b0762 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -337,7 +337,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -362,7 +362,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index 7b660c4..6ef0ace 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/m4/Makefile.in b/m4/Makefile.in
index d5fb886..8f99c2b 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/po/GNUnet.pot b/po/GNUnet.pot
index 5c34207..a4d3c1b 100644
--- a/po/GNUnet.pot
+++ b/po/GNUnet.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: gnunet-developers at mail.gnu.org\n"
-"POT-Creation-Date: 2009-12-29 12:23+0100\n"
+"POT-Creation-Date: 2010-02-12 22:35+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -753,17 +753,17 @@ msgstr ""
msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'\n"
msgstr ""
-#: src/util/network_client/tcpio.c:335
+#: src/util/network_client/tcpio.c:332
#, c-format
msgid "Error connecting to %s:%u. Is the daemon running?\n"
msgstr ""
-#: src/util/network_client/tcpio.c:398 src/util/network/io.c:164
+#: src/util/network_client/tcpio.c:395 src/util/network/io.c:164
#, c-format
msgid "Cannot connect to %s:%u: %s\n"
msgstr ""
-#: src/util/network_client/tcpio.c:636
+#: src/util/network_client/tcpio.c:634
msgid "Reading result from gnunetd failed, reply invalid!\n"
msgstr ""
diff --git a/po/de.gmo b/po/de.gmo
index 5577a90..4fc3e12 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index c1aec1d..035965e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: gnunet-developers at mail.gnu.org\n"
-"POT-Creation-Date: 2009-12-29 12:23+0100\n"
+"POT-Creation-Date: 2010-02-12 22:35+0100\n"
"PO-Revision-Date: 2006-03-17 21:37+0100\n"
"Last-Translator: Nils Durner <durner at gnunet.org>\n"
"Language-Team: German <de at li.org>\n"
@@ -878,17 +878,17 @@ msgstr ""
msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'\n"
msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
-#: src/util/network_client/tcpio.c:335
+#: src/util/network_client/tcpio.c:332
#, fuzzy, c-format
msgid "Error connecting to %s:%u. Is the daemon running?\n"
msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-#: src/util/network_client/tcpio.c:398 src/util/network/io.c:164
+#: src/util/network_client/tcpio.c:395 src/util/network/io.c:164
#, fuzzy, c-format
msgid "Cannot connect to %s:%u: %s\n"
msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-#: src/util/network_client/tcpio.c:636
+#: src/util/network_client/tcpio.c:634
#, fuzzy
msgid "Reading result from gnunetd failed, reply invalid!\n"
msgstr "`%s' fehlgeschlagen, Antwort ist ungültig!\n"
diff --git a/po/es.gmo b/po/es.gmo
index efc09ca..8462c89 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index ab7cb3a..a06dbbb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0e\n"
"Report-Msgid-Bugs-To: gnunet-developers at mail.gnu.org\n"
-"POT-Creation-Date: 2009-12-29 12:23+0100\n"
+"POT-Creation-Date: 2010-02-12 22:35+0100\n"
"PO-Revision-Date: 2006-06-29 12:05+0200\n"
"Last-Translator: Miguel Angel Arruga <miguel.13 at telefonica.net>\n"
"Language-Team: Spanish\n"
@@ -872,17 +872,17 @@ msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'\n"
msgstr ""
"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
-#: src/util/network_client/tcpio.c:335
+#: src/util/network_client/tcpio.c:332
#, fuzzy, c-format
msgid "Error connecting to %s:%u. Is the daemon running?\n"
msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
-#: src/util/network_client/tcpio.c:398 src/util/network/io.c:164
+#: src/util/network_client/tcpio.c:395 src/util/network/io.c:164
#, fuzzy, c-format
msgid "Cannot connect to %s:%u: %s\n"
msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
-#: src/util/network_client/tcpio.c:636
+#: src/util/network_client/tcpio.c:634
#, fuzzy
msgid "Reading result from gnunetd failed, reply invalid!\n"
msgstr "¡'%s' falló, respuesta no válida!\n"
diff --git a/po/sv.gmo b/po/sv.gmo
index a49d042..f984da6 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index ba107e2..ba99c24 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: gnunet-developers at mail.gnu.org\n"
-"POT-Creation-Date: 2009-12-29 12:23+0100\n"
+"POT-Creation-Date: 2010-02-12 22:35+0100\n"
"PO-Revision-Date: 2006-01-21 17:16+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -795,17 +795,17 @@ msgstr ""
msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'\n"
msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
-#: src/util/network_client/tcpio.c:335
+#: src/util/network_client/tcpio.c:332
#, c-format
msgid "Error connecting to %s:%u. Is the daemon running?\n"
msgstr ""
-#: src/util/network_client/tcpio.c:398 src/util/network/io.c:164
+#: src/util/network_client/tcpio.c:395 src/util/network/io.c:164
#, fuzzy, c-format
msgid "Cannot connect to %s:%u: %s\n"
msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-#: src/util/network_client/tcpio.c:636
+#: src/util/network_client/tcpio.c:634
#, fuzzy
msgid "Reading result from gnunetd failed, reply invalid!\n"
msgstr "\"%s\" misslyckades, svar ogiltigt!\n"
diff --git a/po/vi.gmo b/po/vi.gmo
index 7085d91..bf81802 100644
Binary files a/po/vi.gmo and b/po/vi.gmo differ
diff --git a/po/vi.po b/po/vi.po
index ea08f22..1c60745 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,22 +1,22 @@
# Vietnamese translation for GNUnet.
-# Copyright © 2008 Christian Grothoff (msgids).
+# Copyright © 2010 Christian Grothoff (msgids).
# This file is distributed under the same license as the gnunet package.
# Phan Vinh Thinh <teppi82 at gmail.com>, 2005.
-# Clytie Siddall <clytie at riverland.net.au>, 2008.
+# Clytie Siddall <clytie at riverland.net.au>, 2008, 2009, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: gnunet 0.8.0a\n"
+"Project-Id-Version: gnunet 0.8.1\n"
"Report-Msgid-Bugs-To: gnunet-developers at mail.gnu.org\n"
-"POT-Creation-Date: 2009-12-29 12:23+0100\n"
-"PO-Revision-Date: 2008-09-10 22:05+0930\n"
+"POT-Creation-Date: 2010-02-12 22:35+0100\n"
+"PO-Revision-Date: 2010-02-11 21:35+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b3\n"
+"X-Generator: LocFactoryEditor 1.8\n"
#: src/setup/ncurses/wizard_curs.c:72 src/setup/lib/wizard_util.c:155
#: src/setup/lib/wizard_util.c:210
@@ -464,7 +464,7 @@ msgstr ""
#: src/setup/gtk/glade_support.c:133
msgid "Could not determine UI definition filename."
-msgstr ""
+msgstr "Không thể quyết định tên tập tin xác định giao diện người dùng (UI)."
#: src/setup/gnunet-setup.c:65
#, c-format
@@ -522,12 +522,12 @@ msgstr "Chưa xác định giao diện nên dùng mặc định.\n"
#: src/setup/gnunet-setup.c:403
#, c-format
msgid "Configuration file `%s' must be a filename (but is a directory).\n"
-msgstr ""
+msgstr "Tập tin cấu hình « %s » phải là một tên tập tin (vẫn là một thư mục).\n"
#: src/setup/gnunet-setup.c:415 src/server/gnunetd.c:67
-#, fuzzy, c-format
+#, c-format
msgid "Failed to parse configuration file `%s'\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
+msgstr "Lỗi phân tích cú pháp của tập tin cấu hình « %s »\n"
#: src/setup/gnunet-setup.c:453
#, c-format
@@ -826,26 +826,25 @@ msgid "NOTHING"
msgstr "KHÔNG GÌ"
#: src/util/network_client/tcpio.c:98 src/util/network_client/tcpio.c:154
-#, fuzzy
msgid "Could not find valid value for HOST in section NETWORK.\n"
-msgstr "Không tìm thấy giá trị đúng cho MÁY trong phần MẠNG."
+msgstr "Không tìm thấy giá trị đúng cho MÁY trong phần MẠNG.\n"
#: src/util/network_client/tcpio.c:123
-#, fuzzy, c-format
+#, c-format
msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'\n"
-msgstr "Gặp lỗi cú pháp trong mục nhập cấu hình MÁY trong phần MẠNG: « %s »"
+msgstr "Gặp lỗi cú pháp trong mục nhập cấu hình MÁY trong phần MẠNG: « %s »\n"
-#: src/util/network_client/tcpio.c:335
+#: src/util/network_client/tcpio.c:332
#, c-format
msgid "Error connecting to %s:%u. Is the daemon running?\n"
msgstr "Gặp lỗi khi kết nối tới %s:%u. Trình nền đang chạy không?\n"
-#: src/util/network_client/tcpio.c:398 src/util/network/io.c:164
+#: src/util/network_client/tcpio.c:395 src/util/network/io.c:164
#, c-format
msgid "Cannot connect to %s:%u: %s\n"
msgstr "Không thể kết nối tới %s:%u: %s\n"
-#: src/util/network_client/tcpio.c:636
+#: src/util/network_client/tcpio.c:634
msgid "Reading result from gnunetd failed, reply invalid!\n"
msgstr "Lỗi đọc kết quả từ gnunetd, đáp ứng không hợp lệ.\n"
@@ -986,14 +985,14 @@ msgid "Invalid network notation (does not end with ';': `%s')\n"
msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
#: src/util/network/ipcheck.c:306
-#, fuzzy, c-format
+#, c-format
msgid "Wrong format `%s' for netmask\n"
-msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
+msgstr "Mặt nạ mạng có định dạng sai « %s »\n"
#: src/util/network/ipcheck.c:338
-#, fuzzy, c-format
+#, c-format
msgid "Wrong format `%s' for network\n"
-msgstr "Mạng có định dạng sai « %s »: %s\n"
+msgstr "Mạng có định dạng sai « %s »\n"
#: src/util/network/dns.c:472
#, c-format
@@ -1020,6 +1019,8 @@ msgid ""
"OS tells us about very large message (%u bytes) pending on UDP socket, "
"truncating at 64k\n"
msgstr ""
+"Hệ điều hành báo về một thông điệp rất lớn (%u byte) bị hoãn trên ổ cắm UDP "
+"thì cắt ngắn ở 64k\n"
#: src/util/config/config.c:296
#, c-format
@@ -1092,20 +1093,21 @@ msgstr "« %s » trả lại với mã lỗi %u"
#: src/util/os/user.c:298 src/util/os/user.c:345
msgid "Error while parsing dscl output.\n"
-msgstr ""
+msgstr "Gặp lỗi trong khi phân tích cú pháp của kết xuất dscl.\n"
#: src/util/os/user.c:320
#, c-format
msgid "Couldn't find a group (`%s') for the new user and none was specified.\n"
msgstr ""
+"Không tìm thấy nhóm (« %s ») cho người dùng mới, và chưa xác định nhóm nào.\n"
#: src/util/os/user.c:375
msgid "Failed to find a free system id for the new group.\n"
-msgstr ""
+msgstr "Không tìm thấy mã số hệ thống chưa dùng cho nhóm mới.\n"
#: src/util/os/user.c:392
msgid "Failed to find a free system id for the new user.\n"
-msgstr ""
+msgstr "Không tìm thấy mã số hệ thống chưa dùng cho người dùng mới.\n"
#: src/util/os/user.c:529 src/util/os/user.c:574
#, c-format
@@ -1216,7 +1218,7 @@ msgstr "Không đủ quyền cho « %s ».\n"
#: src/util/boot/startup.c:279
#, c-format
msgid "Failed to determine installation path. Try setting `%s'\n"
-msgstr ""
+msgstr "Lỗi quyết định đường dẫn cài đặt. Hãy thử đặt « %s »\n"
#: src/util/boot/startup.c:294
#, c-format
@@ -1545,9 +1547,8 @@ msgid "# bytes in datastore"
msgstr "# các byte trong kho dữ liệu"
#: src/applications/sqstore_sqlite/sqlite.c:1478
-#, fuzzy
msgid "# bytes allocated by SQLite"
-msgstr "# các byte được phép trong kho dữ liệu"
+msgstr "# byte được SQLite cấp phát"
#: src/applications/sqstore_mysql/mysql.c:1092
#: src/applications/sqstore_mysql/mysql.c:1167
@@ -2283,7 +2284,7 @@ msgstr "Tạo biệt hiệu mới, xóa biệt hiệu hoặc liệt kê các bi
#: src/applications/fs/tools/gnunet-pseudonym.c:91
msgid "only display local namespaces"
-msgstr ""
+msgstr "chỉ hiển thị những miền tên cục bộ"
#: src/applications/fs/tools/gnunet-pseudonym.c:95
msgid ""
@@ -2391,6 +2392,8 @@ msgid ""
"Note that a number was appended to your selected name to ensure uniqueness "
"on your system.\n"
msgstr ""
+"Ghi chú rằng một con số phụ thêm vào tên được chọn, nhằm đảm bảo rằng hệ "
+"thống có thông tin duy nhất.\n"
#: src/applications/fs/tools/gnunet-pseudonym.c:335
#, c-format
@@ -2538,9 +2541,9 @@ msgid "Failed to connect to gnunetd.\n"
msgstr "Lỗi kết nối đến gnunetd.\n"
#: src/applications/fs/tools/gnunet-auto-share.c:696
-#, fuzzy, c-format
+#, c-format
msgid "Failed to parse meta data information file `%s'\n"
-msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+msgstr "Lỗi phân tích cú pháp của tập tin thông tin siêu dữ liệu « %s »\n"
#: src/applications/fs/tools/gnunet-auto-share.c:925
#, c-format
@@ -2683,12 +2686,11 @@ msgstr ""
"công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
#: src/applications/fs/tools/gnunet-insert.c:297
-#, fuzzy
msgid ""
"only simulate the process but do not do any actual publishing (useful to "
"compute URIs)"
msgstr ""
-"chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
+"chỉ mô phỏng tiến trình mà không thực sự công bố (có ích để tính địa chỉ URI)"
#: src/applications/fs/tools/gnunet-insert.c:301
msgid ""
@@ -3022,14 +3024,12 @@ msgid "# gap requests total sent"
msgstr "# tổng số yêu cầu lỗ hổng được gửi"
#: src/applications/fs/gap/plan.c:962
-#, fuzzy
msgid "# gap query total planned"
-msgstr "# tổng số nội dung lỗ hổng dự định"
+msgstr "# tổng số truy vấn lỗ hổng dự định"
#: src/applications/fs/gap/plan.c:964
-#, fuzzy
msgid "# gap query foreign planned"
-msgstr "# tổng số nội dung lỗ hổng dự định"
+msgstr "# truy vấn lỗ hổng ngoại dự định"
#: src/applications/fs/gap/plan.c:966
msgid "# gap routes succeeded"
@@ -3060,9 +3060,8 @@ msgid "# gap total trust awarded"
msgstr "# tổng số tin cậy lỗ hổng được cấp"
#: src/applications/fs/gap/fs.c:1015
-#, fuzzy
msgid "# gap replies sent via dv"
-msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
+msgstr "# các đáp ứng lỗ hổng được gửi qua dv"
#: src/applications/fs/gap/fs.c:1044
#, c-format
@@ -3130,9 +3129,8 @@ msgstr ""
"# các bản cập nhật thay đổi kích cỡ bộ lọc bloomfilter truy vấn lỗ hổng"
#: src/applications/fs/gap/querymanager.c:813
-#, fuzzy
msgid "# dv gap requests sent"
-msgstr "# tổng số yêu cầu lỗ hổng được gửi"
+msgstr "# các yêu cầu lỗ hổng dv được gửi"
#: src/applications/fs/gap/migration.c:439
msgid "# blocks migrated"
@@ -3179,62 +3177,64 @@ msgid "Failed to get traffic stats.\n"
msgstr "Lỗi lấy thông kê về truyền tải.\n"
#: src/applications/testing/remote.c:106
-#, fuzzy, c-format
+#, c-format
msgid "cp command is : %s \n"
-msgstr "Câu lệnh scp là: %s\n"
+msgstr "Câu lệnh cp là: %s\n"
#: src/applications/testing/remote.c:135 src/applications/testing/remote.c:167
#: src/applications/testing/remote.c:206 src/applications/testing/remote.c:241
#: src/applications/testing/remote.c:282
-#, fuzzy, c-format
+#, c-format
msgid "exec command is : %s \n"
-msgstr "Câu lệnh scp là: %s\n"
+msgstr "Câu lệnh exec là: %s\n"
#: src/applications/testing/remote.c:214 src/applications/testing/remote.c:291
#, c-format
msgid "Got pid %d\n"
-msgstr ""
+msgstr "Nhận được PID %d\n"
#: src/applications/testing/remote.c:1251
-#, fuzzy, c-format
+#, c-format
msgid ""
"NOT connecting peer %s:%d pid=%d to peer %s:%d pid=%d (already connected!)\n"
-msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
+msgstr ""
+"KHÔNG phải kết nối đồng đẳng %s:%d pid=%d đến đồng đẳng %s:%d pid=%d (đã có "
+"kết nối !)\n"
#: src/applications/testing/remote.c:1263
-#, fuzzy, c-format
+#, c-format
msgid "connecting peer %s:%d pid=%d to peer %s:%d pid=%d\n"
-msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
+msgstr "đang kết nối đồng đẳng %s:%d pid=%d đến đồng đẳng %s:%d pid=%d\n"
#: src/applications/testing/remote.c:1355
-#, fuzzy, c-format
+#, c-format
msgid "Creating clique topology (may take a bit!)\n"
-msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
+msgstr "Đang tạo đồ hình bè lũ (có thể hơi lâu)\n"
#: src/applications/testing/remote.c:1361
-#, fuzzy, c-format
+#, c-format
msgid "Creating small world topology (may take a bit!)\n"
-msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
+msgstr "Đang tạo đồ hình thế giới nhỏ (có thể hơi lâu)\n"
#: src/applications/testing/remote.c:1369
-#, fuzzy, c-format
+#, c-format
msgid "Creating ring topology (may take a bit!)\n"
-msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
+msgstr "Đang tạo đồ hình vòng (có thể hơi lâu)\n"
#: src/applications/testing/remote.c:1373
-#, fuzzy, c-format
+#, c-format
msgid "Creating 2d torus topology (may take a bit!)\n"
-msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
+msgstr "Đang tạo đồ hình xuyến hai chiều (có thể hơi lâu)\n"
#: src/applications/testing/remote.c:1380
-#, fuzzy, c-format
+#, c-format
msgid "Creating Erdos-Renyi topology (may take a bit!)\n"
-msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
+msgstr "Đang tạo đồ hình Erdos-Renyi (có thể hơi lâu)\n"
#: src/applications/testing/remote.c:1386
-#, fuzzy, c-format
+#, c-format
msgid "Creating InterNAT topology (may take a bit!)\n"
-msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
+msgstr "Đang tạo đồ hình InterNAT (có thể hơi lâu)\n"
#: src/applications/testing/remote.c:1420
#, c-format
@@ -3249,18 +3249,18 @@ msgstr "Câu lệnh scp cho bản sao tập tin bạn bè là: %s\n"
#: src/applications/testing/remote.c:1550
#, c-format
msgid "connect didn't return well!\n"
-msgstr ""
+msgstr "tiến trình kết nối không trả lại đúng !\n"
#: src/applications/testing/remote.c:1555
#: src/applications/testing/remotetopologies.c:539
-#, fuzzy, c-format
+#, c-format
msgid "Total connections: %d!\n"
-msgstr "# các kết nối dht"
+msgstr "Tổng các kết nối: %d !\n"
#: src/applications/testing/remote.c:1556
-#, fuzzy, c-format
+#, c-format
msgid "Total failed connections: %d!\n"
-msgstr "VPN không thể bỏ đi kết nối %x\n"
+msgstr "Tổng các kết nối bị lỗi: %d !\n"
#: src/applications/testing/remotetest.c:39
msgid "Set up multiple gnunetd daemons across multiple hosts."
@@ -3275,6 +3275,8 @@ msgid ""
"set output file for a dot input file which represents the graph of the "
"connected nodes"
msgstr ""
+"đặt tập tin kết xuất cho một tập tin đầu vào kiểu chấm mà đại diện đồ họa "
+"các nút được kết nối"
#: src/applications/testing/testing.c:268
#: src/applications/testing/remotetopologies.c:602
@@ -3285,7 +3287,7 @@ msgstr "Đang đợi các đồng đẳng kết nối"
#: src/applications/testing/remotetopologies.c:176
#, c-format
msgid "rand is %f probability is %f\n"
-msgstr ""
+msgstr "rand là %f, xác suất là %f\n"
#: src/applications/testing/remotetopologies.c:265
#: src/applications/testing/remotetopologies.c:347
@@ -3300,63 +3302,65 @@ msgstr ""
#: src/applications/testing/remotetopologies.c:367
#: src/applications/testing/remotetopologies.c:380
#: src/applications/testing/remotetopologies.c:525
-#, fuzzy, c-format
+#, c-format
msgid "connecting node %u to %u\n"
-msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
+msgstr "đang kết nối nút %u đến %u\n"
#: src/applications/testing/remotetopologies.c:390
#, c-format
msgid "natural log of %d is %d, will run %d iterations\n"
-msgstr ""
+msgstr "logarit tự nhiên %d là %d thì chạy %d lần lặp lại\n"
#: src/applications/testing/remotetopologies.c:392
#, c-format
msgid "Total connections added thus far: %u!\n"
-msgstr ""
+msgstr "Tổng số các kết nối được thêm cho đến đây: %u !\n"
#: src/applications/testing/remotetopologies.c:429
#: src/applications/testing/remotetopologies.c:537
#, c-format
msgid "Total connections added for small world: %d!\n"
-msgstr ""
+msgstr "Tổng số các kết nối được thêm cho thế giới nhỏ : %d !\n"
#: src/applications/testing/remotetopologies.c:483
#, c-format
msgid "For peer %d, number must be less than %d or greater than %d (%d)\n"
-msgstr ""
+msgstr "Đối với đồng đẳng %d, con số phải nhỏ hơn %d hay lớn hơn %d (%d)\n"
#: src/applications/testing/remotetopologies.c:503
#, c-format
msgid "NOT connecting node %u to %u (already existing connection!)\n"
-msgstr ""
+msgstr "KHÔNG phải kết nối nút %u đến %u (kết nối đã có !)\n"
#: src/applications/testing/remotetopologies.c:511
-#, fuzzy, c-format
+#, c-format
msgid "connecting node (rewire) %u to %u\n"
-msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
+msgstr "đang kết nối nút (mắc lại dây điện) %u đến %u\n"
#: src/applications/testing/remotetopologies.c:582
#, c-format
msgid "Setting config 1 to host %s\n"
-msgstr ""
+msgstr "Đang đặt cấu hình 1 thành máy %s\n"
#: src/applications/testing/remotetopologies.c:589
#, c-format
msgid "Setting config 2 to host %s\n"
-msgstr ""
+msgstr "Đang đặt cấu hình 2 thành máy %s\n"
#: src/applications/testing/remotetopologies.c:649
-#, fuzzy, c-format
+#, c-format
msgid ""
"\n"
"Failed to connect `%s' and `%s'\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+msgstr ""
+"\n"
+"Lỗi kết nối « %s » và « %s »\n"
#: src/applications/testing/remotetopologies.c:651
#: src/applications/testing/remotetopologies.c:654
-#, fuzzy, c-format
+#, c-format
msgid "Connections of `%s':\n"
-msgstr " Lỗi kết nối\n"
+msgstr "Kết nối của « %s »:\n"
#: src/applications/testing/remotetopologies.c:677
#: src/applications/testing/remotetopologies.c:746
@@ -3536,14 +3540,12 @@ msgid "# plibc handles"
msgstr "# các bộ xử lý plibc"
#: src/applications/stats/statistics.c:256
-#, fuzzy
msgid "# plibc socks"
-msgstr "# các bộ xử lý plibc"
+msgstr "# các sock plibc"
#: src/applications/stats/statistics.c:257
-#, fuzzy
msgid "# plibc maps"
-msgstr "# các bộ xử lý plibc"
+msgstr "# các bản đồ plibc"
#: src/applications/stats/statistics.c:449
#, c-format
@@ -3691,9 +3693,9 @@ msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
msgstr "RFC4193 Sẽ thử tạo một đường hầm trong khoảng %d\n"
#: src/applications/vpn/vpn.c:295
-#, fuzzy, c-format
+#, c-format
msgid "Cannot open tunnel device: %s"
-msgstr "Không thể mở thiết bị đường hầm do %s"
+msgstr "Không thể mở thiết bị đường hầm: %s"
#: src/applications/vpn/vpn.c:331
#, c-format
@@ -3904,7 +3906,7 @@ msgstr "« %s » đang tắt.\n"
#: src/server/gnunetd.c:185
msgid "do not daemonize (run gnunetd as a foreground process)"
-msgstr ""
+msgstr "không nên chạy làm trình nền (chạy gnunetd ở cảnh gần)"
#: src/server/gnunetd.c:188
msgid ""
@@ -4818,7 +4820,6 @@ msgid "Which applications should gnunetd support?"
msgstr "gnunetd nên hỗ trợ những ứng dụng nào?"
#: contrib/config-daemon.scm:368
-#, fuzzy
msgid ""
"Whenever this option is changed, you MUST run gnunet-update. Currently, the "
"available applications are:\n"
@@ -4895,7 +4896,9 @@ msgstr ""
"\n"
" • tracekit\tbộ công cụ mường tượng địa hình. Cần thiết cho gnunet-tracekit. "
"Ghi chú rằng việc nạp tracekit sẽ làm cho một ít dễ hơn khi người dùng muốn "
-"xâm nhập tình trạng nặc danh của bạn."
+"xâm nhập tình trạng nặc danh của bạn.\n"
+"\n"
+" • vpn\tphần mở rộng vẫn còn dựa trên thí nghiệm: đừng sử dụng !"
#: contrib/config-daemon.scm:401
msgid "Disable client-server connections"
@@ -5102,7 +5105,6 @@ msgid "Which database should be used?"
msgstr "Có nên dùng cơ sở dữ liệu nào?"
#: contrib/config-daemon.scm:650
-#, fuzzy
msgid ""
"Which database should be used? The options are \"sqstore_sqlite\", "
"\"sqstore_postgres\" and \"sqstore_mysql\". You must run gnunet-update "
@@ -5112,13 +5114,13 @@ msgid ""
"database, which is relatively simple. Read the file doc/README.mysql or doc/"
"README.postgres for how to setup the respective database."
msgstr ""
-"Có nên dùng cơ sở dữ liệu nào? Hai tùy chọn là « sqstore_sqlite » và « "
-"sqstore_mysql ». Sau khi thay đổi giá trị này thì cũng cần phải chạy tiến "
-"trình cập nhật gnunet-update !\n"
+"Có nên dùng cơ sở dữ liệu nào? Ba tùy chọn là « sqstore_sqlite », « "
+"sqstore_postgres » và « sqstore_mysql ». Sau khi thay đổi giá trị này thì "
+"cũng cần phải chạy tiến trình cập nhật gnunet-update !\n"
"\n"
-"Để sử dụng sqstore_mysql, bạn cũng cần phải cấu hình cơ sở dữ liệu MySQL: "
-"một công việc hơi đơn giản. Hãy đọc tài liệu Đọc Đi « doc/README.mysql » để "
-"tìm biết thiết lập MySQL như thế nào."
+"Để sử dụng chương trình cơ sở dữ liệu MySQL hay PostgreSQL, bạn cũng cần cấu "
+"hình cơ sở dữ liệu tương ứng (một thủ tục hơi đơn giản). Xem tập tin Đọc Đi « "
+"doc/README.mysql » hay « doc/README.postgres » để tìm chi tiết."
#: contrib/config-daemon.scm:663 contrib/config-daemon.scm:676
msgid "Which topology should be used?"
@@ -5577,9 +5579,8 @@ msgstr ""
"đặt MAXNETUPBPS là giới hạn cứng. 0 = vô hạn."
#: contrib/config-daemon.scm:1402
-#, fuzzy
msgid "What priority should gnunetd use to run?"
-msgstr "gnunetd nên chạy như nhóm nào?"
+msgstr "gnunetd nên chạy ở mức ưu tiên nào?"
#: contrib/config-daemon.scm:1403
msgid ""
@@ -5587,6 +5588,11 @@ msgid ""
"IDLE or a numerical integer value (man nice). The default is IDLE, which "
"should result in gnunetd only using resources that would otherwise be idle."
msgstr ""
+"Bạn có khả năng xác định mức ưu tiên, v.d. NORMAL (bình thường), ABOVE "
+"NORMAL (trên bình thường), BELOW NORMAL (dưới bình thường), HIGH (cao), IDLE "
+"(nghỉ) hoặc một giá trị số nguyên (để xem trợ giúp, chạy câu lệnh « man nice "
+"»). Mặc định là IDLE (nghỉ), có kết quả là gnunetd chỉ sử dụng tài nguyên "
+"đang nghỉ."
#: contrib/config-daemon.scm:1415
msgid "Should we disable random padding (experimental option)?"
@@ -5885,89 +5891,3 @@ msgstr "Tên đường dẫn đầy đủ đến thư mục HOME khách GNUnet"
#: contrib/config-client.scm:402
msgid "The directory for GNUnet files that belong to the user."
msgstr "Thư mục chứa những tập tin GNUnet mà thuộc về người dùng."
-
-#~ msgid "Query (get KEY, put KEY VALUE) DHT table."
-#~ msgstr "Hỏi (nhận KHOÁ, gửi GIÁ_TRỊ_KHOÁ) bảng DHT."
-
-#~ msgid "allow TIME ms to process a GET command"
-#~ msgstr "cho phép THỜI_GIAN mili giây để xử lý mỗi câu lệnh GET (lấy)"
-
-#~ msgid "Issuing `%s(%s,%s)' command.\n"
-#~ msgstr "Đang cấp câu lệnh « %s(%s,%s) ».\n"
-
-#~ msgid "Command `%s' requires an argument (`%s').\n"
-#~ msgstr "Câu lệnh « %s » cần đến một đối số (« %s »).\n"
-
-#~ msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
-#~ msgstr "Câu lệnh « %s » cần đến hai đối số (« %s » và « %s »).\n"
-
-#~ msgid "Unsupported command `%s'. Aborting.\n"
-#~ msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
-
-#~ msgid "# dht discovery messages received"
-#~ msgstr "# các thông báo phát hiện dht được nhận"
-
-#~ msgid "# dht route host lookups performed"
-#~ msgstr "# các việc tra tìm đường tới máy dht được làm"
-
-#~ msgid "# dht discovery messages sent"
-#~ msgstr "# các thông báo phát hiện dht được gửi"
-
-#~ msgid "# dht replies routed"
-#~ msgstr "# các đáp ứng dht được định tuyến"
-
-#~ msgid "# dht requests routed"
-#~ msgstr "# các yêu cầu dht được định tuyến"
-
-#~ msgid "# dht get requests received"
-#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#~ msgid "# dht put requests received"
-#~ msgstr "# các yêu cầu put (gửi) dht được nhận"
-
-#~ msgid "# dht results received"
-#~ msgstr "# các kết quả dht được nhận"
-
-#~ msgid "`%s' registering p2p handlers: %d %d %d\n"
-#~ msgstr "« %s » đang đăng ký các trình điều khiển p2p: %d %d %d\n"
-
-#~ msgid "`%s' failed. Terminating connection to client.\n"
-#~ msgstr "« %s » bị lỗi. Đang chấm dứt kết nối tới máy khách.\n"
-
-#~ msgid "`%s' registering client handlers: %d %d\n"
-#~ msgstr "« %s » đang đăng ký các trình điều khiển máy khách: %d %d\n"
-
-#~ msgid "Enables efficient non-anonymous routing"
-#~ msgstr "Hiệu lực định tuyến khác nặc danh hiệu dụng"
-
-#~ msgid "# blocks pushed into DHT"
-#~ msgstr "# các khối được đẩy vào DHT"
-
-#, fuzzy
-#~ msgid "ssh command is : %s \n"
-#~ msgstr "Câu lệnh scp là: %s\n"
-
-#~ msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
-#~ msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
-
-#~ msgid "`%s' failed at %s:%d with error: %s"
-#~ msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
-
-#~ msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
-#~ msgstr "« %s » bị lỗi tại %s:%d với lỗi:« %s » đẳng sau %llu miligiây\n"
-
-#~ msgid "Trying to use file `%s' for MySQL configuration.\n"
-#~ msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
-
-#~ msgid ""
-#~ "Directory `%s' in directory `%s' does not match naming convention. "
-#~ "Removed.\n"
-#~ msgstr ""
-#~ "Thư mục « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
-#~ "bỏ.\n"
-
-#~ msgid "File `%s' does not contain a pseudonym, trying to remove.\n"
-#~ msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
-
-#~ msgid "Format of file `%s' is invalid.\n"
-#~ msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
diff --git a/src/Makefile.in b/src/Makefile.in
index fd405a0..9278a9d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -338,7 +338,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -363,7 +363,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/applications/Makefile.in b/src/applications/Makefile.in
index 3cd58c3..57032bd 100644
--- a/src/applications/Makefile.in
+++ b/src/applications/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -374,7 +374,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -399,7 +399,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/applications/advertising/Makefile.in b/src/applications/advertising/Makefile.in
index c5c0967..18c82dd 100644
--- a/src/applications/advertising/Makefile.in
+++ b/src/applications/advertising/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/bootstrap_http/Makefile.in b/src/applications/bootstrap_http/Makefile.in
index 3dee531..b8db2b3 100644
--- a/src/applications/bootstrap_http/Makefile.in
+++ b/src/applications/bootstrap_http/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/chat/Makefile.in b/src/applications/chat/Makefile.in
index f8e0460..e9968f9 100644
--- a/src/applications/chat/Makefile.in
+++ b/src/applications/chat/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -336,7 +336,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -361,7 +361,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/applications/chat/lib/Makefile.in b/src/applications/chat/lib/Makefile.in
index cc61344..97c59e9 100644
--- a/src/applications/chat/lib/Makefile.in
+++ b/src/applications/chat/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/chat/module/Makefile.in b/src/applications/chat/module/Makefile.in
index 1f331d8..7f211dc 100644
--- a/src/applications/chat/module/Makefile.in
+++ b/src/applications/chat/module/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/chat/tools/Makefile.in b/src/applications/chat/tools/Makefile.in
index 220a2df..013bbaf 100644
--- a/src/applications/chat/tools/Makefile.in
+++ b/src/applications/chat/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/datastore/Makefile.in b/src/applications/datastore/Makefile.in
index 01baf58..5c2d772 100644
--- a/src/applications/datastore/Makefile.in
+++ b/src/applications/datastore/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/dhtlog_mysql/Makefile.in b/src/applications/dhtlog_mysql/Makefile.in
index 0e03f30..9ed1468 100644
--- a/src/applications/dhtlog_mysql/Makefile.in
+++ b/src/applications/dhtlog_mysql/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/dstore_mysql/Makefile.in b/src/applications/dstore_mysql/Makefile.in
index 65c9ccf..3ddf20f 100644
--- a/src/applications/dstore_mysql/Makefile.in
+++ b/src/applications/dstore_mysql/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/dstore_sqlite/Makefile.in b/src/applications/dstore_sqlite/Makefile.in
index faa9d84..bdc6887 100644
--- a/src/applications/dstore_sqlite/Makefile.in
+++ b/src/applications/dstore_sqlite/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/dv/Makefile.in b/src/applications/dv/Makefile.in
index dd850cf..ae5f211 100644
--- a/src/applications/dv/Makefile.in
+++ b/src/applications/dv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -336,7 +336,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -361,7 +361,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/applications/dv/module/Makefile.in b/src/applications/dv/module/Makefile.in
index 7b503eb..4aae7bb 100644
--- a/src/applications/dv/module/Makefile.in
+++ b/src/applications/dv/module/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/dv_dht/Makefile.in b/src/applications/dv_dht/Makefile.in
index e04cddd..2e24084 100644
--- a/src/applications/dv_dht/Makefile.in
+++ b/src/applications/dv_dht/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -336,7 +336,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -361,7 +361,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/applications/dv_dht/module/Makefile.in b/src/applications/dv_dht/module/Makefile.in
index 35b808f..d815a88 100644
--- a/src/applications/dv_dht/module/Makefile.in
+++ b/src/applications/dv_dht/module/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/dv_dht/module/table.c b/src/applications/dv_dht/module/table.c
index 24a74a0..8a5a25a 100644
--- a/src/applications/dv_dht/module/table.c
+++ b/src/applications/dv_dht/module/table.c
@@ -269,11 +269,14 @@ unsigned int
GNUNET_DV_DHT_estimate_network_diameter ()
{
unsigned int i;
-
+ GNUNET_mutex_lock(lock);
for (i = bucketCount - 1; i > 0; i--)
if (buckets[i].peers_size > 0)
break;
+
+ GNUNET_mutex_unlock(lock);
return i + 1;
+
}
/**
diff --git a/src/applications/dv_dht/tools/Makefile.in b/src/applications/dv_dht/tools/Makefile.in
index 69e88d0..d06972e 100644
--- a/src/applications/dv_dht/tools/Makefile.in
+++ b/src/applications/dv_dht/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/fragmentation/Makefile.in b/src/applications/fragmentation/Makefile.in
index 36c36ba..7450718 100644
--- a/src/applications/fragmentation/Makefile.in
+++ b/src/applications/fragmentation/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/fs/Makefile.in b/src/applications/fs/Makefile.in
index 628c271..a547df9 100644
--- a/src/applications/fs/Makefile.in
+++ b/src/applications/fs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -490,7 +490,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -515,7 +515,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/applications/fs/collection/Makefile.in b/src/applications/fs/collection/Makefile.in
index 5cdc7a5..87576e5 100644
--- a/src/applications/fs/collection/Makefile.in
+++ b/src/applications/fs/collection/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/fs/ecrs/Makefile.in b/src/applications/fs/ecrs/Makefile.in
index ae93641..24e0a92 100644
--- a/src/applications/fs/ecrs/Makefile.in
+++ b/src/applications/fs/ecrs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/fs/fsui/Makefile.in b/src/applications/fs/fsui/Makefile.in
index 9a8a949..48fa8f0 100644
--- a/src/applications/fs/fsui/Makefile.in
+++ b/src/applications/fs/fsui/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/fs/gap/Makefile.in b/src/applications/fs/gap/Makefile.in
index 2c71c32..5bc7826 100644
--- a/src/applications/fs/gap/Makefile.in
+++ b/src/applications/fs/gap/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/fs/lib/Makefile.in b/src/applications/fs/lib/Makefile.in
index d2d0780..52ea203 100644
--- a/src/applications/fs/lib/Makefile.in
+++ b/src/applications/fs/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/fs/namespace/Makefile.in b/src/applications/fs/namespace/Makefile.in
index df6f0ce..1a117aa 100644
--- a/src/applications/fs/namespace/Makefile.in
+++ b/src/applications/fs/namespace/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/fs/tools/Makefile.in b/src/applications/fs/tools/Makefile.in
index 6b6a27b..155dec3 100644
--- a/src/applications/fs/tools/Makefile.in
+++ b/src/applications/fs/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/fs/uritrack/Makefile.in b/src/applications/fs/uritrack/Makefile.in
index a4fe9b7..c3b0d5a 100644
--- a/src/applications/fs/uritrack/Makefile.in
+++ b/src/applications/fs/uritrack/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/getoption/Makefile.in b/src/applications/getoption/Makefile.in
index 0da62d4..9765a1d 100644
--- a/src/applications/getoption/Makefile.in
+++ b/src/applications/getoption/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/hostlist/Makefile.in b/src/applications/hostlist/Makefile.in
index 798e447..6d11b23 100644
--- a/src/applications/hostlist/Makefile.in
+++ b/src/applications/hostlist/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/identity/Makefile.in b/src/applications/identity/Makefile.in
index f946579..64dbe9c 100644
--- a/src/applications/identity/Makefile.in
+++ b/src/applications/identity/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/kvstore_sqlite/Makefile.in b/src/applications/kvstore_sqlite/Makefile.in
index b04bb55..07ebb1d 100644
--- a/src/applications/kvstore_sqlite/Makefile.in
+++ b/src/applications/kvstore_sqlite/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/pingpong/Makefile.in b/src/applications/pingpong/Makefile.in
index dae4bbb..d307008 100644
--- a/src/applications/pingpong/Makefile.in
+++ b/src/applications/pingpong/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/rpc/Makefile.in b/src/applications/rpc/Makefile.in
index 882dcfa..0bf955e 100644
--- a/src/applications/rpc/Makefile.in
+++ b/src/applications/rpc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/session/Makefile.in b/src/applications/session/Makefile.in
index 168514a..e0b042d 100644
--- a/src/applications/session/Makefile.in
+++ b/src/applications/session/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/sqstore_mysql/Makefile.in b/src/applications/sqstore_mysql/Makefile.in
index 8434f21..ac9123c 100644
--- a/src/applications/sqstore_mysql/Makefile.in
+++ b/src/applications/sqstore_mysql/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/sqstore_postgres/Makefile.in b/src/applications/sqstore_postgres/Makefile.in
index 4be8449..77bf5f6 100644
--- a/src/applications/sqstore_postgres/Makefile.in
+++ b/src/applications/sqstore_postgres/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/sqstore_sqlite/Makefile.in b/src/applications/sqstore_sqlite/Makefile.in
index 9c9a1ce..0f9ef7b 100644
--- a/src/applications/sqstore_sqlite/Makefile.in
+++ b/src/applications/sqstore_sqlite/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/state/Makefile.in b/src/applications/state/Makefile.in
index afb022d..4a18b51 100644
--- a/src/applications/state/Makefile.in
+++ b/src/applications/state/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/stats/Makefile.in b/src/applications/stats/Makefile.in
index d034f61..83dced8 100644
--- a/src/applications/stats/Makefile.in
+++ b/src/applications/stats/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/tbench/Makefile.in b/src/applications/tbench/Makefile.in
index 8b3141c..b66c2ee 100644
--- a/src/applications/tbench/Makefile.in
+++ b/src/applications/tbench/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/template/Makefile.in b/src/applications/template/Makefile.in
index f9b3f53..c64eba9 100644
--- a/src/applications/template/Makefile.in
+++ b/src/applications/template/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/testing/Makefile.in b/src/applications/testing/Makefile.in
index 0b8f85f..36ea09b 100644
--- a/src/applications/testing/Makefile.in
+++ b/src/applications/testing/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/topology_default/Makefile.in b/src/applications/topology_default/Makefile.in
index aad03f9..6acce33 100644
--- a/src/applications/topology_default/Makefile.in
+++ b/src/applications/topology_default/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/tracekit/Makefile.in b/src/applications/tracekit/Makefile.in
index b1ed552..12f201d 100644
--- a/src/applications/tracekit/Makefile.in
+++ b/src/applications/tracekit/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/traffic/Makefile.in b/src/applications/traffic/Makefile.in
index f61f93c..3653528 100644
--- a/src/applications/traffic/Makefile.in
+++ b/src/applications/traffic/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/transport/Makefile.in b/src/applications/transport/Makefile.in
index cce8036..8d28adc 100644
--- a/src/applications/transport/Makefile.in
+++ b/src/applications/transport/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/applications/vpn/Makefile.in b/src/applications/vpn/Makefile.in
index 7fcaa65..abd57f6 100644
--- a/src/applications/vpn/Makefile.in
+++ b/src/applications/vpn/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index a421ead..830ba39 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -480,7 +480,7 @@ uninstall-nodist_gnunetincludeHEADERS:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -505,7 +505,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/include/gnunet_util.h b/src/include/gnunet_util.h
index f5bd22e..7489459 100644
--- a/src/include/gnunet_util.h
+++ b/src/include/gnunet_util.h
@@ -78,7 +78,7 @@ extern "C"
* especially the least significant bits may change
* frequently, even between different SVN versions.
*/
-#define GNUNET_UTIL_VERSION 0x00080100
+#define GNUNET_UTIL_VERSION 0x00080101
#if 0 /* keep Emacsens' auto-indent happy */
{
diff --git a/src/include/gnunet_util_containers.h b/src/include/gnunet_util_containers.h
index da98520..8134996 100644
--- a/src/include/gnunet_util_containers.h
+++ b/src/include/gnunet_util_containers.h
@@ -600,7 +600,7 @@ enum GNUNET_CONTAINER_HeapOrder
};
-/**
+/**
* Handle to a heap.
*/
struct GNUNET_CONTAINER_Heap;
@@ -618,8 +618,9 @@ struct GNUNET_CONTAINER_HeapNode;
* @param order how should the heap be sorted?
* @return handle to the heap
*/
-struct GNUNET_CONTAINER_Heap *
-GNUNET_CONTAINER_heap_create (enum GNUNET_CONTAINER_HeapOrder order);
+struct GNUNET_CONTAINER_Heap *GNUNET_CONTAINER_heap_create (enum
+ GNUNET_CONTAINER_HeapOrder
+ order);
/**
@@ -637,8 +638,7 @@ void GNUNET_CONTAINER_heap_destroy (struct GNUNET_CONTAINER_Heap *heap);
* @param heap heap to inspect
* @return NULL if heap is empty
*/
-void *
-GNUNET_CONTAINER_heap_peek (const struct GNUNET_CONTAINER_Heap *heap);
+void *GNUNET_CONTAINER_heap_peek (const struct GNUNET_CONTAINER_Heap *heap);
/**
@@ -662,9 +662,10 @@ GNUNET_CONTAINER_heap_get_size (const struct GNUNET_CONTAINER_Heap *heap);
* GNUNET_NO if not.
*/
typedef int (*GNUNET_CONTAINER_HeapIterator) (void *cls,
- struct GNUNET_CONTAINER_HeapNode *node,
- void *element,
- GNUNET_CONTAINER_HeapCostType cost);
+ struct GNUNET_CONTAINER_HeapNode
+ * node, void *element,
+ GNUNET_CONTAINER_HeapCostType
+ cost);
/**
@@ -675,9 +676,9 @@ typedef int (*GNUNET_CONTAINER_HeapIterator) (void *cls,
* @param iterator_cls closure for iterator
*/
void
-GNUNET_CONTAINER_heap_iterate (const struct GNUNET_CONTAINER_Heap *heap,
- GNUNET_CONTAINER_HeapIterator iterator,
- void *iterator_cls);
+GNUNET_CONTAINER_heap_iterate (struct GNUNET_CONTAINER_Heap *heap,
+ GNUNET_CONTAINER_HeapIterator iterator,
+ void *iterator_cls);
/**
@@ -691,8 +692,8 @@ GNUNET_CONTAINER_heap_iterate (const struct GNUNET_CONTAINER_Heap *heap,
* @return data stored at the next random node in the walk;
* NULL if the tree is empty.
*/
-void *
-GNUNET_CONTAINER_heap_walk_get_next (struct GNUNET_CONTAINER_Heap *heap);
+void *GNUNET_CONTAINER_heap_walk_get_next (struct GNUNET_CONTAINER_Heap
+ *heap);
/**
@@ -703,10 +704,12 @@ GNUNET_CONTAINER_heap_walk_get_next (struct GNUNET_CONTAINER_Heap *heap);
* @param cost cost for the element
* @return node for the new element
*/
-struct GNUNET_CONTAINER_HeapNode *
-GNUNET_CONTAINER_heap_insert (struct GNUNET_CONTAINER_Heap *heap,
- void *element,
- GNUNET_CONTAINER_HeapCostType cost);
+struct GNUNET_CONTAINER_HeapNode *GNUNET_CONTAINER_heap_insert (struct
+ GNUNET_CONTAINER_Heap
+ *heap,
+ void *element,
+ GNUNET_CONTAINER_HeapCostType
+ cost);
/**
@@ -715,20 +718,19 @@ GNUNET_CONTAINER_heap_insert (struct GNUNET_CONTAINER_Heap *heap,
* @param heap heap to modify
* @return element data stored at the root node
*/
-void *
-GNUNET_CONTAINER_heap_remove_root (struct GNUNET_CONTAINER_Heap *heap);
+void *GNUNET_CONTAINER_heap_remove_root (struct GNUNET_CONTAINER_Heap *heap);
/**
* Removes a node from the heap.
- *
+ *
* @param heap heap to modify
* @param node node to remove
* @return element data stored at the node, NULL if heap is empty
*/
-void *
-GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_Heap *heap,
- struct GNUNET_CONTAINER_HeapNode *node);
+void *GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_Heap *heap,
+ struct GNUNET_CONTAINER_HeapNode
+ *node);
/**
@@ -740,8 +742,8 @@ GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_Heap *heap,
*/
void
GNUNET_CONTAINER_heap_update_cost (struct GNUNET_CONTAINER_Heap *heap,
- struct GNUNET_CONTAINER_HeapNode *node,
- GNUNET_CONTAINER_HeapCostType new_cost);
+ struct GNUNET_CONTAINER_HeapNode *node,
+ GNUNET_CONTAINER_HeapCostType new_cost);
#if 0 /* keep Emacsens' auto-indent happy */
{
diff --git a/src/intlemu/Makefile.in b/src/intlemu/Makefile.in
index 009e1f7..25668ed 100644
--- a/src/intlemu/Makefile.in
+++ b/src/intlemu/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/libs/Makefile.in b/src/libs/Makefile.in
index 703f490..fc22dc0 100644
--- a/src/libs/Makefile.in
+++ b/src/libs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -337,7 +337,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -362,7 +362,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/libs/mysql/Makefile.in b/src/libs/mysql/Makefile.in
index e4df93e..d9310df 100644
--- a/src/libs/mysql/Makefile.in
+++ b/src/libs/mysql/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -463,7 +463,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -488,7 +488,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/server/Makefile.in b/src/server/Makefile.in
index 9108f7d..a2e99e7 100644
--- a/src/server/Makefile.in
+++ b/src/server/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/server/gnunetd.c b/src/server/gnunetd.c
index 2279800..8040353 100644
--- a/src/server/gnunetd.c
+++ b/src/server/gnunetd.c
@@ -191,7 +191,7 @@ static struct GNUNET_CommandLineOption gnunetdOptions[] = {
0, &GNUNET_getopt_configure_set_one, &debug_flag},
GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Starts the gnunetd daemon.")), /* -h */
GNUNET_COMMAND_LINE_OPTION_LOGGING, /* -L */
- {'p', "padding-disable", "YES/NO",
+ {'p', "padding-disable", NULL,
gettext_noop ("disable padding with random data (experimental)"), 0,
&GNUNET_getopt_configure_set_option, "GNUNETD-EXPERIMENTAL:PADDING"},
{'l', "loud", NULL,
diff --git a/src/setup/Makefile.in b/src/setup/Makefile.in
index c8ca992..c159350 100644
--- a/src/setup/Makefile.in
+++ b/src/setup/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -533,7 +533,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -558,7 +558,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/setup/cocoa/Makefile.in b/src/setup/cocoa/Makefile.in
index a09c73a..425c644 100644
--- a/src/setup/cocoa/Makefile.in
+++ b/src/setup/cocoa/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/setup/gtk/Makefile.in b/src/setup/gtk/Makefile.in
index b84ac50..9af35c3 100644
--- a/src/setup/gtk/Makefile.in
+++ b/src/setup/gtk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/setup/lib/Makefile.in b/src/setup/lib/Makefile.in
index 7ff7d51..f8a410f 100644
--- a/src/setup/lib/Makefile.in
+++ b/src/setup/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/setup/ncurses/Makefile.in b/src/setup/ncurses/Makefile.in
index 1710785..e2de451 100644
--- a/src/setup/ncurses/Makefile.in
+++ b/src/setup/ncurses/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/setup/qt/Makefile.in b/src/setup/qt/Makefile.in
index 769ff74..ef130c3 100644
--- a/src/setup/qt/Makefile.in
+++ b/src/setup/qt/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -563,7 +563,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -588,7 +588,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/setup/qt/pixmaps/Makefile.in b/src/setup/qt/pixmaps/Makefile.in
index 55b2965..41caa17 100644
--- a/src/setup/qt/pixmaps/Makefile.in
+++ b/src/setup/qt/pixmaps/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/setup/text/Makefile.in b/src/setup/text/Makefile.in
index 7b4d21c..21ab2b2 100644
--- a/src/setup/text/Makefile.in
+++ b/src/setup/text/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/transports/Makefile.in b/src/transports/Makefile.in
index ff14b83..89666db 100644
--- a/src/transports/Makefile.in
+++ b/src/transports/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -736,7 +736,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -761,7 +761,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/transports/upnp/Makefile.in b/src/transports/upnp/Makefile.in
index ebe79b6..86673d7 100644
--- a/src/transports/upnp/Makefile.in
+++ b/src/transports/upnp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 99af33e..bf0cfc2 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -516,7 +516,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -541,7 +541,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/boot/Makefile.in b/src/util/boot/Makefile.in
index a193234..edcc386 100644
--- a/src/util/boot/Makefile.in
+++ b/src/util/boot/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -404,7 +404,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -429,7 +429,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/boot/lib_argz.c b/src/util/boot/lib_argz.c
index 6a7776f..5296817 100644
--- a/src/util/boot/lib_argz.c
+++ b/src/util/boot/lib_argz.c
@@ -16,6 +16,7 @@
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+#include "platform.h"
#include <errno.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/util/config/Makefile.in b/src/util/config/Makefile.in
index ba19988..3956f84 100644
--- a/src/util/config/Makefile.in
+++ b/src/util/config/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -432,7 +432,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -457,7 +457,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/containers/Makefile.in b/src/util/containers/Makefile.in
index 20fd7ef..751f77c 100644
--- a/src/util/containers/Makefile.in
+++ b/src/util/containers/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -480,7 +480,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -505,7 +505,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/containers/heap.c b/src/util/containers/heap.c
index a636191..076bb67 100644
--- a/src/util/containers/heap.c
+++ b/src/util/containers/heap.c
@@ -69,6 +69,11 @@ struct GNUNET_CONTAINER_HeapNode
*/
unsigned int tree_size;
+ /*
+ * Is this node scheduled to be deleted?
+ */
+ unsigned int delete;
+
};
/**
@@ -97,6 +102,20 @@ struct GNUNET_CONTAINER_Heap
*/
enum GNUNET_CONTAINER_HeapOrder order;
+ /**
+ * Is the heap dirty (needs purge of deleted nodes after iterators are done)?
+ */
+ unsigned int dirty;
+
+ /**
+ * How many iterations are we into this heap?
+ *
+ * 0 - if no iteration(s) taking place
+ * > 0 if iteration(s) in progress
+ * < 0 if we are currently cleaning up the heap (removing dead nodes)!
+ */
+ unsigned int iterator_count;
+
};
@@ -140,6 +159,8 @@ GNUNET_CONTAINER_heap_create (enum GNUNET_CONTAINER_HeapOrder order)
struct GNUNET_CONTAINER_Heap *heap;
heap = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_Heap));
+ heap->dirty = GNUNET_NO;
+ heap->iterator_count = 0;
heap->order = order;
return heap;
}
@@ -209,11 +230,41 @@ node_iterator (const struct GNUNET_CONTAINER_Heap *heap,
if (GNUNET_YES != node_iterator (heap,
node->right_child, iterator, iterator_cls))
return GNUNET_NO;
+ if (node->delete != GNUNET_NO)
+ return GNUNET_YES;
return iterator (iterator_cls, node, node->element, node->cost);
}
/**
+ * Iterate over the children of the given node.
+ *
+ * @param heap argument to give to iterator
+ * @param node node to iterate over
+ * @param iterator function to call on each node
+ * @param iterator_cls closure for iterator
+ * @return GNUNET_YES to continue to iterate
+ */
+static void
+cleanup_node_iterator (struct GNUNET_CONTAINER_Heap *heap,
+ struct GNUNET_CONTAINER_HeapNode *node)
+{
+ if (node == NULL)
+ return;
+ if (node->left_child != NULL)
+ cleanup_node_iterator(heap, node->left_child);
+ if (node->right_child != NULL)
+ cleanup_node_iterator(heap, node->right_child);
+ if (node->delete != GNUNET_YES)
+ return;
+ if (heap->root == node)
+ GNUNET_CONTAINER_heap_remove_root (heap);
+ else
+ GNUNET_CONTAINER_heap_remove_node (heap, node);
+}
+
+
+/**
* Iterate over all entries in the heap.
*
* @param heap the heap
@@ -221,11 +272,19 @@ node_iterator (const struct GNUNET_CONTAINER_Heap *heap,
* @param iterator_cls closure for iterator
*/
void
-GNUNET_CONTAINER_heap_iterate (const struct GNUNET_CONTAINER_Heap *heap,
+GNUNET_CONTAINER_heap_iterate (struct GNUNET_CONTAINER_Heap *heap,
GNUNET_CONTAINER_HeapIterator iterator,
void *iterator_cls)
{
+ heap->iterator_count++;
(void) node_iterator (heap, heap->root, iterator, iterator_cls);
+ heap->iterator_count--;
+ if ( (heap->iterator_count == 0) &&
+ (heap->dirty == GNUNET_YES) )
+ {
+ cleanup_node_iterator(heap, heap->root);
+ heap->dirty = GNUNET_NO;
+ }
}
@@ -361,8 +420,16 @@ GNUNET_CONTAINER_heap_remove_root (struct GNUNET_CONTAINER_Heap *heap)
if (NULL == (root = heap->root))
return NULL;
- heap->size--;
+
ret = root->element;
+ if (heap->iterator_count > 0)
+ {
+ heap->root->delete = GNUNET_YES;
+ heap->dirty = GNUNET_YES;
+ return ret;
+ }
+ heap->size--;
+
if (root->left_child == NULL)
{
heap->root = root->right_child;
@@ -466,7 +533,7 @@ remove_node (struct GNUNET_CONTAINER_Heap *heap,
/**
* Removes a node from the heap.
- *
+ *
* @param heap heap to modify
* @param node node to remove
* @return element data stored at the node
@@ -478,6 +545,15 @@ GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_Heap *heap,
void *ret;
CHECK (heap->root);
+
+ ret = node->element;
+ if (heap->iterator_count > 0)
+ {
+ node->delete = GNUNET_YES;
+ heap->dirty = GNUNET_YES;
+ return ret;
+ }
+
if (heap->walk_pos == node)
(void) GNUNET_CONTAINER_heap_walk_get_next (heap);
remove_node (heap, node);
diff --git a/src/util/containers/heaptest.c b/src/util/containers/heaptest.c
index 46a4d88..1813805 100644
--- a/src/util/containers/heaptest.c
+++ b/src/util/containers/heaptest.c
@@ -49,21 +49,44 @@ struct GNUNET_neighbor
unsigned int cost;
};
+static struct GNUNET_CONTAINER_Heap *minHeap;
+static struct GNUNET_CONTAINER_Heap *maxHeap;
+static int cur_pos = 0;
+struct GNUNET_neighbor *neighbors[TESTS];
+
+static int
+iterator_callback (void *cls,
+ struct GNUNET_CONTAINER_HeapNode * node,
+ void *element,
+ GNUNET_CONTAINER_HeapCostType cost)
+{
+ struct GNUNET_neighbor *neighbor = element;
+ struct GNUNET_neighbor *to_remove = cls;
+
+ if (to_remove == neighbor)
+ {
+#if DEBUG
+ fprintf(stderr, "Iterating, removing: neighbor %u with cost %u\n", neighbor->neighbor, neighbor->cost);
+#endif
+ GNUNET_CONTAINER_heap_remove_node (maxHeap, node);
+ GNUNET_free (neighbors[cur_pos - 1]);
+ neighbors[cur_pos - 1] = NULL;
+ cur_pos--;
+ }
+ return GNUNET_YES;
+
+}
int
main (int argc, char **argv)
{
-
- struct GNUNET_CONTAINER_Heap *minHeap;
- struct GNUNET_CONTAINER_Heap *maxHeap;
int i;
int ret;
- int cur_pos = 0;
+
unsigned int temp_rand;
unsigned int temp_node;
unsigned int temp_id;
- struct GNUNET_neighbor *neighbors[TESTS];
struct GNUNET_CONTAINER_HeapNode *min_nodes[TESTS];
struct GNUNET_CONTAINER_HeapNode *max_nodes[TESTS];
@@ -130,6 +153,19 @@ main (int argc, char **argv)
cur_pos--;
break;
case 4:
+#if DEBUG
+ fprintf (stderr, "First removing from minheap, pre removal size is %d\n", GNUNET_CONTAINER_heap_get_size(minHeap));
+#endif
+ GNUNET_CONTAINER_heap_remove_node (minHeap, min_nodes[cur_pos - 1]);
+#if DEBUG
+ fprintf (stderr, "removal from minheap, post removal size is %d\n", GNUNET_CONTAINER_heap_get_size(minHeap));
+ fprintf (stderr, "Iterating over heap, pre removal size is %d\n", GNUNET_CONTAINER_heap_get_size(maxHeap));
+#endif
+ GNUNET_CONTAINER_heap_iterate(maxHeap, &iterator_callback, neighbors[cur_pos - 1]);
+#if DEBUG
+ fprintf (stderr, "post removal size is %d\n", GNUNET_CONTAINER_heap_get_size(maxHeap));
+#endif
+
break;
}
@@ -137,6 +173,9 @@ main (int argc, char **argv)
return GNUNET_SYSERR;
}
+
+
+
while (GNUNET_CONTAINER_heap_get_size (maxHeap) > 0)
{
GNUNET_CONTAINER_heap_remove_root (maxHeap);
diff --git a/src/util/cron/Makefile.in b/src/util/cron/Makefile.in
index b15626a..1949813 100644
--- a/src/util/cron/Makefile.in
+++ b/src/util/cron/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -444,7 +444,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -469,7 +469,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/crypto/Makefile.in b/src/util/crypto/Makefile.in
index 3d55c64..ef11347 100644
--- a/src/util/crypto/Makefile.in
+++ b/src/util/crypto/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -551,7 +551,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -576,7 +576,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/disk/Makefile.in b/src/util/disk/Makefile.in
index 8a09281..667e8a6 100644
--- a/src/util/disk/Makefile.in
+++ b/src/util/disk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -431,7 +431,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -456,7 +456,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/error/Makefile.in b/src/util/error/Makefile.in
index 7502115..7047099 100644
--- a/src/util/error/Makefile.in
+++ b/src/util/error/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -429,7 +429,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -454,7 +454,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/getopt/Makefile.in b/src/util/getopt/Makefile.in
index 65a349e..fa3e6c2 100644
--- a/src/util/getopt/Makefile.in
+++ b/src/util/getopt/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -410,7 +410,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -435,7 +435,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/loggers/Makefile.in b/src/util/loggers/Makefile.in
index 432235d..1fdb75c 100644
--- a/src/util/loggers/Makefile.in
+++ b/src/util/loggers/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -404,7 +404,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -429,7 +429,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/network/Makefile.in b/src/util/network/Makefile.in
index 739473d..6cf7424 100644
--- a/src/util/network/Makefile.in
+++ b/src/util/network/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -461,7 +461,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -486,7 +486,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/network_client/Makefile.in b/src/util/network_client/Makefile.in
index 39c61e9..3d88eb3 100644
--- a/src/util/network_client/Makefile.in
+++ b/src/util/network_client/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -432,7 +432,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -457,7 +457,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/network_client/tcpio.c b/src/util/network_client/tcpio.c
index 9005a9a..9cd798c 100644
--- a/src/util/network_client/tcpio.c
+++ b/src/util/network_client/tcpio.c
@@ -316,11 +316,8 @@ GNUNET_client_connection_ensure_connected (struct
* a connection issue.
*/
#define TRIES_PER_AF 2
-#ifdef WINDOWS
-#define DELAY_PER_RETRY (5000 * GNUNET_CRON_MILLISECONDS)
-#else
+#define CONNECT_TIMEOUT (5 * GNUNET_CRON_SECONDS)
#define DELAY_PER_RETRY (50 * GNUNET_CRON_MILLISECONDS)
-#endif
#define ADVANCE() do { af_index++; tries = TRIES_PER_AF; } while(0)
#define RETRY() do { tries--; if (tries == 0) { ADVANCE(); } else { GNUNET_thread_sleep(DELAY_PER_RETRY); } } while (0)
tries = TRIES_PER_AF;
@@ -415,8 +412,8 @@ GNUNET_client_connection_ensure_connected (struct
FD_ZERO (&eset);
FD_SET (osock, &wset);
FD_SET (osock, &eset);
- timeout.tv_sec = 0;
- timeout.tv_usec = DELAY_PER_RETRY * TRIES_PER_AF * 1000;
+ timeout.tv_sec = CONNECT_TIMEOUT * TRIES_PER_AF / 1000;
+ timeout.tv_usec = (CONNECT_TIMEOUT * TRIES_PER_AF - timeout.tv_sec * 1000) * 1000;
errno = 0;
select_start = GNUNET_get_time ();
ret = SELECT (osock + 1, &rset, &wset, &eset, &timeout);
@@ -430,7 +427,7 @@ GNUNET_client_connection_ensure_connected (struct
sock->sock = NULL;
GNUNET_mutex_unlock (sock->destroylock);
if ((GNUNET_get_time () - select_start >
- TRIES_PER_AF * DELAY_PER_RETRY) || (errno != EINTR))
+ TRIES_PER_AF * CONNECT_TIMEOUT) || (errno != EINTR))
ADVANCE (); /* spend enough time trying here */
else
RETRY ();
@@ -442,7 +439,7 @@ GNUNET_client_connection_ensure_connected (struct
sock->sock = NULL;
GNUNET_mutex_unlock (sock->destroylock);
if (GNUNET_get_time () - select_start >
- TRIES_PER_AF * DELAY_PER_RETRY)
+ TRIES_PER_AF * CONNECT_TIMEOUT)
ADVANCE (); /* spend enough time trying here */
else
RETRY ();
@@ -462,7 +459,7 @@ GNUNET_client_connection_ensure_connected (struct
sock->sock = NULL;
GNUNET_mutex_unlock (sock->destroylock);
if (GNUNET_get_time () - select_start >
- TRIES_PER_AF * DELAY_PER_RETRY)
+ TRIES_PER_AF * CONNECT_TIMEOUT)
ADVANCE (); /* spend enough time trying here */
else
RETRY ();
@@ -478,6 +475,7 @@ GNUNET_client_connection_ensure_connected (struct
#undef RETRY
#undef TRIES_PER_AF
#undef DELAY_PER_RETRY
+#undef CONNECT_TIMEOUT
return GNUNET_OK;
}
diff --git a/src/util/os/Makefile.in b/src/util/os/Makefile.in
index 0f7c553..fc258ed 100644
--- a/src/util/os/Makefile.in
+++ b/src/util/os/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -485,7 +485,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -510,7 +510,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/pseudonym/Makefile.in b/src/util/pseudonym/Makefile.in
index c63ae74..e45ec94 100644
--- a/src/util/pseudonym/Makefile.in
+++ b/src/util/pseudonym/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/util/string/Makefile.in b/src/util/string/Makefile.in
index e7bf3bd..f60ea76 100644
--- a/src/util/string/Makefile.in
+++ b/src/util/string/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -433,7 +433,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -458,7 +458,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/threads/Makefile.in b/src/util/threads/Makefile.in
index d77d37c..090f756 100644
--- a/src/util/threads/Makefile.in
+++ b/src/util/threads/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -487,7 +487,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -512,7 +512,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/src/util/win/Makefile.in b/src/util/win/Makefile.in
index 0c16e34..7f9d6bf 100644
--- a/src/util/win/Makefile.in
+++ b/src/util/win/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--
gnunet
More information about the gnunet-vcs
mailing list