[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3882 - in GNUnet: . po src/applications/fs src/application
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r3882 - in GNUnet: . po src/applications/fs src/applications/fs/uritrack src/include src/util/error |
|
Date: |
Mon, 4 Dec 2006 17:01:58 -0800 (PST) |
Author: grothoff
Date: 2006-12-04 17:01:45 -0800 (Mon, 04 Dec 2006)
New Revision: 3882
Added:
GNUnet/src/applications/fs/ecrs_core_test.c
GNUnet/src/applications/fs/uritrack/check.conf
GNUnet/src/applications/fs/uritrack/tracktest.c
Modified:
GNUnet/UPDATING
GNUnet/configure.ac
GNUnet/po/GNUnet.pot
GNUnet/po/de.po
GNUnet/po/es.po
GNUnet/po/rw.po
GNUnet/po/sv.po
GNUnet/po/vi.po
GNUnet/src/applications/fs/Makefile.am
GNUnet/src/applications/fs/uritrack/Makefile.am
GNUnet/src/applications/fs/uritrack/callbacks.c
GNUnet/src/applications/fs/uritrack/file_info.c
GNUnet/src/include/ecrs_core.h
GNUnet/src/include/gnunet_uritrack_lib.h
GNUnet/src/util/error/error.c
GNUnet/todo
Log:
stuff
Modified: GNUnet/UPDATING
===================================================================
--- GNUnet/UPDATING 2006-12-05 01:01:27 UTC (rev 3881)
+++ GNUnet/UPDATING 2006-12-05 01:01:45 UTC (rev 3882)
@@ -8,6 +8,16 @@
data-preserving migration may not be possible. For SVN versions,
you're on your own.
+0.7.1pre0 to 0.7.1pre1
+======================
+
+Run
+
+$ gnunet-update
+
+(as the same user that also runs gnunetd).
+
+
0.7.0e to 0.7.1pre0
===================
Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2006-12-05 01:01:27 UTC (rev 3881)
+++ GNUnet/configure.ac 2006-12-05 01:01:45 UTC (rev 3882)
@@ -21,8 +21,8 @@
#
#
AC_PREREQ(2.57)
-AC_INIT([GNUnet], [0.7.1pre0],address@hidden)
-AM_INIT_AUTOMAKE([GNUnet], [0.7.1pre0])
+AC_INIT([GNUnet], [0.7.1pre1],address@hidden)
+AM_INIT_AUTOMAKE([GNUnet], [0.7.1pre1])
AM_CONFIG_HEADER([config.h])
AH_TOP([#define _GNU_SOURCE 1])
Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot 2006-12-05 01:01:27 UTC (rev 3881)
+++ GNUnet/po/GNUnet.pot 2006-12-05 01:01:45 UTC (rev 3882)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-03 18:33-0700\n"
+"POT-Creation-Date: 2006-12-04 08:45-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -2352,66 +2352,66 @@
"choices\n"
msgstr ""
-#: src/util/error/error.c:122
+#: src/util/error/error.c:121
#, c-format
msgid ""
"\n"
"Press any key to continue\n"
msgstr ""
-#: src/util/error/error.c:190 src/util/error/error.c:234
+#: src/util/error/error.c:189 src/util/error/error.c:233
msgid "DEBUG"
msgstr ""
-#: src/util/error/error.c:193 src/util/error/error.c:236
+#: src/util/error/error.c:192 src/util/error/error.c:235
msgid "STATUS"
msgstr ""
-#: src/util/error/error.c:196 src/util/error/error.c:240
+#: src/util/error/error.c:195 src/util/error/error.c:239
msgid "WARNING"
msgstr ""
-#: src/util/error/error.c:199 src/util/error/error.c:242
+#: src/util/error/error.c:198 src/util/error/error.c:241
msgid "ERROR"
msgstr ""
-#: src/util/error/error.c:202 src/util/error/error.c:244
+#: src/util/error/error.c:201 src/util/error/error.c:243
msgid "FATAL"
msgstr ""
-#: src/util/error/error.c:205 src/util/error/error.c:246
+#: src/util/error/error.c:204 src/util/error/error.c:245
msgid "USER"
msgstr ""
-#: src/util/error/error.c:208 src/util/error/error.c:248
+#: src/util/error/error.c:207 src/util/error/error.c:247
msgid "ADMIN"
msgstr ""
-#: src/util/error/error.c:211 src/util/error/error.c:250
+#: src/util/error/error.c:210 src/util/error/error.c:249
msgid "DEVELOPER"
msgstr ""
-#: src/util/error/error.c:214 src/util/error/error.c:252
+#: src/util/error/error.c:213 src/util/error/error.c:251
msgid "REQUEST"
msgstr ""
-#: src/util/error/error.c:217 src/util/error/error.c:254
+#: src/util/error/error.c:216 src/util/error/error.c:253
msgid "BULK"
msgstr ""
-#: src/util/error/error.c:220 src/util/error/error.c:256
+#: src/util/error/error.c:219 src/util/error/error.c:255
msgid "IMMEDIATE"
msgstr ""
-#: src/util/error/error.c:223
+#: src/util/error/error.c:222
msgid "ALL"
msgstr ""
-#: src/util/error/error.c:238
+#: src/util/error/error.c:237
msgid "INFO"
msgstr ""
-#: src/util/error/error.c:257
+#: src/util/error/error.c:256
msgid "NOTHING"
msgstr ""
Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po 2006-12-05 01:01:27 UTC (rev 3881)
+++ GNUnet/po/de.po 2006-12-05 01:01:45 UTC (rev 3882)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-03 18:33-0700\n"
+"POT-Creation-Date: 2006-12-04 08:45-0700\n"
"PO-Revision-Date: 2006-03-17 21:37+0100\n"
"Last-Translator: Nils Durner <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -2508,66 +2508,66 @@
"choices\n"
msgstr ""
-#: src/util/error/error.c:122
+#: src/util/error/error.c:121
#, c-format
msgid ""
"\n"
"Press any key to continue\n"
msgstr ""
-#: src/util/error/error.c:190 src/util/error/error.c:234
+#: src/util/error/error.c:189 src/util/error/error.c:233
msgid "DEBUG"
msgstr "DEBUG"
-#: src/util/error/error.c:193 src/util/error/error.c:236
+#: src/util/error/error.c:192 src/util/error/error.c:235
msgid "STATUS"
msgstr ""
-#: src/util/error/error.c:196 src/util/error/error.c:240
+#: src/util/error/error.c:195 src/util/error/error.c:239
msgid "WARNING"
msgstr "WARNUNG"
-#: src/util/error/error.c:199 src/util/error/error.c:242
+#: src/util/error/error.c:198 src/util/error/error.c:241
msgid "ERROR"
msgstr "FEHLER"
-#: src/util/error/error.c:202 src/util/error/error.c:244
+#: src/util/error/error.c:201 src/util/error/error.c:243
msgid "FATAL"
msgstr "SCHWERWIEGEND"
-#: src/util/error/error.c:205 src/util/error/error.c:246
+#: src/util/error/error.c:204 src/util/error/error.c:245
msgid "USER"
msgstr ""
-#: src/util/error/error.c:208 src/util/error/error.c:248
+#: src/util/error/error.c:207 src/util/error/error.c:247
msgid "ADMIN"
msgstr ""
-#: src/util/error/error.c:211 src/util/error/error.c:250
+#: src/util/error/error.c:210 src/util/error/error.c:249
msgid "DEVELOPER"
msgstr ""
-#: src/util/error/error.c:214 src/util/error/error.c:252
+#: src/util/error/error.c:213 src/util/error/error.c:251
msgid "REQUEST"
msgstr ""
-#: src/util/error/error.c:217 src/util/error/error.c:254
+#: src/util/error/error.c:216 src/util/error/error.c:253
msgid "BULK"
msgstr ""
-#: src/util/error/error.c:220 src/util/error/error.c:256
+#: src/util/error/error.c:219 src/util/error/error.c:255
msgid "IMMEDIATE"
msgstr ""
-#: src/util/error/error.c:223
+#: src/util/error/error.c:222
msgid "ALL"
msgstr ""
-#: src/util/error/error.c:238
+#: src/util/error/error.c:237
msgid "INFO"
msgstr "INFO"
-#: src/util/error/error.c:257
+#: src/util/error/error.c:256
msgid "NOTHING"
msgstr "NICHTS"
Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po 2006-12-05 01:01:27 UTC (rev 3881)
+++ GNUnet/po/es.po 2006-12-05 01:01:45 UTC (rev 3882)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0e\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-03 18:33-0700\n"
+"POT-Creation-Date: 2006-12-04 08:45-0700\n"
"PO-Revision-Date: 2006-06-29 12:05+0200\n"
"Last-Translator: Miguel Angel Arruga <address@hidden>\n"
"Language-Team: Spanish\n"
@@ -2472,66 +2472,66 @@
"choices\n"
msgstr ""
-#: src/util/error/error.c:122
+#: src/util/error/error.c:121
#, c-format
msgid ""
"\n"
"Press any key to continue\n"
msgstr ""
-#: src/util/error/error.c:190 src/util/error/error.c:234
+#: src/util/error/error.c:189 src/util/error/error.c:233
msgid "DEBUG"
msgstr "DEPURACIÓN"
-#: src/util/error/error.c:193 src/util/error/error.c:236
+#: src/util/error/error.c:192 src/util/error/error.c:235
msgid "STATUS"
msgstr ""
-#: src/util/error/error.c:196 src/util/error/error.c:240
+#: src/util/error/error.c:195 src/util/error/error.c:239
msgid "WARNING"
msgstr "PELIGRO"
-#: src/util/error/error.c:199 src/util/error/error.c:242
+#: src/util/error/error.c:198 src/util/error/error.c:241
msgid "ERROR"
msgstr "ERROR"
-#: src/util/error/error.c:202 src/util/error/error.c:244
+#: src/util/error/error.c:201 src/util/error/error.c:243
msgid "FATAL"
msgstr "FATAL"
-#: src/util/error/error.c:205 src/util/error/error.c:246
+#: src/util/error/error.c:204 src/util/error/error.c:245
msgid "USER"
msgstr ""
-#: src/util/error/error.c:208 src/util/error/error.c:248
+#: src/util/error/error.c:207 src/util/error/error.c:247
msgid "ADMIN"
msgstr ""
-#: src/util/error/error.c:211 src/util/error/error.c:250
+#: src/util/error/error.c:210 src/util/error/error.c:249
msgid "DEVELOPER"
msgstr ""
-#: src/util/error/error.c:214 src/util/error/error.c:252
+#: src/util/error/error.c:213 src/util/error/error.c:251
msgid "REQUEST"
msgstr ""
-#: src/util/error/error.c:217 src/util/error/error.c:254
+#: src/util/error/error.c:216 src/util/error/error.c:253
msgid "BULK"
msgstr ""
-#: src/util/error/error.c:220 src/util/error/error.c:256
+#: src/util/error/error.c:219 src/util/error/error.c:255
msgid "IMMEDIATE"
msgstr ""
-#: src/util/error/error.c:223
+#: src/util/error/error.c:222
msgid "ALL"
msgstr ""
-#: src/util/error/error.c:238
+#: src/util/error/error.c:237
msgid "INFO"
msgstr "INFORMACIÓN"
-#: src/util/error/error.c:257
+#: src/util/error/error.c:256
msgid "NOTHING"
msgstr "NADA"
Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po 2006-12-05 01:01:27 UTC (rev 3881)
+++ GNUnet/po/rw.po 2006-12-05 01:01:45 UTC (rev 3882)
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre0\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-03 18:33-0700\n"
+"POT-Creation-Date: 2006-12-04 08:45-0700\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <address@hidden>\n"
"Language-Team: Kinyarwanda <address@hidden>\n"
@@ -2579,67 +2579,67 @@
"choices\n"
msgstr ""
-#: src/util/error/error.c:122
+#: src/util/error/error.c:121
#, c-format
msgid ""
"\n"
"Press any key to continue\n"
msgstr ""
-#: src/util/error/error.c:190 src/util/error/error.c:234
+#: src/util/error/error.c:189 src/util/error/error.c:233
msgid "DEBUG"
msgstr ""
-#: src/util/error/error.c:193 src/util/error/error.c:236
+#: src/util/error/error.c:192 src/util/error/error.c:235
msgid "STATUS"
msgstr ""
-#: src/util/error/error.c:196 src/util/error/error.c:240
+#: src/util/error/error.c:195 src/util/error/error.c:239
msgid "WARNING"
msgstr ""
-#: src/util/error/error.c:199 src/util/error/error.c:242
+#: src/util/error/error.c:198 src/util/error/error.c:241
msgid "ERROR"
msgstr ""
-#: src/util/error/error.c:202 src/util/error/error.c:244
+#: src/util/error/error.c:201 src/util/error/error.c:243
msgid "FATAL"
msgstr ""
-#: src/util/error/error.c:205 src/util/error/error.c:246
+#: src/util/error/error.c:204 src/util/error/error.c:245
#, fuzzy
msgid "USER"
msgstr "Umubare"
-#: src/util/error/error.c:208 src/util/error/error.c:248
+#: src/util/error/error.c:207 src/util/error/error.c:247
msgid "ADMIN"
msgstr ""
-#: src/util/error/error.c:211 src/util/error/error.c:250
+#: src/util/error/error.c:210 src/util/error/error.c:249
msgid "DEVELOPER"
msgstr ""
-#: src/util/error/error.c:214 src/util/error/error.c:252
+#: src/util/error/error.c:213 src/util/error/error.c:251
msgid "REQUEST"
msgstr ""
-#: src/util/error/error.c:217 src/util/error/error.c:254
+#: src/util/error/error.c:216 src/util/error/error.c:253
msgid "BULK"
msgstr ""
-#: src/util/error/error.c:220 src/util/error/error.c:256
+#: src/util/error/error.c:219 src/util/error/error.c:255
msgid "IMMEDIATE"
msgstr ""
-#: src/util/error/error.c:223
+#: src/util/error/error.c:222
msgid "ALL"
msgstr ""
-#: src/util/error/error.c:238
+#: src/util/error/error.c:237
msgid "INFO"
msgstr ""
-#: src/util/error/error.c:257
+#: src/util/error/error.c:256
msgid "NOTHING"
msgstr ""
Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po 2006-12-05 01:01:27 UTC (rev 3881)
+++ GNUnet/po/sv.po 2006-12-05 01:01:45 UTC (rev 3882)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-03 18:33-0700\n"
+"POT-Creation-Date: 2006-12-04 08:45-0700\n"
"PO-Revision-Date: 2006-01-21 17:16+0100\n"
"Last-Translator: Daniel Nylander <address@hidden>\n"
"Language-Team: Swedish <address@hidden>\n"
@@ -2384,66 +2384,66 @@
"choices\n"
msgstr ""
-#: src/util/error/error.c:122
+#: src/util/error/error.c:121
#, c-format
msgid ""
"\n"
"Press any key to continue\n"
msgstr ""
-#: src/util/error/error.c:190 src/util/error/error.c:234
+#: src/util/error/error.c:189 src/util/error/error.c:233
msgid "DEBUG"
msgstr "FELSÖKNING"
-#: src/util/error/error.c:193 src/util/error/error.c:236
+#: src/util/error/error.c:192 src/util/error/error.c:235
msgid "STATUS"
msgstr ""
-#: src/util/error/error.c:196 src/util/error/error.c:240
+#: src/util/error/error.c:195 src/util/error/error.c:239
msgid "WARNING"
msgstr "VARNING"
-#: src/util/error/error.c:199 src/util/error/error.c:242
+#: src/util/error/error.c:198 src/util/error/error.c:241
msgid "ERROR"
msgstr "FEL"
-#: src/util/error/error.c:202 src/util/error/error.c:244
+#: src/util/error/error.c:201 src/util/error/error.c:243
msgid "FATAL"
msgstr "ÖDESDIGER"
-#: src/util/error/error.c:205 src/util/error/error.c:246
+#: src/util/error/error.c:204 src/util/error/error.c:245
msgid "USER"
msgstr ""
-#: src/util/error/error.c:208 src/util/error/error.c:248
+#: src/util/error/error.c:207 src/util/error/error.c:247
msgid "ADMIN"
msgstr ""
-#: src/util/error/error.c:211 src/util/error/error.c:250
+#: src/util/error/error.c:210 src/util/error/error.c:249
msgid "DEVELOPER"
msgstr ""
-#: src/util/error/error.c:214 src/util/error/error.c:252
+#: src/util/error/error.c:213 src/util/error/error.c:251
msgid "REQUEST"
msgstr ""
-#: src/util/error/error.c:217 src/util/error/error.c:254
+#: src/util/error/error.c:216 src/util/error/error.c:253
msgid "BULK"
msgstr ""
-#: src/util/error/error.c:220 src/util/error/error.c:256
+#: src/util/error/error.c:219 src/util/error/error.c:255
msgid "IMMEDIATE"
msgstr ""
-#: src/util/error/error.c:223
+#: src/util/error/error.c:222
msgid "ALL"
msgstr ""
-#: src/util/error/error.c:238
+#: src/util/error/error.c:237
msgid "INFO"
msgstr "INFO"
-#: src/util/error/error.c:257
+#: src/util/error/error.c:256
msgid "NOTHING"
msgstr "INGET"
Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po 2006-12-05 01:01:27 UTC (rev 3881)
+++ GNUnet/po/vi.po 2006-12-05 01:01:45 UTC (rev 3882)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre4\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-03 18:33-0700\n"
+"POT-Creation-Date: 2006-12-04 08:45-0700\n"
"PO-Revision-Date: 2005-07-05 21:18+0400\n"
"Last-Translator: Phan Vinh Thinh <address@hidden>\n"
"Language-Team: Vietnamese <address@hidden>\n"
@@ -2456,66 +2456,66 @@
"choices\n"
msgstr ""
-#: src/util/error/error.c:122
+#: src/util/error/error.c:121
#, c-format
msgid ""
"\n"
"Press any key to continue\n"
msgstr ""
-#: src/util/error/error.c:190 src/util/error/error.c:234
+#: src/util/error/error.c:189 src/util/error/error.c:233
msgid "DEBUG"
msgstr "TÌMLỖI"
-#: src/util/error/error.c:193 src/util/error/error.c:236
+#: src/util/error/error.c:192 src/util/error/error.c:235
msgid "STATUS"
msgstr ""
-#: src/util/error/error.c:196 src/util/error/error.c:240
+#: src/util/error/error.c:195 src/util/error/error.c:239
msgid "WARNING"
msgstr "CẢNH BÁO"
-#: src/util/error/error.c:199 src/util/error/error.c:242
+#: src/util/error/error.c:198 src/util/error/error.c:241
msgid "ERROR"
msgstr "LỖI"
-#: src/util/error/error.c:202 src/util/error/error.c:244
+#: src/util/error/error.c:201 src/util/error/error.c:243
msgid "FATAL"
msgstr "LỖI NẶNG"
-#: src/util/error/error.c:205 src/util/error/error.c:246
+#: src/util/error/error.c:204 src/util/error/error.c:245
msgid "USER"
msgstr ""
-#: src/util/error/error.c:208 src/util/error/error.c:248
+#: src/util/error/error.c:207 src/util/error/error.c:247
msgid "ADMIN"
msgstr ""
-#: src/util/error/error.c:211 src/util/error/error.c:250
+#: src/util/error/error.c:210 src/util/error/error.c:249
msgid "DEVELOPER"
msgstr ""
-#: src/util/error/error.c:214 src/util/error/error.c:252
+#: src/util/error/error.c:213 src/util/error/error.c:251
msgid "REQUEST"
msgstr ""
-#: src/util/error/error.c:217 src/util/error/error.c:254
+#: src/util/error/error.c:216 src/util/error/error.c:253
msgid "BULK"
msgstr ""
-#: src/util/error/error.c:220 src/util/error/error.c:256
+#: src/util/error/error.c:219 src/util/error/error.c:255
msgid "IMMEDIATE"
msgstr ""
-#: src/util/error/error.c:223
+#: src/util/error/error.c:222
msgid "ALL"
msgstr ""
-#: src/util/error/error.c:238
+#: src/util/error/error.c:237
msgid "INFO"
msgstr "THÔNGTIN"
-#: src/util/error/error.c:257
+#: src/util/error/error.c:256
msgid "NOTHING"
msgstr "KHÔNGCÓGÌ"
Modified: GNUnet/src/applications/fs/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/Makefile.am 2006-12-05 01:01:27 UTC (rev
3881)
+++ GNUnet/src/applications/fs/Makefile.am 2006-12-05 01:01:45 UTC (rev
3882)
@@ -9,4 +9,17 @@
libecrs_core_la_SOURCES = \
ecrs_core.c
libecrs_core_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
+
+
+check_PROGRAMS = \
+ ecrs_core_test
+
+TESTS = $(check_PROGRAMS)
+
+ecrs_core_test_SOURCES = \
+ ecrs_core_test.c
+ecrs_core_test_LDADD = \
+ $(top_builddir)/src/util/config_impl/libgnunetutil_config.la \
+ $(top_builddir)/src/applications/fs/libecrs_core.la
+
Added: GNUnet/src/applications/fs/ecrs_core_test.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core_test.c 2006-12-05 01:01:27 UTC (rev
3881)
+++ GNUnet/src/applications/fs/ecrs_core_test.c 2006-12-05 01:01:45 UTC (rev
3882)
@@ -0,0 +1,48 @@
+/*
+ This file is part of GNUnet.
+ (C) 2006 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
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file applications/fs/ecrs_core_test.c
+ * @brief Test for ECRS CORE library
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include <extractor.h>
+#include "ecrs_core.h"
+
+#define CHECK(a) { if (! (a)) { fprintf(stderr, "Error at %s:%d\n", __FILE__,
__LINE__); return 1; } }
+
+static int testEC() {
+ return 0;
+}
+
+int main(int argc,
+ char * argv[]) {
+ int failureCount = 0;
+
+ failureCount += testEC();
+ fprintf(stderr, "\n");
+ if (failureCount != 0)
+ return 1;
+ return 0;
+}
+
+/* end of ecrs_core_test.c */
Modified: GNUnet/src/applications/fs/uritrack/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/uritrack/Makefile.am 2006-12-05 01:01:27 UTC
(rev 3881)
+++ GNUnet/src/applications/fs/uritrack/Makefile.am 2006-12-05 01:01:45 UTC
(rev 3882)
@@ -10,3 +10,17 @@
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
$(top_builddir)/src/util/libgnunetutil.la
+
+check_PROGRAMS = \
+ tracktest
+
+TESTS = $(check_PROGRAMS)
+
+tracktest_SOURCES = \
+ tracktest.c
+tracktest_LDADD = \
+ $(top_builddir)/src/util/config_impl/libgnunetutil_config.la \
+ $(top_builddir)/src/applications/fs/uritrack/libgnuneturitrack.la
+
+EXTRA_DIST = \
+ check.conf
Modified: GNUnet/src/applications/fs/uritrack/callbacks.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/callbacks.c 2006-12-05 01:01:27 UTC
(rev 3881)
+++ GNUnet/src/applications/fs/uritrack/callbacks.c 2006-12-05 01:01:45 UTC
(rev 3882)
@@ -124,6 +124,9 @@
c->abort_init = YES;
PTHREAD_JOIN(c->init, &unused);
callbacks[i] = callbacks[callbacks_size-1];
+ GROW(callbacks,
+ callbacks_size,
+ callbacks_size - 1);
FREE(c);
MUTEX_UNLOCK(lock);
return OK;
Added: GNUnet/src/applications/fs/uritrack/check.conf
===================================================================
--- GNUnet/src/applications/fs/uritrack/check.conf 2006-12-05 01:01:27 UTC
(rev 3881)
+++ GNUnet/src/applications/fs/uritrack/check.conf 2006-12-05 01:01:45 UTC
(rev 3882)
@@ -0,0 +1,12 @@
+# General settings
+[GNUNET]
+GNUNET_HOME = "/tmp/gnunet-uritrack-test-driver"
+LOGLEVEL = "WARNING"
+LOGFILE = ""
+PROCESS-PRIORITY = "NORMAL"
+
+# Network options for the clients
+[NETWORK]
+CLIENT-PORT = 2087
+HOST = "localhost"
+
Modified: GNUnet/src/applications/fs/uritrack/file_info.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/file_info.c 2006-12-05 01:01:27 UTC
(rev 3881)
+++ GNUnet/src/applications/fs/uritrack/file_info.c 2006-12-05 01:01:45 UTC
(rev 3882)
@@ -62,7 +62,7 @@
static char * getUriDbName(struct GE_Context * ectx,
struct GC_Configuration * cfg) {
- char * new;
+ char * nw;
char * pfx;
GC_get_configuration_value_filename(cfg,
@@ -70,12 +70,14 @@
"GNUNET_HOME",
GNUNET_HOME_DIRECTORY,
&pfx);
- new = MALLOC(strlen(pfx) + strlen(STATE_NAME) + 2);
- strcpy(new, pfx);
- strcat(new, "/");
- strcat(new, STATE_NAME);
+ nw = MALLOC(strlen(pfx) + strlen(STATE_NAME) + 2);
+ strcpy(nw, pfx);
+ strcat(nw, "/");
+ strcat(nw, STATE_NAME);
FREE(pfx);
- return new;
+ disk_directory_create_for_file(ectx,
+ nw);
+ return nw;
}
static char * getToggleName(struct GE_Context * ectx,
@@ -93,6 +95,8 @@
strcat(nw, "/");
strcat(nw, TRACK_OPTION);
FREE(pfx);
+ disk_directory_create_for_file(ectx,
+ nw);
return nw;
}
@@ -163,12 +167,7 @@
fn,
O_WRONLY|O_APPEND|O_CREAT|O_LARGEFILE,
S_IRUSR|S_IWUSR);
- if (fh == -1) {
- GE_LOG_STRERROR_FILE(ectx,
- GE_ERROR | GE_USER | GE_ADMIN | GE_BULK,
- "open",
- fn);
- } else {
+ if (fh != -1) {
WRITE(fh, suri, strlen(suri) + 1);
WRITE(fh, &size, sizeof(unsigned int));
WRITE(fh, data, ntohl(size));
@@ -194,11 +193,14 @@
sem = createIPC(ectx, cfg);
IPC_SEMAPHORE_DOWN(sem, YES);
fn = getUriDbName(ectx, cfg);
- if (0 != UNLINK(fn))
- GE_LOG_STRERROR_FILE(ectx,
- GE_ERROR | GE_USER | GE_ADMIN | GE_BULK,
- "unlink",
- fn);
+ if (YES == disk_file_test(ectx,
+ fn)) {
+ if (0 != UNLINK(fn))
+ GE_LOG_STRERROR_FILE(ectx,
+ GE_ERROR | GE_USER | GE_ADMIN | GE_BULK,
+ "unlink",
+ fn);
+ }
FREE(fn);
IPC_SEMAPHORE_UP(sem);
IPC_SEMAPHORE_DESTROY(sem);
Added: GNUnet/src/applications/fs/uritrack/tracktest.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/tracktest.c 2006-12-05 01:01:27 UTC
(rev 3881)
+++ GNUnet/src/applications/fs/uritrack/tracktest.c 2006-12-05 01:01:45 UTC
(rev 3882)
@@ -0,0 +1,201 @@
+/*
+ This file is part of GNUnet.
+ (C) 2006 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
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file applications/fs/uritrack/tracktest.c
+ * @brief Test for uritrack library
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include <extractor.h>
+#include "gnunet_util.h"
+#include "gnunet_uritrack_lib.h"
+#include "gnunet_util_config_impl.h"
+
+#define CHECK(a) { if (! (a)) { fprintf(stderr, "Error at %s:%d\n", __FILE__,
__LINE__); return 1; } }
+
+static struct GC_Configuration * cfg;
+
+static ECRS_FileInfo fi1;
+
+static ECRS_FileInfo fi2;
+
+static unsigned int notifications;
+
+static int notified(const ECRS_FileInfo * fi,
+ const HashCode512 * key,
+ int isRoot,
+ void * cls) {
+ if ( (fi1.meta != NULL) &&
+ (fi1.uri != NULL) &&
+ (ECRS_equalsMetaData(fi->meta,
+ fi1.meta)) &&
+ (ECRS_equalsUri(fi->uri,
+ fi1.uri)) ) {
+ notifications++;
+ return OK;
+ }
+ if ( (fi2.meta != NULL) &&
+ (fi2.uri != NULL) &&
+ (ECRS_equalsMetaData(fi->meta,
+ fi2.meta)) &&
+ (ECRS_equalsUri(fi->uri,
+ fi2.uri)) ) {
+ notifications++;
+ return OK;
+ }
+ return OK;
+}
+
+static int processor(const ECRS_FileInfo * fi,
+ const HashCode512 * key,
+ int isRoot,
+ void * cls) {
+ if ( (fi1.meta != NULL) &&
+ (fi1.uri != NULL) &&
+ (ECRS_equalsMetaData(fi->meta,
+ fi1.meta)) &&
+ (ECRS_equalsUri(fi->uri,
+ fi1.uri)) ) {
+ ECRS_freeUri(fi1.uri);
+ fi1.uri = NULL;
+ ECRS_freeMetaData(fi1.meta);
+ fi1.meta = NULL;
+ return OK;
+ }
+ if ( (fi2.meta != NULL) &&
+ (fi2.uri != NULL) &&
+ (ECRS_equalsMetaData(fi->meta,
+ fi2.meta)) &&
+ (ECRS_equalsUri(fi->uri,
+ fi2.uri)) ) {
+ ECRS_freeUri(fi2.uri);
+ fi2.uri = NULL;
+ ECRS_freeMetaData(fi2.meta);
+ fi2.meta = NULL;
+ return OK;
+ }
+ return SYSERR;
+}
+
+static int testTracking() {
+ static const char * k1[] = {
+ "foo",
+ NULL,
+ };
+ static const char * k2[] = {
+ "foot",
+ NULL,
+ };
+ fi1.uri = ECRS_keywordsToUri(k1);
+ fi1.meta = ECRS_createMetaData();
+ ECRS_addToMetaData(fi1.meta,
+ EXTRACTOR_MIMETYPE,
+ "foo/bar");
+ fi2.uri = ECRS_keywordsToUri(k2);
+ fi2.meta = ECRS_createMetaData();
+ ECRS_addToMetaData(fi2.meta,
+ EXTRACTOR_MIMETYPE,
+ "foo/bar");
+
+ URITRACK_clearTrackedURIS(NULL,
+ cfg);
+ URITRACK_registerTrackCallback(NULL,
+ cfg,
+ ¬ified,
+ NULL);
+ URITRACK_trackURIS(NULL,
+ cfg,
+ NO);
+ URITRACK_clearTrackedURIS(NULL,
+ cfg);
+ /* test non-tracking */
+ URITRACK_trackURI(NULL,
+ cfg,
+ &fi1);
+ CHECK(0 == URITRACK_listURIs(NULL,
+ cfg,
+ NO,
+ NULL,
+ NULL));
+ CHECK(NO == URITRACK_trackStatus(NULL,
+ cfg));
+ URITRACK_clearTrackedURIS(NULL,
+ cfg);
+ URITRACK_trackURIS(NULL,
+ cfg,
+ YES);
+ URITRACK_clearTrackedURIS(NULL,
+ cfg);
+ CHECK(0 == URITRACK_listURIs(NULL,
+ cfg,
+ NO,
+ NULL,
+ NULL));
+ CHECK(YES == URITRACK_trackStatus(NULL,
+ cfg));
+ URITRACK_trackURI(NULL,
+ cfg,
+ &fi1);
+ CHECK(1 == URITRACK_listURIs(NULL,
+ cfg,
+ NO,
+ NULL,
+ NULL));
+ URITRACK_trackURI(NULL,
+ cfg,
+ &fi2);
+ CHECK(2 == URITRACK_listURIs(NULL,
+ cfg,
+ YES,
+ &processor,
+ NULL));
+ URITRACK_trackURIS(NULL,
+ cfg,
+ NO);
+ CHECK(NO == URITRACK_trackStatus(NULL,
+ cfg));
+ URITRACK_clearTrackedURIS(NULL,
+ cfg);
+ CHECK(notifications == 2);
+ URITRACK_unregisterTrackCallback(¬ified,
+ NULL);
+ return 0;
+}
+
+int main(int argc,
+ char * argv[]) {
+ int failureCount = 0;
+
+ cfg = GC_create_C_impl();
+ if (-1 == GC_parse_configuration(cfg,
+ "check.conf")) {
+ GC_free(cfg);
+ return -1;
+ }
+ failureCount += testTracking();
+ GC_free(cfg);
+ if (failureCount != 0)
+ return 1;
+ return 0;
+}
+
+/* end of tracktest.c */
Modified: GNUnet/src/include/ecrs_core.h
===================================================================
--- GNUnet/src/include/ecrs_core.h 2006-12-05 01:01:27 UTC (rev 3881)
+++ GNUnet/src/include/ecrs_core.h 2006-12-05 01:01:45 UTC (rev 3882)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other
contributing authors)
+ (C) 2001, 2002, 2003, 2004, 2005, 2006 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
@@ -45,12 +45,25 @@
* @brief data block
*/
typedef struct {
+
+ /**
+ * Type of the block, in network byte order.
+ */
unsigned int type;
+
+ /* data follows here */
+
} DBlock;
typedef struct {
+
+ /**
+ * Type of the block (IBLOCK), in network byte order.
+ */
DBlock iblock;
+
CHK data[1];
+
} IBlock;
/**
@@ -70,58 +83,110 @@
* Query and key of the top IBlock.
*/
CHK chk;
+
} FileIdentifier;
/**
* @brief keyword block (advertising data under a keyword)
*/
typedef struct {
+
+ /**
+ * Type of the block (KBLOCK), in network byte order.
+ */
unsigned int type;
- Signature signature; /* 256 b */
/**
+ * Signature using RSA-key generated from search keyword.
+ */
+ Signature signature;
+
+ /**
* Key generated (!) from the H(keyword) as the seed!
*/
PublicKey keyspace;
/* 0-terminated URI here */
+
/* variable-size Meta-Data follows here! */
+
} KBlock;
typedef struct {
+
+ /**
+ * Type of the block (SBLOCK), in network byte order.
+ */
unsigned int type;
- Signature signature; /* 256 b */
/**
- * S = H(subspace); 264 b
+ * RSA signature (from pseudonym controlling the namespace)
*/
+ Signature signature;
+
+ /**
+ * Public key of the pseudonym; S = H(subspace);
+ */
PublicKey subspace;
/* from here on signed */
+
/**
* R = H(N-I)^S, used for routing!
*/
HashCode512 identifier;
/* from here on encrypted */
- TIME_T creationTime; /* in network byte order */
- TIME_T updateInterval; /* in network byte order */
- HashCode512 nextIdentifier; /* N, 20 b */
- HashCode512 identifierIncrement; /* I, 20 b */
+
+ /**
+ * Time at which this SBlock was created;
+ * in network byte order
+ */
+ TIME_T creationTime;
+
+ /**
+ * Interval (in seconds) how often the publisher intends to produce
+ * an updated SBlock; ECRS_SBLOCK_UPDATE_NONE(0) is used for
+ * non-updateable SBlocks, ECRS_SBLOCK_UPDATE_SPORADIC(-1) is used
+ * for entries without a fixed update frequency; in network byte
+ * order
+ */
+ TIME_T updateInterval;
+
+ /**
+ * N, the identifier that will be used for the
+ * next revision of this SBlock.
+ */
+ HashCode512 nextIdentifier;
+
+ /**
+ * I, the increment between identifiers (used to enable
+ * skipping of blocks by appying multiple increments.
+ */
+ HashCode512 identifierIncrement;
+
/* 0-terminated URI follows here! */
+
/* variable-size Meta-Data follows here! */
} SBlock;
typedef struct {
+
+ /**
+ * Type of the block (NBLOCK), in network byte order.
+ */
unsigned int type;
Signature signature; /* 256 b */
PublicKey subspace; /* S = H(subspace); 264 b */
+
/**
* Must be all zeros
*/
HashCode512 identifier;
+
/* The REST (from here on) is encrypted! */
+
/**
* Identifier of the namespace
*/
@@ -140,6 +205,10 @@
* @brief keyword-NBlock (advertising namespace under a keyword)
*/
typedef struct {
+
+ /**
+ * Type of the block (KNBLOCK), in network byte order.
+ */
unsigned int type;
KBlock kblock;
@@ -147,7 +216,6 @@
NBlock nblock;
} KNBlock;
-
/**
* Perform on-demand content encoding.
*
@@ -230,5 +298,4 @@
unsigned int keyCount,
const HashCode512 * keys);
-
#endif
Modified: GNUnet/src/include/gnunet_uritrack_lib.h
===================================================================
--- GNUnet/src/include/gnunet_uritrack_lib.h 2006-12-05 01:01:27 UTC (rev
3881)
+++ GNUnet/src/include/gnunet_uritrack_lib.h 2006-12-05 01:01:45 UTC (rev
3882)
@@ -36,7 +36,6 @@
#endif
#endif
-
/**
* Toggle tracking URIs.
*
Modified: GNUnet/src/util/error/error.c
===================================================================
--- GNUnet/src/util/error/error.c 2006-12-05 01:01:27 UTC (rev 3881)
+++ GNUnet/src/util/error/error.c 2006-12-05 01:01:45 UTC (rev 3882)
@@ -67,8 +67,7 @@
size_t size;
char * buf;
- if (ctx == NULL)
- {
+ if (ctx == NULL) {
ctx = defaultContext;
#ifdef WINDOWS
/* Most tools disband the console window early in the initialization
Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2006-12-05 01:01:27 UTC (rev 3881)
+++ GNUnet/todo 2006-12-05 01:01:45 UTC (rev 3882)
@@ -18,7 +18,6 @@
- more testcases: [RCpre3]
* ecrs_core
* gap (incl. economy)
- * fs/uritrack
* fs/namespaces
* fs/collection
* tracekit
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3882 - in GNUnet: . po src/applications/fs src/applications/fs/uritrack src/include src/util/error,
grothoff <=