[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r349 - GNUnet GNUnet/contrib GNUnet/src/applications GNUnet
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r349 - GNUnet GNUnet/contrib GNUnet/src/applications GNUnet/src/applications/dht/module GNUnet/src/applications/fs/ecrs GNUnet/src/applications/identity GNUnet/src/applications/traffic GNUnet/src/include GNUnet/src/util GNUnet-docs/WWW branches/GNUnet06 branches/GNUnet06/po branches/GNUnet06/src/applications/afs/gtkui branches/GNUnet06/src/applications/afs/module branches/GNUnet06/src/util |
|
Date: |
Sun, 27 Feb 2005 20:01:48 -0800 (PST) |
Author: grothoff
Date: 2005-02-27 20:01:48 -0800 (Sun, 27 Feb 2005)
New Revision: 349
Added:
GNUnet-docs/WWW/news_20050227.inc
GNUnet-docs/WWW/news_20050228.inc
Modified:
GNUnet-docs/WWW/download.php3
GNUnet/ChangeLog
GNUnet/configure.ac
GNUnet/contrib/doxygen
GNUnet/src/applications/Makefile.am
GNUnet/src/applications/dht/module/datastore_memory_test.c
GNUnet/src/applications/fs/ecrs/ecrstest.c
GNUnet/src/applications/identity/Makefile.am
GNUnet/src/applications/identity/identitytest.c
GNUnet/src/applications/traffic/Makefile.am
GNUnet/src/include/Makefile.am
GNUnet/src/util/hashtest.c
GNUnet/src/util/storagetest.c
branches/GNUnet06/ChangeLog
branches/GNUnet06/configure.ac
branches/GNUnet06/po/de.po
branches/GNUnet06/src/applications/afs/gtkui/main.c
branches/GNUnet06/src/applications/afs/module/high_simple.c
branches/GNUnet06/src/applications/afs/module/migration.c
branches/GNUnet06/src/util/hashtest.c
branches/GNUnet06/src/util/storagetest.c
Log:
releasing 0.6.6b and 0.7.0pre0
Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog 2005-02-28 03:57:13 UTC (rev 348)
+++ GNUnet/ChangeLog 2005-02-28 04:01:48 UTC (rev 349)
@@ -1,3 +1,6 @@
+Sun Feb 27 21:59:31 EST 2005
+ All unit testcases pass. Releasing 0.7.0pre0.
+
Sat Feb 12 17:35:08 EST 2005
Fixed mysql-test. Changed MySQL to use prepared statements,
avoids conversion (mysql_escape_string) and is faster on the
Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2005-02-28 03:57:13 UTC (rev 348)
+++ GNUnet/configure.ac 2005-02-28 04:01:48 UTC (rev 349)
@@ -1,5 +1,5 @@
# This file is part of GNUnet.
-# (C) 2001, 2002, 2003, 2004 Christian Grothoff (and other contributing
authors)
+# (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other contributing
authors)
#
# GNUnet is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published
@@ -21,8 +21,8 @@
#
#
AC_PREREQ(2.57)
-AC_INIT([GNUnet], [0.6.9-cvs],address@hidden)
-AM_INIT_AUTOMAKE([GNUnet], [0.6.9-cvs])
+AC_INIT([GNUnet], [0.7.0pre0],address@hidden)
+AM_INIT_AUTOMAKE([GNUnet], [0.7.0pre0])
AM_CONFIG_HEADER([config.h])
AH_TOP([#define _GNU_SOURCE 1])
Modified: GNUnet/contrib/doxygen
===================================================================
--- GNUnet/contrib/doxygen 2005-02-28 03:57:13 UTC (rev 348)
+++ GNUnet/contrib/doxygen 2005-02-28 04:01:48 UTC (rev 349)
@@ -23,7 +23,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.6.9
+PROJECT_NUMBER = 0.7.0pre0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
Modified: GNUnet/src/applications/Makefile.am
===================================================================
--- GNUnet/src/applications/Makefile.am 2005-02-28 03:57:13 UTC (rev 348)
+++ GNUnet/src/applications/Makefile.am 2005-02-28 04:01:48 UTC (rev 349)
@@ -29,6 +29,8 @@
stats \
tbench \
template \
+ $(TESTBED_DIR) \
topology_default \
+ tracekit \
traffic \
transport
Modified: GNUnet/src/applications/dht/module/datastore_memory_test.c
===================================================================
--- GNUnet/src/applications/dht/module/datastore_memory_test.c 2005-02-28
03:57:13 UTC (rev 348)
+++ GNUnet/src/applications/dht/module/datastore_memory_test.c 2005-02-28
04:01:48 UTC (rev 349)
@@ -161,16 +161,26 @@
return 0;
}
+/**
+ * Perform option parsing from the command line.
+ */
+static int parseCommandLine(int argc,
+ char * argv[]) {
+ return OK;
+}
+
int main(int args,
char * argv[]) {
Blockstore * s;
int i;
+ initUtil(argc, argv, &parseCommandLine);
s = create_blockstore_memory(65536);
for (i=0;i<65536;i++)
if (0 != test(s))
{ DUMP(s); return 1; }
destroy_blockstore_memory(s);
+ doneUtil();
return 0;
}
Modified: GNUnet/src/applications/fs/ecrs/ecrstest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrstest.c 2005-02-28 03:57:13 UTC (rev
348)
+++ GNUnet/src/applications/fs/ecrs/ecrstest.c 2005-02-28 04:01:48 UTC (rev
349)
@@ -262,7 +262,7 @@
struct ECRS_URI * uri;
int i;
- daemon = -1; // fork();
+ daemon = fork();
if (daemon == 0) {
/* FIXME: would be nice to be able to tell
gnunetd to use the check/debug DB and not
Modified: GNUnet/src/applications/identity/Makefile.am
===================================================================
--- GNUnet/src/applications/identity/Makefile.am 2005-02-28 03:57:13 UTC
(rev 348)
+++ GNUnet/src/applications/identity/Makefile.am 2005-02-28 04:01:48 UTC
(rev 349)
@@ -5,6 +5,8 @@
plugin_LTLIBRARIES = \
libgnunetmodule_identity.la
+EXTRA_DIST = \
+ check.conf
libgnunetmodule_identity_la_SOURCES = \
identity.c \
Modified: GNUnet/src/applications/identity/identitytest.c
===================================================================
--- GNUnet/src/applications/identity/identitytest.c 2005-02-28 03:57:13 UTC
(rev 348)
+++ GNUnet/src/applications/identity/identitytest.c 2005-02-28 04:01:48 UTC
(rev 349)
@@ -108,7 +108,7 @@
char * argv[]) {
FREENONNULL(setConfigurationString("FILES",
"gnunet.conf",
- "/tmp/gnunet_test/gnunet.conf"));
+ "check.conf"));
FREENONNULL(setConfigurationString("GNUNETD",
"_MAGIC_",
"YES"));
Modified: GNUnet/src/applications/traffic/Makefile.am
===================================================================
--- GNUnet/src/applications/traffic/Makefile.am 2005-02-28 03:57:13 UTC (rev
348)
+++ GNUnet/src/applications/traffic/Makefile.am 2005-02-28 04:01:48 UTC (rev
349)
@@ -16,7 +16,7 @@
libgnunetmodule_traffic_la_SOURCES = \
- traffic.c
+ traffic.c traffic.h
libgnunetmodule_traffic_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la
libgnunetmodule_traffic_la_LDFLAGS = \
Modified: GNUnet/src/include/Makefile.am
===================================================================
--- GNUnet/src/include/Makefile.am 2005-02-28 03:57:13 UTC (rev 348)
+++ GNUnet/src/include/Makefile.am 2005-02-28 04:01:48 UTC (rev 349)
@@ -14,6 +14,7 @@
gnunet_blockstore.h \
gnunet_bootstrap_service.h \
gnunet_core.h \
+ gnunet_datastore_service.h \
gnunet_dht.h \
gnunet_dht_datastore_memory.h \
gnunet_dht_lib.h \
Modified: GNUnet/src/util/hashtest.c
===================================================================
--- GNUnet/src/util/hashtest.c 2005-02-28 03:57:13 UTC (rev 348)
+++ GNUnet/src/util/hashtest.c 2005-02-28 04:01:48 UTC (rev 349)
@@ -6,9 +6,18 @@
#include "gnunet_util.h"
#include "platform.h"
+/**
+ * Perform option parsing from the command line.
+ */
+static int parseCommandLine(int argc,
+ char * argv[]) {
+ return OK;
+}
+
int main(int argc, char * argv[]){
HashCode160 hc;
+ initUtil(argc, argv, &parseCommandLine);
hash("TEST", 4, &hc);
if ( (hc.a != ntohl(830102737)) ||
(hc.b != ntohl(-2066785626)) ||
@@ -29,5 +38,6 @@
hc.a, hc.b, hc.c, hc.d, hc.e);
return -1;
}
+ doneUtil();
return 0;
}
Modified: GNUnet/src/util/storagetest.c
===================================================================
--- GNUnet/src/util/storagetest.c 2005-02-28 03:57:13 UTC (rev 348)
+++ GNUnet/src/util/storagetest.c 2005-02-28 04:01:48 UTC (rev 349)
@@ -9,6 +9,14 @@
#define TESTSTRING "Hello World\0"
+/**
+ * Perform option parsing from the command line.
+ */
+static int parseCommandLine(int argc,
+ char * argv[]) {
+ return OK;
+}
+
static int testReadWrite() {
HashCode160 ha;
EncName filename;
@@ -33,8 +41,9 @@
int main(int argc, char * argv[]) {
int failureCount = 0;
+ initUtil(argc, argv, &parseCommandLine);
failureCount += testReadWrite();
-
+ doneUtil();
if (failureCount == 0)
return 0;
else {
Modified: GNUnet-docs/WWW/download.php3
===================================================================
--- GNUnet-docs/WWW/download.php3 2005-02-28 03:57:13 UTC (rev 348)
+++ GNUnet-docs/WWW/download.php3 2005-02-28 04:01:48 UTC (rev 349)
@@ -19,7 +19,7 @@
<a href="http://www.openssl.org/";>OpenSSL</a> (>= 0.95) <?php
W("or"); ?>
<a href="http://www.gnu.org/directory/security/libgcrypt.html";>libgcrypt
(>= 1.2.0)</a></li>
<li><strong><?php W("Required:"); ?></strong>
- <a href="/libextractor/">libextractor (>= 0.4.1)</a></li>
+ <a href="/libextractor/">libextractor (>= 0.4.2)</a></li>
<li><strong><?php W("Required:"); ?></strong>
<a href="http://www.sqlite.com/";>sqlite</a> (>= 3.0.0) <?php W("or");
?>
<a href="http://www.mysql.com/";>mysql</a> (>= 4.1)</li>
@@ -63,10 +63,6 @@
extlink_("https://gnunet.org/mantis/","Mantis";));
P();
-P();
-W("The next major release will be %s and is expected %s.",
- ARRAY("0.7.0", "2005"));
-BR();
W("RPM binaries for GNUnet and %s (x86 only) can be found %s.",
ARRAY(intlink_("/libextractor/index.php", "libextractor"),
extlink_("http://ovmj.org/~rpm/";, "here")));
@@ -77,13 +73,22 @@
P();
W("If you want to build GNUnet from source, use these links:");
echo "<ul>\n";
-LIV(extlink_("download/GNUnet-0.6.6a.tar.bz2","GNUnet-0.6.6a.tar.bz2 (1291
kb)"));
-LIV(extlink_("download/GNUnet-0.6.6a.tar.gz","GNUnet-0.6.6a.tar.gz (1757
kb)"));
-LIV(extlink_("/libextractor/download/libextractor-0.4.1.tar.bz2",
- "libextractor-0.4.1.tar.bz2 (6245 kb)"));
-LIV(extlink_("/libextractor/download/libextractor-0.4.1.tar.gz",
- "libextractor-0.4.1.tar.gz (5868 kb)"));
+LIV(extlink_("download/GNUnet-0.6.6b.tar.bz2","GNUnet-0.6.6b.tar.bz2 (1291
kb)"));
+LIV(extlink_("download/GNUnet-0.6.6b.tar.gz","GNUnet-0.6.6b.tar.gz (1737
kb)"));
+LIV(extlink_("/libextractor/download/libextractor-0.4.2.tar.bz2",
+ "libextractor-0.4.2.tar.bz2 (6245 kb)"));
+LIV(extlink_("/libextractor/download/libextractor-0.4.2.tar.gz",
+ "libextractor-0.4.2.tar.gz (5868 kb)"));
echo "</ul>\n";
+P();
+W("The next major release will be %s and is expected %s.",
+ ARRAY("0.7.0", "07-2005"));
+W("A pre-release (alpha-quality) is available:");
+echo "<ul>\n";
+LIV(extlink_("download/GNUnet-0.7.0pre0.tar.bz2","GNUnet-0.7.0pre0.tar.bz2
(1142 kb)"));
+LIV(extlink_("download/GNUnet-0.7.0pre0.tar.gz","GNUnet-0.7.0pre0.tar.gz (1626
kb)"));
+echo "</ul>\n";
+
include("html_footer.php3");
?>
Added: GNUnet-docs/WWW/news_20050227.inc
===================================================================
--- GNUnet-docs/WWW/news_20050227.inc 2005-02-28 03:57:13 UTC (rev 348)
+++ GNUnet-docs/WWW/news_20050227.inc 2005-02-28 04:01:48 UTC (rev 349)
@@ -0,0 +1,54 @@
+<?php
+W("Download %s here.",
+ extlink_("http://gnunet.org/download/GNUnet-0.7.0pre0.tar.bz2";,
+ "GNUnet 0.7.0pre0"));
+W("This is <strong>not</strong> your usual GNUnet release.");
+W("You are strongly encouraged to read this before trying to use it.");
+W("Starting with the good news, these are the highlights:");
+
+echo "<ul>";
+LI("highly modular and pluggable architecture");
+LI("extensive test-suite for testing individual modules");
+LI("improved session key exchange protocol");
+LI("support for peer-to-peer messages up to 64k");
+LI("remote procedure call API");
+LI("distributed hash table API");
+LI("simple but powerful APIs for writing GNUnet user interfaces");
+LI("clear separation of anonymous routing and file-sharing concerns");
+LI("new meta-data encoding allows arbitrary meta-data including thumbnails");
+LI("new database abstraction for improved performance (only MySQL and SQLite
supported)");
+LI("new ECRS encoding with KBlocks for improved security against
router-in-the-middle data corruption attacks");
+LI("content expiration (after originator dies) without breaking properties of
the GNUnet anonymity protocol");
+LI("different anonymity requirements can be specified for each shared file");
+LI("improved internationalization and localization");
+echo "</ul>";
+
+W("This was achieved by doing an almost complete re-write of the code.");
+W("The list is incomplete in that for the final 0.7.0 release additional
changes are planned.");
+W("In particular various aspects of how content and peer-to-peer messages are
encoded will change (a bit more).");
+W("In consequence, this release:");
+echo "<ul>";
+LI("breaks compatibility with all previous versions");
+LI("will also not be compatible with any future version");
+LI("does not feature a graphical user interface");
+LI("will not bootstrap (as in, there is no hostlist to find other peers)");
+LI("has terrible performance (intentionally for debugging)");
+LI("has known critical bugs");
+echo "</ul>";
+
+W("So why release the code at this stage?");
+W("The answer is, this is a pre-release with the goal to:");
+echo "<ul>";
+LI("give packagers a chance to update their build-process");
+LI("give developers an opportunity to create (graphical) user interfaces based
on the new APIs");
+LI("get some early feedback about critical problems");
+LI("find portability problems for platforms that we do not have access to");
+echo "</ul>";
+W("In summary, run this code if you feel adventurous.");
+W("If you want to actually <strong>use</strong> GNUnet, stick to the 0.6.x
branch.");
+W("Please report any bugs you find to %s.",
+ extlink_("https://gnunet.org/mantis/";, "mantis"));
+W("Note that all protocols and storage formats have changed, so you may want
to make sure that when trying 0.7.0 you do not accidentially overwrite or use
files from 0.6.x.");
+W("Migrating data from 0.6.x is not possible.");
+W("However, you can run 0.7.x and 0.6.x in parallel if you use different ports
and directories.");
+?>
Added: GNUnet-docs/WWW/news_20050228.inc
===================================================================
--- GNUnet-docs/WWW/news_20050228.inc 2005-02-28 03:57:13 UTC (rev 348)
+++ GNUnet-docs/WWW/news_20050228.inc 2005-02-28 04:01:48 UTC (rev 349)
@@ -0,0 +1,18 @@
+<?php
+W("Download %s.",
+ extlink_("http://gnunet.org/download/GNUnet-0.6.6b.tar.bz2";,
+ "GNUnet 0.6.6b here"));
+W("This release fixes many bugs:");
+echo "<ul>";
+LI("problems with gnunet-insert and libextractor");
+LI("problems with descriptions for inserted directories in gnunet-gtk");
+LI("problems with the copy files button in gnunet-gtk for uploading
directories");
+LI("crash of gnunetd with gnunet-download and the -a option");
+LI("crash with libgcrypt and hashing (concurrency problem)");
+LI("crash in gnunetd if peer has 0 connections");
+LI("various minor problems in the Win32 code");
+LI("various other minor bugs were resolved");
+echo "</ul>";
+W("All protocols and storage formats are unchanged (and thus compatible).");
+W("Updating from 0.6.6a should be trivial.");
+?>
Modified: branches/GNUnet06/ChangeLog
===================================================================
--- branches/GNUnet06/ChangeLog 2005-02-28 03:57:13 UTC (rev 348)
+++ branches/GNUnet06/ChangeLog 2005-02-28 04:01:48 UTC (rev 349)
@@ -1,3 +1,6 @@
+Mon Feb 28 00:33:03 EST 2005
+ Releasing GNUnet 0.6.6b.
+
Sun Feb 27 19:27:44 EST 2005
Fixing mantis 839.
Modified: branches/GNUnet06/configure.ac
===================================================================
--- branches/GNUnet06/configure.ac 2005-02-28 03:57:13 UTC (rev 348)
+++ branches/GNUnet06/configure.ac 2005-02-28 04:01:48 UTC (rev 349)
@@ -21,8 +21,8 @@
#
#
AC_PREREQ(2.57)
-AC_INIT([GNUnet], [0.6.6a-cvs],address@hidden)
-AM_INIT_AUTOMAKE([GNUnet], [0.6.6a-cvs])
+AC_INIT([GNUnet], [0.6.6b],address@hidden)
+AM_INIT_AUTOMAKE([GNUnet], [0.6.6b])
AM_CONFIG_HEADER([config.h])
AH_TOP([#define _GNU_SOURCE 1])
Modified: branches/GNUnet06/po/de.po
===================================================================
--- branches/GNUnet06/po/de.po 2005-02-28 03:57:13 UTC (rev 348)
+++ branches/GNUnet06/po/de.po 2005-02-28 04:01:48 UTC (rev 349)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.6.3a-cvs\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-02-09 16:05-0500\n"
+"POT-Creation-Date: 2005-02-27 22:25-0500\n"
"PO-Revision-Date: 2004-08-21 00:55+0530\n"
"Last-Translator: Christian Grothoff <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -22,8 +22,8 @@
msgid "Assertion failed at %s:%d.\n"
msgstr ""
-#: src/include/gnunet_util.h:1274 src/include/gnunet_util.h:1281
-#: src/include/gnunet_util.h:1283 src/applications/afs/module/high_mysql.c:174
+#: src/include/gnunet_util.h:1268 src/include/gnunet_util.h:1275
+#: src/include/gnunet_util.h:1277 src/applications/afs/module/high_mysql.c:174
#: src/applications/afs/module/high_mysql.c:181 src/util/hostkey_gcrypt.c:52
#: src/util/hostkey_gcrypt.c:59 src/util/hostkey_openssl.c:53
#: src/util/hostkey_openssl.c:330 src/util/hostkey_openssl.c:375
@@ -33,8 +33,8 @@
msgid "'%s' failed at %s:%d with error: %s\n"
msgstr ""
-#: src/include/gnunet_util.h:1290 src/include/gnunet_util.h:1292
-#: src/include/gnunet_util.h:1299 src/applications/afs/module/low_bdb.c:85
+#: src/include/gnunet_util.h:1284 src/include/gnunet_util.h:1286
+#: src/include/gnunet_util.h:1293 src/applications/afs/module/low_bdb.c:85
#: src/applications/afs/module/low_bdb.c:92
#: src/applications/afs/module/low_gdbm.c:95
#: src/applications/afs/module/low_gdbm.c:102
@@ -44,98 +44,98 @@
msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
msgstr ""
-#: src/include/gnunet_util.h:2729
+#: src/include/gnunet_util.h:2723
msgid "print this help"
msgstr ""
-#: src/include/gnunet_util.h:2732
+#: src/include/gnunet_util.h:2726
msgid "set verbosity to LEVEL"
msgstr ""
-#: src/include/gnunet_util.h:2735
+#: src/include/gnunet_util.h:2729
msgid "use configuration file FILENAME"
msgstr ""
-#: src/include/gnunet_util.h:2738
+#: src/include/gnunet_util.h:2732
msgid "specify host on which gnunetd is running"
msgstr ""
-#: src/include/gnunet_util.h:2741
+#: src/include/gnunet_util.h:2735
msgid "print the version number"
msgstr ""
-#: src/include/gnunet_util.h:2744
+#: src/include/gnunet_util.h:2738
msgid "be verbose"
msgstr ""
-#: src/applications/afs/esed2/block.c:284
-#: src/applications/afs/esed2/block.c:329
-#: src/applications/afs/esed2/block.c:414
-#: src/applications/afs/esed2/block.c:478
-#: src/applications/afs/esed2/block.c:1045
-#: src/applications/afs/esed2/block.c:1129
+#: src/applications/afs/esed2/block.c:283
+#: src/applications/afs/esed2/block.c:328
+#: src/applications/afs/esed2/block.c:413
+#: src/applications/afs/esed2/block.c:477
+#: src/applications/afs/esed2/block.c:1044
+#: src/applications/afs/esed2/block.c:1128
#, c-format
msgid "Could not send '%s' request to gnunetd. Is gnunetd running?\n"
msgstr ""
-#: src/applications/afs/esed2/block.c:290
-#: src/applications/afs/esed2/block.c:1039
+#: src/applications/afs/esed2/block.c:289
+#: src/applications/afs/esed2/block.c:1038
#: src/applications/afs/esed2/insertutil.c:239
#: src/applications/afs/esed2/sblock.c:327
msgid "Server did not send confirmation of insertion.\n"
msgstr ""
-#: src/applications/afs/esed2/block.c:294
-#: src/applications/afs/esed2/block.c:1042
+#: src/applications/afs/esed2/block.c:293
+#: src/applications/afs/esed2/block.c:1041
#: src/applications/afs/esed2/insertutil.c:244
#: src/applications/afs/esed2/sblock.c:332
msgid "Server could not perform insertion.\n"
msgstr ""
-#: src/applications/afs/esed2/block.c:335
-#: src/applications/afs/esed2/block.c:1124
+#: src/applications/afs/esed2/block.c:334
+#: src/applications/afs/esed2/block.c:1123
msgid "Server did not send confirmation of deletion.\n"
msgstr ""
-#: src/applications/afs/esed2/block.c:339
+#: src/applications/afs/esed2/block.c:338
msgid "Server could not perform deletion.\n"
msgstr ""
-#: src/applications/afs/esed2/block.c:420
+#: src/applications/afs/esed2/block.c:419
msgid "Server did not send confirmation for indexing request.\n"
msgstr ""
-#: src/applications/afs/esed2/block.c:424
+#: src/applications/afs/esed2/block.c:423
msgid "Server could not perform indexing\n"
msgstr ""
-#: src/applications/afs/esed2/block.c:484
+#: src/applications/afs/esed2/block.c:483
msgid "Server did not send confirmation for unindex request.\n"
msgstr ""
-#: src/applications/afs/esed2/block.c:488
+#: src/applications/afs/esed2/block.c:487
msgid "Server could not perform unindexing (content already removed?).\n"
msgstr ""
-#: src/applications/afs/esed2/block.c:674
+#: src/applications/afs/esed2/block.c:673
msgid ""
"Decrypted content does not match key. This is either a bug or a maliciously "
"inserted file. Download aborted.\n"
msgstr ""
-#: src/applications/afs/esed2/block.c:1859
-#: src/applications/afs/esed2/block.c:1879
+#: src/applications/afs/esed2/block.c:1858
+#: src/applications/afs/esed2/block.c:1878
msgid "File corrupted (or bug)."
msgstr ""
-#: src/applications/afs/esed2/block.c:1916
+#: src/applications/afs/esed2/block.c:1915
#, c-format
msgid ""
"File '%s': %s of mime-type '%s' (size %u)\n"
"%s"
msgstr ""
-#: src/applications/afs/esed2/block.c:1946
+#: src/applications/afs/esed2/block.c:1945
#, c-format
msgid ""
"File '%s': %s of mime-type '%s'\n"
@@ -143,7 +143,7 @@
"\t%s"
msgstr ""
-#: src/applications/afs/esed2/block.c:1972
+#: src/applications/afs/esed2/block.c:1971
#, c-format
msgid ""
"Namespace %s (called '%.*s'):\n"
@@ -151,7 +151,7 @@
"\t(Contact: '%.*s', URI: '%.*s', owner: '%.*s')"
msgstr ""
-#: src/applications/afs/esed2/block.c:1991
+#: src/applications/afs/esed2/block.c:1990
#, c-format
msgid ""
"Namespace %s (called '%.*s'):\n"
@@ -159,17 +159,17 @@
"\t(Contact: '%.*s', URI: '%.*s', owner: '%.*s', root: '%s')"
msgstr ""
-#: src/applications/afs/esed2/block.c:2015
+#: src/applications/afs/esed2/block.c:2014
#, c-format
msgid "Unknown format with ID %d:%d"
msgstr ""
-#: src/applications/afs/esed2/block.c:2045
-#: src/applications/afs/esed2/block.c:2098
+#: src/applications/afs/esed2/block.c:2044
+#: src/applications/afs/esed2/block.c:2097
msgid "Unsupported node type."
msgstr ""
-#: src/applications/afs/esed2/block.c:2071
+#: src/applications/afs/esed2/block.c:2070
msgid "unknown"
msgstr ""
@@ -197,7 +197,7 @@
msgid "Adding to index list failed, trying insertion!\n"
msgstr ""
-#: src/applications/afs/esed2/insertutil.c:491
+#: src/applications/afs/esed2/insertutil.c:497
#, c-format
msgid ""
"Error inserting directory %s.\n"
@@ -205,9 +205,9 @@
"Run gnunet-stats | grep \"AFS storage left\" to check.\n"
msgstr ""
-#: src/applications/afs/esed2/insertutil.c:582
-#: src/applications/afs/esed2/insertutil.c:596
-#: src/applications/afs/esed2/insertutil.c:649
+#: src/applications/afs/esed2/insertutil.c:588
+#: src/applications/afs/esed2/insertutil.c:602
+#: src/applications/afs/esed2/insertutil.c:655
msgid "Failed to insert RBlock. Is gnunetd running and space available?\n"
msgstr ""
@@ -382,7 +382,7 @@
msgstr ""
#: src/applications/afs/gtkui/directory.c:379
-#: src/applications/afs/gtkui/insert.c:489
+#: src/applications/afs/gtkui/insert.c:500
msgid "Keyword(s) used"
msgstr ""
@@ -404,7 +404,7 @@
msgstr ""
#: src/applications/afs/gtkui/directory.c:448
-#: src/applications/afs/gtkui/insert.c:561
+#: src/applications/afs/gtkui/insert.c:572
#: src/applications/afs/gtkui/namespace.c:1643
#: src/applications/afs/gtkui/pseudonyms.c:367
msgid "Description:"
@@ -415,22 +415,22 @@
msgstr ""
#: src/applications/afs/gtkui/directory.c:516
-#: src/applications/afs/gtkui/insert.c:696
-#: src/applications/afs/gtkui/insert.c:1102
+#: src/applications/afs/gtkui/insert.c:707
+#: src/applications/afs/gtkui/insert.c:1112
msgid "Add keyword"
msgstr ""
#: src/applications/afs/gtkui/directory.c:517
-#: src/applications/afs/gtkui/insert.c:697
-#: src/applications/afs/gtkui/insert.c:1103
+#: src/applications/afs/gtkui/insert.c:708
+#: src/applications/afs/gtkui/insert.c:1113
msgid "Delete keyword"
msgstr ""
#: src/applications/afs/gtkui/directory.c:649
#: src/applications/afs/gtkui/download.c:897
#: src/applications/afs/gtkui/helper.c:223
-#: src/applications/afs/gtkui/insert.c:735
-#: src/applications/afs/gtkui/insert.c:1143
+#: src/applications/afs/gtkui/insert.c:746
+#: src/applications/afs/gtkui/insert.c:1153
#: src/applications/afs/gtkui/namespace.c:1058
#: src/applications/afs/gtkui/pseudonyms.c:529
#: src/applications/afs/gtkui/search.c:212
@@ -439,8 +439,8 @@
#: src/applications/afs/gtkui/directory.c:650
#: src/applications/afs/gtkui/download.c:898
-#: src/applications/afs/gtkui/insert.c:736
-#: src/applications/afs/gtkui/insert.c:1144
+#: src/applications/afs/gtkui/insert.c:747
+#: src/applications/afs/gtkui/insert.c:1154
#: src/applications/afs/gtkui/namespace.c:1059
#: src/applications/afs/gtkui/namespace.c:1796
#: src/applications/afs/gtkui/pseudonyms.c:530
@@ -692,69 +692,69 @@
msgid "No description specified."
msgstr ""
-#: src/applications/afs/gtkui/insert.c:501
-#: src/applications/afs/gtkui/insert.c:863
+#: src/applications/afs/gtkui/insert.c:512
+#: src/applications/afs/gtkui/insert.c:874
msgid "Edit attributes"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:525
+#: src/applications/afs/gtkui/insert.c:536
msgid "Published filename:"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:543
+#: src/applications/afs/gtkui/insert.c:554
msgid "Mimetype:"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:579
+#: src/applications/afs/gtkui/insert.c:590
msgid "Insertion method:"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:594
-#: src/applications/afs/gtkui/insert.c:939
+#: src/applications/afs/gtkui/insert.c:605
+#: src/applications/afs/gtkui/insert.c:950
msgid "Index only"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:596
-#: src/applications/afs/gtkui/insert.c:954
+#: src/applications/afs/gtkui/insert.c:607
+#: src/applications/afs/gtkui/insert.c:965
msgid "Copy file to shared directory"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:611
-#: src/applications/afs/gtkui/insert.c:953
+#: src/applications/afs/gtkui/insert.c:622
+#: src/applications/afs/gtkui/insert.c:964
msgid "Full insertion"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:777
+#: src/applications/afs/gtkui/insert.c:788
msgid "Can't process files larger than 2 GB"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:851
+#: src/applications/afs/gtkui/insert.c:862
msgid "Keyword(s) used for directory"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:852
+#: src/applications/afs/gtkui/insert.c:863
msgid "Keyword(s) used for all files in directory"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:887
+#: src/applications/afs/gtkui/insert.c:898
msgid "Published name of the directory:"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:924
+#: src/applications/afs/gtkui/insert.c:935
msgid "Insertion method (for files in directory):"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:1222
+#: src/applications/afs/gtkui/insert.c:1232
#, c-format
msgid "'%s' is not a file!\n"
msgstr ""
-#: src/applications/afs/gtkui/insert.c:1270
+#: src/applications/afs/gtkui/insert.c:1280
msgid "Choose file to be inserted"
msgstr ""
#: src/applications/afs/gtkui/insertprogress.c:177
-#: src/applications/afs/gtkui/insertprogress.c:519
+#: src/applications/afs/gtkui/insertprogress.c:533
#, c-format
msgid ""
"Successfully processed file '%s'.\n"
@@ -767,7 +767,7 @@
msgstr ""
#: src/applications/afs/gtkui/insertprogress.c:186
-#: src/applications/afs/gtkui/insertprogress.c:528
+#: src/applications/afs/gtkui/insertprogress.c:542
#, c-format
msgid "Insertion of file '%s' failed!\n"
msgstr ""
@@ -1956,13 +1956,13 @@
"s' under '%s'.\n"
msgstr ""
-#: src/applications/afs/module/high_simple.c:280
-#: src/applications/afs/module/high_simple.c:289
+#: src/applications/afs/module/high_simple.c:283
+#: src/applications/afs/module/high_simple.c:292
#, c-format
msgid "pIdx database corrupt (content not indexed) in %s:%d\n"
msgstr ""
-#: src/applications/afs/module/high_simple.c:708
+#: src/applications/afs/module/high_simple.c:711
#, c-format
msgid "pIdx database corrupt, trying to fix (%d)\n"
msgstr ""
@@ -2225,7 +2225,7 @@
msgstr ""
#: src/applications/afs/tools/gnunet-delete.c:142
-#: src/applications/afs/tools/gnunet-insert.c:646
+#: src/applications/afs/tools/gnunet-insert.c:650
#: src/applications/afs/tools/gnunet-pseudonym.c:382
#: src/applications/afs/tools/gnunet-search.c:534
#: src/applications/chat/gnunet-chat.c:148
@@ -2636,16 +2636,16 @@
msgid "Option '%s' is implied by option '%s'.\n"
msgstr ""
-#: src/applications/afs/tools/gnunet-insert.c:692
+#: src/applications/afs/tools/gnunet-insert.c:698
msgid "no filename specified"
msgstr ""
-#: src/applications/afs/tools/gnunet-insert.c:726
+#: src/applications/afs/tools/gnunet-insert.c:732
#, c-format
msgid "Directory %s successfully indexed -- %s\n"
msgstr ""
-#: src/applications/afs/tools/gnunet-insert.c:773
+#: src/applications/afs/tools/gnunet-insert.c:779
#, c-format
msgid ""
"Filename (option '%s') specified but multiple files given on the command "
@@ -2653,22 +2653,22 @@
"files."
msgstr ""
-#: src/applications/afs/tools/gnunet-insert.c:821
-#: src/applications/afs/tools/gnunet-insert.c:830
-#: src/applications/afs/tools/gnunet-insert.c:841
-#: src/applications/afs/tools/gnunet-insert.c:848
+#: src/applications/afs/tools/gnunet-insert.c:829
+#: src/applications/afs/tools/gnunet-insert.c:838
+#: src/applications/afs/tools/gnunet-insert.c:849
+#: src/applications/afs/tools/gnunet-insert.c:856
#, c-format
msgid "Inserting file '%s' (%s, %s) under keyword '%s'.\n"
msgstr ""
-#: src/applications/afs/tools/gnunet-insert.c:1019
+#: src/applications/afs/tools/gnunet-insert.c:1027
#, c-format
msgid ""
"File '%s' (%s, %s) successfully inserted into namespace under\n"
"\t'%s'\n"
msgstr ""
-#: src/applications/afs/tools/gnunet-insert.c:1027
+#: src/applications/afs/tools/gnunet-insert.c:1035
#, c-format
msgid "Insertion of file into namespace failed.\n"
msgstr ""
@@ -3839,17 +3839,17 @@
msgid "No applications defined in configuration!\n"
msgstr ""
-#: src/server/core.c:652
+#: src/server/core.c:654
#, c-format
msgid "Could not initialize application '%s'\n"
msgstr ""
-#: src/server/core.c:694
+#: src/server/core.c:696
#, c-format
msgid "Could not properly shutdown application '%s'.\n"
msgstr ""
-#: src/server/core.c:726
+#: src/server/core.c:728
#, c-format
msgid "Could not properly unload application '%s'.\n"
msgstr ""
@@ -4377,7 +4377,7 @@
msgid "Rejected blacklisted connection from %u.%u.%u.%u.\n"
msgstr ""
-#: src/transports/http.c:1226 src/transports/tcp.c:1028 src/util/tcpio.c:165
+#: src/transports/http.c:1226 src/transports/tcp.c:1029 src/util/tcpio.c:165
#: src/util/tcpio.c:195
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
@@ -4398,7 +4398,7 @@
msgstr ""
#: src/transports/http.c:1497 src/transports/smtp.c:920
-#: src/transports/tcp.c:1337 src/transports/tcp6.c:1395
+#: src/transports/tcp.c:1338 src/transports/tcp6.c:1395
#: src/transports/udp.c:651 src/transports/udp6.c:671
#, c-format
msgid "MTU for '%s' is probably too low (fragmentation not implemented!)\n"
@@ -4460,20 +4460,20 @@
msgid "Received malformed message from tcp-peer connection. Closing.\n"
msgstr ""
-#: src/transports/tcp.c:956
+#: src/transports/tcp.c:957
msgid "Could not determine my public IP address.\n"
msgstr ""
-#: src/transports/tcp.c:1216 src/transports/tcp6.c:1273
+#: src/transports/tcp.c:1217 src/transports/tcp6.c:1273
#, c-format
msgid "Failed to start transport service on port %d.\n"
msgstr ""
-#: src/transports/tcp.c:1328
+#: src/transports/tcp.c:1329
msgid "# bytes received via tcp"
msgstr ""
-#: src/transports/tcp.c:1330
+#: src/transports/tcp.c:1331
msgid "# bytes sent via tcp"
msgstr ""
@@ -4620,14 +4620,14 @@
msgid "Syntax error in configuration file '%s' at line %d.\n"
msgstr ""
-#: src/util/configuration.c:434
+#: src/util/configuration.c:440
#, c-format
msgid ""
"Configuration file '%s' not found. I will try to create the default "
"configuration file at that location.\n"
msgstr ""
-#: src/util/configuration.c:450
+#: src/util/configuration.c:456
#, c-format
msgid "Cannot open configuration file '%s'\n"
msgstr ""
@@ -4756,43 +4756,43 @@
msgid "Could not find an IP address for interface '%s'.\n"
msgstr ""
-#: src/util/identity.c:274
+#: src/util/identity.c:276
#, c-format
msgid ""
"There is more than one IP address specified for interface '%s'.\n"
"GNUnet will use %u.%u.%u.%u.\n"
msgstr ""
-#: src/util/identity.c:280
+#: src/util/identity.c:282
#, c-format
msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
msgstr ""
-#: src/util/identity.c:295
+#: src/util/identity.c:300
#, c-format
msgid "Could not resolve '%s' to determine our IP address: %s\n"
msgstr ""
-#: src/util/identity.c:352 src/util/identity.c:394
+#: src/util/identity.c:357 src/util/identity.c:399
#, c-format
msgid "Could not resolve '%s': %s\n"
msgstr ""
-#: src/util/identity.c:421
+#: src/util/identity.c:426
msgid "Could not determine IP address of the local machine!\n"
msgstr ""
-#: src/util/identity.c:432
+#: src/util/identity.c:437
msgid "Could not determine IP(v6) address of the local machine!\n"
msgstr ""
-#: src/util/identity.c:444
+#: src/util/identity.c:449
msgid ""
"Could not find IP(v4) for this host. Please provide the IP in the "
"configuration file.\n"
msgstr ""
-#: src/util/identity.c:456
+#: src/util/identity.c:461
msgid ""
"Could not find IP(v6) for this host. Please provide the IP in the "
"configuration file.\n"
@@ -4832,61 +4832,61 @@
msgid "Wrong format '%s' for network: %s\n"
msgstr ""
-#: src/util/logging.c:90
+#: src/util/logging.c:92
msgid "NOTHING"
msgstr ""
-#: src/util/logging.c:91
+#: src/util/logging.c:93
msgid "FATAL"
msgstr ""
-#: src/util/logging.c:92
+#: src/util/logging.c:94
msgid "ERROR"
msgstr ""
-#: src/util/logging.c:93
+#: src/util/logging.c:95
msgid "FAILURE"
msgstr ""
-#: src/util/logging.c:94
+#: src/util/logging.c:96
msgid "WARNING"
msgstr ""
-#: src/util/logging.c:95
+#: src/util/logging.c:97
msgid "MESSAGE"
msgstr ""
-#: src/util/logging.c:96
+#: src/util/logging.c:98
msgid "INFO"
msgstr ""
-#: src/util/logging.c:97
+#: src/util/logging.c:99
msgid "DEBUG"
msgstr ""
-#: src/util/logging.c:98
+#: src/util/logging.c:100
msgid "CRON"
msgstr ""
-#: src/util/logging.c:99
+#: src/util/logging.c:101
msgid "EVERYTHING"
msgstr ""
-#: src/util/logging.c:237
+#: src/util/logging.c:249
msgid "LOGLEVEL not specified, that is not ok.\n"
msgstr ""
-#: src/util/logging.c:248
+#: src/util/logging.c:260
#, c-format
msgid "Invalid LOGLEVEL '%s' specified.\n"
msgstr ""
-#: src/util/logging.c:353
+#: src/util/logging.c:365
#, c-format
msgid "Failure at %s:%d.\n"
msgstr ""
-#: src/util/logging.c:359
+#: src/util/logging.c:371
#, c-format
msgid "Failure at at %s:%d.\n"
msgstr ""
@@ -4957,26 +4957,26 @@
msgid "% of allowed network load (down)"
msgstr ""
-#: src/util/statuscalls.c:461 src/util/statuscalls.c:679
+#: src/util/statuscalls.c:461 src/util/statuscalls.c:681
#, c-format
msgid "Failed to parse interface data from '%s' at %s:%d.\n"
msgstr ""
-#: src/util/statuscalls.c:561
+#: src/util/statuscalls.c:563
#, c-format
msgid "Failed to parse interface data '%s' output at %s:%d.\n"
msgstr ""
-#: src/util/statuscalls.c:886
+#: src/util/statuscalls.c:890
#, c-format
msgid "Could not decoding file '%s' at %s:%d.\n"
msgstr ""
-#: src/util/statuscalls.c:1061
+#: src/util/statuscalls.c:1065
msgid "Cannot query the CPU usage (Windows NT).\n"
msgstr ""
-#: src/util/statuscalls.c:1081
+#: src/util/statuscalls.c:1085
msgid "Cannot query the CPU usage (Win 9x)\n"
msgstr ""
Modified: branches/GNUnet06/src/applications/afs/gtkui/main.c
===================================================================
--- branches/GNUnet06/src/applications/afs/gtkui/main.c 2005-02-28 03:57:13 UTC
(rev 348)
+++ branches/GNUnet06/src/applications/afs/gtkui/main.c 2005-02-28 04:01:48 UTC
(rev 349)
@@ -60,10 +60,10 @@
*/
GtkItemFactory * itemFactory = NULL;
-static GtkWidget * main_window_input_line = NULL;
-
-static debug_flag = NO;
+static GtkWidget * main_window_input_line = NULL;
+static int debug_flag = NO;
+
/**
* Shows the info window
*/
Modified: branches/GNUnet06/src/applications/afs/module/high_simple.c
===================================================================
--- branches/GNUnet06/src/applications/afs/module/high_simple.c 2005-02-28
03:57:13 UTC (rev 348)
+++ branches/GNUnet06/src/applications/afs/module/high_simple.c 2005-02-28
04:01:48 UTC (rev 349)
@@ -119,6 +119,9 @@
mkdirp(dir);
dbtype = getConfigurationString("AFS",
"DATABASETYPE");
+ if (dbtype == NULL)
+ errexit("You must specify a database type in section AFS under
DATABASETYPE.");
+
nX = strlen(dir) + strlen("bucket") + 256 + strlen(dbtype);
bucketname = MALLOC(nX);
SNPRINTF(bucketname,
@@ -663,7 +666,7 @@
res = readContent(handle,
&query,
ce,
- data,
+ (void**) data,
0);
if (res == -1)
return SYSERR;
Modified: branches/GNUnet06/src/applications/afs/module/migration.c
===================================================================
--- branches/GNUnet06/src/applications/afs/module/migration.c 2005-02-28
03:57:13 UTC (rev 348)
+++ branches/GNUnet06/src/applications/afs/module/migration.c 2005-02-28
04:01:48 UTC (rev 349)
@@ -118,7 +118,7 @@
readCount = 1;
}
- if (read == SYSERR)
+ if (readCount == SYSERR)
ok = SYSERR;
else
for (i=0;i<readCount;i++) {
Modified: branches/GNUnet06/src/util/hashtest.c
===================================================================
--- branches/GNUnet06/src/util/hashtest.c 2005-02-28 03:57:13 UTC (rev
348)
+++ branches/GNUnet06/src/util/hashtest.c 2005-02-28 04:01:48 UTC (rev
349)
@@ -6,10 +6,16 @@
#include "gnunet_util.h"
#include "platform.h"
+static int parseCommandLine(int argc,
+ char * argv[]) {
+ return OK;
+}
+
int main(int argc, char * argv[]){
HashCode160 hc;
HexName hex;
+ initUtil(argc, argv, &parseCommandLine);
hash("TEST", 4, &hc);
if ( (hc.a != ntohl(830102737)) ||
(hc.b != ntohl(-2066785626)) ||
@@ -38,5 +44,6 @@
hc.a, hc.b, hc.c, hc.d, hc.e);
return -1;
}
+ doneUtil();
return 0;
}
Modified: branches/GNUnet06/src/util/storagetest.c
===================================================================
--- branches/GNUnet06/src/util/storagetest.c 2005-02-28 03:57:13 UTC (rev
348)
+++ branches/GNUnet06/src/util/storagetest.c 2005-02-28 04:01:48 UTC (rev
349)
@@ -9,6 +9,11 @@
#define TESTSTRING "Hello World\0"
+static int parseCommandLine(int argc,
+ char * argv[]) {
+ return OK;
+}
+
static int testReadWrite() {
HashCode160 ha;
HexName filename;
@@ -32,8 +37,10 @@
int main(int argc, char * argv[]) {
int failureCount = 0;
-
+
+ initUtil(argc, argv, &parseCommandLine);
failureCount += testReadWrite();
+ doneUtil();
if (failureCount == 0)
return 0;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r349 - GNUnet GNUnet/contrib GNUnet/src/applications GNUnet/src/applications/dht/module GNUnet/src/applications/fs/ecrs GNUnet/src/applications/identity GNUnet/src/applications/traffic GNUnet/src/include GNUnet/src/util GNUnet-docs/WWW branches/GNUnet06 branches/GNUnet06/po branches/GNUnet06/src/applications/afs/gtkui branches/GNUnet06/src/applications/afs/module branches/GNUnet06/src/util,
grothoff <=