[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r1576 - Extractor GNUnet GNUnet/bin GNUnet/m4 GNUnet/po GNU
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r1576 - Extractor GNUnet GNUnet/bin GNUnet/m4 GNUnet/po GNUnet/src/applications/advertising GNUnet/src/applications/bootstrap_http GNUnet/src/applications/chat GNUnet/src/applications/dht/module GNUnet/src/applications/dht/tools GNUnet/src/applications/fragmentation GNUnet/src/applications/fs/ecrs GNUnet/src/applications/fs/fsui GNUnet/src/applications/fs/lib GNUnet/src/applications/fs/module GNUnet/src/applications/gap GNUnet/src/applications/gap/peer1 GNUnet/src/applications/gap/peer2 GNUnet/src/applications/getoption GNUnet/src/applications/identity GNUnet/src/applications/pingpong GNUnet/src/applications/rpc GNUnet/src/applications/session GNUnet/src/applications/stats GNUnet/src/applications/tbench GNUnet/src/applications/template GNUnet/src/applications/testbed GNUnet/src/applications/tracekit GNUnet/src/applications/traffic GNUnet/src/applications/transport GNUnet/src/conf GNUnet/src/include GNUnet/src/server GNUnet/src/transports GNUnet/src/util GNUnet-docs/WWW GNUnet-docs/WWW/news GNUnet-docs/WWW/test gnunet-gtk gnunet-gtk/po gnunet-gtk/src/core gnunet-gtk/src/plugins/stats |
|
Date: |
Sun, 17 Jul 2005 16:23:46 -0700 (PDT) |
Author: grothoff
Date: 2005-07-17 16:21:45 -0700 (Sun, 17 Jul 2005)
New Revision: 1576
Added:
GNUnet-docs/WWW/news/news_20050718.inc
GNUnet/bin/rename-multiple.sh
GNUnet/src/applications/gap/peer1/.hostkey
GNUnet/src/applications/gap/peer2/.hostkey
GNUnet/src/util/check.conf
Modified:
Extractor/PLATFORMS
GNUnet-docs/WWW/download.php3
GNUnet-docs/WWW/protocol_cs.php3
GNUnet-docs/WWW/protocol_cs_afs.php3
GNUnet-docs/WWW/protocol_cs_core.php3
GNUnet-docs/WWW/protocol_cs_getoption.php3
GNUnet-docs/WWW/protocol_cs_stats.php3
GNUnet-docs/WWW/protocol_cs_traffic.php3
GNUnet-docs/WWW/protocol_p2p.php3
GNUnet-docs/WWW/protocol_p2p_afs.php3
GNUnet-docs/WWW/protocol_p2p_core.php3
GNUnet-docs/WWW/protocol_p2p_rpc.php3
GNUnet-docs/WWW/protocol_transport_tcp.php3
GNUnet-docs/WWW/test/protocol_cs_afs.php3
GNUnet-docs/WWW/test/protocol_cs_core.php3
GNUnet-docs/WWW/test/protocol_p2p_afs.php3
GNUnet-docs/WWW/test/protocol_transport_udp.php3
GNUnet-docs/WWW/test/user_tbench.php3
GNUnet/ABOUT-NLS
GNUnet/ChangeLog
GNUnet/PLATFORMS
GNUnet/bin/rename.sh
GNUnet/m4/po.m4
GNUnet/m4/printf-posix.m4
GNUnet/po/GNUnet.pot
GNUnet/po/Makefile.in.in
GNUnet/po/de.po
GNUnet/po/rw.po
GNUnet/po/vi.po
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/advertising/bootstrap.c
GNUnet/src/applications/advertising/bootstrap.h
GNUnet/src/applications/bootstrap_http/http.c
GNUnet/src/applications/chat/chat.c
GNUnet/src/applications/chat/chat.h
GNUnet/src/applications/chat/gnunet-chat.c
GNUnet/src/applications/dht/module/cs.c
GNUnet/src/applications/dht/module/dht.c
GNUnet/src/applications/dht/module/dht_test.c
GNUnet/src/applications/dht/tools/dht_api.c
GNUnet/src/applications/dht/tools/dhttest2.c
GNUnet/src/applications/dht/tools/peer1.conf
GNUnet/src/applications/dht/tools/peer2.conf
GNUnet/src/applications/fragmentation/fragmentation.c
GNUnet/src/applications/fragmentation/fragmentationtest.c
GNUnet/src/applications/fs/ecrs/check.conf
GNUnet/src/applications/fs/fsui/check.conf
GNUnet/src/applications/fs/lib/check.conf
GNUnet/src/applications/fs/lib/fslib.c
GNUnet/src/applications/fs/module/anonymity.c
GNUnet/src/applications/fs/module/fs.c
GNUnet/src/applications/fs/module/querymanager.c
GNUnet/src/applications/gap/gap.c
GNUnet/src/applications/gap/gaptest.c
GNUnet/src/applications/gap/peer1.conf
GNUnet/src/applications/gap/peer2.conf
GNUnet/src/applications/getoption/clientapi.c
GNUnet/src/applications/getoption/getoption.c
GNUnet/src/applications/getoption/getoption.h
GNUnet/src/applications/identity/check.conf
GNUnet/src/applications/identity/identity.c
GNUnet/src/applications/identity/identitytest.c
GNUnet/src/applications/pingpong/pingpong.c
GNUnet/src/applications/rpc/rpc.c
GNUnet/src/applications/session/connect.c
GNUnet/src/applications/session/peer1.conf
GNUnet/src/applications/session/peer2.conf
GNUnet/src/applications/session/sessiontest.c
GNUnet/src/applications/stats/clientapi.c
GNUnet/src/applications/stats/statistics.c
GNUnet/src/applications/stats/statistics.h
GNUnet/src/applications/tbench/gnunet-tbench.c
GNUnet/src/applications/tbench/peer1.conf
GNUnet/src/applications/tbench/peer2.conf
GNUnet/src/applications/tbench/tbench.c
GNUnet/src/applications/tbench/tbench.h
GNUnet/src/applications/tbench/tbenchtest.c
GNUnet/src/applications/template/gnunet-template.c
GNUnet/src/applications/template/template.c
GNUnet/src/applications/testbed/commands.c
GNUnet/src/applications/testbed/testbed.c
GNUnet/src/applications/testbed/testbed.h
GNUnet/src/applications/tracekit/gnunet-tracekit.c
GNUnet/src/applications/tracekit/tracekit.c
GNUnet/src/applications/tracekit/tracekit.h
GNUnet/src/applications/traffic/clientapi.c
GNUnet/src/applications/traffic/traffic.c
GNUnet/src/applications/traffic/traffic.h
GNUnet/src/applications/transport/transport.c
GNUnet/src/conf/wizard_curs.c
GNUnet/src/include/fs.h
GNUnet/src/include/gnunet_blockstore.h
GNUnet/src/include/gnunet_bootstrap_service.h
GNUnet/src/include/gnunet_core.h
GNUnet/src/include/gnunet_dht.h
GNUnet/src/include/gnunet_dht_lib.h
GNUnet/src/include/gnunet_dht_service.h
GNUnet/src/include/gnunet_fragmentation_service.h
GNUnet/src/include/gnunet_gap_service.h
GNUnet/src/include/gnunet_getoption_lib.h
GNUnet/src/include/gnunet_identity_service.h
GNUnet/src/include/gnunet_pingpong_service.h
GNUnet/src/include/gnunet_protocols.h
GNUnet/src/include/gnunet_sqstore_service.h
GNUnet/src/include/gnunet_topology_service.h
GNUnet/src/include/gnunet_traffic_lib.h
GNUnet/src/include/gnunet_transport.h
GNUnet/src/include/gnunet_transport_service.h
GNUnet/src/include/gnunet_util.h
GNUnet/src/server/connection.c
GNUnet/src/server/connection.h
GNUnet/src/server/gnunet-peer-info.c
GNUnet/src/server/gnunet-transport-check.c
GNUnet/src/server/handler.c
GNUnet/src/server/handler.h
GNUnet/src/server/startup.c
GNUnet/src/server/tcpserver.c
GNUnet/src/server/tcpserver.h
GNUnet/src/transports/http.c
GNUnet/src/transports/nat.c
GNUnet/src/transports/smtp.c
GNUnet/src/transports/tcp.c
GNUnet/src/transports/tcp6.c
GNUnet/src/transports/udp.c
GNUnet/src/transports/udp6.c
GNUnet/src/util/cron.c
GNUnet/src/util/daemon.c
GNUnet/src/util/osconfig.c
GNUnet/src/util/tcp_return.c
GNUnet/src/util/tcpio.c
GNUnet/src/util/tcpiotest.c
gnunet-gtk/ABOUT-NLS
gnunet-gtk/configure.ac
gnunet-gtk/mkinstalldirs
gnunet-gtk/po/Makefile.in
gnunet-gtk/po/Makefile.in.in
gnunet-gtk/po/Rules-quot
gnunet-gtk/po/de.po
gnunet-gtk/po/gnunet-gtk.pot
gnunet-gtk/po/rw.po
gnunet-gtk/po/vi.po
gnunet-gtk/src/core/Makefile.am
gnunet-gtk/src/plugins/stats/functions.c
Log:
alpha renaming and some minor refactoring
Modified: Extractor/PLATFORMS
===================================================================
--- Extractor/PLATFORMS 2005-07-17 23:19:45 UTC (rev 1575)
+++ Extractor/PLATFORMS 2005-07-17 23:21:45 UTC (rev 1576)
@@ -4,28 +4,24 @@
GNU/Linux (x86):
- perfect
+GNU/Linux (Ultra Sparc):
+- perfect
+
+GNU/Linux (Alpha):
+- perfect
+
FreeBSD (x86):
- perfect
OpenBSD/NetBSD:
- unknown
-GNU/Linux (Ultra Sparc):
-- perfect
-
-GNU/Linux (Alpha):
+OS X (10.3, PowerPC):
- perfect
Solaris 8 (SunOS 5.8, Sparc SunFire 880):
-- possibly with small libltdl compile problem
- (add #define LT_USE_POSIX_DIRENT in line 88 of ltdl.c).
+- unknown
-OS X (10.3, PowerPC):
-- MacOS X users must bootstrap the configuration system using
- libtool 1.5.10 or later (in the root libextractor directory):
- autoreconf -f -i; cd libltdl; autoreconf -f -i; cd ..
- After this, configure & make should work properly.
-
MinGW:
- linking against libstdc++ fails
my workaround: rename libstdc++.la
Modified: GNUnet/ABOUT-NLS
===================================================================
--- GNUnet/ABOUT-NLS 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/ABOUT-NLS 2005-07-17 23:21:45 UTC (rev 1576)
@@ -131,13 +131,6 @@
read translations in German than English for when Swedish is not
available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
- Special advice for Norwegian users: The language code for Norwegian
-bokma*l changed from `no' to `nb' recently (in 2003). During the
-transition period, while some message catalogs for this language are
-installed under `nb' and some older ones under `no', it's recommended
-for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
-older translations are used.
-
In the `LANGUAGE' environment variable, but not in the `LANG'
environment variable, `LL_CC' combinations can be abbreviated as `LL'
to denote the language's main dialect. For example, `de' is equivalent
@@ -178,558 +171,502 @@
==================
Languages are not equally supported in all packages. The following
-matrix shows the current state of internationalization, as of January
-2004. The matrix shows, in regard of each package, for which languages
+matrix shows the current state of internationalization, as of November
+2003. The matrix shows, in regard of each package, for which languages
PO files have been submitted to translation coordination, with a
translation percentage of at least 50%.
- Ready PO files af am ar az be bg bs ca cs da de el en en_GB eo es
- +----------------------------------------------------+
- a2ps | [] [] [] [] |
- aegis | () |
- ant-phone | () |
- anubis | |
- ap-utils | |
- aspell | [] |
- bash | [] [] [] [] |
- batchelor | |
- bfd | [] [] |
- binutils | [] [] |
- bison | [] [] [] |
- bluez-pin | [] [] [] |
- clisp | |
- clisp | [] [] [] |
- console-tools | [] [] |
- coreutils | [] [] [] [] |
- cpio | [] [] [] |
- darkstat | [] () [] |
- diffutils | [] [] [] [] [] [] [] |
- e2fsprogs | [] [] [] |
- enscript | [] [] [] [] |
- error | [] [] [] [] [] |
- fetchmail | [] () [] [] [] [] |
- fileutils | [] [] [] |
- findutils | [] [] [] [] [] [] [] |
- flex | [] [] [] [] |
- fslint | |
- gas | [] |
- gawk | [] [] [] [] |
- gbiff | [] |
- gcal | [] |
- gcc | [] [] |
- gettext | [] [] [] [] [] |
- gettext-examples | [] [] [] [] |
- gettext-runtime | [] [] [] [] [] |
- gettext-tools | [] [] [] |
- gimp-print | [] [] [] [] [] |
- gliv | |
- glunarclock | [] [] |
- gnubiff | [] |
- gnucash | [] () [] [] |
- gnucash-glossary | [] () [] |
- gnupg | [] () [] [] [] [] |
- gpe-aerial | [] |
- gpe-beam | [] [] |
- gpe-calendar | [] [] |
- gpe-clock | [] [] |
- gpe-conf | [] [] |
- gpe-contacts | [] [] |
- gpe-edit | [] |
- gpe-go | [] |
- gpe-login | [] [] |
- gpe-ownerinfo | [] [] |
- gpe-sketchbook | [] [] |
- gpe-su | [] [] |
- gpe-taskmanager | [] [] |
- gpe-timesheet | [] |
- gpe-today | [] [] |
- gpe-todo | [] [] |
- gphoto2 | [] [] [] [] |
- gprof | [] [] [] |
- gpsdrive | () () () |
- gramadoir | [] |
- grep | [] [] [] [] [] [] |
- gretl | [] |
- gtick | [] () |
- hello | [] [] [] [] [] [] |
- id-utils | [] [] |
- indent | [] [] [] [] |
- iso_3166 | [] [] [] [] [] [] [] [] [] [] |
- iso_3166_1 | [] [] [] [] [] [] |
- iso_3166_2 | |
- iso_3166_3 | [] |
- iso_4217 | [] [] [] [] |
- iso_639 | |
- jpilot | [] [] [] |
- jtag | |
- jwhois | [] |
- kbd | [] [] [] [] [] |
- latrine | () |
- ld | [] [] |
- libc | [] [] [] [] [] [] |
- libgpewidget | [] [] |
- libiconv | [] [] [] [] [] |
- lifelines | [] () |
- lilypond | [] |
- lingoteach | |
- lingoteach_lessons | () () |
- lynx | [] [] [] [] |
- m4 | [] [] [] [] |
- mailutils | [] [] |
- make | [] [] [] |
- man-db | [] () [] [] () |
- minicom | [] [] [] |
- mysecretdiary | [] [] [] |
- nano | [] () [] [] [] |
- nano_1_0 | [] () [] [] [] |
- opcodes | [] |
- parted | [] [] [] [] [] |
- ptx | [] [] [] [] [] |
- python | |
- radius | [] |
- recode | [] [] [] [] [] [] [] |
- rpm | [] [] |
- screem | |
- scrollkeeper | [] [] [] [] [] [] |
- sed | [] [] [] [] [] [] |
- sh-utils | [] [] [] |
- shared-mime-info | |
- sharutils | [] [] [] [] [] [] |
- silky | () |
- skencil | [] () [] |
- sketch | [] () [] |
- soundtracker | [] [] [] |
- sp | [] |
- tar | [] [] [] [] |
- texinfo | [] [] [] |
- textutils | [] [] [] [] |
- tin | () () |
- tp-robot | |
- tuxpaint | [] [] [] [] [] [] [] |
- unicode-han-tra... | |
- unicode-transla... | |
- util-linux | [] [] [] [] [] |
- vorbis-tools | [] [] [] [] |
- wastesedge | () |
- wdiff | [] [] [] [] |
- wget | [] [] [] [] [] [] |
- xchat | [] [] [] [] |
- xfree86_xkb_xml | [] [] |
- xpad | [] |
- +----------------------------------------------------+
- af am ar az be bg bs ca cs da de el en en_GB eo es
- 4 0 0 1 9 4 1 40 41 60 78 17 1 5 13 68
+ Ready PO files am az be bg ca cs da de el en en_GB eo es
+ +-------------------------------------------+
+ a2ps | [] [] [] [] |
+ aegis | () |
+ ant-phone | () |
+ anubis | |
+ ap-utils | |
+ bash | [] [] [] [] |
+ batchelor | |
+ bfd | [] [] |
+ binutils | [] [] |
+ bison | [] [] [] |
+ bluez-pin | [] [] |
+ clisp | [] [] [] |
+ clisp | |
+ coreutils | [] [] [] [] |
+ cpio | [] [] [] |
+ darkstat | [] () [] |
+ diffutils | [] [] [] [] [] [] [] |
+ e2fsprogs | [] [] |
+ enscript | [] [] [] [] |
+ error | [] [] [] [] [] |
+ fetchmail | [] () [] [] [] [] |
+ fileutils | [] [] [] |
+ findutils | [] [] [] [] [] [] [] |
+ flex | [] [] [] [] |
+ fslint | |
+ gas | [] |
+ gawk | [] [] [] [] |
+ gbiff | [] |
+ gcal | [] |
+ gcc | [] [] |
+ gettext | [] [] [] [] [] |
+ gettext-examples | [] [] [] |
+ gettext-runtime | [] [] [] [] [] |
+ gettext-tools | [] [] [] |
+ gimp-print | [] [] [] [] [] |
+ gliv | |
+ glunarclock | [] [] [] |
+ gnubiff | [] |
+ gnucash | [] () [] [] |
+ gnucash-glossary | [] () [] |
+ gnupg | [] () [] [] [] [] |
+ gpe-aerial | [] |
+ gpe-beam | [] [] |
+ gpe-calendar | [] [] |
+ gpe-clock | [] [] |
+ gpe-conf | [] [] |
+ gpe-contacts | [] [] |
+ gpe-edit | [] |
+ gpe-go | [] |
+ gpe-login | [] [] |
+ gpe-ownerinfo | [] [] |
+ gpe-sketchbook | [] [] |
+ gpe-su | [] [] |
+ gpe-taskmanager | [] [] |
+ gpe-timesheet | [] |
+ gpe-today | [] [] |
+ gpe-todo | [] [] |
+ gphoto2 | [] [] [] [] |
+ gprof | [] [] [] |
+ gpsdrive | () () () |
+ gramadoir | [] |
+ grep | [] [] [] [] [] [] |
+ gretl | [] |
+ gtick | () |
+ hello | [] [] [] [] [] [] |
+ id-utils | [] [] |
+ indent | [] [] [] [] |
+ jpilot | [] [] [] |
+ jtag | |
+ jwhois | [] |
+ kbd | [] [] [] [] [] |
+ latrine | () |
+ ld | [] [] |
+ libc | [] [] [] [] [] [] |
+ libgpewidget | [] [] |
+ libiconv | [] [] [] [] [] |
+ lifelines | [] () |
+ lilypond | [] |
+ lingoteach | |
+ lingoteach_lessons | () () |
+ lynx | [] [] [] [] |
+ m4 | [] [] [] [] |
+ mailutils | [] [] |
+ make | [] [] [] |
+ man-db | [] () [] [] () |
+ minicom | [] [] [] |
+ mysecretdiary | [] [] [] |
+ nano | [] () [] [] [] |
+ nano_1_0 | [] () [] [] [] |
+ opcodes | [] |
+ parted | [] [] [] [] [] |
+ ptx | [] [] [] [] [] |
+ python | |
+ radius | |
+ recode | [] [] [] [] [] [] [] |
+ screem | |
+ scrollkeeper | [] [] [] [] [] [] |
+ sed | [] [] [] [] [] |
+ sh-utils | [] [] [] |
+ shared-mime-info | |
+ sharutils | [] [] [] [] [] [] |
+ sketch | [] () [] |
+ soundtracker | [] [] [] |
+ sp | [] |
+ tar | [] [] [] [] |
+ texinfo | [] [] [] |
+ textutils | [] [] [] [] |
+ tin | () () |
+ tuxpaint | [] [] [] [] [] [] [] |
+ util-linux | [] [] [] [] [] |
+ vorbis-tools | [] [] [] [] |
+ wastesedge | () |
+ wdiff | [] [] [] [] |
+ wget | [] [] [] [] [] [] |
+ xchat | [] [] [] [] |
+ xfree86_xkb_xml | [] |
+ xpad | [] |
+ +-------------------------------------------+
+ am az be bg ca cs da de el en en_GB eo es
+ 0 1 8 3 37 37 54 73 15 1 5 12 62
- et eu fa fi fr ga gl he hr hu id is it ja ko lg
- +-------------------------------------------------+
- a2ps | [] [] [] () () |
- aegis | |
- ant-phone | [] |
- anubis | [] |
- ap-utils | [] |
- aspell | [] [] |
- bash | [] [] |
- batchelor | [] [] |
- bfd | [] |
- binutils | [] [] |
- bison | [] [] [] [] |
- bluez-pin | [] [] [] [] [] |
- clisp | |
- clisp | [] |
- console-tools | |
- coreutils | [] [] [] [] [] [] |
- cpio | [] [] [] [] |
- darkstat | () [] [] [] |
- diffutils | [] [] [] [] [] [] [] |
- e2fsprogs | |
- enscript | [] [] |
- error | [] [] [] [] |
- fetchmail | [] |
- fileutils | [] [] [] [] [] [] |
- findutils | [] [] [] [] [] [] [] [] [] [] [] |
- flex | [] [] [] |
- fslint | [] |
- gas | [] |
- gawk | [] [] [] |
- gbiff | [] |
- gcal | [] |
- gcc | [] |
- gettext | [] [] [] |
- gettext-examples | [] [] |
- gettext-runtime | [] [] [] [] [] |
- gettext-tools | [] [] [] |
- gimp-print | [] [] |
- gliv | () |
- glunarclock | [] [] [] [] |
- gnubiff | [] |
- gnucash | () [] |
- gnucash-glossary | [] |
- gnupg | [] [] [] [] [] [] [] |
- gpe-aerial | [] |
- gpe-beam | [] |
- gpe-calendar | [] [] [] |
- gpe-clock | [] |
- gpe-conf | [] |
- gpe-contacts | [] [] |
- gpe-edit | [] [] |
- gpe-go | [] |
- gpe-login | [] [] |
- gpe-ownerinfo | [] [] [] |
- gpe-sketchbook | [] |
- gpe-su | [] |
- gpe-taskmanager | [] |
- gpe-timesheet | [] [] [] |
- gpe-today | [] [] |
- gpe-todo | [] [] |
- gphoto2 | [] [] [] |
- gprof | [] [] |
- gpsdrive | () () () |
- gramadoir | [] [] |
- grep | [] [] [] [] [] [] [] [] [] [] [] |
- gretl | [] [] |
- gtick | [] [] [] |
- hello | [] [] [] [] [] [] [] [] [] [] [] [] [] |
- id-utils | [] [] [] [] |
- indent | [] [] [] [] [] [] [] [] [] |
- iso_3166 | [] [] [] [] [] [] [] |
- iso_3166_1 | [] [] [] [] [] |
- iso_3166_2 | |
- iso_3166_3 | |
- iso_4217 | [] [] [] [] [] [] |
- iso_639 | |
- jpilot | [] () |
- jtag | [] |
- jwhois | [] [] [] [] |
- kbd | [] |
- latrine | [] |
- ld | [] |
- libc | [] [] [] [] [] [] |
- libgpewidget | [] [] [] [] |
- libiconv | [] [] [] [] [] [] [] [] [] |
- lifelines | () |
- lilypond | [] |
- lingoteach | [] [] |
- lingoteach_lessons | |
- lynx | [] [] [] [] |
- m4 | [] [] [] [] |
- mailutils | |
- make | [] [] [] [] [] [] |
- man-db | () () |
- minicom | [] [] [] [] |
- mysecretdiary | [] [] |
- nano | [] [] [] [] |
- nano_1_0 | [] [] [] [] |
- opcodes | [] |
- parted | [] [] [] |
- ptx | [] [] [] [] [] [] [] |
- python | |
- radius | [] |
- recode | [] [] [] [] [] [] |
- rpm | [] [] |
- screem | |
- scrollkeeper | [] |
- sed | [] [] [] [] [] [] [] [] [] |
- sh-utils | [] [] [] [] [] [] [] |
- shared-mime-info | [] [] [] |
- sharutils | [] [] [] [] [] |
- silky | () [] () () |
- skencil | [] |
- sketch | [] |
- soundtracker | [] [] |
- sp | [] () |
- tar | [] [] [] [] [] [] [] [] [] |
- texinfo | [] [] [] [] |
- textutils | [] [] [] [] [] [] |
- tin | [] () |
- tp-robot | [] |
- tuxpaint | [] [] [] [] [] [] [] [] [] |
- unicode-han-tra... | |
- unicode-transla... | [] [] |
- util-linux | [] [] [] [] () [] |
- vorbis-tools | [] |
- wastesedge | () |
- wdiff | [] [] [] [] [] [] |
- wget | [] [] [] [] [] [] [] |
- xchat | [] [] [] |
- xfree86_xkb_xml | [] [] |
- xpad | [] [] |
- +-------------------------------------------------+
- et eu fa fi fr ga gl he hr hu id is it ja ko lg
- 22 2 1 26 106 28 24 8 10 41 33 1 26 33 12 0
+ et fa fi fr ga gl he hr hu id is it ja
+ +----------------------------------------+
+ a2ps | [] [] [] () |
+ aegis | |
+ ant-phone | |
+ anubis | [] |
+ ap-utils | [] |
+ bash | [] [] |
+ batchelor | [] |
+ bfd | [] |
+ binutils | [] [] |
+ bison | [] [] [] [] |
+ bluez-pin | [] [] [] [] [] |
+ clisp | [] |
+ clisp | |
+ coreutils | [] [] [] [] [] [] |
+ cpio | [] [] [] |
+ darkstat | () [] [] [] |
+ diffutils | [] [] [] [] [] [] [] |
+ e2fsprogs | |
+ enscript | [] [] |
+ error | [] [] [] [] |
+ fetchmail | [] |
+ fileutils | [] [] [] [] [] [] |
+ findutils | [] [] [] [] [] [] [] [] [] [] |
+ flex | [] [] |
+ fslint | |
+ gas | [] |
+ gawk | [] [] [] |
+ gbiff | |
+ gcal | [] |
+ gcc | [] |
+ gettext | [] [] |
+ gettext-examples | [] [] |
+ gettext-runtime | [] [] [] [] |
+ gettext-tools | [] [] |
+ gimp-print | [] [] |
+ gliv | () |
+ glunarclock | [] [] [] [] [] |
+ gnubiff | |
+ gnucash | () [] |
+ gnucash-glossary | [] |
+ gnupg | [] [] [] [] [] [] [] |
+ gpe-aerial | [] |
+ gpe-beam | [] |
+ gpe-calendar | [] [] [] |
+ gpe-clock | [] |
+ gpe-conf | [] |
+ gpe-contacts | [] [] |
+ gpe-edit | [] [] |
+ gpe-go | [] |
+ gpe-login | [] [] |
+ gpe-ownerinfo | [] [] [] |
+ gpe-sketchbook | [] |
+ gpe-su | [] |
+ gpe-taskmanager | [] |
+ gpe-timesheet | [] [] [] |
+ gpe-today | [] [] |
+ gpe-todo | [] [] |
+ gphoto2 | [] [] [] |
+ gprof | [] [] |
+ gpsdrive | () [] () () |
+ gramadoir | [] |
+ grep | [] [] [] [] [] [] [] [] [] [] [] |
+ gretl | [] |
+ gtick | [] [] |
+ hello | [] [] [] [] [] [] [] [] [] [] [] [] |
+ id-utils | [] [] [] [] |
+ indent | [] [] [] [] [] [] [] [] [] |
+ jpilot | [] () |
+ jtag | |
+ jwhois | [] [] [] [] |
+ kbd | [] |
+ latrine | |
+ ld | [] |
+ libc | [] [] [] [] [] |
+ libgpewidget | [] [] [] [] |
+ libiconv | [] [] [] [] [] [] [] [] [] |
+ lifelines | () |
+ lilypond | [] |
+ lingoteach | [] [] |
+ lingoteach_lessons | |
+ lynx | [] [] [] [] |
+ m4 | [] [] [] [] |
+ mailutils | |
+ make | [] [] [] [] [] |
+ man-db | () () |
+ minicom | [] [] [] [] |
+ mysecretdiary | [] [] |
+ nano | [] [] [] [] |
+ nano_1_0 | [] [] [] [] |
+ opcodes | [] |
+ parted | [] [] [] |
+ ptx | [] [] [] [] [] [] [] |
+ python | |
+ radius | |
+ recode | [] [] [] [] [] [] |
+ screem | |
+ scrollkeeper | [] |
+ sed | [] [] [] [] [] [] [] [] [] |
+ sh-utils | [] [] [] [] [] [] [] |
+ shared-mime-info | [] |
+ sharutils | [] [] [] [] [] |
+ sketch | [] |
+ soundtracker | [] [] [] [] |
+ sp | [] () |
+ tar | [] [] [] [] [] [] [] [] [] |
+ texinfo | [] [] [] [] |
+ textutils | [] [] [] [] [] |
+ tin | [] () |
+ tuxpaint | [] [] [] [] [] [] [] [] |
+ util-linux | [] [] [] [] () [] |
+ vorbis-tools | [] |
+ wastesedge | () |
+ wdiff | [] [] [] [] [] [] |
+ wget | [] [] [] [] [] [] [] |
+ xchat | [] [] [] |
+ xfree86_xkb_xml | |
+ xpad | [] |
+ +----------------------------------------+
+ et fa fi fr ga gl he hr hu id is it ja
+ 21 1 24 84 24 24 8 10 38 31 1 22 33
- lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
- +-----------------------------------------------------+
- a2ps | [] [] () () [] [] [] |
- aegis | () () () |
- ant-phone | [] [] |
- anubis | [] [] [] [] [] [] |
- ap-utils | [] () [] |
- aspell | [] |
- bash | [] [] [] |
- batchelor | [] |
- bfd | [] |
- binutils | [] |
- bison | [] [] [] [] [] |
- bluez-pin | [] [] [] |
- clisp | |
- clisp | [] |
- console-tools | [] |
- coreutils | [] [] |
- cpio | [] [] [] [] [] |
- darkstat | [] [] [] [] |
- diffutils | [] [] [] [] [] [] |
- e2fsprogs | [] |
- enscript | [] [] [] [] |
- error | [] [] [] |
- fetchmail | [] [] () [] |
- fileutils | [] [] [] |
- findutils | [] [] [] [] [] |
- flex | [] [] [] [] |
- fslint | [] [] |
- gas | |
- gawk | [] [] [] |
- gbiff | [] [] |
- gcal | |
- gcc | |
- gettext | [] [] [] |
- gettext-examples | [] [] [] |
- gettext-runtime | [] [] [] [] |
- gettext-tools | [] [] |
- gimp-print | [] |
- gliv | [] [] [] |
- glunarclock | [] [] [] [] |
- gnubiff | [] |
- gnucash | [] [] () [] |
- gnucash-glossary | [] [] |
- gnupg | [] |
- gpe-aerial | [] [] [] [] |
- gpe-beam | [] [] [] [] |
- gpe-calendar | [] [] [] [] |
- gpe-clock | [] [] [] [] |
- gpe-conf | [] [] [] [] |
- gpe-contacts | [] [] [] [] |
- gpe-edit | [] [] [] [] |
- gpe-go | [] [] [] |
- gpe-login | [] [] [] [] |
- gpe-ownerinfo | [] [] [] [] |
- gpe-sketchbook | [] [] [] [] |
- gpe-su | [] [] [] [] |
- gpe-taskmanager | [] [] [] [] |
- gpe-timesheet | [] [] [] [] |
- gpe-today | [] [] [] [] |
- gpe-todo | [] [] [] [] |
- gphoto2 | [] |
- gprof | [] [] |
- gpsdrive | () () [] |
- gramadoir | () [] |
- grep | [] [] [] [] [] |
- gretl | |
- gtick | [] [] [] |
- hello | [] [] [] [] [] [] [] [] [] [] |
- id-utils | [] [] [] [] |
- indent | [] [] [] [] |
- iso_3166 | [] [] [] |
- iso_3166_1 | [] [] |
- iso_3166_2 | |
- iso_3166_3 | [] |
- iso_4217 | [] [] [] [] [] [] [] [] |
- iso_639 | [] |
- jpilot | () () |
- jtag | |
- jwhois | [] [] [] [] () |
- kbd | [] [] [] |
- latrine | [] |
- ld | |
- libc | [] [] [] [] |
- libgpewidget | [] [] [] |
- libiconv | [] [] [] [] [] |
- lifelines | |
- lilypond | |
- lingoteach | |
- lingoteach_lessons | |
- lynx | [] [] [] |
- m4 | [] [] [] [] [] |
- mailutils | [] [] [] |
- make | [] [] [] [] |
- man-db | [] |
- minicom | [] [] [] [] |
- mysecretdiary | [] [] [] |
- nano | [] [] [] [] [] |
- nano_1_0 | [] [] [] [] [] [] |
- opcodes | [] [] |
- parted | [] [] [] [] |
- ptx | [] [] [] [] [] [] [] [] |
- python | |
- radius | [] [] |
- recode | [] [] [] [] |
- rpm | [] [] [] |
- screem | |
- scrollkeeper | [] [] [] [] [] |
- sed | [] [] [] |
- sh-utils | [] [] |
- shared-mime-info | [] [] |
- sharutils | [] [] |
- silky | () |
- skencil | [] [] |
- sketch | [] [] |
- soundtracker | |
- sp | |
- tar | [] [] [] [] [] [] |
- texinfo | [] [] [] [] |
- textutils | [] [] |
- tin | |
- tp-robot | [] |
- tuxpaint | [] [] [] [] [] [] [] [] |
- unicode-han-tra... | |
- unicode-transla... | |
- util-linux | [] [] [] |
- vorbis-tools | [] [] [] |
- wastesedge | |
- wdiff | [] [] [] [] [] |
- wget | [] [] [] |
- xchat | [] [] [] |
- xfree86_xkb_xml | [] [] |
- xpad | [] [] |
- +-----------------------------------------------------+
- lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
- 1 2 0 3 12 0 10 69 6 7 1 40 26 36 76 63
+ ko lg lt lv ms nb nl nn no pl pt pt_BR ro
+ +-------------------------------------------+
+ a2ps | () [] [] () () [] [] |
+ aegis | () () |
+ ant-phone | [] [] |
+ anubis | [] [] [] [] [] |
+ ap-utils | [] () [] |
+ bash | [] [] |
+ batchelor | [] |
+ bfd | [] |
+ binutils | |
+ bison | [] [] [] [] |
+ bluez-pin | [] [] [] |
+ clisp | [] |
+ clisp | |
+ coreutils | [] |
+ cpio | [] [] [] [] [] |
+ darkstat | [] [] [] [] |
+ diffutils | [] [] [] [] |
+ e2fsprogs | [] |
+ enscript | [] [] [] |
+ error | [] [] [] |
+ fetchmail | [] [] () |
+ fileutils | [] |
+ findutils | [] [] [] [] [] |
+ flex | [] [] [] [] |
+ fslint | [] [] |
+ gas | |
+ gawk | [] [] [] |
+ gbiff | [] [] |
+ gcal | |
+ gcc | |
+ gettext | [] [] [] |
+ gettext-examples | [] [] |
+ gettext-runtime | [] [] [] |
+ gettext-tools | [] [] [] |
+ gimp-print | [] |
+ gliv | [] [] [] |
+ glunarclock | [] [] [] |
+ gnubiff | |
+ gnucash | [] [] () |
+ gnucash-glossary | [] [] |
+ gnupg | [] |
+ gpe-aerial | [] [] [] |
+ gpe-beam | [] [] [] |
+ gpe-calendar | [] [] [] |
+ gpe-clock | [] [] [] |
+ gpe-conf | [] [] [] |
+ gpe-contacts | [] [] [] |
+ gpe-edit | [] [] [] |
+ gpe-go | [] [] |
+ gpe-login | [] [] [] |
+ gpe-ownerinfo | [] [] [] |
+ gpe-sketchbook | [] [] [] |
+ gpe-su | [] [] [] |
+ gpe-taskmanager | [] [] [] |
+ gpe-timesheet | [] [] [] |
+ gpe-today | [] [] [] |
+ gpe-todo | [] [] [] |
+ gphoto2 | [] |
+ gprof | [] [] |
+ gpsdrive | () () () [] |
+ gramadoir | [] |
+ grep | [] [] [] [] |
+ gretl | |
+ gtick | [] [] |
+ hello | [] [] [] [] [] [] [] [] [] [] |
+ id-utils | [] [] [] |
+ indent | [] [] [] |
+ jpilot | () () |
+ jtag | |
+ jwhois | [] [] [] [] |
+ kbd | [] [] [] |
+ latrine | [] |
+ ld | |
+ libc | [] [] [] [] [] |
+ libgpewidget | [] [] [] |
+ libiconv | [] [] [] [] |
+ lifelines | |
+ lilypond | |
+ lingoteach | |
+ lingoteach_lessons | |
+ lynx | [] [] |
+ m4 | [] [] [] [] |
+ mailutils | [] |
+ make | [] [] [] [] |
+ man-db | [] |
+ minicom | [] [] [] |
+ mysecretdiary | [] [] [] |
+ nano | [] [] [] [] |
+ nano_1_0 | [] [] [] [] [] |
+ opcodes | [] [] |
+ parted | [] [] [] [] |
+ ptx | [] [] [] [] [] [] [] |
+ python | |
+ radius | [] |
+ recode | [] [] [] |
+ screem | |
+ scrollkeeper | [] [] [] [] |
+ sed | [] [] [] |
+ sh-utils | [] |
+ shared-mime-info | [] |
+ sharutils | [] |
+ sketch | [] [] |
+ soundtracker | |
+ sp | |
+ tar | [] [] [] [] [] [] |
+ texinfo | [] [] [] |
+ textutils | [] [] |
+ tin | |
+ tuxpaint | [] [] [] [] [] [] [] [] [] |
+ util-linux | [] [] |
+ vorbis-tools | [] [] |
+ wastesedge | |
+ wdiff | [] [] [] [] |
+ wget | [] [] |
+ xchat | [] [] |
+ xfree86_xkb_xml | [] |
+ xpad | [] [] |
+ +-------------------------------------------+
+ ko lg lt lv ms nb nl nn no pl pt pt_BR ro
+ 11 0 1 2 12 10 60 4 4 38 23 34 74
- sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
- +-----------------------------------------------------+
- a2ps | [] [] [] []
| 16
- aegis |
| 0
- ant-phone |
| 3
- anubis | [] []
| 9
- ap-utils | ()
| 3
- aspell |
| 4
- bash |
| 9
- batchelor |
| 3
- bfd | [] []
| 6
- binutils | [] [] []
| 8
- bison | [] []
| 14
- bluez-pin | [] [] []
| 14
- clisp |
| 0
- clisp |
| 5
- console-tools |
| 3
- coreutils | [] [] [] []
| 16
- cpio | [] []
| 14
- darkstat | [] [] [] () ()
| 12
- diffutils | [] [] []
| 23
- e2fsprogs | [] []
| 6
- enscript | [] []
| 12
- error | [] [] []
| 15
- fetchmail | [] []
| 11
- fileutils | [] [] [] [] []
| 17
- findutils | [] [] [] [] [] []
| 29
- flex | [] []
| 13
- fslint |
| 3
- gas | []
| 3
- gawk | [] []
| 12
- gbiff |
| 4
- gcal | [] []
| 4
- gcc | []
| 4
- gettext | [] [] [] [] []
| 16
- gettext-examples | [] [] [] [] []
| 14
- gettext-runtime | [] [] [] [] [] [] [] []
| 22
- gettext-tools | [] [] [] [] [] []
| 14
- gimp-print | [] []
| 10
- gliv |
| 3
- glunarclock | [] [] []
| 13
- gnubiff |
| 3
- gnucash | [] []
| 9
- gnucash-glossary | [] [] []
| 8
- gnupg | [] [] [] []
| 17
- gpe-aerial | []
| 7
- gpe-beam | []
| 8
- gpe-calendar | [] [] [] []
| 13
- gpe-clock | [] [] []
| 10
- gpe-conf | [] []
| 9
- gpe-contacts | [] [] []
| 11
- gpe-edit | [] [] [] [] []
| 12
- gpe-go |
| 5
- gpe-login | [] [] [] [] []
| 13
- gpe-ownerinfo | [] [] [] []
| 13
- gpe-sketchbook | [] []
| 9
- gpe-su | [] [] []
| 10
- gpe-taskmanager | [] [] []
| 10
- gpe-timesheet | [] [] [] []
| 12
- gpe-today | [] [] [] [] []
| 13
- gpe-todo | [] [] [] []
| 12
- gphoto2 | [] [] []
| 11
- gprof | [] []
| 9
- gpsdrive | [] []
| 3
- gramadoir | []
| 5
- grep | [] [] [] []
| 26
- gretl |
| 3
- gtick |
| 7
- hello | [] [] [] [] []
| 34
- id-utils | [] []
| 12
- indent | [] [] [] []
| 21
- iso_3166 | [] [] [] [] [] [] []
| 27
- iso_3166_1 | [] [] []
| 16
- iso_3166_2 |
| 0
- iso_3166_3 |
| 2
- iso_4217 | [] [] [] [] [] []
| 24
- iso_639 |
| 1
- jpilot | [] [] [] [] []
| 9
- jtag | []
| 2
- jwhois | () [] []
| 11
- kbd | [] []
| 11
- latrine |
| 2
- ld | [] []
| 5
- libc | [] [] [] []
| 20
- libgpewidget | [] [] [] []
| 13
- libiconv | [] [] [] [] [] [] [] []
| 27
- lifelines | []
| 2
- lilypond | []
| 3
- lingoteach |
| 2
- lingoteach_lessons | ()
| 0
- lynx | [] [] []
| 14
- m4 | [] []
| 15
- mailutils |
| 5
- make | [] [] []
| 16
- man-db | []
| 5
- minicom |
| 11
- mysecretdiary | [] []
| 10
- nano | [] [] [] []
| 17
- nano_1_0 | [] [] []
| 17
- opcodes | [] []
| 6
- parted | [] [] []
| 15
- ptx | [] []
| 22
- python |
| 0
- radius |
| 4
- recode | [] [] []
| 20
- rpm | [] []
| 9
- screem | [] []
| 2
- scrollkeeper | [] [] []
| 15
- sed | [] [] [] [] [] []
| 24
- sh-utils | [] []
| 14
- shared-mime-info | [] []
| 7
- sharutils | [] [] [] []
| 17
- silky | ()
| 3
- skencil | []
| 6
- sketch | []
| 6
- soundtracker | [] []
| 7
- sp | []
| 3
- tar | [] [] [] [] []
| 24
- texinfo | [] [] []
| 14
- textutils | [] [] [] []
| 16
- tin |
| 1
- tp-robot |
| 2
- tuxpaint | [] [] [] [] []
| 29
- unicode-han-tra... |
| 0
- unicode-transla... |
| 2
- util-linux | [] []
| 15
- vorbis-tools |
| 8
- wastesedge |
| 0
- wdiff | [] [] []
| 18
- wget | [] [] [] [] [] [] [] []
| 24
- xchat | [] [] [] [] []
| 15
- xfree86_xkb_xml | [] [] [] [] []
| 11
- xpad |
| 5
- +-----------------------------------------------------+
- 63 teams sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
- 131 domains 47 19 28 83 0 0 59 13 1 1 11 0 22 22 0
1373
+ ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
+ +-------------------------------------------+
+ a2ps | [] [] [] [] [] | 16
+ aegis | () | 0
+ ant-phone | | 2
+ anubis | [] [] [] | 9
+ ap-utils | () | 3
+ bash | [] | 9
+ batchelor | | 2
+ bfd | [] [] | 6
+ binutils | [] [] [] | 7
+ bison | [] [] [] | 14
+ bluez-pin | [] [] [] | 13
+ clisp | | 5
+ clisp | | 0
+ coreutils | [] [] [] [] [] | 16
+ cpio | [] [] [] | 14
+ darkstat | [] [] [] () () | 12
+ diffutils | [] [] [] [] | 22
+ e2fsprogs | [] [] | 5
+ enscript | [] [] [] | 12
+ error | [] [] [] | 15
+ fetchmail | [] [] [] | 11
+ fileutils | [] [] [] [] [] [] | 16
+ findutils | [] [] [] [] [] [] [] | 29
+ flex | [] [] [] | 13
+ fslint | | 2
+ gas | [] | 3
+ gawk | [] [] | 12
+ gbiff | | 3
+ gcal | [] [] | 4
+ gcc | [] | 4
+ gettext | [] [] [] [] [] [] | 16
+ gettext-examples | [] [] | 9
+ gettext-runtime | [] [] [] [] [] [] [] [] [] | 21
+ gettext-tools | [] [] [] [] [] [] | 14
+ gimp-print | [] [] | 10
+ gliv | | 3
+ glunarclock | [] [] [] [] | 15
+ gnubiff | | 1
+ gnucash | [] [] [] | 9
+ gnucash-glossary | [] [] [] | 8
+ gnupg | [] [] [] [] | 17
+ gpe-aerial | [] [] | 7
+ gpe-beam | [] [] | 8
+ gpe-calendar | [] [] [] [] [] | 13
+ gpe-clock | [] [] [] | 9
+ gpe-conf | [] [] [] | 9
+ gpe-contacts | [] [] [] [] | 11
+ gpe-edit | [] [] [] [] [] | 11
+ gpe-go | [] | 5
+ gpe-login | [] [] [] [] [] | 12
+ gpe-ownerinfo | [] [] [] [] | 12
+ gpe-sketchbook | [] [] [] | 9
+ gpe-su | [] [] [] | 9
+ gpe-taskmanager | [] [] [] | 9
+ gpe-timesheet | [] [] [] [] | 11
+ gpe-today | [] [] [] [] [] | 12
+ gpe-todo | [] [] [] [] [] | 12
+ gphoto2 | [] [] [] | 11
+ gprof | [] [] | 9
+ gpsdrive | [] [] | 4
+ gramadoir | | 3
+ grep | [] [] [] [] [] | 26
+ gretl | | 2
+ gtick | [] | 5
+ hello | [] [] [] [] [] | 33
+ id-utils | [] [] [] | 12
+ indent | [] [] [] [] [] | 21
+ jpilot | [] [] [] [] [] | 9
+ jtag | [] | 1
+ jwhois | () () [] [] | 11
+ kbd | [] [] | 11
+ latrine | | 1
+ ld | [] [] | 5
+ libc | [] [] [] [] | 20
+ libgpewidget | [] [] [] | 12
+ libiconv | [] [] [] [] [] [] [] [] [] | 27
+ lifelines | [] | 2
+ lilypond | [] | 3
+ lingoteach | | 2
+ lingoteach_lessons | () | 0
+ lynx | [] [] [] [] | 14
+ m4 | [] [] [] | 15
+ mailutils | [] | 4
+ make | [] [] [] [] | 16
+ man-db | [] | 5
+ minicom | [] | 11
+ mysecretdiary | [] [] | 10
+ nano | [] [] [] [] [] | 17
+ nano_1_0 | [] [] [] [] | 17
+ opcodes | [] [] | 6
+ parted | [] [] [] | 15
+ ptx | [] [] [] | 22
+ python | | 0
+ radius | [] | 2
+ recode | [] [] [] [] | 20
+ screem | [] [] | 2
+ scrollkeeper | [] [] [] [] | 15
+ sed | [] [] [] [] [] [] | 23
+ sh-utils | [] [] [] | 14
+ shared-mime-info | [] [] | 4
+ sharutils | [] [] [] [] [] | 17
+ sketch | [] | 6
+ soundtracker | [] [] | 9
+ sp | [] | 3
+ tar | [] [] [] [] [] | 24
+ texinfo | [] [] [] [] | 14
+ textutils | [] [] [] [] [] | 16
+ tin | | 1
+ tuxpaint | [] [] [] [] [] | 29
+ util-linux | [] [] [] | 15
+ vorbis-tools | [] | 8
+ wastesedge | | 0
+ wdiff | [] [] [] [] | 18
+ wget | [] [] [] [] [] [] [] [] | 23
+ xchat | [] [] [] [] [] | 14
+ xfree86_xkb_xml | [] [] [] [] | 6
+ xpad | | 4
+ +-------------------------------------------+
+ 51 teams ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
+ 117 domains 58 41 16 16 78 0 53 12 1 10 21 22 1230
Some counters in the preceding matrix are higher than the number of
visible blocks let us expect. This is because a few extra PO files are
@@ -742,9 +679,9 @@
lag between the mere existence a PO file and its wide availability in a
distribution.
- If January 2004 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
-matrix with full percentage details can be found at
+ If November 2003 seems to be old, you may fetch a more recent copy
+of this `ABOUT-NLS' file on most GNU archive sites. The most
+up-to-date matrix with full percentage details can be found at
`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
Using `gettext' in new packages
Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/ChangeLog 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,7 +1,10 @@
+Mon Jul 18 01:03:05 CEST 2005
+ Alpha-rename fest. Releasing 0.7.0pre5.
+
Sun Jul 17 13:49:40 CEST 2005
Fixed problems with struct alignment on 64-bit
AMDs. Fixed recently introduced memory leak.
- Fixed various compiler warnings.
+ Fixed various compiler warnings.
Sat Jul 16 23:55:31 CEST 2005
Fixed various minor problems with platforms
Modified: GNUnet/PLATFORMS
===================================================================
--- GNUnet/PLATFORMS 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/PLATFORMS 2005-07-17 23:21:45 UTC (rev 1576)
@@ -10,25 +10,27 @@
GNU/Linux (x86):
- perfect
-FreeBSD (x86):
+GNU/Linux (AMD Athlon64):
- perfect
-OpenBSD/NetBSD:
+GNU/Linux (Ultra Sparc):
- unknown
-GNU/Linux (Ultra Sparc):
-- RSA key generation may not work (libgcrypt bug)
-
GNU/Linux (Alpha):
-- RSA key generation may not work (libgcrypt bug)
+- unknown
-Solaris 8 (SunOS 5.8, Sparc SunFire 880):
-- RSA key generation may not work (libgcrypt bug)
-- IPC semaphore test fails (hmm, used to pass, not critical)
+FreeBSD (x86):
+- perfect
+OpenBSD/NetBSD:
+- unknown
+
OS X (10.3.7, PowerPC):
-- RSA key generation may not work (libgcrypt bug)
+- perfect (needs libextractor > 0.5.2)
+Solaris:
+- unknown
+
Cygwin (x86):
- plugins cannot be loaded (FATAL)
- difficult to compile (autotools trouble)
Added: GNUnet/bin/rename-multiple.sh
===================================================================
--- GNUnet/bin/rename-multiple.sh 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/bin/rename-multiple.sh 2005-07-17 23:21:45 UTC (rev 1576)
@@ -0,0 +1,3 @@
+#!/bin/sh
+M=`cat $1 | wc -l`
+for n in `seq 1 $M`; do A=`cat $1 | head -n $n | tail -n 1 | awk '{ print
$1}'`; B=`cat ~/rename-list | head -n $n | tail -n 1 | awk '{ print $2}'`;
./rename.sh $A $B; echo "Did $A $B ($n)"; done
\ No newline at end of file
Property changes on: GNUnet/bin/rename-multiple.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: GNUnet/bin/rename.sh
===================================================================
--- GNUnet/bin/rename.sh 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/bin/rename.sh 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,6 +1,6 @@
#!/bin/sh
for n in `find * -name "*.c"` `find * -name "*.h"`
do
- cat $n | sed -e "s/$1/$2/" > $n.new
+ cat $n | sed -e "s/$1/$2/g" > $n.new
mv $n.new $n || echo "Move failed: $n.new to $n"
done
Modified: GNUnet/m4/po.m4
===================================================================
--- GNUnet/m4/po.m4 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/m4/po.m4 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,4 +1,4 @@
-# po.m4 serial 3 (gettext-0.14)
+# po.m4 serial 2 (gettext-0.13)
dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
@@ -323,8 +323,6 @@
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
# Compute MSGFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
- # Compute RESOURCESDLLFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob
$(lang))/$(DOMAIN).resources.dll)
case "$ac_given_srcdir" in
.) srcdirpre= ;;
*) srcdirpre='$(srcdir)/' ;;
@@ -337,7 +335,6 @@
CLASSFILES=
QMFILES=
MSGFILES=
- RESOURCESDLLFILES=
for lang in $ALL_LINGUAS; do
POFILES="$POFILES $srcdirpre$lang.po"
UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
@@ -348,8 +345,6 @@
QMFILES="$QMFILES $srcdirpre$lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g'`
- RESOURCESDLLFILES="$RESOURCESDLLFILES
$srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
done
# CATALOGS depends on both $ac_dir and the user's LINGUAS
# environment variable.
@@ -381,7 +376,6 @@
JAVACATALOGS=
QTCATALOGS=
TCLCATALOGS=
- CSHARPCATALOGS=
if test -n "$INST_LINGUAS"; then
for lang in $INST_LINGUAS; do
CATALOGS="$CATALOGS $lang.gmo"
@@ -389,12 +383,10 @@
QTCATALOGS="$QTCATALOGS $lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g'`
- CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
done
fi
- sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e
"s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e
"s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e
"s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e
"s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e
"s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e
"s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e
"s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file"
> "$ac_file.tmp"
+ sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e
"s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e
"s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e
"s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e
"s|@MSGFILES@|$MSGFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e
"s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e
"s|@TCLCATALOGS@|$TCLCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" >
"$ac_file.tmp"
if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
# Add dependencies that cannot be formulated as a simple suffix rule.
for lang in $ALL_LINGUAS; do
@@ -406,17 +398,6 @@
EOF
done
fi
- if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
- # Add dependencies that cannot be formulated as a simple suffix rule.
- for lang in $ALL_LINGUAS; do
- frobbedlang=`echo $lang | sed -e 's/_/-/g'`
- cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
- @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po
-r \$(DOMAIN)"; \
- \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r
"\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
- done
- fi
if test -n "$POMAKEFILEDEPS"; then
cat >> "$ac_file.tmp" <<EOF
Makefile: $POMAKEFILEDEPS
Modified: GNUnet/m4/printf-posix.m4
===================================================================
--- GNUnet/m4/printf-posix.m4 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/m4/printf-posix.m4 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,4 +1,4 @@
-# printf-posix.m4 serial 2 (gettext-0.13.1)
+# printf-posix.m4 serial 1 (gettext-0.13)
dnl Copyright (C) 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
@@ -30,7 +30,7 @@
}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
[
AC_EGREP_CPP(notposix, [
-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined
__CYGWIN__
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__
notposix
#endif
], gt_cv_func_printf_posix="guessing no",
Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/po/GNUnet.pot 2005-07-17 23:21:45 UTC (rev 1576)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-16 21:36+0200\n"
+"POT-Creation-Date: 2005-07-18 01:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -18,20 +18,21 @@
#: src/applications/advertising/advertising.c:156
#, c-format
-msgid "HELO message from '%s' invalid (signature invalid). Dropping.\n"
+msgid "hello message from '%s' invalid (signature invalid). Dropping.\n"
msgstr ""
#: src/applications/advertising/advertising.c:162
-msgid "HELO message received invalid (expiration time over limit). Dropping.\n"
+msgid ""
+"hello message received invalid (expiration time over limit). Dropping.\n"
msgstr ""
#: src/applications/advertising/advertising.c:171
#, c-format
-msgid "HELO advertisement for protocol %d received.\n"
+msgid "hello advertisement for protocol %d received.\n"
msgstr ""
#: src/applications/advertising/advertising.c:290
-msgid "Could not send HELOs+PING, ping buffer full.\n"
+msgid "Could not send hellos+PING, ping buffer full.\n"
msgstr ""
#: src/applications/advertising/advertising.c:303
@@ -51,7 +52,7 @@
#: src/applications/advertising/advertising.c:560
#, c-format
-msgid "Removing HELO from peer '%s' (expired %ds ago).\n"
+msgid "Removing hello from peer '%s' (expired %ds ago).\n"
msgstr ""
#: src/applications/advertising/advertising.c:720
@@ -115,7 +116,7 @@
#: src/applications/bootstrap_http/http.c:250
#, c-format
-msgid "Parsing HELO from '%s' failed.\n"
+msgid "Parsing hello from '%s' failed.\n"
msgstr ""
#: src/applications/bootstrap_http/http.c:326
@@ -124,7 +125,7 @@
msgstr ""
#: src/applications/bootstrap_http/http.c:350
-msgid "# HELOs downloaded via http"
+msgid "# hellos downloaded via http"
msgstr ""
#: src/applications/chat/chat.c:87
@@ -167,7 +168,7 @@
#: src/applications/fs/tools/gnunet-delete.c:111
#: src/applications/fs/tools/gnunet-directory.c:183
#: src/applications/fs/tools/gnunet-download.c:128
-#: src/applications/fs/tools/gnunet-insert.c:499
+#: src/applications/fs/tools/gnunet-insert.c:511
#: src/applications/fs/tools/gnunet-pseudonym.c:214
#: src/applications/fs/tools/gnunet-search.c:213
#: src/applications/fs/tools/gnunet-unindex.c:139
@@ -319,7 +320,7 @@
#: src/applications/dht/tools/dht-query.c:84
#: src/applications/fs/tools/gnunet-download.c:94
#: src/applications/fs/tools/gnunet-insert.c:312
-#: src/applications/fs/tools/gnunet-insert.c:428
+#: src/applications/fs/tools/gnunet-insert.c:440
#: src/applications/fs/tools/gnunet-pseudonym.c:120
#: src/applications/fs/tools/gnunet-search.c:159
#: src/applications/fs/tools/gnunet-search.c:175
@@ -667,19 +668,19 @@
msgid "Cannot upload directory without using recursion.\n"
msgstr ""
-#: src/applications/fs/module/fs.c:964
+#: src/applications/fs/module/fs.c:961
#, c-format
msgid ""
"You must specify a postive number for '%s' in the configuration in section '%"
"s'.\n"
msgstr ""
-#: src/applications/fs/module/fs.c:1005
+#: src/applications/fs/module/fs.c:1002
#, c-format
msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
msgstr ""
-#: src/applications/fs/module/fs.c:1042
+#: src/applications/fs/module/fs.c:1039
msgid "enables (anonymous) file-sharing"
msgstr ""
@@ -695,7 +696,7 @@
msgid "Indexed file disappeared, deleting block for query '%s'\n"
msgstr ""
-#: src/applications/fs/module/ondemand.c:408
+#: src/applications/fs/module/ondemand.c:416
#, c-format
msgid ""
"Because the file '%s' has been unavailable for 3 days it got removed from "
@@ -703,14 +704,14 @@
"contains invalid references!"
msgstr ""
-#: src/applications/fs/module/ondemand.c:434
+#: src/applications/fs/module/ondemand.c:442
#, c-format
msgid ""
"Configuration file must specify directory for storage of FS data in section "
"'%s' under '%s'.\n"
msgstr ""
-#: src/applications/fs/module/ondemand.c:629
+#: src/applications/fs/module/ondemand.c:637
#, c-format
msgid ""
"Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
@@ -979,42 +980,42 @@
msgid "You must pass a positive number to the '%s' option.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:504
+#: src/applications/fs/tools/gnunet-insert.c:516
#: src/applications/fs/tools/gnunet-unindex.c:144
#, c-format
msgid "You must specify a list of files to insert.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:508
+#: src/applications/fs/tools/gnunet-insert.c:520
#, c-format
msgid "Only one file or directory can be specified at a time.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:512
+#: src/applications/fs/tools/gnunet-insert.c:524
#, c-format
msgid "You must specify a file or directory to upload.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:561
+#: src/applications/fs/tools/gnunet-insert.c:573
#, c-format
msgid "Keywords for file '%s':\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:583
+#: src/applications/fs/tools/gnunet-insert.c:595
#, c-format
msgid "Could not access namespace '%s' (does not exist?).\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:598
+#: src/applications/fs/tools/gnunet-insert.c:614
#, c-format
msgid "Parsing time failed. Use '%s' format.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:607
-#: src/applications/fs/tools/gnunet-insert.c:611
-#: src/applications/fs/tools/gnunet-insert.c:615
-#: src/applications/fs/tools/gnunet-insert.c:619
-#: src/applications/fs/tools/gnunet-insert.c:624
+#: src/applications/fs/tools/gnunet-insert.c:627
+#: src/applications/fs/tools/gnunet-insert.c:631
+#: src/applications/fs/tools/gnunet-insert.c:635
+#: src/applications/fs/tools/gnunet-insert.c:639
+#: src/applications/fs/tools/gnunet-insert.c:644
#, c-format
msgid "Option '%s' makes no sense without option '%s'.\n"
msgstr ""
@@ -1294,7 +1295,7 @@
#: src/applications/identity/identity.c:614
#: src/applications/identity/identity.c:632
#, c-format
-msgid "Removed file '%s' containing invalid HELO data.\n"
+msgid "Removed file '%s' containing invalid hello data.\n"
msgstr ""
#: src/applications/pingpong/pingpong.c:120
@@ -1470,8 +1471,8 @@
#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:56
#: src/util/hostkey_gcrypt.c:63 src/util/storage.c:643
#: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1002 src/include/gnunet_util.h:1009
-#: src/include/gnunet_util.h:1011
+#: src/include/gnunet_util.h:1011 src/include/gnunet_util.h:1018
+#: src/include/gnunet_util.h:1020
#, c-format
msgid "'%s' failed at %s:%d with error: %s\n"
msgstr ""
@@ -1723,7 +1724,7 @@
msgid "Template for gnunet-clients."
msgstr ""
-#: src/applications/template/template.c:59
+#: src/applications/template/template.c:61
#, c-format
msgid "'%s' registering client handler %d and %d\n"
msgstr ""
@@ -1799,7 +1800,7 @@
#: src/applications/testbed/testbed.c:137
#, c-format
-msgid "TESTBED could not generate HELO message for protocol %u\n"
+msgid "TESTBED could not generate hello message for protocol %u\n"
msgstr ""
#: src/applications/testbed/testbed.c:215
@@ -1874,7 +1875,7 @@
msgid "No testbed URL given, not registered.\n"
msgstr ""
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1449
+#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1451
#, c-format
msgid "Could not resolve name of HTTP proxy '%s'.\n"
msgstr ""
@@ -1985,21 +1986,21 @@
msgstr ""
#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:179
+#: src/applications/tracekit/tracekit.c:186
#, c-format
msgid "Received invalid '%s' message from '%s'.\n"
msgstr ""
-#: src/applications/tracekit/tracekit.c:236
+#: src/applications/tracekit/tracekit.c:243
msgid "TRACEKIT: routing table full, trace request dropped\n"
msgstr ""
-#: src/applications/tracekit/tracekit.c:334
+#: src/applications/tracekit/tracekit.c:331
#, c-format
msgid "TRACEKIT: received invalid '%s' message\n"
msgstr ""
-#: src/applications/tracekit/tracekit.c:434
+#: src/applications/tracekit/tracekit.c:431
msgid "allows mapping of the network topology"
msgstr ""
@@ -2282,31 +2283,31 @@
msgid "Unable to save configuration file %s:"
msgstr ""
-#: src/conf/wizard_callbacks.c:236 src/conf/wizard_curs.c:511
+#: src/conf/wizard_callbacks.c:236 src/conf/wizard_curs.c:517
msgid "Unable to create user account:"
msgstr ""
-#: src/conf/wizard_callbacks.c:243 src/conf/wizard_curs.c:514
+#: src/conf/wizard_callbacks.c:243 src/conf/wizard_curs.c:520
msgid "Unable to change startup process:"
msgstr ""
-#: src/conf/wizard_curs.c:47 src/conf/wizard_interface.c:1075
-#: src/conf/wizard_util.c:116 src/conf/wizard_util.c:157
+#: src/conf/wizard_curs.c:50 src/conf/wizard_interface.c:1075
+#: src/conf/wizard_util.c:118 src/conf/wizard_util.c:160
msgid "Error"
msgstr ""
-#: src/conf/wizard_curs.c:93 src/conf/wizard_curs.c:108
-#: src/conf/wizard_curs.c:161 src/conf/wizard_curs.c:196
-#: src/conf/wizard_curs.c:224 src/conf/wizard_curs.c:249
-#: src/conf/wizard_curs.c:281 src/conf/wizard_curs.c:307
-#: src/conf/wizard_curs.c:338 src/conf/wizard_curs.c:361
-#: src/conf/wizard_curs.c:389 src/conf/wizard_curs.c:411
-#: src/conf/wizard_curs.c:433 src/conf/wizard_curs.c:461
-#: src/conf/wizard_curs.c:491 src/conf/wizard_curs.c:574
+#: src/conf/wizard_curs.c:99 src/conf/wizard_curs.c:114
+#: src/conf/wizard_curs.c:167 src/conf/wizard_curs.c:202
+#: src/conf/wizard_curs.c:230 src/conf/wizard_curs.c:255
+#: src/conf/wizard_curs.c:287 src/conf/wizard_curs.c:313
+#: src/conf/wizard_curs.c:344 src/conf/wizard_curs.c:367
+#: src/conf/wizard_curs.c:395 src/conf/wizard_curs.c:417
+#: src/conf/wizard_curs.c:439 src/conf/wizard_curs.c:467
+#: src/conf/wizard_curs.c:497 src/conf/wizard_curs.c:582
msgid "GNUnet configuration"
msgstr ""
-#: src/conf/wizard_curs.c:94 src/conf/wizard_interface.c:77
+#: src/conf/wizard_curs.c:100 src/conf/wizard_interface.c:77
msgid ""
"Welcome to GNUnet!\n"
"\n"
@@ -2323,39 +2324,39 @@
"the GNUnet team"
msgstr ""
-#: src/conf/wizard_curs.c:109
+#: src/conf/wizard_curs.c:115
msgid ""
"Choose the network interface that connects your computer to the internet "
"from the list below."
msgstr ""
-#: src/conf/wizard_curs.c:115 src/conf/wizard_curs.c:167
-#: src/conf/wizard_curs.c:202 src/conf/wizard_curs.c:254
-#: src/conf/wizard_curs.c:286 src/conf/wizard_curs.c:343
+#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
+#: src/conf/wizard_curs.c:208 src/conf/wizard_curs.c:260
+#: src/conf/wizard_curs.c:292 src/conf/wizard_curs.c:349
msgid "Help"
msgstr ""
-#: src/conf/wizard_curs.c:115 src/conf/wizard_curs.c:167
+#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
msgid ""
"The \"Network interface\" is the device that connects your computer to the "
"internet. This is usually a modem, an ISDN card or a network card in case "
"you are using DSL."
msgstr ""
-#: src/conf/wizard_curs.c:161
+#: src/conf/wizard_curs.c:167
msgid ""
"What is the name of the network interface that connects your computer to the "
"Internet?"
msgstr ""
-#: src/conf/wizard_curs.c:196
+#: src/conf/wizard_curs.c:202
msgid ""
"What is this computer's public IP address or hostname?\n"
"\n"
"If in doubt, leave this empty."
msgstr ""
-#: src/conf/wizard_curs.c:202
+#: src/conf/wizard_curs.c:208
msgid ""
"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -2366,7 +2367,7 @@
"IP-Address."
msgstr ""
-#: src/conf/wizard_curs.c:224
+#: src/conf/wizard_curs.c:230
msgid ""
"Is this machine behind NAT?\n"
"\n"
@@ -2377,11 +2378,11 @@
"forwarding\")."
msgstr ""
-#: src/conf/wizard_curs.c:249
+#: src/conf/wizard_curs.c:255
msgid "How much upstream (Bytes/s) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:254
+#: src/conf/wizard_curs.c:260
msgid ""
"You can limit GNUnet's resource usage here.\n"
"\n"
@@ -2392,11 +2393,11 @@
"connection."
msgstr ""
-#: src/conf/wizard_curs.c:281
+#: src/conf/wizard_curs.c:287
msgid "How much downstream (Bytes/s) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:286
+#: src/conf/wizard_curs.c:292
msgid ""
"You can limit GNUnet's resource usage here.\n"
"\n"
@@ -2407,7 +2408,7 @@
"connection."
msgstr ""
-#: src/conf/wizard_curs.c:307
+#: src/conf/wizard_curs.c:313
msgid ""
"Share denoted bandwidth with other applications?\n"
"\n"
@@ -2420,18 +2421,18 @@
"connection whenever your high-speed LAN gets used (e.g. by NFS)."
msgstr ""
-#: src/conf/wizard_curs.c:338
+#: src/conf/wizard_curs.c:344
msgid "How much CPU (in %) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:343
+#: src/conf/wizard_curs.c:349
msgid ""
"You can limit GNUnet's resource usage here.\n"
"\n"
"This is the percentage of processor time GNUnet is allowed to use."
msgstr ""
-#: src/conf/wizard_curs.c:361
+#: src/conf/wizard_curs.c:367
msgid ""
"Store migrated content?\n"
"\n"
@@ -2444,7 +2445,7 @@
"availability."
msgstr ""
-#: src/conf/wizard_curs.c:389
+#: src/conf/wizard_curs.c:395
msgid ""
"What's the maximum datastore size in MB?\n"
"\n"
@@ -2452,7 +2453,7 @@
"inserted and migrated content)."
msgstr ""
-#: src/conf/wizard_curs.c:411
+#: src/conf/wizard_curs.c:417
msgid ""
"Do you want to launch GNUnet as a system service?\n"
"\n"
@@ -2461,7 +2462,7 @@
"launch GNUnet yourself each time you want to use it."
msgstr ""
-#: src/conf/wizard_curs.c:434
+#: src/conf/wizard_curs.c:440
msgid ""
"Define the user owning the GNUnet service.\n"
"\n"
@@ -2477,7 +2478,7 @@
"GNUnet user:"
msgstr ""
-#: src/conf/wizard_curs.c:462
+#: src/conf/wizard_curs.c:468
msgid ""
"Define the group owning the GNUnet service.\n"
"\n"
@@ -2492,7 +2493,7 @@
"GNUnet group:"
msgstr ""
-#: src/conf/wizard_curs.c:491
+#: src/conf/wizard_curs.c:497
msgid ""
"If you are an experienced user, you may want to tweak your GNUnet "
"installation using the enhanced configurator.\n"
@@ -2500,7 +2501,7 @@
"Do you want to start it after saving your configuration?"
msgstr ""
-#: src/conf/wizard_curs.c:568
+#: src/conf/wizard_curs.c:576
#, c-format
msgid ""
"Unable to save configuration file %s: %s.\n"
@@ -2705,51 +2706,51 @@
msgid "User account:"
msgstr ""
-#: src/conf/wizard_util.c:89
+#: src/conf/wizard_util.c:90
msgid "Can't open Service Control Manager"
msgstr ""
-#: src/conf/wizard_util.c:94
+#: src/conf/wizard_util.c:95
msgid "Can't create service"
msgstr ""
-#: src/conf/wizard_util.c:99
+#: src/conf/wizard_util.c:100
msgid "Error changing the permissions of the GNUnet directory"
msgstr ""
-#: src/conf/wizard_util.c:103
+#: src/conf/wizard_util.c:105
msgid "Cannot write to the regisitry"
msgstr ""
-#: src/conf/wizard_util.c:106
+#: src/conf/wizard_util.c:108
msgid "Can't access the service"
msgstr ""
-#: src/conf/wizard_util.c:109
+#: src/conf/wizard_util.c:111
msgid "Can't delete the service"
msgstr ""
-#: src/conf/wizard_util.c:112
+#: src/conf/wizard_util.c:114
msgid "Unknown error"
msgstr ""
-#: src/conf/wizard_util.c:140
+#: src/conf/wizard_util.c:143
msgid "This version of Windows does not support multiple users."
msgstr ""
-#: src/conf/wizard_util.c:144
+#: src/conf/wizard_util.c:147
msgid "Error creating user"
msgstr ""
-#: src/conf/wizard_util.c:147
+#: src/conf/wizard_util.c:150
msgid "Error accessing local security policy"
msgstr ""
-#: src/conf/wizard_util.c:150
+#: src/conf/wizard_util.c:153
msgid "Error granting service right to user"
msgstr ""
-#: src/conf/wizard_util.c:153
+#: src/conf/wizard_util.c:156
msgid "Unknown error while creating a new user"
msgstr ""
@@ -2870,7 +2871,7 @@
msgstr ""
#: src/server/gnunet-peer-info.c:153
-msgid "HELO message invalid (signature invalid).\n"
+msgid "hello message invalid (signature invalid).\n"
msgstr ""
#: src/server/gnunet-peer-info.c:164
@@ -2880,7 +2881,7 @@
#: src/server/gnunet-transport-check.c:108
#, c-format
-msgid "'%s': Could not create HELO.\n"
+msgid "'%s': Could not create hello.\n"
msgstr ""
#: src/server/gnunet-transport-check.c:117
@@ -3127,185 +3128,185 @@
msgid "Failed to obtain my (external) IPv6 address!\n"
msgstr ""
-#: src/transports/http.c:600
+#: src/transports/http.c:601
msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
msgstr ""
-#: src/transports/http.c:816 src/transports/tcp.c:688 src/transports/udp.c:285
+#: src/transports/http.c:817 src/transports/tcp.c:689 src/transports/udp.c:286
#, c-format
msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
msgstr ""
-#: src/transports/http.c:1097
+#: src/transports/http.c:1099
msgid "HTTP: Could not determine my public IP address.\n"
msgstr ""
-#: src/transports/http.c:1171 src/transports/tcp.c:1124 src/util/tcpio.c:166
+#: src/transports/http.c:1173 src/transports/tcp.c:1125 src/util/tcpio.c:166
#: src/util/tcpio.c:196
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr ""
-#: src/transports/http.c:1327
+#: src/transports/http.c:1329
#, c-format
msgid ""
"Could not bind the HTTP listener to port %d. No transport service started.\n"
msgstr ""
-#: src/transports/http.c:1470
+#: src/transports/http.c:1472
msgid "# bytes received via HTTP"
msgstr ""
-#: src/transports/http.c:1472
+#: src/transports/http.c:1474
msgid "# bytes sent via HTTP"
msgstr ""
-#: src/transports/http.c:1474
+#: src/transports/http.c:1476
msgid "# bytes dropped by HTTP (outgoing)"
msgstr ""
-#: src/transports/smtp.c:295
+#: src/transports/smtp.c:296
#, c-format
msgid "Could not resolve name of SMTP server '%s': %s"
msgstr ""
-#: src/transports/smtp.c:413
+#: src/transports/smtp.c:415
#, c-format
msgid ""
"You must specify the name of a pipe for the SMTP transport in section '%s' "
"under '%s'.\n"
msgstr ""
-#: src/transports/smtp.c:482
+#: src/transports/smtp.c:484
msgid "Received malformed message via SMTP (size mismatch).\n"
msgstr ""
-#: src/transports/smtp.c:569
+#: src/transports/smtp.c:571
msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
msgstr ""
-#: src/transports/smtp.c:576
+#: src/transports/smtp.c:578
#, c-format
msgid "SMTP filter string to long, capped to '%s'\n"
msgstr ""
-#: src/transports/smtp.c:746
+#: src/transports/smtp.c:748
#, c-format
msgid "Sending E-mail to '%s' failed.\n"
msgstr ""
-#: src/transports/smtp.c:795
+#: src/transports/smtp.c:797
#, c-format
msgid "SMTP server send unexpected response at %s:%d.\n"
msgstr ""
-#: src/transports/smtp.c:862
+#: src/transports/smtp.c:864
#, c-format
msgid "%.*s filter %s (SMTP)"
msgstr ""
-#: src/transports/smtp.c:891 src/transports/udp.c:657
-#: src/transports/udp6.c:635
+#: src/transports/smtp.c:893 src/transports/udp.c:658
+#: src/transports/udp6.c:636
#, c-format
msgid "MTU for '%s' is probably too low (fragmentation not implemented!)\n"
msgstr ""
-#: src/transports/tcp.c:464
+#: src/transports/tcp.c:465
#, c-format
msgid ""
"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
msgstr ""
-#: src/transports/tcp.c:498
+#: src/transports/tcp.c:499
#, c-format
msgid ""
"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
msgstr ""
-#: src/transports/tcp.c:1056
+#: src/transports/tcp.c:1057
msgid "Could not determine my public IP address.\n"
msgstr ""
-#: src/transports/tcp.c:1306 src/transports/tcp6.c:1199
+#: src/transports/tcp.c:1307 src/transports/tcp6.c:1200
#, c-format
msgid "Failed to start transport service on port %d.\n"
msgstr ""
-#: src/transports/tcp.c:1423
+#: src/transports/tcp.c:1424
msgid "# bytes received via TCP"
msgstr ""
-#: src/transports/tcp.c:1425
+#: src/transports/tcp.c:1426
msgid "# bytes sent via TCP"
msgstr ""
-#: src/transports/tcp.c:1427
+#: src/transports/tcp.c:1428
msgid "# bytes dropped by TCP (outgoing)"
msgstr ""
-#: src/transports/tcp6.c:438
+#: src/transports/tcp6.c:439
msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
msgstr ""
-#: src/transports/tcp6.c:468
+#: src/transports/tcp6.c:469
msgid ""
"Received malformed message from tcp6-peer connection. Closing connection.\n"
msgstr ""
-#: src/transports/tcp6.c:656 src/transports/udp6.c:273
+#: src/transports/tcp6.c:657 src/transports/udp6.c:274
#, c-format
msgid "%s: Rejected connection from blacklisted address %s.\n"
msgstr ""
-#: src/transports/tcp6.c:957
+#: src/transports/tcp6.c:958
msgid "Could not determine my public IPv6 address.\n"
msgstr ""
-#: src/transports/tcp6.c:1001
+#: src/transports/tcp6.c:1002
#, c-format
msgid "'%s': unknown service: %s\n"
msgstr ""
-#: src/transports/udp.c:144 src/transports/udp6.c:127
+#: src/transports/udp.c:145 src/transports/udp6.c:128
#, c-format
msgid ""
"Cannot determine port to bind to. Define in configuration file in section '%"
"s' under '%s' or in '%s' under %s/%s.\n"
msgstr ""
-#: src/transports/udp.c:178
+#: src/transports/udp.c:179
#, c-format
msgid "Failed to bind to UDP port %d.\n"
msgstr ""
-#: src/transports/udp.c:251
+#: src/transports/udp.c:252
#, c-format
msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
msgstr ""
-#: src/transports/udp.c:274
+#: src/transports/udp.c:275
#, c-format
msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
msgstr ""
-#: src/transports/udp.c:355
+#: src/transports/udp.c:356
msgid "UDP: Could not determine my public IP address.\n"
msgstr ""
-#: src/transports/udp.c:487
+#: src/transports/udp.c:488
#, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
-#: src/transports/udp.c:642
+#: src/transports/udp.c:643
msgid "# bytes received via UDP"
msgstr ""
-#: src/transports/udp.c:644
+#: src/transports/udp.c:645
msgid "# bytes sent via UDP"
msgstr ""
-#: src/transports/udp.c:646
+#: src/transports/udp.c:647
msgid "# bytes dropped by UDP (outgoing)"
msgstr ""
@@ -3346,22 +3347,22 @@
msgid "Failed to obtain my (external) IP address!\n"
msgstr ""
-#: src/transports/udp6.c:163
+#: src/transports/udp6.c:164
#, c-format
msgid "Failed to bind to UDP6 port %d.\n"
msgstr ""
-#: src/transports/udp6.c:233
+#: src/transports/udp6.c:234
#, c-format
msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
msgstr ""
-#: src/transports/udp6.c:262
+#: src/transports/udp6.c:263
#, c-format
msgid "Packet received from %s:%d (UDP6) failed format check."
msgstr ""
-#: src/transports/udp6.c:352
+#: src/transports/udp6.c:353
msgid "UDP6: Could not determine my public IPv6 address.\n"
msgstr ""
@@ -3562,12 +3563,12 @@
msgid "EVERYTHING"
msgstr ""
-#: src/util/logging.c:261
+#: src/util/logging.c:269
#, c-format
msgid "Invalid LOGLEVEL '%s' specified.\n"
msgstr ""
-#: src/util/logging.c:353 src/util/logging.c:359
+#: src/util/logging.c:361 src/util/logging.c:367
#, c-format
msgid "Failure at %s:%d.\n"
msgstr ""
@@ -3625,15 +3626,15 @@
msgid "Failed to parse interface data from '%s' at %s:%d.\n"
msgstr ""
-#: src/util/statuscalls.c:487
+#: src/util/statuscalls.c:489
msgid "Cannot query the CPU usage (Windows NT).\n"
msgstr ""
-#: src/util/statuscalls.c:505
+#: src/util/statuscalls.c:507
msgid "Cannot query the CPU usage (Win 9x)\n"
msgstr ""
-#: src/util/statuscalls.c:598
+#: src/util/statuscalls.c:600
#, c-format
msgid ""
"No network interfaces defined in configuration section '%s' under '%s'!\n"
@@ -3718,13 +3719,13 @@
msgid "be verbose"
msgstr ""
-#: src/include/gnunet_util.h:611 src/include/gnunet_util.h:613
+#: src/include/gnunet_util.h:620 src/include/gnunet_util.h:622
#, c-format
msgid "Assertion failed at %s:%d.\n"
msgstr ""
-#: src/include/gnunet_util.h:1018 src/include/gnunet_util.h:1020
-#: src/include/gnunet_util.h:1027
+#: src/include/gnunet_util.h:1027 src/include/gnunet_util.h:1029
+#: src/include/gnunet_util.h:1036
#, c-format
msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
msgstr ""
Modified: GNUnet/po/Makefile.in.in
===================================================================
--- GNUnet/po/Makefile.in.in 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/po/Makefile.in.in 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,5 +1,5 @@
# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <address@hidden>
+# Copyright (C) 1995-1997, 2000-2003 by Ulrich Drepper <address@hidden>
#
# This file can be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU General Public
@@ -8,7 +8,7 @@
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
#
-# Origin: gettext-0.14
+# Origin: gettext-0.13
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -57,7 +57,7 @@
# Makevars gets inserted here. (Don't remove this line!)
.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
.po.mo:
@echo "$(MSGFMT) -c -o $@ $<"; \
@@ -130,13 +130,9 @@
# Note that a PO file is not touched if it doesn't need to be changed.
$(POFILES): $(srcdir)/$(DOMAIN).pot
@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
- if test -f "$(srcdir)/$${lang}.po"; then \
- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
- else \
- $(MAKE) $${lang}.po-create; \
- fi
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
install: install-exec install-data
@@ -316,13 +312,6 @@
test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
$(MAKE) update-gmo
-# General rule for creating PO files.
-
-.nop.po-create:
- @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
- echo "File $$lang.po does not exist. If you are a translator, you can
create it through 'msginit'." 1>&2; \
- exit 1
-
# General rule for updating PO files.
.nop.po-update:
Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/po/de.po 2005-07-17 23:21:45 UTC (rev 1576)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre4\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-16 21:36+0200\n"
+"POT-Creation-Date: 2005-07-18 01:09+0200\n"
"PO-Revision-Date: 2005-07-03 00:56+0100\n"
"Last-Translator: Nils Durner <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -18,25 +18,28 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: src/applications/advertising/advertising.c:156
-#, c-format
-msgid "HELO message from '%s' invalid (signature invalid). Dropping.\n"
+#, fuzzy, c-format
+msgid "hello message from '%s' invalid (signature invalid). Dropping.\n"
msgstr ""
"HELO Nachricht von '%s' ist ung�ltig (Signatur ist ung�ltig). Nachricht "
"wurde verworfen.\n"
#: src/applications/advertising/advertising.c:162
-msgid "HELO message received invalid (expiration time over limit). Dropping.\n"
+#, fuzzy
+msgid ""
+"hello message received invalid (expiration time over limit). Dropping.\n"
msgstr ""
"Empfangene HELO Nachricht ist ung�ltig (Ablaufzeit �ber Limit). Nachricht "
"wurde verworfen.\n"
#: src/applications/advertising/advertising.c:171
-#, c-format
-msgid "HELO advertisement for protocol %d received.\n"
+#, fuzzy, c-format
+msgid "hello advertisement for protocol %d received.\n"
msgstr "HELO Ank�ndigung f�r Protokoll %d empfangen.\n"
#: src/applications/advertising/advertising.c:290
-msgid "Could not send HELOs+PING, ping buffer full.\n"
+#, fuzzy
+msgid "Could not send hellos+PING, ping buffer full.\n"
msgstr "HELOs+PING konnten nicht gesendet werden, Ping Puffer ist voll.\n"
#: src/applications/advertising/advertising.c:303
@@ -57,8 +60,8 @@
"bekannt.\n"
#: src/applications/advertising/advertising.c:560
-#, c-format
-msgid "Removing HELO from peer '%s' (expired %ds ago).\n"
+#, fuzzy, c-format
+msgid "Removing hello from peer '%s' (expired %ds ago).\n"
msgstr "HELO von Knoten '%s' wird entfernt (lief vor %ds ab).\n"
#: src/applications/advertising/advertising.c:720
@@ -123,8 +126,8 @@
msgstr "Das Parsen der HTTP Antwort f�r die URL '%s' schlug fehl.\n"
#: src/applications/bootstrap_http/http.c:250
-#, c-format
-msgid "Parsing HELO from '%s' failed.\n"
+#, fuzzy, c-format
+msgid "Parsing hello from '%s' failed.\n"
msgstr "Das Parsen des HELO von '%s' schlug fehl.\n"
#: src/applications/bootstrap_http/http.c:326
@@ -135,7 +138,8 @@
"Proxy versucht.\n"
#: src/applications/bootstrap_http/http.c:350
-msgid "# HELOs downloaded via http"
+#, fuzzy
+msgid "# hellos downloaded via http"
msgstr "# HELOs per HTTP heruntergeladen"
#: src/applications/chat/chat.c:87
@@ -178,7 +182,7 @@
#: src/applications/fs/tools/gnunet-delete.c:111
#: src/applications/fs/tools/gnunet-directory.c:183
#: src/applications/fs/tools/gnunet-download.c:128
-#: src/applications/fs/tools/gnunet-insert.c:499
+#: src/applications/fs/tools/gnunet-insert.c:511
#: src/applications/fs/tools/gnunet-pseudonym.c:214
#: src/applications/fs/tools/gnunet-search.c:213
#: src/applications/fs/tools/gnunet-unindex.c:139
@@ -333,7 +337,7 @@
#: src/applications/dht/tools/dht-query.c:84
#: src/applications/fs/tools/gnunet-download.c:94
#: src/applications/fs/tools/gnunet-insert.c:312
-#: src/applications/fs/tools/gnunet-insert.c:428
+#: src/applications/fs/tools/gnunet-insert.c:440
#: src/applications/fs/tools/gnunet-pseudonym.c:120
#: src/applications/fs/tools/gnunet-search.c:159
#: src/applications/fs/tools/gnunet-search.c:175
@@ -699,7 +703,7 @@
"Verzeichnis kann nicht ohne die Verwendung von Rekursion hochgeladen "
"werden.\n"
-#: src/applications/fs/module/fs.c:964
+#: src/applications/fs/module/fs.c:961
#, c-format
msgid ""
"You must specify a postive number for '%s' in the configuration in section '%"
@@ -708,12 +712,12 @@
"Sie m�ssen f�r '%s' in der Sektion '%s' der Konfigurationsdatei eine "
"positive Zahl angeben.\n"
-#: src/applications/fs/module/fs.c:1005
+#: src/applications/fs/module/fs.c:1002
#, c-format
msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
msgstr "'%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
-#: src/applications/fs/module/fs.c:1042
+#: src/applications/fs/module/fs.c:1039
msgid "enables (anonymous) file-sharing"
msgstr ""
@@ -732,7 +736,7 @@
msgstr ""
"Indizierte Datei ist verschwunden, Block f�r Anfrage '%s' wird gel�scht\n"
-#: src/applications/fs/module/ondemand.c:408
+#: src/applications/fs/module/ondemand.c:416
#, c-format
msgid ""
"Because the file '%s' has been unavailable for 3 days it got removed from "
@@ -743,7 +747,7 @@
"aus Ihrem Share entfernt. Bitte deindizieren Sie Dateien, bevor Sie sie "
"l�schen, da Ihr Index nun ung�ltige Referenzen enth�lt!"
-#: src/applications/fs/module/ondemand.c:434
+#: src/applications/fs/module/ondemand.c:442
#, c-format
msgid ""
"Configuration file must specify directory for storage of FS data in section "
@@ -752,7 +756,7 @@
"Die Konfigurationsdatei muss ein Verzeichnis f�r die Speicherung von FS "
"Daten in der Sektion '%s' unter '%s' angeben.\n"
-#: src/applications/fs/module/ondemand.c:629
+#: src/applications/fs/module/ondemand.c:637
#, c-format
msgid ""
"Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
@@ -1061,42 +1065,42 @@
msgid "You must pass a positive number to the '%s' option.\n"
msgstr "Sie m�ssen eine positive Zahl zu der Option '%s' �bergeben.\n"
-#: src/applications/fs/tools/gnunet-insert.c:504
+#: src/applications/fs/tools/gnunet-insert.c:516
#: src/applications/fs/tools/gnunet-unindex.c:144
#, c-format
msgid "You must specify a list of files to insert.\n"
msgstr "Sie m�ssen eine Liste von Dateien zum Einf�gen angeben.\n"
-#: src/applications/fs/tools/gnunet-insert.c:508
+#: src/applications/fs/tools/gnunet-insert.c:520
#, c-format
msgid "Only one file or directory can be specified at a time.\n"
msgstr "Nur eine Datei oder Verzeichnis kann auf einmal angegeben werden.\n"
-#: src/applications/fs/tools/gnunet-insert.c:512
+#: src/applications/fs/tools/gnunet-insert.c:524
#, c-format
msgid "You must specify a file or directory to upload.\n"
msgstr "Sie m�ssen eine Datei oder Verzeichnis f�r den Upload angeben.\n"
-#: src/applications/fs/tools/gnunet-insert.c:561
+#: src/applications/fs/tools/gnunet-insert.c:573
#, c-format
msgid "Keywords for file '%s':\n"
msgstr "Schl�sselw�rter f�r Datei '%s':\n"
-#: src/applications/fs/tools/gnunet-insert.c:583
+#: src/applications/fs/tools/gnunet-insert.c:595
#, c-format
msgid "Could not access namespace '%s' (does not exist?).\n"
msgstr "Konnte nicht auf den Namespace '%s' zugreifen (existiert nicht?).\n"
-#: src/applications/fs/tools/gnunet-insert.c:598
+#: src/applications/fs/tools/gnunet-insert.c:614
#, c-format
msgid "Parsing time failed. Use '%s' format.\n"
msgstr "Das Parsen der Zeit schlug fehl. Verwenden Sie das '%s' Format.\n"
-#: src/applications/fs/tools/gnunet-insert.c:607
-#: src/applications/fs/tools/gnunet-insert.c:611
-#: src/applications/fs/tools/gnunet-insert.c:615
-#: src/applications/fs/tools/gnunet-insert.c:619
-#: src/applications/fs/tools/gnunet-insert.c:624
+#: src/applications/fs/tools/gnunet-insert.c:627
+#: src/applications/fs/tools/gnunet-insert.c:631
+#: src/applications/fs/tools/gnunet-insert.c:635
+#: src/applications/fs/tools/gnunet-insert.c:639
+#: src/applications/fs/tools/gnunet-insert.c:644
#, c-format
msgid "Option '%s' makes no sense without option '%s'.\n"
msgstr "Option '%s' macht keinen Sinn ohne die Option '%s'.\n"
@@ -1418,8 +1422,8 @@
#: src/applications/identity/identity.c:614
#: src/applications/identity/identity.c:632
-#, c-format
-msgid "Removed file '%s' containing invalid HELO data.\n"
+#, fuzzy, c-format
+msgid "Removed file '%s' containing invalid hello data.\n"
msgstr "Datei '%s' enthielt ung�ltige HELO Daten und wurde entfernt.\n"
#: src/applications/pingpong/pingpong.c:120
@@ -1610,8 +1614,8 @@
#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:56
#: src/util/hostkey_gcrypt.c:63 src/util/storage.c:643
#: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1002 src/include/gnunet_util.h:1009
-#: src/include/gnunet_util.h:1011
+#: src/include/gnunet_util.h:1011 src/include/gnunet_util.h:1018
+#: src/include/gnunet_util.h:1020
#, c-format
msgid "'%s' failed at %s:%d with error: %s\n"
msgstr "'%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1875,7 +1879,7 @@
msgid "Template for gnunet-clients."
msgstr "Vorlage f�r gnunet-clients."
-#: src/applications/template/template.c:59
+#: src/applications/template/template.c:61
#, c-format
msgid "'%s' registering client handler %d and %d\n"
msgstr "'%s' registriert Client-Handler %d and %d\n"
@@ -1954,8 +1958,8 @@
msgstr "Gr��e der '%s' Nachricht ist falsch. Nachricht wird ignoriert.\n"
#: src/applications/testbed/testbed.c:137
-#, c-format
-msgid "TESTBED could not generate HELO message for protocol %u\n"
+#, fuzzy, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
msgstr ""
"Das TESTBED konnte keine HELO Nachricht f�r das Protokoll %u erzeugen\n"
@@ -2035,7 +2039,7 @@
msgstr ""
"Keine Testbed URL angegeben, es wurde keine Registrierung vorgenommen.\n"
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1449
+#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1451
#, c-format
msgid "Could not resolve name of HTTP proxy '%s'.\n"
msgstr "Der Name des HTTP Proxies '%s' konnte nicht aufgel�st werden.\n"
@@ -2156,21 +2160,21 @@
msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:179
+#: src/applications/tracekit/tracekit.c:186
#, c-format
msgid "Received invalid '%s' message from '%s'.\n"
msgstr "Ung�ltige '%s' Anfrage von '%s' empfangen.\n"
-#: src/applications/tracekit/tracekit.c:236
+#: src/applications/tracekit/tracekit.c:243
msgid "TRACEKIT: routing table full, trace request dropped\n"
msgstr "TRACEKIT: Routing-Tabelle ist voll, Trace-Anfrage wird verworfen\n"
-#: src/applications/tracekit/tracekit.c:334
+#: src/applications/tracekit/tracekit.c:331
#, c-format
msgid "TRACEKIT: received invalid '%s' message\n"
msgstr "TRACEKIT: ung�ltige '%s' Nachricht empfangen\n"
-#: src/applications/tracekit/tracekit.c:434
+#: src/applications/tracekit/tracekit.c:431
#, fuzzy
msgid "allows mapping of the network topology"
msgstr "GNUnet Netzwerk Topologie tracen."
@@ -2473,31 +2477,31 @@
msgid "Unable to save configuration file %s:"
msgstr "Fehler beim Speichern der Konfigurationsdatei %s:"
-#: src/conf/wizard_callbacks.c:236 src/conf/wizard_curs.c:511
+#: src/conf/wizard_callbacks.c:236 src/conf/wizard_curs.c:517
msgid "Unable to create user account:"
msgstr "Fehler beim Anlegen des Benutzerkontos:"
-#: src/conf/wizard_callbacks.c:243 src/conf/wizard_curs.c:514
+#: src/conf/wizard_callbacks.c:243 src/conf/wizard_curs.c:520
msgid "Unable to change startup process:"
msgstr "Startproze� konnte nicht ge�ndert werden:"
-#: src/conf/wizard_curs.c:47 src/conf/wizard_interface.c:1075
-#: src/conf/wizard_util.c:116 src/conf/wizard_util.c:157
+#: src/conf/wizard_curs.c:50 src/conf/wizard_interface.c:1075
+#: src/conf/wizard_util.c:118 src/conf/wizard_util.c:160
msgid "Error"
msgstr "Fehler"
-#: src/conf/wizard_curs.c:93 src/conf/wizard_curs.c:108
-#: src/conf/wizard_curs.c:161 src/conf/wizard_curs.c:196
-#: src/conf/wizard_curs.c:224 src/conf/wizard_curs.c:249
-#: src/conf/wizard_curs.c:281 src/conf/wizard_curs.c:307
-#: src/conf/wizard_curs.c:338 src/conf/wizard_curs.c:361
-#: src/conf/wizard_curs.c:389 src/conf/wizard_curs.c:411
-#: src/conf/wizard_curs.c:433 src/conf/wizard_curs.c:461
-#: src/conf/wizard_curs.c:491 src/conf/wizard_curs.c:574
+#: src/conf/wizard_curs.c:99 src/conf/wizard_curs.c:114
+#: src/conf/wizard_curs.c:167 src/conf/wizard_curs.c:202
+#: src/conf/wizard_curs.c:230 src/conf/wizard_curs.c:255
+#: src/conf/wizard_curs.c:287 src/conf/wizard_curs.c:313
+#: src/conf/wizard_curs.c:344 src/conf/wizard_curs.c:367
+#: src/conf/wizard_curs.c:395 src/conf/wizard_curs.c:417
+#: src/conf/wizard_curs.c:439 src/conf/wizard_curs.c:467
+#: src/conf/wizard_curs.c:497 src/conf/wizard_curs.c:582
msgid "GNUnet configuration"
msgstr "GNUnet Konfiguration"
-#: src/conf/wizard_curs.c:94 src/conf/wizard_interface.c:77
+#: src/conf/wizard_curs.c:100 src/conf/wizard_interface.c:77
msgid ""
"Welcome to GNUnet!\n"
"\n"
@@ -2527,7 +2531,7 @@
"\n"
"das GNUnet-Team"
-#: src/conf/wizard_curs.c:109
+#: src/conf/wizard_curs.c:115
msgid ""
"Choose the network interface that connects your computer to the internet "
"from the list below."
@@ -2535,13 +2539,13 @@
"W�hlen Sie das Netzwerkger�t, das Ihren Computer mit dem Internet verbindet, "
"aus unten stehender Liste."
-#: src/conf/wizard_curs.c:115 src/conf/wizard_curs.c:167
-#: src/conf/wizard_curs.c:202 src/conf/wizard_curs.c:254
-#: src/conf/wizard_curs.c:286 src/conf/wizard_curs.c:343
+#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
+#: src/conf/wizard_curs.c:208 src/conf/wizard_curs.c:260
+#: src/conf/wizard_curs.c:292 src/conf/wizard_curs.c:349
msgid "Help"
msgstr "Hilfe"
-#: src/conf/wizard_curs.c:115 src/conf/wizard_curs.c:167
+#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
msgid ""
"The \"Network interface\" is the device that connects your computer to the "
"internet. This is usually a modem, an ISDN card or a network card in case "
@@ -2551,7 +2555,7 @@
"verbindet. Dies ist �blicherweise ein Modem, eine ISDN-Karte oder eine "
"Netzwerkkarte falls Sie DSL nutzen."
-#: src/conf/wizard_curs.c:161
+#: src/conf/wizard_curs.c:167
msgid ""
"What is the name of the network interface that connects your computer to the "
"Internet?"
@@ -2559,7 +2563,7 @@
"Was ist der Name des Netzwerkger�tes, das Ihren Computer mit dem Internet "
"verbindet?"
-#: src/conf/wizard_curs.c:196
+#: src/conf/wizard_curs.c:202
msgid ""
"What is this computer's public IP address or hostname?\n"
"\n"
@@ -2569,7 +2573,7 @@
"Computers?\n"
"Wenn Sie nicht sicher sind, lassen Sie dieses Feld leer."
-#: src/conf/wizard_curs.c:202
+#: src/conf/wizard_curs.c:208
msgid ""
"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -2587,7 +2591,7 @@
"Wenn Sie nicht sicher sind, so k�nnen Sie das Feld leer lassen. GNUnet wird "
"dann versuchen, Ihre IP-Adresse automatisch zu bestimmen."
-#: src/conf/wizard_curs.c:224
+#: src/conf/wizard_curs.c:230
msgid ""
"Is this machine behind NAT?\n"
"\n"
@@ -2605,11 +2609,11 @@
"hier \"Ja\". Antworten Sie \"Nein\" bei direkten Verbindungen �ber Modem, "
"ISDN-Karten und DNAT (auch bekannt als \"Port forwarding\")."
-#: src/conf/wizard_curs.c:249
+#: src/conf/wizard_curs.c:255
msgid "How much upstream (Bytes/s) may be used?"
msgstr "Wieviel Upstream (Bytes/s) darf verwendet werden?"
-#: src/conf/wizard_curs.c:254
+#: src/conf/wizard_curs.c:260
msgid ""
"You can limit GNUnet's resource usage here.\n"
"\n"
@@ -2627,11 +2631,11 @@
"festlegen. Wenn Sie eine Flatrate haben, k�nnen Sie die maximale "
"Geschwindigkeit Ihrer Internetverbindung angeben."
-#: src/conf/wizard_curs.c:281
+#: src/conf/wizard_curs.c:287
msgid "How much downstream (Bytes/s) may be used?"
msgstr "Wieviel Downstream (Bytes/s) darf verwendet werden?"
-#: src/conf/wizard_curs.c:286
+#: src/conf/wizard_curs.c:292
msgid ""
"You can limit GNUnet's resource usage here.\n"
"\n"
@@ -2649,7 +2653,7 @@
"festlegen. Wenn Sie eine Flatrate haben, k�nnen Sie die maximale "
"Geschwindigkeit Ihrer Internetverbindung angeben."
-#: src/conf/wizard_curs.c:307
+#: src/conf/wizard_curs.c:313
msgid ""
"Share denoted bandwidth with other applications?\n"
"\n"
@@ -2672,11 +2676,11 @@
"Netzwerkverkehr �ber die Internetverbindung einschr�nken, wann immer Ihre "
"Hochgeschwindigkeits-LAN-Verbindung verwendet wird (z.B. durch NFS)."
-#: src/conf/wizard_curs.c:338
+#: src/conf/wizard_curs.c:344
msgid "How much CPU (in %) may be used?"
msgstr "Wieviel CPU (in %) darf verwendet werden?"
-#: src/conf/wizard_curs.c:343
+#: src/conf/wizard_curs.c:349
msgid ""
"You can limit GNUnet's resource usage here.\n"
"\n"
@@ -2686,7 +2690,7 @@
"\n"
"Dies ist der Prozentsatz an Prozessorzeit, den GNUnet verwenden darf."
-#: src/conf/wizard_curs.c:361
+#: src/conf/wizard_curs.c:367
msgid ""
"Store migrated content?\n"
"\n"
@@ -2708,7 +2712,7 @@
"Au�erdem hilft es, beliebte Inhalte �ber verschiedene Netzteilnehmer zu "
"verteilen, um so die Verf�gbarkeit zu erh�hen."
-#: src/conf/wizard_curs.c:389
+#: src/conf/wizard_curs.c:395
msgid ""
"What's the maximum datastore size in MB?\n"
"\n"
@@ -2719,7 +2723,7 @@
"Der GNUnet Datenspeicher enth�lt alle Daten, die GNUnet erzeugt (Indexdaten, "
"eingef�gte und migrierte Inhalte)."
-#: src/conf/wizard_curs.c:411
+#: src/conf/wizard_curs.c:417
msgid ""
"Do you want to launch GNUnet as a system service?\n"
"\n"
@@ -2734,7 +2738,7 @@
"\"Nein\" sagen, so m�ssen Sie GNUnet jedesmal selbst starten, wenn Sie es "
"verwenden m�chten."
-#: src/conf/wizard_curs.c:434
+#: src/conf/wizard_curs.c:440
msgid ""
"Define the user owning the GNUnet service.\n"
"\n"
@@ -2764,7 +2768,7 @@
"\n"
"GNUnet Benutzer:"
-#: src/conf/wizard_curs.c:462
+#: src/conf/wizard_curs.c:468
msgid ""
"Define the group owning the GNUnet service.\n"
"\n"
@@ -2790,7 +2794,7 @@
"\n"
"GNUnet Gruppe:"
-#: src/conf/wizard_curs.c:491
+#: src/conf/wizard_curs.c:497
msgid ""
"If you are an experienced user, you may want to tweak your GNUnet "
"installation using the enhanced configurator.\n"
@@ -2802,7 +2806,7 @@
"\n"
"M�chten Sie ihn starten, nachdem Ihre Konfiguration gespeichert wurde?"
-#: src/conf/wizard_curs.c:568
+#: src/conf/wizard_curs.c:576
#, c-format
msgid ""
"Unable to save configuration file %s: %s.\n"
@@ -3070,51 +3074,51 @@
msgid "User account:"
msgstr "Benutzerkonto:"
-#: src/conf/wizard_util.c:89
+#: src/conf/wizard_util.c:90
msgid "Can't open Service Control Manager"
msgstr "Der Dienstemanager konnte nicht ge�ffnet werden"
-#: src/conf/wizard_util.c:94
+#: src/conf/wizard_util.c:95
msgid "Can't create service"
msgstr "Der Dienst konnte nicht angelegt werden"
-#: src/conf/wizard_util.c:99
+#: src/conf/wizard_util.c:100
msgid "Error changing the permissions of the GNUnet directory"
msgstr "Fehler beim �ndern der Berechtigungen des GNUnet Verzeichnisses"
-#: src/conf/wizard_util.c:103
+#: src/conf/wizard_util.c:105
msgid "Cannot write to the regisitry"
msgstr "Konnte nicht in die Registry schreiben"
-#: src/conf/wizard_util.c:106
+#: src/conf/wizard_util.c:108
msgid "Can't access the service"
msgstr "Auf den Dienst konnte nicht zugegriffen werden"
-#: src/conf/wizard_util.c:109
+#: src/conf/wizard_util.c:111
msgid "Can't delete the service"
msgstr "Dienst konnte nicht gel�scht werden"
-#: src/conf/wizard_util.c:112
+#: src/conf/wizard_util.c:114
msgid "Unknown error"
msgstr "Unbekannter Fehler"
-#: src/conf/wizard_util.c:140
+#: src/conf/wizard_util.c:143
msgid "This version of Windows does not support multiple users."
msgstr "Diese Version von Windows ist nicht Mehrbenutzerf�hig."
-#: src/conf/wizard_util.c:144
+#: src/conf/wizard_util.c:147
msgid "Error creating user"
msgstr "Fehler beim Anlegen des Benutzers"
-#: src/conf/wizard_util.c:147
+#: src/conf/wizard_util.c:150
msgid "Error accessing local security policy"
msgstr "Fehler beim Zugriff auf die lokale Sicherheitsrichtlinie"
-#: src/conf/wizard_util.c:150
+#: src/conf/wizard_util.c:153
msgid "Error granting service right to user"
msgstr "Fehler beim Zuweisen des Dienstrechtes dem Benutzer"
-#: src/conf/wizard_util.c:153
+#: src/conf/wizard_util.c:156
msgid "Unknown error while creating a new user"
msgstr "Unbekannter Fehler beim Anlegen des neuen Benutzers"
@@ -3241,7 +3245,8 @@
msgstr "Adresse des Knotens '%s' konnte nicht ermittelt werden.\n"
#: src/server/gnunet-peer-info.c:153
-msgid "HELO message invalid (signature invalid).\n"
+#, fuzzy
+msgid "hello message invalid (signature invalid).\n"
msgstr "HELO Nachricht ist ung�ltig (Signatur ist ung�ltig).\n"
#: src/server/gnunet-peer-info.c:164
@@ -3250,8 +3255,8 @@
msgstr "Knoten '%s' mit Vertrauen %8u und Adresse '%s'\n"
#: src/server/gnunet-transport-check.c:108
-#, c-format
-msgid "'%s': Could not create HELO.\n"
+#, fuzzy, c-format
+msgid "'%s': Could not create hello.\n"
msgstr "'%s': HELO konnte nicht erzeugt werden.\n"
#: src/server/gnunet-transport-check.c:117
@@ -3521,29 +3526,29 @@
msgid "Failed to obtain my (external) IPv6 address!\n"
msgstr "Die �ffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
-#: src/transports/http.c:600
+#: src/transports/http.c:601
msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
msgstr ""
"Es wurde eine Willkommensnachricht erwartet, tats�chlich wurde jedoch keine "
"gesendet. HTTP-Verbindung wird geschlossen.\n"
-#: src/transports/http.c:816 src/transports/tcp.c:688 src/transports/udp.c:285
+#: src/transports/http.c:817 src/transports/tcp.c:689 src/transports/udp.c:286
#, c-format
msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
msgstr ""
"%s: Abgewiesene Verbindung von schwarzgelisteter Adresse %u.%u.%u.%u.\n"
-#: src/transports/http.c:1097
+#: src/transports/http.c:1099
msgid "HTTP: Could not determine my public IP address.\n"
msgstr "HTTP: �ffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-#: src/transports/http.c:1171 src/transports/tcp.c:1124 src/util/tcpio.c:166
+#: src/transports/http.c:1173 src/transports/tcp.c:1125 src/util/tcpio.c:166
#: src/util/tcpio.c:196
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-#: src/transports/http.c:1327
+#: src/transports/http.c:1329
#, c-format
msgid ""
"Could not bind the HTTP listener to port %d. No transport service started.\n"
@@ -3551,24 +3556,24 @@
"HTTP-Listener konnte nicht an Port %d gebunden werden. Der Transport Dienst "
"wurde nicht gestartet.\n"
-#: src/transports/http.c:1470
+#: src/transports/http.c:1472
msgid "# bytes received via HTTP"
msgstr "# Bytes empfangen �ber HTTP"
-#: src/transports/http.c:1472
+#: src/transports/http.c:1474
msgid "# bytes sent via HTTP"
msgstr "# Bytes gesendet �ber HTTP"
-#: src/transports/http.c:1474
+#: src/transports/http.c:1476
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "# Bytes verworfen von HTTP"
-#: src/transports/smtp.c:295
+#: src/transports/smtp.c:296
#, c-format
msgid "Could not resolve name of SMTP server '%s': %s"
msgstr "Der Name des SMTP servers '%s' konnte nicht aufgel�st werden: %s"
-#: src/transports/smtp.c:413
+#: src/transports/smtp.c:415
#, c-format
msgid ""
"You must specify the name of a pipe for the SMTP transport in section '%s' "
@@ -3577,46 +3582,46 @@
"F�r den SMTP Transport m�ssen Sie den Namen einer Pipe in Sektion '%s', "
"Eintrag '%s' eintragen.\n"
-#: src/transports/smtp.c:482
+#: src/transports/smtp.c:484
msgid "Received malformed message via SMTP (size mismatch).\n"
msgstr ""
"Es wurde eine ung�ltige Nachricht per SMTP empfangen (ung�ltige Gr��e).\n"
-#: src/transports/smtp.c:569
+#: src/transports/smtp.c:571
msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
msgstr ""
"Kein Filter f�r E-Mail angegeben, es kann keine Bekanntmachung erstellt "
"werden.\n"
-#: src/transports/smtp.c:576
+#: src/transports/smtp.c:578
#, c-format
msgid "SMTP filter string to long, capped to '%s'\n"
msgstr "SMTP Filterstring zu lang, wurde auf '%s' abgeschnitten\n"
-#: src/transports/smtp.c:746
+#: src/transports/smtp.c:748
#, c-format
msgid "Sending E-mail to '%s' failed.\n"
msgstr "Das Senden einer E-Mail an '%s' schlug fehl.\n"
-#: src/transports/smtp.c:795
+#: src/transports/smtp.c:797
#, c-format
msgid "SMTP server send unexpected response at %s:%d.\n"
msgstr "Der SMTP server sendete eine unerwartete Antwort bei %s:%d.\n"
-#: src/transports/smtp.c:862
+#: src/transports/smtp.c:864
#, c-format
msgid "%.*s filter %s (SMTP)"
msgstr "%.*s filter %s (SMTP)"
-#: src/transports/smtp.c:891 src/transports/udp.c:657
-#: src/transports/udp6.c:635
+#: src/transports/smtp.c:893 src/transports/udp.c:658
+#: src/transports/udp6.c:636
#, c-format
msgid "MTU for '%s' is probably too low (fragmentation not implemented!)\n"
msgstr ""
"MTU f�r '%s' ist m�glicherweise zu gering (Fragmentierung ist nicht "
"implementiert!)\n"
-#: src/transports/tcp.c:464
+#: src/transports/tcp.c:465
#, c-format
msgid ""
"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
@@ -3624,7 +3629,7 @@
"Es wurde eine Willkommensnachricht erwartet, �ber die TCP Verbindung wurde "
"aber keine gesendet (%u, %u). Verbindung wird geschlossen.\n"
-#: src/transports/tcp.c:498
+#: src/transports/tcp.c:499
#, c-format
msgid ""
"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
@@ -3632,55 +3637,55 @@
"Es wurde per TCP von einem anderen Knoten eine ung�ltige Nachricht (Gr��e %"
"u) empfangen. Verbindung wird geschlossen.\n"
-#: src/transports/tcp.c:1056
+#: src/transports/tcp.c:1057
msgid "Could not determine my public IP address.\n"
msgstr "�ffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-#: src/transports/tcp.c:1306 src/transports/tcp6.c:1199
+#: src/transports/tcp.c:1307 src/transports/tcp6.c:1200
#, c-format
msgid "Failed to start transport service on port %d.\n"
msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-#: src/transports/tcp.c:1423
+#: src/transports/tcp.c:1424
msgid "# bytes received via TCP"
msgstr "# Bytes empfangen �ber TCP"
-#: src/transports/tcp.c:1425
+#: src/transports/tcp.c:1426
msgid "# bytes sent via TCP"
msgstr "# Bytes gesendet �ber TCP"
-#: src/transports/tcp.c:1427
+#: src/transports/tcp.c:1428
msgid "# bytes dropped by TCP (outgoing)"
msgstr "# Bytes verworfen von TCP (ausgehend)"
-#: src/transports/tcp6.c:438
+#: src/transports/tcp6.c:439
msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
msgstr ""
"Es wurde eine Willkommensnachricht erwartet, �ber die TCP Verbindung wurde "
"jedoch keine gesendet. Verbindung wird geschlossen.\n"
-#: src/transports/tcp6.c:468
+#: src/transports/tcp6.c:469
msgid ""
"Received malformed message from tcp6-peer connection. Closing connection.\n"
msgstr ""
"�ber die TCP6-Verbindung zu einem anderen Knoten wurde eine ung�ltige "
"Nachricht empfangen. Verbindung wird geschlossen.\n"
-#: src/transports/tcp6.c:656 src/transports/udp6.c:273
+#: src/transports/tcp6.c:657 src/transports/udp6.c:274
#, c-format
msgid "%s: Rejected connection from blacklisted address %s.\n"
msgstr "%s: Zur�ckgewiesene Verbindung von schwarzgelisteter Adresse %s.\n"
-#: src/transports/tcp6.c:957
+#: src/transports/tcp6.c:958
msgid "Could not determine my public IPv6 address.\n"
msgstr "Die �ffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
-#: src/transports/tcp6.c:1001
+#: src/transports/tcp6.c:1002
#, c-format
msgid "'%s': unknown service: %s\n"
msgstr "'%s': unbekannter Dienst: %s\n"
-#: src/transports/udp.c:144 src/transports/udp6.c:127
+#: src/transports/udp.c:145 src/transports/udp6.c:128
#, c-format
msgid ""
"Cannot determine port to bind to. Define in configuration file in section '%"
@@ -3690,44 +3695,44 @@
"Konfigurationsdatei in der Sektion '%s' unter '%s' oder in '%s' unter %s/%"
"s.\n"
-#: src/transports/udp.c:178
+#: src/transports/udp.c:179
#, c-format
msgid "Failed to bind to UDP port %d.\n"
msgstr "Fehler beim Binden an UDP Port %d.\n"
-#: src/transports/udp.c:251
+#: src/transports/udp.c:252
#, c-format
msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
msgstr ""
"Es wurde eine ung�ltige UDP Nachricht von %u.%u.%u.%u:%u empfangen, "
"Nachricht wird ignoriert.\n"
-#: src/transports/udp.c:274
+#: src/transports/udp.c:275
#, c-format
msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
msgstr ""
"Ein Paket empfangen von %u.%u.%u.%u:%u (UDP) hat ein ung�ltiges Format.\n"
-#: src/transports/udp.c:355
+#: src/transports/udp.c:356
msgid "UDP: Could not determine my public IP address.\n"
msgstr "UDP: �ffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-#: src/transports/udp.c:487
+#: src/transports/udp.c:488
#, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
"Eine Nachricht der Gr��e %d konnte nicht per UDP an %u.%u.%u.%u:%u versendet "
"werden: %s\n"
-#: src/transports/udp.c:642
+#: src/transports/udp.c:643
msgid "# bytes received via UDP"
msgstr "# Bytes empfangen �ber UDP"
-#: src/transports/udp.c:644
+#: src/transports/udp.c:645
msgid "# bytes sent via UDP"
msgstr "# Bytes gesendet �ber UDP"
-#: src/transports/udp.c:646
+#: src/transports/udp.c:647
msgid "# bytes dropped by UDP (outgoing)"
msgstr "# Bytes verworfen von UDP (outgoing)"
@@ -3775,25 +3780,25 @@
msgid "Failed to obtain my (external) IP address!\n"
msgstr "Fehler beim Bestimmen der (externen) IP-Adresse!\n"
-#: src/transports/udp6.c:163
+#: src/transports/udp6.c:164
#, c-format
msgid "Failed to bind to UDP6 port %d.\n"
msgstr "Fehler beim Binden an UDP6 Port %d.\n"
-#: src/transports/udp6.c:233
+#: src/transports/udp6.c:234
#, c-format
msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
msgstr ""
"Ung�ltige UDP6 Nachricht von %s:%d empfangen, Nachricht wird ignoriert.\n"
-#: src/transports/udp6.c:262
+#: src/transports/udp6.c:263
#, c-format
msgid "Packet received from %s:%d (UDP6) failed format check."
msgstr ""
"Die Format�berpr�fung des Pakets, das von %s:%d (UDP6) empfangen wurde, "
"schlug fehl."
-#: src/transports/udp6.c:352
+#: src/transports/udp6.c:353
msgid "UDP6: Could not determine my public IPv6 address.\n"
msgstr "UDP6: �ffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
@@ -4000,12 +4005,12 @@
msgid "EVERYTHING"
msgstr "ALLES"
-#: src/util/logging.c:261
+#: src/util/logging.c:269
#, c-format
msgid "Invalid LOGLEVEL '%s' specified.\n"
msgstr "Ung�ltiger LOGLEVEL '%s' angegeben.\n"
-#: src/util/logging.c:353 src/util/logging.c:359
+#: src/util/logging.c:361 src/util/logging.c:367
#, c-format
msgid "Failure at %s:%d.\n"
msgstr "Fehler bei %s:%d.\n"
@@ -4072,15 +4077,15 @@
msgid "Failed to parse interface data from '%s' at %s:%d.\n"
msgstr "Fehler beim Parsen der Ger�tedaten von '%s' bei %s:%d.\n"
-#: src/util/statuscalls.c:487
+#: src/util/statuscalls.c:489
msgid "Cannot query the CPU usage (Windows NT).\n"
msgstr "CPU Nutzung kann nicht ermittelt werden (Windows NT).\n"
-#: src/util/statuscalls.c:505
+#: src/util/statuscalls.c:507
msgid "Cannot query the CPU usage (Win 9x)\n"
msgstr "CPU Nutzung kann nicht ermittelt werden (Win 9x).\n"
-#: src/util/statuscalls.c:598
+#: src/util/statuscalls.c:600
#, c-format
msgid ""
"No network interfaces defined in configuration section '%s' under '%s'!\n"
@@ -4167,13 +4172,13 @@
msgid "be verbose"
msgstr "umfangreiche Meldungen ausgeben"
-#: src/include/gnunet_util.h:611 src/include/gnunet_util.h:613
+#: src/include/gnunet_util.h:620 src/include/gnunet_util.h:622
#, c-format
msgid "Assertion failed at %s:%d.\n"
msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
-#: src/include/gnunet_util.h:1018 src/include/gnunet_util.h:1020
-#: src/include/gnunet_util.h:1027
+#: src/include/gnunet_util.h:1027 src/include/gnunet_util.h:1029
+#: src/include/gnunet_util.h:1036
#, c-format
msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
msgstr "'%s' schlug bei Datei '%s' fehl. Ort: %s:%d. Fehler: %s\n"
Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/po/rw.po 2005-07-17 23:21:45 UTC (rev 1576)
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre0\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-16 21:36+0200\n"
+"POT-Creation-Date: 2005-07-18 01:09+0200\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"
@@ -26,22 +26,23 @@
#: src/applications/advertising/advertising.c:156
#, fuzzy, c-format
-msgid "HELO message from '%s' invalid (signature invalid). Dropping.\n"
+msgid "hello message from '%s' invalid (signature invalid). Dropping.\n"
msgstr "Ubutumwa Bivuye Sibyo Isinya Sibyo"
#: src/applications/advertising/advertising.c:162
#, fuzzy
-msgid "HELO message received invalid (expiration time over limit). Dropping.\n"
+msgid ""
+"hello message received invalid (expiration time over limit). Dropping.\n"
msgstr "Ubutumwa BYAKIRIWE Sibyo Igihe KURI"
#: src/applications/advertising/advertising.c:171
#, fuzzy, c-format
-msgid "HELO advertisement for protocol %d received.\n"
+msgid "hello advertisement for protocol %d received.\n"
msgstr "kugirango Porotokole BYAKIRIWE"
#: src/applications/advertising/advertising.c:290
#, fuzzy
-msgid "Could not send HELOs+PING, ping buffer full.\n"
+msgid "Could not send hellos+PING, ping buffer full.\n"
msgstr "OYA Kohereza"
#: src/applications/advertising/advertising.c:303
@@ -62,7 +63,7 @@
#: src/applications/advertising/advertising.c:560
#, fuzzy, c-format
-msgid "Removing HELO from peer '%s' (expired %ds ago).\n"
+msgid "Removing hello from peer '%s' (expired %ds ago).\n"
msgstr "Bivuye Byarengeje igihe"
#: src/applications/advertising/advertising.c:720
@@ -128,7 +129,7 @@
#: src/applications/bootstrap_http/http.c:250
#, fuzzy, c-format
-msgid "Parsing HELO from '%s' failed.\n"
+msgid "Parsing hello from '%s' failed.\n"
msgstr "Bivuye Byanze"
#: src/applications/bootstrap_http/http.c:326
@@ -138,7 +139,7 @@
#: src/applications/bootstrap_http/http.c:350
#, fuzzy
-msgid "# HELOs downloaded via http"
+msgid "# hellos downloaded via http"
msgstr "#KB Yimuwe ku"
#: src/applications/chat/chat.c:87
@@ -186,7 +187,7 @@
#: src/applications/fs/tools/gnunet-delete.c:111
#: src/applications/fs/tools/gnunet-directory.c:183
#: src/applications/fs/tools/gnunet-download.c:128
-#: src/applications/fs/tools/gnunet-insert.c:499
+#: src/applications/fs/tools/gnunet-insert.c:511
#: src/applications/fs/tools/gnunet-pseudonym.c:214
#: src/applications/fs/tools/gnunet-search.c:213
#: src/applications/fs/tools/gnunet-unindex.c:139
@@ -345,7 +346,7 @@
#: src/applications/dht/tools/dht-query.c:84
#: src/applications/fs/tools/gnunet-download.c:94
#: src/applications/fs/tools/gnunet-insert.c:312
-#: src/applications/fs/tools/gnunet-insert.c:428
+#: src/applications/fs/tools/gnunet-insert.c:440
#: src/applications/fs/tools/gnunet-pseudonym.c:120
#: src/applications/fs/tools/gnunet-search.c:159
#: src/applications/fs/tools/gnunet-search.c:175
@@ -708,19 +709,19 @@
msgid "Cannot upload directory without using recursion.\n"
msgstr ""
-#: src/applications/fs/module/fs.c:964
+#: src/applications/fs/module/fs.c:961
#, fuzzy, c-format
msgid ""
"You must specify a postive number for '%s' in the configuration in section '%"
"s'.\n"
msgstr "a Umubare kugirango in i Iboneza in Icyiciro"
-#: src/applications/fs/module/fs.c:1005
+#: src/applications/fs/module/fs.c:1002
#, c-format
msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
msgstr ""
-#: src/applications/fs/module/fs.c:1042
+#: src/applications/fs/module/fs.c:1039
msgid "enables (anonymous) file-sharing"
msgstr ""
@@ -736,7 +737,7 @@
msgid "Indexed file disappeared, deleting block for query '%s'\n"
msgstr ""
-#: src/applications/fs/module/ondemand.c:408
+#: src/applications/fs/module/ondemand.c:416
#, c-format
msgid ""
"Because the file '%s' has been unavailable for 3 days it got removed from "
@@ -744,14 +745,14 @@
"contains invalid references!"
msgstr ""
-#: src/applications/fs/module/ondemand.c:434
+#: src/applications/fs/module/ondemand.c:442
#, fuzzy, c-format
msgid ""
"Configuration file must specify directory for storage of FS data in section "
"'%s' under '%s'.\n"
msgstr "IDOSIYE bushyinguro kugirango Bya Ibyatanzwe in Icyiciro"
-#: src/applications/fs/module/ondemand.c:629
+#: src/applications/fs/module/ondemand.c:637
#, c-format
msgid ""
"Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
@@ -1088,28 +1089,28 @@
msgid "You must pass a positive number to the '%s' option.\n"
msgstr "a Umubare Kuri i Ihitamo"
-#: src/applications/fs/tools/gnunet-insert.c:504
+#: src/applications/fs/tools/gnunet-insert.c:516
#: src/applications/fs/tools/gnunet-unindex.c:144
#, fuzzy, c-format
msgid "You must specify a list of files to insert.\n"
msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
-#: src/applications/fs/tools/gnunet-insert.c:508
+#: src/applications/fs/tools/gnunet-insert.c:520
#, c-format
msgid "Only one file or directory can be specified at a time.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-insert.c:512
+#: src/applications/fs/tools/gnunet-insert.c:524
#, fuzzy, c-format
msgid "You must specify a file or directory to upload.\n"
msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
-#: src/applications/fs/tools/gnunet-insert.c:561
+#: src/applications/fs/tools/gnunet-insert.c:573
#, fuzzy, c-format
msgid "Keywords for file '%s':\n"
msgstr "kugirango IDOSIYE"
-#: src/applications/fs/tools/gnunet-insert.c:583
+#: src/applications/fs/tools/gnunet-insert.c:595
#, fuzzy, c-format
msgid "Could not access namespace '%s' (does not exist?).\n"
msgstr ""
@@ -1122,16 +1123,16 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/applications/fs/tools/gnunet-insert.c:598
+#: src/applications/fs/tools/gnunet-insert.c:614
#, fuzzy, c-format
msgid "Parsing time failed. Use '%s' format.\n"
msgstr "Igihe Byanze Imiterere"
-#: src/applications/fs/tools/gnunet-insert.c:607
-#: src/applications/fs/tools/gnunet-insert.c:611
-#: src/applications/fs/tools/gnunet-insert.c:615
-#: src/applications/fs/tools/gnunet-insert.c:619
-#: src/applications/fs/tools/gnunet-insert.c:624
+#: src/applications/fs/tools/gnunet-insert.c:627
+#: src/applications/fs/tools/gnunet-insert.c:631
+#: src/applications/fs/tools/gnunet-insert.c:635
+#: src/applications/fs/tools/gnunet-insert.c:639
+#: src/applications/fs/tools/gnunet-insert.c:644
#, fuzzy, c-format
msgid "Option '%s' makes no sense without option '%s'.\n"
msgstr "Oya Ihitamo"
@@ -1453,7 +1454,7 @@
#: src/applications/identity/identity.c:614
#: src/applications/identity/identity.c:632
#, fuzzy, c-format
-msgid "Removed file '%s' containing invalid HELO data.\n"
+msgid "Removed file '%s' containing invalid hello data.\n"
msgstr "IDOSIYE Sibyo Ibyatanzwe"
#: src/applications/pingpong/pingpong.c:120
@@ -1641,8 +1642,8 @@
#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:56
#: src/util/hostkey_gcrypt.c:63 src/util/storage.c:643
#: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1002 src/include/gnunet_util.h:1009
-#: src/include/gnunet_util.h:1011
+#: src/include/gnunet_util.h:1011 src/include/gnunet_util.h:1018
+#: src/include/gnunet_util.h:1020
#, fuzzy, c-format
msgid "'%s' failed at %s:%d with error: %s\n"
msgstr "'%s'Byanze ku Na: Ikosa"
@@ -1928,7 +1929,7 @@
msgid "Template for gnunet-clients."
msgstr "kugirango"
-#: src/applications/template/template.c:59
+#: src/applications/template/template.c:61
#, c-format
msgid "'%s' registering client handler %d and %d\n"
msgstr ""
@@ -2030,7 +2031,7 @@
#: src/applications/testbed/testbed.c:137
#, fuzzy, c-format
-msgid "TESTBED could not generate HELO message for protocol %u\n"
+msgid "TESTBED could not generate hello message for protocol %u\n"
msgstr "OYA Ubutumwa kugirango Porotokole"
#: src/applications/testbed/testbed.c:215
@@ -2124,7 +2125,7 @@
msgid "No testbed URL given, not registered.\n"
msgstr "OYA"
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1449
+#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1451
#, fuzzy, c-format
msgid "Could not resolve name of HTTP proxy '%s'.\n"
msgstr "OYA Izina: Bya Porogisi"
@@ -2243,22 +2244,22 @@
msgstr "OYA Kohereza Kubaza... Kuri"
#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:179
+#: src/applications/tracekit/tracekit.c:186
#, fuzzy, c-format
msgid "Received invalid '%s' message from '%s'.\n"
msgstr "Sibyo Ubutumwa Bivuye"
-#: src/applications/tracekit/tracekit.c:236
+#: src/applications/tracekit/tracekit.c:243
#, fuzzy
msgid "TRACEKIT: routing table full, trace request dropped\n"
msgstr "imbonerahamwe# Kubaza..."
-#: src/applications/tracekit/tracekit.c:334
+#: src/applications/tracekit/tracekit.c:331
#, fuzzy, c-format
msgid "TRACEKIT: received invalid '%s' message\n"
msgstr "BYAKIRIWE Sibyo"
-#: src/applications/tracekit/tracekit.c:434
+#: src/applications/tracekit/tracekit.c:431
#, fuzzy
msgid "allows mapping of the network topology"
msgstr "urusobe"
@@ -2556,32 +2557,32 @@
msgid "Unable to save configuration file %s:"
msgstr "OYA Iboneza IDOSIYE"
-#: src/conf/wizard_callbacks.c:236 src/conf/wizard_curs.c:511
+#: src/conf/wizard_callbacks.c:236 src/conf/wizard_curs.c:517
msgid "Unable to create user account:"
msgstr ""
-#: src/conf/wizard_callbacks.c:243 src/conf/wizard_curs.c:514
+#: src/conf/wizard_callbacks.c:243 src/conf/wizard_curs.c:520
msgid "Unable to change startup process:"
msgstr ""
-#: src/conf/wizard_curs.c:47 src/conf/wizard_interface.c:1075
-#: src/conf/wizard_util.c:116 src/conf/wizard_util.c:157
+#: src/conf/wizard_curs.c:50 src/conf/wizard_interface.c:1075
+#: src/conf/wizard_util.c:118 src/conf/wizard_util.c:160
msgid "Error"
msgstr ""
-#: src/conf/wizard_curs.c:93 src/conf/wizard_curs.c:108
-#: src/conf/wizard_curs.c:161 src/conf/wizard_curs.c:196
-#: src/conf/wizard_curs.c:224 src/conf/wizard_curs.c:249
-#: src/conf/wizard_curs.c:281 src/conf/wizard_curs.c:307
-#: src/conf/wizard_curs.c:338 src/conf/wizard_curs.c:361
-#: src/conf/wizard_curs.c:389 src/conf/wizard_curs.c:411
-#: src/conf/wizard_curs.c:433 src/conf/wizard_curs.c:461
-#: src/conf/wizard_curs.c:491 src/conf/wizard_curs.c:574
+#: src/conf/wizard_curs.c:99 src/conf/wizard_curs.c:114
+#: src/conf/wizard_curs.c:167 src/conf/wizard_curs.c:202
+#: src/conf/wizard_curs.c:230 src/conf/wizard_curs.c:255
+#: src/conf/wizard_curs.c:287 src/conf/wizard_curs.c:313
+#: src/conf/wizard_curs.c:344 src/conf/wizard_curs.c:367
+#: src/conf/wizard_curs.c:395 src/conf/wizard_curs.c:417
+#: src/conf/wizard_curs.c:439 src/conf/wizard_curs.c:467
+#: src/conf/wizard_curs.c:497 src/conf/wizard_curs.c:582
#, fuzzy
msgid "GNUnet configuration"
msgstr "A bushyinguro"
-#: src/conf/wizard_curs.c:94 src/conf/wizard_interface.c:77
+#: src/conf/wizard_curs.c:100 src/conf/wizard_interface.c:77
msgid ""
"Welcome to GNUnet!\n"
"\n"
@@ -2598,41 +2599,41 @@
"the GNUnet team"
msgstr ""
-#: src/conf/wizard_curs.c:109
+#: src/conf/wizard_curs.c:115
msgid ""
"Choose the network interface that connects your computer to the internet "
"from the list below."
msgstr ""
# sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: src/conf/wizard_curs.c:115 src/conf/wizard_curs.c:167
-#: src/conf/wizard_curs.c:202 src/conf/wizard_curs.c:254
-#: src/conf/wizard_curs.c:286 src/conf/wizard_curs.c:343
+#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
+#: src/conf/wizard_curs.c:208 src/conf/wizard_curs.c:260
+#: src/conf/wizard_curs.c:292 src/conf/wizard_curs.c:349
#, fuzzy
msgid "Help"
msgstr "/Kugoboka"
-#: src/conf/wizard_curs.c:115 src/conf/wizard_curs.c:167
+#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
msgid ""
"The \"Network interface\" is the device that connects your computer to the "
"internet. This is usually a modem, an ISDN card or a network card in case "
"you are using DSL."
msgstr ""
-#: src/conf/wizard_curs.c:161
+#: src/conf/wizard_curs.c:167
msgid ""
"What is the name of the network interface that connects your computer to the "
"Internet?"
msgstr ""
-#: src/conf/wizard_curs.c:196
+#: src/conf/wizard_curs.c:202
msgid ""
"What is this computer's public IP address or hostname?\n"
"\n"
"If in doubt, leave this empty."
msgstr ""
-#: src/conf/wizard_curs.c:202
+#: src/conf/wizard_curs.c:208
msgid ""
"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -2643,7 +2644,7 @@
"IP-Address."
msgstr ""
-#: src/conf/wizard_curs.c:224
+#: src/conf/wizard_curs.c:230
msgid ""
"Is this machine behind NAT?\n"
"\n"
@@ -2654,11 +2655,11 @@
"forwarding\")."
msgstr ""
-#: src/conf/wizard_curs.c:249
+#: src/conf/wizard_curs.c:255
msgid "How much upstream (Bytes/s) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:254
+#: src/conf/wizard_curs.c:260
msgid ""
"You can limit GNUnet's resource usage here.\n"
"\n"
@@ -2669,11 +2670,11 @@
"connection."
msgstr ""
-#: src/conf/wizard_curs.c:281
+#: src/conf/wizard_curs.c:287
msgid "How much downstream (Bytes/s) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:286
+#: src/conf/wizard_curs.c:292
msgid ""
"You can limit GNUnet's resource usage here.\n"
"\n"
@@ -2684,7 +2685,7 @@
"connection."
msgstr ""
-#: src/conf/wizard_curs.c:307
+#: src/conf/wizard_curs.c:313
msgid ""
"Share denoted bandwidth with other applications?\n"
"\n"
@@ -2697,18 +2698,18 @@
"connection whenever your high-speed LAN gets used (e.g. by NFS)."
msgstr ""
-#: src/conf/wizard_curs.c:338
+#: src/conf/wizard_curs.c:344
msgid "How much CPU (in %) may be used?"
msgstr ""
-#: src/conf/wizard_curs.c:343
+#: src/conf/wizard_curs.c:349
msgid ""
"You can limit GNUnet's resource usage here.\n"
"\n"
"This is the percentage of processor time GNUnet is allowed to use."
msgstr ""
-#: src/conf/wizard_curs.c:361
+#: src/conf/wizard_curs.c:367
msgid ""
"Store migrated content?\n"
"\n"
@@ -2721,7 +2722,7 @@
"availability."
msgstr ""
-#: src/conf/wizard_curs.c:389
+#: src/conf/wizard_curs.c:395
msgid ""
"What's the maximum datastore size in MB?\n"
"\n"
@@ -2729,7 +2730,7 @@
"inserted and migrated content)."
msgstr ""
-#: src/conf/wizard_curs.c:411
+#: src/conf/wizard_curs.c:417
msgid ""
"Do you want to launch GNUnet as a system service?\n"
"\n"
@@ -2738,7 +2739,7 @@
"launch GNUnet yourself each time you want to use it."
msgstr ""
-#: src/conf/wizard_curs.c:434
+#: src/conf/wizard_curs.c:440
msgid ""
"Define the user owning the GNUnet service.\n"
"\n"
@@ -2754,7 +2755,7 @@
"GNUnet user:"
msgstr ""
-#: src/conf/wizard_curs.c:462
+#: src/conf/wizard_curs.c:468
msgid ""
"Define the group owning the GNUnet service.\n"
"\n"
@@ -2769,7 +2770,7 @@
"GNUnet group:"
msgstr ""
-#: src/conf/wizard_curs.c:491
+#: src/conf/wizard_curs.c:497
msgid ""
"If you are an experienced user, you may want to tweak your GNUnet "
"installation using the enhanced configurator.\n"
@@ -2777,7 +2778,7 @@
"Do you want to start it after saving your configuration?"
msgstr ""
-#: src/conf/wizard_curs.c:568
+#: src/conf/wizard_curs.c:576
#, fuzzy, c-format
msgid ""
"Unable to save configuration file %s: %s.\n"
@@ -2988,53 +2989,53 @@
msgid "User account:"
msgstr ""
-#: src/conf/wizard_util.c:89
+#: src/conf/wizard_util.c:90
msgid "Can't open Service Control Manager"
msgstr ""
-#: src/conf/wizard_util.c:94
+#: src/conf/wizard_util.c:95
msgid "Can't create service"
msgstr ""
-#: src/conf/wizard_util.c:99
+#: src/conf/wizard_util.c:100
msgid "Error changing the permissions of the GNUnet directory"
msgstr ""
-#: src/conf/wizard_util.c:103
+#: src/conf/wizard_util.c:105
msgid "Cannot write to the regisitry"
msgstr ""
-#: src/conf/wizard_util.c:106
+#: src/conf/wizard_util.c:108
msgid "Can't access the service"
msgstr ""
-#: src/conf/wizard_util.c:109
+#: src/conf/wizard_util.c:111
msgid "Can't delete the service"
msgstr ""
-#: src/conf/wizard_util.c:112
+#: src/conf/wizard_util.c:114
#, fuzzy
msgid "Unknown error"
msgstr "Verisiyo"
-#: src/conf/wizard_util.c:140
+#: src/conf/wizard_util.c:143
msgid "This version of Windows does not support multiple users."
msgstr ""
-#: src/conf/wizard_util.c:144
+#: src/conf/wizard_util.c:147
#, fuzzy
msgid "Error creating user"
msgstr "Ivugurura Verisiyo"
-#: src/conf/wizard_util.c:147
+#: src/conf/wizard_util.c:150
msgid "Error accessing local security policy"
msgstr ""
-#: src/conf/wizard_util.c:150
+#: src/conf/wizard_util.c:153
msgid "Error granting service right to user"
msgstr ""
-#: src/conf/wizard_util.c:153
+#: src/conf/wizard_util.c:156
msgid "Unknown error while creating a new user"
msgstr ""
@@ -3164,7 +3165,7 @@
#: src/server/gnunet-peer-info.c:153
#, fuzzy
-msgid "HELO message invalid (signature invalid).\n"
+msgid "hello message invalid (signature invalid).\n"
msgstr "Ubutumwa Sibyo Isinya Sibyo"
#: src/server/gnunet-peer-info.c:164
@@ -3174,7 +3175,7 @@
#: src/server/gnunet-transport-check.c:108
#, fuzzy, c-format
-msgid "'%s': Could not create HELO.\n"
+msgid "'%s': Could not create hello.\n"
msgstr "'%s':OYA Kurema"
#: src/server/gnunet-transport-check.c:117
@@ -3436,12 +3437,12 @@
msgid "Failed to obtain my (external) IPv6 address!\n"
msgstr "OYA Rusange Aderesi"
-#: src/transports/http.c:600
+#: src/transports/http.c:601
#, fuzzy
msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
msgstr "Itegerejwe Urakaza neza ku HTTP Ukwihuza Ukwihuza"
-#: src/transports/http.c:816 src/transports/tcp.c:688 src/transports/udp.c:285
+#: src/transports/http.c:817 src/transports/tcp.c:689 src/transports/udp.c:286
#, fuzzy, c-format
msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
msgstr ""
@@ -3468,12 +3469,12 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/transports/http.c:1097
+#: src/transports/http.c:1099
#, fuzzy
msgid "HTTP: Could not determine my public IP address.\n"
msgstr "OYA Rusange Aderesi"
-#: src/transports/http.c:1171 src/transports/tcp.c:1124 src/util/tcpio.c:166
+#: src/transports/http.c:1173 src/transports/tcp.c:1125 src/util/tcpio.c:166
#: src/util/tcpio.c:196
#, fuzzy, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
@@ -3494,64 +3495,64 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/transports/http.c:1327
+#: src/transports/http.c:1329
#, fuzzy, c-format
msgid ""
"Could not bind the HTTP listener to port %d. No transport service started.\n"
msgstr "OYA i Kuri Umuyoboro Serivisi"
-#: src/transports/http.c:1470
+#: src/transports/http.c:1472
#, fuzzy
msgid "# bytes received via HTTP"
msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-#: src/transports/http.c:1472
+#: src/transports/http.c:1474
#, fuzzy
msgid "# bytes sent via HTTP"
msgstr "#Bayite Yoherejwe:"
-#: src/transports/http.c:1474
+#: src/transports/http.c:1476
msgid "# bytes dropped by HTTP (outgoing)"
msgstr ""
-#: src/transports/smtp.c:295
+#: src/transports/smtp.c:296
#, fuzzy, c-format
msgid "Could not resolve name of SMTP server '%s': %s"
msgstr "OYA Izina: Bya Seriveri"
-#: src/transports/smtp.c:413
+#: src/transports/smtp.c:415
#, fuzzy, c-format
msgid ""
"You must specify the name of a pipe for the SMTP transport in section '%s' "
"under '%s'.\n"
msgstr "i Izina: Bya a kugirango i in Icyiciro"
-#: src/transports/smtp.c:482
+#: src/transports/smtp.c:484
#, fuzzy
msgid "Received malformed message via SMTP (size mismatch).\n"
msgstr "Ubutumwa Biturutse Ingano"
-#: src/transports/smtp.c:569
+#: src/transports/smtp.c:571
#, fuzzy
msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
msgstr "Muyunguruzi... kugirango E Ubutumwa Kurema"
-#: src/transports/smtp.c:576
+#: src/transports/smtp.c:578
#, fuzzy, c-format
msgid "SMTP filter string to long, capped to '%s'\n"
msgstr "Muyunguruzi... Ikurikiranyanyuguti Kuri Kuri"
-#: src/transports/smtp.c:746
+#: src/transports/smtp.c:748
#, fuzzy, c-format
msgid "Sending E-mail to '%s' failed.\n"
msgstr "E Ubutumwa Kuri Byanze"
-#: src/transports/smtp.c:795
+#: src/transports/smtp.c:797
#, fuzzy, c-format
msgid "SMTP server send unexpected response at %s:%d.\n"
msgstr "Seriveri Kohereza ku"
-#: src/transports/smtp.c:862
+#: src/transports/smtp.c:864
#, fuzzy, c-format
msgid "%.*s filter %s (SMTP)"
msgstr ""
@@ -3564,87 +3565,87 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/transports/smtp.c:891 src/transports/udp.c:657
-#: src/transports/udp6.c:635
+#: src/transports/smtp.c:893 src/transports/udp.c:658
+#: src/transports/udp6.c:636
#, fuzzy, c-format
msgid "MTU for '%s' is probably too low (fragmentation not implemented!)\n"
msgstr "kugirango ni Byo hasi OYA"
-#: src/transports/tcp.c:464
+#: src/transports/tcp.c:465
#, fuzzy, c-format
msgid ""
"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
msgstr "Itegerejwe Urakaza neza Ubutumwa ku Ukwihuza"
-#: src/transports/tcp.c:498
+#: src/transports/tcp.c:499
#, fuzzy, c-format
msgid ""
"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
msgstr "Ubutumwa Bivuye Ukwihuza"
-#: src/transports/tcp.c:1056
+#: src/transports/tcp.c:1057
#, fuzzy
msgid "Could not determine my public IP address.\n"
msgstr "OYA Rusange Aderesi"
-#: src/transports/tcp.c:1306 src/transports/tcp6.c:1199
+#: src/transports/tcp.c:1307 src/transports/tcp6.c:1200
#, fuzzy, c-format
msgid "Failed to start transport service on port %d.\n"
msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
-#: src/transports/tcp.c:1423
+#: src/transports/tcp.c:1424
#, fuzzy
msgid "# bytes received via TCP"
msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-#: src/transports/tcp.c:1425
+#: src/transports/tcp.c:1426
#, fuzzy
msgid "# bytes sent via TCP"
msgstr "#Bayite Yoherejwe:"
-#: src/transports/tcp.c:1427
+#: src/transports/tcp.c:1428
msgid "# bytes dropped by TCP (outgoing)"
msgstr ""
-#: src/transports/tcp6.c:438
+#: src/transports/tcp6.c:439
#, fuzzy
msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
msgstr "Itegerejwe Urakaza neza Ubutumwa ku Ukwihuza"
-#: src/transports/tcp6.c:468
+#: src/transports/tcp6.c:469
#, fuzzy
msgid ""
"Received malformed message from tcp6-peer connection. Closing connection.\n"
msgstr "Ubutumwa Bivuye Ukwihuza Ukwihuza"
-#: src/transports/tcp6.c:656 src/transports/udp6.c:273
+#: src/transports/tcp6.c:657 src/transports/udp6.c:274
#, fuzzy, c-format
msgid "%s: Rejected connection from blacklisted address %s.\n"
msgstr "Ukwihuza Bivuye Aderesi"
-#: src/transports/tcp6.c:957
+#: src/transports/tcp6.c:958
#, fuzzy
msgid "Could not determine my public IPv6 address.\n"
msgstr "OYA Rusange Aderesi"
-#: src/transports/tcp6.c:1001
+#: src/transports/tcp6.c:1002
#, fuzzy, c-format
msgid "'%s': unknown service: %s\n"
msgstr "'%s':Kitazwi Serivisi"
-#: src/transports/udp.c:144 src/transports/udp6.c:127
+#: src/transports/udp.c:145 src/transports/udp6.c:128
#, fuzzy, c-format
msgid ""
"Cannot determine port to bind to. Define in configuration file in section '%"
"s' under '%s' or in '%s' under %s/%s.\n"
msgstr "Umuyoboro Kuri Kuri in Iboneza IDOSIYE in Icyiciro Cyangwa in"
-#: src/transports/udp.c:178
+#: src/transports/udp.c:179
#, fuzzy, c-format
msgid "Failed to bind to UDP port %d.\n"
msgstr "Kuri Kuri Umuyoboro"
-#: src/transports/udp.c:251
+#: src/transports/udp.c:252
#, fuzzy, c-format
msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
msgstr ""
@@ -3664,7 +3665,7 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/transports/udp.c:274
+#: src/transports/udp.c:275
#, fuzzy, c-format
msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
msgstr ""
@@ -3684,12 +3685,12 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/transports/udp.c:355
+#: src/transports/udp.c:356
#, fuzzy
msgid "UDP: Could not determine my public IP address.\n"
msgstr "OYA Rusange Aderesi"
-#: src/transports/udp.c:487
+#: src/transports/udp.c:488
#, fuzzy, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
@@ -3709,17 +3710,17 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/transports/udp.c:642
+#: src/transports/udp.c:643
#, fuzzy
msgid "# bytes received via UDP"
msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-#: src/transports/udp.c:644
+#: src/transports/udp.c:645
#, fuzzy
msgid "# bytes sent via UDP"
msgstr "#Bayite Yoherejwe:"
-#: src/transports/udp.c:646
+#: src/transports/udp.c:647
msgid "# bytes dropped by UDP (outgoing)"
msgstr ""
@@ -3782,22 +3783,22 @@
msgid "Failed to obtain my (external) IP address!\n"
msgstr ""
-#: src/transports/udp6.c:163
+#: src/transports/udp6.c:164
#, fuzzy, c-format
msgid "Failed to bind to UDP6 port %d.\n"
msgstr "Kuri Kuri Umuyoboro"
-#: src/transports/udp6.c:233
+#: src/transports/udp6.c:234
#, fuzzy, c-format
msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
msgstr "Sibyo Ubutumwa Bivuye"
-#: src/transports/udp6.c:262
+#: src/transports/udp6.c:263
#, fuzzy, c-format
msgid "Packet received from %s:%d (UDP6) failed format check."
msgstr "BYAKIRIWE Bivuye Byanze Imiterere Kugenzura..."
-#: src/transports/udp6.c:352
+#: src/transports/udp6.c:353
#, fuzzy
msgid "UDP6: Could not determine my public IPv6 address.\n"
msgstr "OYA Rusange Aderesi"
@@ -4001,12 +4002,12 @@
msgid "EVERYTHING"
msgstr ""
-#: src/util/logging.c:261
+#: src/util/logging.c:269
#, c-format
msgid "Invalid LOGLEVEL '%s' specified.\n"
msgstr ""
-#: src/util/logging.c:353 src/util/logging.c:359
+#: src/util/logging.c:361 src/util/logging.c:367
#, fuzzy, c-format
msgid "Failure at %s:%d.\n"
msgstr "ku"
@@ -4064,17 +4065,17 @@
msgid "Failed to parse interface data from '%s' at %s:%d.\n"
msgstr "Kuri Ibyatanzwe Bivuye ku"
-#: src/util/statuscalls.c:487
+#: src/util/statuscalls.c:489
#, fuzzy
msgid "Cannot query the CPU usage (Windows NT).\n"
msgstr "Ikibazo# i Ikoresha:"
-#: src/util/statuscalls.c:505
+#: src/util/statuscalls.c:507
#, fuzzy
msgid "Cannot query the CPU usage (Win 9x)\n"
msgstr "Ikibazo# i Ikoresha:"
-#: src/util/statuscalls.c:598
+#: src/util/statuscalls.c:600
#, fuzzy, c-format
msgid ""
"No network interfaces defined in configuration section '%s' under '%s'!\n"
@@ -4165,13 +4166,13 @@
msgid "be verbose"
msgstr ""
-#: src/include/gnunet_util.h:611 src/include/gnunet_util.h:613
+#: src/include/gnunet_util.h:620 src/include/gnunet_util.h:622
#, fuzzy, c-format
msgid "Assertion failed at %s:%d.\n"
msgstr "Byanze ku"
-#: src/include/gnunet_util.h:1018 src/include/gnunet_util.h:1020
-#: src/include/gnunet_util.h:1027
+#: src/include/gnunet_util.h:1027 src/include/gnunet_util.h:1029
+#: src/include/gnunet_util.h:1036
#, fuzzy, c-format
msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
msgstr "'%s'Byanze ku IDOSIYE ku Na: Ikosa"
Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/po/vi.po 2005-07-17 23:21:45 UTC (rev 1576)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre4\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-16 21:36+0200\n"
+"POT-Creation-Date: 2005-07-18 01:09+0200\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"
@@ -16,21 +16,24 @@
"X-Generator: KBabel 1.9.1\n"
#: src/applications/advertising/advertising.c:156
-#, c-format
-msgid "HELO message from '%s' invalid (signature invalid). Dropping.\n"
+#, fuzzy, c-format
+msgid "hello message from '%s' invalid (signature invalid). Dropping.\n"
msgstr "Thông báo HELO từ '%s' bị sai (sai chữ ký). Đang bỏ đi.\n"
#: src/applications/advertising/advertising.c:162
-msgid "HELO message received invalid (expiration time over limit). Dropping.\n"
+#, fuzzy
+msgid ""
+"hello message received invalid (expiration time over limit). Dropping.\n"
msgstr "Thông báo HELO nhận được bị sai (vượt quá thời hạn). Đang bỏ đi.\n"
#: src/applications/advertising/advertising.c:171
-#, c-format
-msgid "HELO advertisement for protocol %d received.\n"
+#, fuzzy, c-format
+msgid "hello advertisement for protocol %d received.\n"
msgstr "Nhận được quảng cáo HELO cho giao thức %d.\n"
#: src/applications/advertising/advertising.c:290
-msgid "Could not send HELOs+PING, ping buffer full.\n"
+#, fuzzy
+msgid "Could not send hellos+PING, ping buffer full.\n"
msgstr "Không gửi được các HELO+PING, đầy bộ đệm ping.\n"
#: src/applications/advertising/advertising.c:303
@@ -51,8 +54,8 @@
"nào.\n"
#: src/applications/advertising/advertising.c:560
-#, c-format
-msgid "Removing HELO from peer '%s' (expired %ds ago).\n"
+#, fuzzy, c-format
+msgid "Removing hello from peer '%s' (expired %ds ago).\n"
msgstr "Đang xóa bỏ HELO từ đầu peer '%s' (đã hết hạn %dgiây).\n"
#: src/applications/advertising/advertising.c:720
@@ -117,8 +120,8 @@
msgstr "Phân tích câu trả lời HTTP cho URL '%s' không thành công.\n"
#: src/applications/bootstrap_http/http.c:250
-#, c-format
-msgid "Parsing HELO from '%s' failed.\n"
+#, fuzzy, c-format
+msgid "Parsing hello from '%s' failed.\n"
msgstr "Phân tích HELO từ '%s' không thành công.\n"
#: src/applications/bootstrap_http/http.c:326
@@ -127,7 +130,8 @@
msgstr "Không tìm thấy tên của HTTP proxy '%s'. Đang thử không dùng proxy.\n"
#: src/applications/bootstrap_http/http.c:350
-msgid "# HELOs downloaded via http"
+#, fuzzy
+msgid "# hellos downloaded via http"
msgstr "# đã tải xuống HELO qua http"
#: src/applications/chat/chat.c:87
@@ -170,7 +174,7 @@
#: src/applications/fs/tools/gnunet-delete.c:111
#: src/applications/fs/tools/gnunet-directory.c:183
#: src/applications/fs/tools/gnunet-download.c:128
-#: src/applications/fs/tools/gnunet-insert.c:499
+#: src/applications/fs/tools/gnunet-insert.c:511
#: src/applications/fs/tools/gnunet-pseudonym.c:214
#: src/applications/fs/tools/gnunet-search.c:213
#: src/applications/fs/tools/gnunet-unindex.c:139
@@ -323,7 +327,7 @@
#: src/applications/dht/tools/dht-query.c:84
#: src/applications/fs/tools/gnunet-download.c:94
#: src/applications/fs/tools/gnunet-insert.c:312
-#: src/applications/fs/tools/gnunet-insert.c:428
+#: src/applications/fs/tools/gnunet-insert.c:440
#: src/applications/fs/tools/gnunet-pseudonym.c:120
#: src/applications/fs/tools/gnunet-search.c:159
#: src/applications/fs/tools/gnunet-search.c:175
@@ -680,7 +684,7 @@
msgid "Cannot upload directory without using recursion.\n"
msgstr "Không tải lên được thư mục khi không dùng đệ quy.\n"
-#: src/applications/fs/module/fs.c:964
+#: src/applications/fs/module/fs.c:961
#, c-format
msgid ""
"You must specify a postive number for '%s' in the configuration in section '%"
@@ -688,12 +692,12 @@
msgstr ""
"Người dùng phải chỉ ra một số dương cho '%s' trong phần '%s' của cấu hình.\n"
-#: src/applications/fs/module/fs.c:1005
+#: src/applications/fs/module/fs.c:1002
#, c-format
msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
msgstr "'%s' đăng ký trình điều khiển máy khách %d %d %d %d %d %d %d %d %d\n"
-#: src/applications/fs/module/fs.c:1042
+#: src/applications/fs/module/fs.c:1039
msgid "enables (anonymous) file-sharing"
msgstr ""
@@ -711,7 +715,7 @@
msgid "Indexed file disappeared, deleting block for query '%s'\n"
msgstr "Tập tin đã đánh chỉ mục biến mất, đang xóa khối cho yêu cầu '%s'\n"
-#: src/applications/fs/module/ondemand.c:408
+#: src/applications/fs/module/ondemand.c:416
#, c-format
msgid ""
"Because the file '%s' has been unavailable for 3 days it got removed from "
@@ -722,7 +726,7 @@
"hãy bỏ chỉ mục các tập tin trước khi xóa chúng vì chỉ mục hiện thời chứa các "
"liên kết sai!"
-#: src/applications/fs/module/ondemand.c:434
+#: src/applications/fs/module/ondemand.c:442
#, c-format
msgid ""
"Configuration file must specify directory for storage of FS data in section "
@@ -731,7 +735,7 @@
"Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu FS trong phần '%s' dưới "
"'%s'.\n"
-#: src/applications/fs/module/ondemand.c:629
+#: src/applications/fs/module/ondemand.c:637
#, c-format
msgid ""
"Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
@@ -1025,42 +1029,42 @@
msgid "You must pass a positive number to the '%s' option.\n"
msgstr "Người dùng phải đưa một số dương vào tùy chọn '%s'.\n"
-#: src/applications/fs/tools/gnunet-insert.c:504
+#: src/applications/fs/tools/gnunet-insert.c:516
#: src/applications/fs/tools/gnunet-unindex.c:144
#, c-format
msgid "You must specify a list of files to insert.\n"
msgstr "Người dùng phải chỉ ra một danh sách tập tin để chèn.\n"
-#: src/applications/fs/tools/gnunet-insert.c:508
+#: src/applications/fs/tools/gnunet-insert.c:520
#, c-format
msgid "Only one file or directory can be specified at a time.\n"
msgstr "Chỉ có thể đưa ra một tập tin hay thư mục mỗi lần.\n"
-#: src/applications/fs/tools/gnunet-insert.c:512
+#: src/applications/fs/tools/gnunet-insert.c:524
#, c-format
msgid "You must specify a file or directory to upload.\n"
msgstr "Người dùng phải chỉ ra một tập tin hay thư mục để tải lên.\n"
-#: src/applications/fs/tools/gnunet-insert.c:561
+#: src/applications/fs/tools/gnunet-insert.c:573
#, c-format
msgid "Keywords for file '%s':\n"
msgstr "Từ khóa cho tập tin '%s':\n"
-#: src/applications/fs/tools/gnunet-insert.c:583
+#: src/applications/fs/tools/gnunet-insert.c:595
#, c-format
msgid "Could not access namespace '%s' (does not exist?).\n"
msgstr "Không truy cập được không gian tên '%s' (đã có rồi?).\n"
-#: src/applications/fs/tools/gnunet-insert.c:598
+#: src/applications/fs/tools/gnunet-insert.c:614
#, c-format
msgid "Parsing time failed. Use '%s' format.\n"
msgstr "Phân tích thời gian thất bại. Hãy dùng định dạng '%s'.\n"
-#: src/applications/fs/tools/gnunet-insert.c:607
-#: src/applications/fs/tools/gnunet-insert.c:611
-#: src/applications/fs/tools/gnunet-insert.c:615
-#: src/applications/fs/tools/gnunet-insert.c:619
-#: src/applications/fs/tools/gnunet-insert.c:624
+#: src/applications/fs/tools/gnunet-insert.c:627
+#: src/applications/fs/tools/gnunet-insert.c:631
+#: src/applications/fs/tools/gnunet-insert.c:635
+#: src/applications/fs/tools/gnunet-insert.c:639
+#: src/applications/fs/tools/gnunet-insert.c:644
#, c-format
msgid "Option '%s' makes no sense without option '%s'.\n"
msgstr "Tùy chọn '%s' không có ý nghĩa khi không có tùy chọn '%s'.\n"
@@ -1369,8 +1373,8 @@
#: src/applications/identity/identity.c:614
#: src/applications/identity/identity.c:632
-#, c-format
-msgid "Removed file '%s' containing invalid HELO data.\n"
+#, fuzzy, c-format
+msgid "Removed file '%s' containing invalid hello data.\n"
msgstr "Xóa bỏ tập tin '%s' chứa dữ liệu HELO sai.\n"
#: src/applications/pingpong/pingpong.c:120
@@ -1557,8 +1561,8 @@
#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:56
#: src/util/hostkey_gcrypt.c:63 src/util/storage.c:643
#: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1002 src/include/gnunet_util.h:1009
-#: src/include/gnunet_util.h:1011
+#: src/include/gnunet_util.h:1011 src/include/gnunet_util.h:1018
+#: src/include/gnunet_util.h:1020
#, c-format
msgid "'%s' failed at %s:%d with error: %s\n"
msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
@@ -1818,7 +1822,7 @@
msgid "Template for gnunet-clients."
msgstr "Biểu mẫu cho gnunet-clients."
-#: src/applications/template/template.c:59
+#: src/applications/template/template.c:61
#, c-format
msgid "'%s' registering client handler %d and %d\n"
msgstr "'%s' đang đăng ký trình điều khiển máy khách %d và %d\n"
@@ -1895,8 +1899,8 @@
msgstr "kích thước của thông báo '%s' bị sai. Đang lờ đi.\n"
#: src/applications/testbed/testbed.c:137
-#, c-format
-msgid "TESTBED could not generate HELO message for protocol %u\n"
+#, fuzzy, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
msgstr "TESTBED không tạo được thông báo HELO cho giao thức %u\n"
#: src/applications/testbed/testbed.c:215
@@ -1974,7 +1978,7 @@
msgid "No testbed URL given, not registered.\n"
msgstr "Chưa đưa ra URL của testbed, không đăng ký.\n"
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1449
+#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1451
#, c-format
msgid "Could not resolve name of HTTP proxy '%s'.\n"
msgstr "Không tìm được tên của proxy HTTP '%s'.\n"
@@ -2087,21 +2091,21 @@
msgstr "Không gửi được yêu cầu tới gnunetd.\n"
#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:179
+#: src/applications/tracekit/tracekit.c:186
#, c-format
msgid "Received invalid '%s' message from '%s'.\n"
msgstr "Nhận được thông báo sai '%s' từ '%s'.\n"
-#: src/applications/tracekit/tracekit.c:236
+#: src/applications/tracekit/tracekit.c:243
msgid "TRACEKIT: routing table full, trace request dropped\n"
msgstr "TRACEKIT: bảng định tuyến đầy, bỏ đi yêu cầu theo vết trace\n"
-#: src/applications/tracekit/tracekit.c:334
+#: src/applications/tracekit/tracekit.c:331
#, c-format
msgid "TRACEKIT: received invalid '%s' message\n"
msgstr "TRACEKIT: nhận được thông báo sai '%s'\n"
-#: src/applications/tracekit/tracekit.c:434
+#: src/applications/tracekit/tracekit.c:431
#, fuzzy
msgid "allows mapping of the network topology"
msgstr "Theo dấu vết trace hình học của mạng GNUnet."
@@ -2399,31 +2403,31 @@
msgid "Unable to save configuration file %s:"
msgstr "Không ghi được tập tin cấu hình %s:"
-#: src/conf/wizard_callbacks.c:236 src/conf/wizard_curs.c:511
+#: src/conf/wizard_callbacks.c:236 src/conf/wizard_curs.c:517
msgid "Unable to create user account:"
msgstr "Không tạo được tài khoản người dùng:"
-#: src/conf/wizard_callbacks.c:243 src/conf/wizard_curs.c:514
+#: src/conf/wizard_callbacks.c:243 src/conf/wizard_curs.c:520
msgid "Unable to change startup process:"
msgstr "Không thay đổi được tiến trình khởi động:"
-#: src/conf/wizard_curs.c:47 src/conf/wizard_interface.c:1075
-#: src/conf/wizard_util.c:116 src/conf/wizard_util.c:157
+#: src/conf/wizard_curs.c:50 src/conf/wizard_interface.c:1075
+#: src/conf/wizard_util.c:118 src/conf/wizard_util.c:160
msgid "Error"
msgstr "Lỗi"
-#: src/conf/wizard_curs.c:93 src/conf/wizard_curs.c:108
-#: src/conf/wizard_curs.c:161 src/conf/wizard_curs.c:196
-#: src/conf/wizard_curs.c:224 src/conf/wizard_curs.c:249
-#: src/conf/wizard_curs.c:281 src/conf/wizard_curs.c:307
-#: src/conf/wizard_curs.c:338 src/conf/wizard_curs.c:361
-#: src/conf/wizard_curs.c:389 src/conf/wizard_curs.c:411
-#: src/conf/wizard_curs.c:433 src/conf/wizard_curs.c:461
-#: src/conf/wizard_curs.c:491 src/conf/wizard_curs.c:574
+#: src/conf/wizard_curs.c:99 src/conf/wizard_curs.c:114
+#: src/conf/wizard_curs.c:167 src/conf/wizard_curs.c:202
+#: src/conf/wizard_curs.c:230 src/conf/wizard_curs.c:255
+#: src/conf/wizard_curs.c:287 src/conf/wizard_curs.c:313
+#: src/conf/wizard_curs.c:344 src/conf/wizard_curs.c:367
+#: src/conf/wizard_curs.c:395 src/conf/wizard_curs.c:417
+#: src/conf/wizard_curs.c:439 src/conf/wizard_curs.c:467
+#: src/conf/wizard_curs.c:497 src/conf/wizard_curs.c:582
msgid "GNUnet configuration"
msgstr "Cấu hình GNUnet"
-#: src/conf/wizard_curs.c:94 src/conf/wizard_interface.c:77
+#: src/conf/wizard_curs.c:100 src/conf/wizard_interface.c:77
msgid ""
"Welcome to GNUnet!\n"
"\n"
@@ -2452,20 +2456,20 @@
"\n"
"đội GNUnet"
-#: src/conf/wizard_curs.c:109
+#: src/conf/wizard_curs.c:115
msgid ""
"Choose the network interface that connects your computer to the internet "
"from the list below."
msgstr ""
"Chọn giao diện mạng kết nối máy tính tới internet từ danh sách dưới đây."
-#: src/conf/wizard_curs.c:115 src/conf/wizard_curs.c:167
-#: src/conf/wizard_curs.c:202 src/conf/wizard_curs.c:254
-#: src/conf/wizard_curs.c:286 src/conf/wizard_curs.c:343
+#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
+#: src/conf/wizard_curs.c:208 src/conf/wizard_curs.c:260
+#: src/conf/wizard_curs.c:292 src/conf/wizard_curs.c:349
msgid "Help"
msgstr "Trợ giúp"
-#: src/conf/wizard_curs.c:115 src/conf/wizard_curs.c:167
+#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
msgid ""
"The \"Network interface\" is the device that connects your computer to the "
"internet. This is usually a modem, an ISDN card or a network card in case "
@@ -2474,13 +2478,13 @@
"\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây thường là "
"một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL."
-#: src/conf/wizard_curs.c:161
+#: src/conf/wizard_curs.c:167
msgid ""
"What is the name of the network interface that connects your computer to the "
"Internet?"
msgstr "Tên của giao diện mạng kết nối máy tính tới Internet là gì?"
-#: src/conf/wizard_curs.c:196
+#: src/conf/wizard_curs.c:202
msgid ""
"What is this computer's public IP address or hostname?\n"
"\n"
@@ -2490,7 +2494,7 @@
"\n"
"Nếu không biết, hãy để trống."
-#: src/conf/wizard_curs.c:202
+#: src/conf/wizard_curs.c:208
msgid ""
"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -2508,7 +2512,7 @@
"Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra địa "
"chỉ IP."
-#: src/conf/wizard_curs.c:224
+#: src/conf/wizard_curs.c:230
msgid ""
"Is this machine behind NAT?\n"
"\n"
@@ -2525,11 +2529,11 @@
"thể kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu kết nối "
"thẳng qua môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp cổng\")."
-#: src/conf/wizard_curs.c:249
+#: src/conf/wizard_curs.c:255
msgid "How much upstream (Bytes/s) may be used?"
msgstr "Tốc độ ra giới hạn là bao nhiêu (Byte/giây)?"
-#: src/conf/wizard_curs.c:254
+#: src/conf/wizard_curs.c:260
msgid ""
"You can limit GNUnet's resource usage here.\n"
"\n"
@@ -2546,11 +2550,11 @@
"chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
"internet lớn nhất."
-#: src/conf/wizard_curs.c:281
+#: src/conf/wizard_curs.c:287
msgid "How much downstream (Bytes/s) may be used?"
msgstr "Dùng bao nhiêu (Byte/giây) cho dòng vào?"
-#: src/conf/wizard_curs.c:286
+#: src/conf/wizard_curs.c:292
msgid ""
"You can limit GNUnet's resource usage here.\n"
"\n"
@@ -2567,7 +2571,7 @@
"chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
"internet lớn nhất."
-#: src/conf/wizard_curs.c:307
+#: src/conf/wizard_curs.c:313
msgid ""
"Share denoted bandwidth with other applications?\n"
"\n"
@@ -2589,11 +2593,11 @@
"người dùng không nên giới hạn truyền tải GNUnet phải chịu trên kết nối "
"internet mỗi khi sử dụng LAN tốc độ cao (ví dụ bởi NFS)."
-#: src/conf/wizard_curs.c:338
+#: src/conf/wizard_curs.c:344
msgid "How much CPU (in %) may be used?"
msgstr "Sử dụng bao nhiêu CPU (tính theo %)?"
-#: src/conf/wizard_curs.c:343
+#: src/conf/wizard_curs.c:349
msgid ""
"You can limit GNUnet's resource usage here.\n"
"\n"
@@ -2603,7 +2607,7 @@
"\n"
"Đây là phần trăm thời gian của bộ xử lý cho phép GNUnet sử dụng."
-#: src/conf/wizard_curs.c:361
+#: src/conf/wizard_curs.c:367
msgid ""
"Store migrated content?\n"
"\n"
@@ -2625,7 +2629,7 @@
"Nó đồng thời giúp chia sẻ nội dung phổ biến qua các đầu peer khác nhau để dễ "
"dàng truy cập."
-#: src/conf/wizard_curs.c:389
+#: src/conf/wizard_curs.c:395
msgid ""
"What's the maximum datastore size in MB?\n"
"\n"
@@ -2637,7 +2641,7 @@
"Kho dữ liệu GNUnet chứa tất cả các dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, "
"nội dung chèn và nhập vào)."
-#: src/conf/wizard_curs.c:411
+#: src/conf/wizard_curs.c:417
msgid ""
"Do you want to launch GNUnet as a system service?\n"
"\n"
@@ -2650,7 +2654,7 @@
"Nếu chọn \"yes\", tiến trình nền sau GNUnet sẽ tự động chạy khi bật máy "
"tính. Nếu chọn \"no\", thì cần chạy GNUnet mỗi khi muốn sử dụng."
-#: src/conf/wizard_curs.c:434
+#: src/conf/wizard_curs.c:440
msgid ""
"Define the user owning the GNUnet service.\n"
"\n"
@@ -2677,7 +2681,7 @@
"Để trống để chạy GNUnet với quyền hệ thống.\n"
"Người dùng GNUnet:"
-#: src/conf/wizard_curs.c:462
+#: src/conf/wizard_curs.c:468
msgid ""
"Define the group owning the GNUnet service.\n"
"\n"
@@ -2703,7 +2707,7 @@
"\n"
"Nhóm GNUnet:"
-#: src/conf/wizard_curs.c:491
+#: src/conf/wizard_curs.c:497
msgid ""
"If you are an experienced user, you may want to tweak your GNUnet "
"installation using the enhanced configurator.\n"
@@ -2715,7 +2719,7 @@
"\n"
"Chạy nó sau khi ghi cấu hình?"
-#: src/conf/wizard_curs.c:568
+#: src/conf/wizard_curs.c:576
#, c-format
msgid ""
"Unable to save configuration file %s: %s.\n"
@@ -2969,51 +2973,51 @@
msgid "User account:"
msgstr "Tài khoản người dùng:"
-#: src/conf/wizard_util.c:89
+#: src/conf/wizard_util.c:90
msgid "Can't open Service Control Manager"
msgstr "Không mở được Trình Quản Lý Điều Khiển Dịch Vụ"
-#: src/conf/wizard_util.c:94
+#: src/conf/wizard_util.c:95
msgid "Can't create service"
msgstr "Không tạo được dịch vụ"
-#: src/conf/wizard_util.c:99
+#: src/conf/wizard_util.c:100
msgid "Error changing the permissions of the GNUnet directory"
msgstr "Lỗi thay đổi quyền hạn của thư mục GNUnet"
-#: src/conf/wizard_util.c:103
+#: src/conf/wizard_util.c:105
msgid "Cannot write to the regisitry"
msgstr "Không ghi được tới bản ghi"
-#: src/conf/wizard_util.c:106
+#: src/conf/wizard_util.c:108
msgid "Can't access the service"
msgstr "Không truy cập được dịch vụ"
-#: src/conf/wizard_util.c:109
+#: src/conf/wizard_util.c:111
msgid "Can't delete the service"
msgstr "Không xóa được dịch vụ"
-#: src/conf/wizard_util.c:112
+#: src/conf/wizard_util.c:114
msgid "Unknown error"
msgstr "Lỗi không rõ"
-#: src/conf/wizard_util.c:140
+#: src/conf/wizard_util.c:143
msgid "This version of Windows does not support multiple users."
msgstr "Phiên bản này của Windows không hỗ trợ nhiều người dùng."
-#: src/conf/wizard_util.c:144
+#: src/conf/wizard_util.c:147
msgid "Error creating user"
msgstr "Lỗi tạo người dùng"
-#: src/conf/wizard_util.c:147
+#: src/conf/wizard_util.c:150
msgid "Error accessing local security policy"
msgstr "Lỗi truy cập chính sách bảo mật nội bộ"
-#: src/conf/wizard_util.c:150
+#: src/conf/wizard_util.c:153
msgid "Error granting service right to user"
msgstr "Lỗi chuyển quyền hạn dịch vụ tới cho người dùng"
-#: src/conf/wizard_util.c:153
+#: src/conf/wizard_util.c:156
msgid "Unknown error while creating a new user"
msgstr "Lỗi không rõ khi tạo một người dùng mới"
@@ -3137,7 +3141,8 @@
msgstr "Không nhận được địa chỉ của đầu peer '%s'.\n"
#: src/server/gnunet-peer-info.c:153
-msgid "HELO message invalid (signature invalid).\n"
+#, fuzzy
+msgid "hello message invalid (signature invalid).\n"
msgstr "Thông báo HELO sai (sai chữ ký).\n"
#: src/server/gnunet-peer-info.c:164
@@ -3146,8 +3151,8 @@
msgstr "Đầu peer '%s' với tin tưởng %8u và địa chỉ '%s'\n"
#: src/server/gnunet-transport-check.c:108
-#, c-format
-msgid "'%s': Could not create HELO.\n"
+#, fuzzy, c-format
+msgid "'%s': Could not create hello.\n"
msgstr "'%s': Không tạo được HELO.\n"
#: src/server/gnunet-transport-check.c:117
@@ -3407,26 +3412,26 @@
msgid "Failed to obtain my (external) IPv6 address!\n"
msgstr "Không lấy được địa chỉ IPv6 (ngoài) của tôi!\n"
-#: src/transports/http.c:600
+#: src/transports/http.c:601
msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
msgstr "Mong chào mừng từ kết nối http, nhận được rác. Đang đóng kết nối.\n"
-#: src/transports/http.c:816 src/transports/tcp.c:688 src/transports/udp.c:285
+#: src/transports/http.c:817 src/transports/tcp.c:689 src/transports/udp.c:286
#, c-format
msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
msgstr "%s: Nhả ra kết nối có trong danh sách đen từ %u.%u.%u.%u.\n"
-#: src/transports/http.c:1097
+#: src/transports/http.c:1099
msgid "HTTP: Could not determine my public IP address.\n"
msgstr "HTTP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
-#: src/transports/http.c:1171 src/transports/tcp.c:1124 src/util/tcpio.c:166
+#: src/transports/http.c:1173 src/transports/tcp.c:1125 src/util/tcpio.c:166
#: src/util/tcpio.c:196
#, c-format
msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
msgstr "Không kết nối được tới %u.%u.%u.%u:%u: %s\n"
-#: src/transports/http.c:1327
+#: src/transports/http.c:1329
#, c-format
msgid ""
"Could not bind the HTTP listener to port %d. No transport service started.\n"
@@ -3434,24 +3439,24 @@
"Không kết gắn được trình nghe HTTP tới cổng %d. Dịch vụ truyền tải chưa "
"chạy.\n"
-#: src/transports/http.c:1470
+#: src/transports/http.c:1472
msgid "# bytes received via HTTP"
msgstr "# byte nhận được qua HTTP"
-#: src/transports/http.c:1472
+#: src/transports/http.c:1474
msgid "# bytes sent via HTTP"
msgstr "# byte gửi qua HTTP"
-#: src/transports/http.c:1474
+#: src/transports/http.c:1476
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "# byte loại bỏ bởi HTTP (đi ra)"
-#: src/transports/smtp.c:295
+#: src/transports/smtp.c:296
#, c-format
msgid "Could not resolve name of SMTP server '%s': %s"
msgstr "Không tìm thấy tên của máy chủ SMTP '%s': %s"
-#: src/transports/smtp.c:413
+#: src/transports/smtp.c:415
#, c-format
msgid ""
"You must specify the name of a pipe for the SMTP transport in section '%s' "
@@ -3460,48 +3465,48 @@
"Người dùng phải chỉ ra tên của ống pipe cho truyền tải SMTP trong phần '%s' "
"dưới '%s'.\n"
-#: src/transports/smtp.c:482
+#: src/transports/smtp.c:484
msgid "Received malformed message via SMTP (size mismatch).\n"
msgstr "Nhận được thông báo bị hỏng qua SMTP (kích thước không tương ứng).\n"
-#: src/transports/smtp.c:569
+#: src/transports/smtp.c:571
msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
msgstr "Không chỉ ra đầu lọc cho E-mail, không tạo được quảng cáo SMTP.\n"
-#: src/transports/smtp.c:576
+#: src/transports/smtp.c:578
#, c-format
msgid "SMTP filter string to long, capped to '%s'\n"
msgstr "Đầu lọc SMTP quá dài, đổi thành '%s'\n"
-#: src/transports/smtp.c:746
+#: src/transports/smtp.c:748
#, c-format
msgid "Sending E-mail to '%s' failed.\n"
msgstr "Gửi E-mail tới '%s' thất bại.\n"
-#: src/transports/smtp.c:795
+#: src/transports/smtp.c:797
#, c-format
msgid "SMTP server send unexpected response at %s:%d.\n"
msgstr "Máy chủ SMTP gửi cầu trả lời không mong đợi tại %s: %d.\n"
-#: src/transports/smtp.c:862
+#: src/transports/smtp.c:864
#, c-format
msgid "%.*s filter %s (SMTP)"
msgstr "%.*s đầu lọc %s (SMTP)"
-#: src/transports/smtp.c:891 src/transports/udp.c:657
-#: src/transports/udp6.c:635
+#: src/transports/smtp.c:893 src/transports/udp.c:658
+#: src/transports/udp6.c:636
#, c-format
msgid "MTU for '%s' is probably too low (fragmentation not implemented!)\n"
msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
-#: src/transports/tcp.c:464
+#: src/transports/tcp.c:465
#, c-format
msgid ""
"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
msgstr ""
"Mong đợi chào mừng trên kết nối tcp, nhận được rác (%u, %u). Đang đóng.\n"
-#: src/transports/tcp.c:498
+#: src/transports/tcp.c:499
#, c-format
msgid ""
"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
@@ -3509,52 +3514,52 @@
"Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
"đóng.\n"
-#: src/transports/tcp.c:1056
+#: src/transports/tcp.c:1057
msgid "Could not determine my public IP address.\n"
msgstr "Không nhận ra địa chỉ IP công cộng của tôi.\n"
-#: src/transports/tcp.c:1306 src/transports/tcp6.c:1199
+#: src/transports/tcp.c:1307 src/transports/tcp6.c:1200
#, c-format
msgid "Failed to start transport service on port %d.\n"
msgstr "Chạy dịch vụ truyền tải trên cổng %d thất bại.\n"
-#: src/transports/tcp.c:1423
+#: src/transports/tcp.c:1424
msgid "# bytes received via TCP"
msgstr "# byte nhận được qua TCP"
-#: src/transports/tcp.c:1425
+#: src/transports/tcp.c:1426
msgid "# bytes sent via TCP"
msgstr "# Byte gửi qua TCP"
-#: src/transports/tcp.c:1427
+#: src/transports/tcp.c:1428
msgid "# bytes dropped by TCP (outgoing)"
msgstr "# byte loại đi bởi TCP (đi ra)"
-#: src/transports/tcp6.c:438
+#: src/transports/tcp6.c:439
msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
msgstr "Mong chào mừng từ kết nối tcp, nhận được rác. Đang đóng.\n"
-#: src/transports/tcp6.c:468
+#: src/transports/tcp6.c:469
msgid ""
"Received malformed message from tcp6-peer connection. Closing connection.\n"
msgstr ""
"Nhận được thông báo bị hỏng từ kết nối tcp6-đầu peer. Đang đóng kết nối.\n"
-#: src/transports/tcp6.c:656 src/transports/udp6.c:273
+#: src/transports/tcp6.c:657 src/transports/udp6.c:274
#, c-format
msgid "%s: Rejected connection from blacklisted address %s.\n"
msgstr "%s: Nhả ra kết nối có trong danh sách đen từ địa chỉ %s.\n"
-#: src/transports/tcp6.c:957
+#: src/transports/tcp6.c:958
msgid "Could not determine my public IPv6 address.\n"
msgstr "Không nhận ra địa chỉ IPv6 của tôi.\n"
-#: src/transports/tcp6.c:1001
+#: src/transports/tcp6.c:1002
#, c-format
msgid "'%s': unknown service: %s\n"
msgstr "'%s': không rõ dịch vụ: %s\n"
-#: src/transports/udp.c:144 src/transports/udp6.c:127
+#: src/transports/udp.c:145 src/transports/udp6.c:128
#, c-format
msgid ""
"Cannot determine port to bind to. Define in configuration file in section '%"
@@ -3563,42 +3568,42 @@
"Không nhận ra cổng để kết gắn tới. Hãy xác định trong tập tin cấu hình phần "
"'%s' dưới '%s' hoặc phần '%s' dưới %s/%s.\n"
-#: src/transports/udp.c:178
+#: src/transports/udp.c:179
#, c-format
msgid "Failed to bind to UDP port %d.\n"
msgstr "Không kết gắn được tới cổng UDP %d.\n"
-#: src/transports/udp.c:251
+#: src/transports/udp.c:252
#, c-format
msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
msgstr "Nhận được thông báo UDP sai từ %u.%u.%u.%u:%u, đang loại bỏ.\n"
-#: src/transports/udp.c:274
+#: src/transports/udp.c:275
#, c-format
msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
msgstr ""
"Kiểm tra định dạng gói nhận được từ %u.%u.%u.%u:%u (UDP) không thành công.\n"
-#: src/transports/udp.c:355
+#: src/transports/udp.c:356
msgid "UDP: Could not determine my public IP address.\n"
msgstr "UDP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
-#: src/transports/udp.c:487
+#: src/transports/udp.c:488
#, c-format
msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
msgstr ""
"Gửi thông báo với kích thước %d qua UDP tới %u.%u.%u.%u:%u không thành công: "
"%s\n"
-#: src/transports/udp.c:642
+#: src/transports/udp.c:643
msgid "# bytes received via UDP"
msgstr "# byte nhận được qua UDP"
-#: src/transports/udp.c:644
+#: src/transports/udp.c:645
msgid "# bytes sent via UDP"
msgstr "# byte gửi qua UDP"
-#: src/transports/udp.c:646
+#: src/transports/udp.c:647
msgid "# bytes dropped by UDP (outgoing)"
msgstr "# byte loại bỏ bởi UDP (đi ra)"
@@ -3643,22 +3648,22 @@
msgid "Failed to obtain my (external) IP address!\n"
msgstr "Lấy địa chỉ IP (ngoài) của tôi không thành công!\n"
-#: src/transports/udp6.c:163
+#: src/transports/udp6.c:164
#, c-format
msgid "Failed to bind to UDP6 port %d.\n"
msgstr "Kết gắn bind tới cổng UDP6 %d không thành công.\n"
-#: src/transports/udp6.c:233
+#: src/transports/udp6.c:234
#, c-format
msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
msgstr "Nhận được thông báo UDP6 sai từ %s: %d, đang loại bỏ.\n"
-#: src/transports/udp6.c:262
+#: src/transports/udp6.c:263
#, c-format
msgid "Packet received from %s:%d (UDP6) failed format check."
msgstr "Kiểm tra định dạng gói nhận được từ %s:%d (UDP6) thất bại."
-#: src/transports/udp6.c:352
+#: src/transports/udp6.c:353
msgid "UDP6: Could not determine my public IPv6 address.\n"
msgstr "UDP6: Không nhận ra địa chỉ IP công cộng của tôi.\n"
@@ -3864,12 +3869,12 @@
msgid "EVERYTHING"
msgstr "MỌITHỨ"
-#: src/util/logging.c:261
+#: src/util/logging.c:269
#, c-format
msgid "Invalid LOGLEVEL '%s' specified.\n"
msgstr "Đưa ra LOGLEVEL sai '%s'.\n"
-#: src/util/logging.c:353 src/util/logging.c:359
+#: src/util/logging.c:361 src/util/logging.c:367
#, c-format
msgid "Failure at %s:%d.\n"
msgstr "Thất bại tại %s: %d.\n"
@@ -3934,15 +3939,15 @@
msgid "Failed to parse interface data from '%s' at %s:%d.\n"
msgstr "Thất bại khi phân tích dữ liệu giao diện từ '%s' tại %s:%d.\n"
-#: src/util/statuscalls.c:487
+#: src/util/statuscalls.c:489
msgid "Cannot query the CPU usage (Windows NT).\n"
msgstr "Không hỏi được sự sử dụng CPU (Windows NT).\n"
-#: src/util/statuscalls.c:505
+#: src/util/statuscalls.c:507
msgid "Cannot query the CPU usage (Win 9x)\n"
msgstr "Không hỏi được sự sử dụng CPU (Windows 9x).\n"
-#: src/util/statuscalls.c:598
+#: src/util/statuscalls.c:600
#, c-format
msgid ""
"No network interfaces defined in configuration section '%s' under '%s'!\n"
@@ -4028,13 +4033,13 @@
msgid "be verbose"
msgstr "thông báo chi tiết"
-#: src/include/gnunet_util.h:611 src/include/gnunet_util.h:613
+#: src/include/gnunet_util.h:620 src/include/gnunet_util.h:622
#, c-format
msgid "Assertion failed at %s:%d.\n"
msgstr "Xác nhận thất bại tại %s:%d.\n"
-#: src/include/gnunet_util.h:1018 src/include/gnunet_util.h:1020
-#: src/include/gnunet_util.h:1027
+#: src/include/gnunet_util.h:1027 src/include/gnunet_util.h:1029
+#: src/include/gnunet_util.h:1036
#, c-format
msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
msgstr "'%s' thất bại trên tập tin'%s' tại %s:%d với lỗi: %s\n"
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/advertising/advertising.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -20,7 +20,7 @@
/**
* @file advertising/advertising.c
- * @brief Cron-jobs that exchange HELOs to ensure that the network is
+ * @brief Cron-jobs that exchange hellos to ensure that the network is
* connected (nodes know of each other). This is implemented as
* an application and not a service (since no API is provided for
* clients to call on -- this just happens in the background).
@@ -43,15 +43,15 @@
#include "bootstrap.h"
/**
- * Send our HELO to a random connected host on a regular basis.
+ * Send our hello to a random connected host on a regular basis.
*/
-#define HELO_BROADCAST_FREQUENCY (2 * cronMINUTES)
+#define hello_BROADCAST_FREQUENCY (2 * cronMINUTES)
/**
- * From time to time, forward one HELO from one peer to
+ * From time to time, forward one hello from one peer to
* a random other peer.
*/
-#define HELO_FORWARD_FREQUENCY (4 * cronMINUTES)
+#define hello_FORWARD_FREQUENCY (4 * cronMINUTES)
/**
* Meanings of the bits in activeCronJobs (ACJ).
@@ -61,7 +61,7 @@
#define ACJ_FORWARD 2
#define ACJ_ALL (ACJ_ANNOUNCE | ACJ_FORWARD)
-#define DEBUG_HELOEXCHANGE NO
+#define DEBUG_helloEXCHANGE NO
static CoreAPIForApplication * coreAPI;
@@ -75,11 +75,11 @@
static Stats_ServiceAPI * stats;
-static int stat_HELO_in;
+static int stat_hello_in;
-static int stat_HELO_out;
+static int stat_hello_out;
-static int stat_HELO_fwd;
+static int stat_hello_fwd;
/**
* Which types of cron-jobs are currently scheduled
@@ -87,12 +87,12 @@
*/
static int activeCronJobs = ACJ_NONE;
-static cron_t lastHELOMsg = 0;
+static cron_t lasthelloMsg = 0;
static double getConnectPriority() {
double preference;
- /* we should'nt give lots of bandwidth for HELOs if we're close to
+ /* we should'nt give lots of bandwidth for hellos if we're close to
the connection goal */
preference = topology->getSaturation();
if (preference <= 0.0001)
@@ -101,40 +101,40 @@
preference = 1/preference;
/* always give some decent, but compared to (migrated) content
competitive amount of bandwidth to peers sending (valid)
- HELOs */
+ hellos */
if (preference < 0.2)
preference = 0.2;
return preference;
}
-static void callAddHost(HELO_Message * helo) {
+static void callAddHost(P2P_hello_MESSAGE * helo) {
identity->addHost(helo);
FREE(helo);
}
/**
- * We have received a HELO. Verify (signature, integrity,
+ * We have received a hello. Verify (signature, integrity,
* ping-pong) and store identity if ok.
*
- * @param message the HELO message
+ * @param message the hello message
* @return SYSERR on error, OK on success
*/
static int
-receivedHELO(const p2p_HEADER * message) {
+receivedhello(const P2P_MESSAGE_HEADER * message) {
TSession * tsession;
- HELO_Message * copy;
+ P2P_hello_MESSAGE * copy;
PeerIdentity foreignId;
- HELO_Message * msg;
- p2p_HEADER * ping;
+ P2P_hello_MESSAGE * msg;
+ P2P_MESSAGE_HEADER * ping;
char * buffer;
int heloEnd;
int mtu;
int res;
cron_t now;
- /* first verify that it is actually a valid HELO */
- msg = (HELO_Message* ) message;
- if (ntohs(msg->header.size) != HELO_Message_size(msg))
+ /* first verify that it is actually a valid hello */
+ msg = (P2P_hello_MESSAGE* ) message;
+ if (ntohs(msg->header.size) != P2P_hello_MESSAGE_size(msg))
return SYSERR;
identity->getPeerIdentity(&msg->publicKey,
&foreignId);
@@ -142,10 +142,10 @@
&foreignId.hashPubKey))
return SYSERR; /* public key and host hash do not match */
if (SYSERR == verifySig(&msg->senderIdentity,
- HELO_Message_size(msg)
+ P2P_hello_MESSAGE_size(msg)
- sizeof(Signature)
- sizeof(PublicKey)
- - sizeof(p2p_HEADER),
+ - sizeof(P2P_MESSAGE_HEADER),
&msg->signature,
&msg->publicKey)) {
EncName enc;
@@ -153,22 +153,22 @@
hash2enc(&msg->senderIdentity.hashPubKey,
&enc));
LOG(LOG_WARNING,
- _("HELO message from '%s' invalid (signature invalid). Dropping.\n"),
+ _("hello message from '%s' invalid (signature invalid). Dropping.\n"),
(char*)&enc);
return SYSERR; /* message invalid */
}
- if ((TIME_T)ntohl(msg->expirationTime) > TIME(NULL) + MAX_HELO_EXPIRES) {
+ if ((TIME_T)ntohl(msg->expirationTime) > TIME(NULL) + MAX_hello_EXPIRES) {
LOG(LOG_WARNING,
- _("HELO message received invalid (expiration time over limit).
Dropping.\n"));
+ _("hello message received invalid (expiration time over limit).
Dropping.\n"));
return SYSERR;
}
- if (SYSERR == transport->verifyHELO(msg))
+ if (SYSERR == transport->verifyhello(msg))
return OK; /* not good, but do process rest of message */
if (stats != NULL)
- stats->change(stat_HELO_in, 1);
-#if DEBUG_HELOEXCHANGE
+ stats->change(stat_hello_in, 1);
+#if DEBUG_helloEXCHANGE
LOG(LOG_INFO,
- _("HELO advertisement for protocol %d received.\n"),
+ _("hello advertisement for protocol %d received.\n"),
ntohs(msg->protocol));
#endif
if (ntohs(msg->protocol) == NAT_PROTOCOL_NUMBER) {
@@ -178,7 +178,7 @@
forwarded by another peer (forwarding NAT
advertisements is invalid), but even that
check can not be done securely (since we
- have to accept HELOs in plaintext). Thus
+ have to accept hellos in plaintext). Thus
we take NAT advertisements at face value
(which is OK since we never attempt to
connect to a NAT). */
@@ -186,7 +186,7 @@
return OK;
}
- /* Then check if we have seen this HELO before, if it is identical
+ /* Then check if we have seen this hello before, if it is identical
except for the TTL, we trust it and do not play PING-PONG */
copy = identity->identity2Helo(&foreignId,
ntohs(msg->protocol),
@@ -206,9 +206,9 @@
FREE(copy);
return OK;
} else {
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_DEBUG,
- "advertised HELO differs from prior knowledge,"
+ "advertised hello differs from prior knowledge,"
" requireing ping-pong confirmation.\n");
#endif
}
@@ -236,37 +236,37 @@
}
cronTime(&now);
- if ( (now - lastHELOMsg) *
+ if ( (now - lasthelloMsg) *
getConfigurationInt("LOAD",
"MAXNETDOWNBPSTOTAL") /
cronSECONDS / 100
- < HELO_Message_size(msg) ) {
+ < P2P_hello_MESSAGE_size(msg) ) {
/* do not use more than about 1% of the
- available bandwidth to VERIFY HELOs (by sending
+ available bandwidth to VERIFY hellos (by sending
our own with a PING). This does not affect
- the HELO advertising. Sure, we should not
+ the hello advertising. Sure, we should not
advertise much more than what other peers
can verify, but the problem is that buggy/
- malicious peers can spam us with HELOs, and
+ malicious peers can spam us with hellos, and
we don't want to follow that up with massive
- HELO-ing by ourselves. */
+ hello-ing by ourselves. */
return SYSERR;
}
- lastHELOMsg = now;
+ lasthelloMsg = now;
- /* Ok, must play PING-PONG. Add the HELO to the temporary
+ /* Ok, must play PING-PONG. Add the hello to the temporary
(in-memory only) buffer to make it available for a short
time in order to play PING-PONG */
identity->addHostTemporarily(msg);
- /* Establish session as advertised in the HELO */
+ /* Establish session as advertised in the hello */
tsession = transport->connect(msg);
if (tsession == NULL)
return SYSERR; /* could not connect */
/* build message to send, ping must contain return-information,
- such as a selection of our HELOs... */
+ such as a selection of our hellos... */
mtu = transport->getMTU(tsession->ttype);
if (mtu == 0) {
mtu = 2048; /* bound size */
@@ -275,10 +275,10 @@
mtu -= P2P_MESSAGE_OVERHEAD;
}
buffer = MALLOC(mtu);
- copy = MALLOC(HELO_Message_size(msg));
+ copy = MALLOC(P2P_hello_MESSAGE_size(msg));
memcpy(copy,
msg,
- HELO_Message_size(msg));
+ P2P_hello_MESSAGE_size(msg));
ping = pingpong->pingUser(&msg->senderIdentity,
(CronJob)&callAddHost,
copy,
@@ -287,12 +287,12 @@
res = SYSERR;
FREE(buffer);
LOG(LOG_INFO,
- _("Could not send HELOs+PING, ping buffer full.\n"));
+ _("Could not send hellos+PING, ping buffer full.\n"));
transport->disconnect(tsession);
return SYSERR;
}
if (mtu > ntohs(ping->size)) {
- heloEnd = transport->getAdvertisedHELOs(mtu - ntohs(ping->size),
+ heloEnd = transport->getAdvertisedhellos(mtu - ntohs(ping->size),
buffer);
GNUNET_ASSERT(mtu - ntohs(ping->size) >= heloEnd);
} else {
@@ -301,7 +301,7 @@
if (heloEnd <= 0) {
LOG(LOG_WARNING,
_("'%s' failed (%d, %u). Will not send PING.\n"),
- "getAdvertisedHELOs",
+ "getAdvertisedhellos",
heloEnd,
mtu - ntohs(ping->size));
FREE(buffer);
@@ -328,9 +328,9 @@
}
typedef struct {
- /* the HELO message */
- HELO_Message * m;
- /* send the HELO in 1 out of n cases */
+ /* the hello message */
+ P2P_hello_MESSAGE * m;
+ /* send the hello in 1 out of n cases */
int n;
} SendData;
@@ -339,7 +339,7 @@
const unsigned short proto,
int confirmed,
SendData * sd) {
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
TSession * tsession;
EncName other;
int prio;
@@ -352,7 +352,7 @@
return;
hash2enc(&hi->hashPubKey,
&other);
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_DEBUG,
"Entering '%s' with target '%s'.\n",
__FUNCTION__,
@@ -368,9 +368,9 @@
coreAPI->unicast(hi,
&sd->m->header,
prio,
- HELO_BROADCAST_FREQUENCY);
+ hello_BROADCAST_FREQUENCY);
if (stats != NULL)
- stats->change(stat_HELO_out,
+ stats->change(stat_hello_out,
1);
return;
}
@@ -387,7 +387,7 @@
proto,
NO);
if (NULL == helo) {
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_DEBUG,
"Exit from '%s' (error: '%s' failed).\n",
__FUNCTION__,
@@ -398,7 +398,7 @@
tsession = transport->connect(helo);
FREE(helo);
if (tsession == NULL) {
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_DEBUG,
"Exit from '%s' (%s error).\n",
__FUNCTION__,
@@ -407,13 +407,13 @@
return; /* could not connect */
}
if (stats != NULL)
- stats->change(stat_HELO_out,
+ stats->change(stat_hello_out,
1);
coreAPI->sendPlaintext(tsession,
(char*)&sd->m->header,
- HELO_Message_size(sd->m));
+ P2P_hello_MESSAGE_size(sd->m));
transport->disconnect(tsession);
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_DEBUG,
"Exit from %s.\n",
__FUNCTION__);
@@ -425,7 +425,7 @@
* that we exist (called for each transport)...
*/
static void
-broadcastHELOTransport(TransportAPI * tapi,
+broadcasthelloTransport(TransportAPI * tapi,
const int * prob) {
SendData sd;
cron_t now;
@@ -434,7 +434,7 @@
return; /* network load too high... */
if (0 != randomi(*prob))
return; /* ignore */
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_CRON,
"Enter '%s'.\n",
__FUNCTION__);
@@ -443,10 +443,10 @@
sd.n = identity->forEachHost(now,
NULL,
NULL); /* just count */
- sd.m = transport->createHELO(tapi->protocolNumber);
+ sd.m = transport->createhello(tapi->protocolNumber);
if (sd.m == NULL)
return;
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_INFO,
_("Advertising my transport %d to selected peers.\n"),
tapi->protocolNumber);
@@ -464,7 +464,7 @@
(HostIterator)&broadcastHelper,
&sd);
FREE(sd.m);
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_CRON,
"Exit '%s'.\n",
__FUNCTION__);
@@ -475,7 +475,7 @@
* Tell a couple of random hosts on the currentKnownHost list
* that we exist...
*/
-static void broadcastHELO(void * unused) {
+static void broadcasthello(void * unused) {
unsigned int i;
if (getNetworkLoadUp() > 100)
@@ -484,13 +484,13 @@
return; /* CPU load too high... */
i = transport->forEach(NULL,
NULL);
- transport->forEach((TransportCallback)&broadcastHELOTransport,
+ transport->forEach((TransportCallback)&broadcasthelloTransport,
&i);
}
typedef struct {
unsigned int delay;
- HELO_Message * msg;
+ P2P_hello_MESSAGE * msg;
int prob;
} FCC;
@@ -502,10 +502,10 @@
return; /* only forward with a certain chance */
if (equalsHashCode512(&peer->hashPubKey,
&fcc->msg->senderIdentity.hashPubKey))
- return; /* do not bounce the HELO of a peer back
+ return; /* do not bounce the hello of a peer back
to the same peer! */
if (stats != NULL)
- stats->change(stat_HELO_fwd, 1);
+ stats->change(stat_hello_fwd, 1);
coreAPI->unicast(peer,
&fcc->msg->header,
0, /* priority */
@@ -513,15 +513,15 @@
}
/**
- * Forward HELOs from all known hosts to all connected hosts.
+ * Forward hellos from all known hosts to all connected hosts.
*/
static void
-forwardHELOHelper(const PeerIdentity * peer,
+forwardhelloHelper(const PeerIdentity * peer,
unsigned short protocol,
int confirmed,
void * data) {
int * probability = data;
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
TIME_T now;
int count;
FCC fcc;
@@ -535,9 +535,9 @@
if (randomi((*probability)+1) != 0)
return; /* only forward with a certain chance,
(on average: 1 peer per run!) */
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_CRON,
- "forwarding HELOs\n");
+ "forwarding hellos\n");
#endif
helo = identity->identity2Helo(peer,
protocol,
@@ -545,19 +545,19 @@
if (NULL == helo)
return; /* this should not happen */
helo->header.type
- = htons(p2p_PROTO_HELO);
+ = htons(p2p_PROTO_hello);
helo->header.size
- = htons(HELO_Message_size(helo));
- /* do not forward expired HELOs */
+ = htons(P2P_hello_MESSAGE_size(helo));
+ /* do not forward expired hellos */
TIME(&now);
if ((TIME_T)ntohl(helo->expirationTime) < now) {
EncName enc;
- /* remove HELOs that expired */
+ /* remove hellos that expired */
IFLOG(LOG_INFO,
hash2enc(&peer->hashPubKey,
&enc));
LOG(LOG_INFO,
- _("Removing HELO from peer '%s' (expired %ds ago).\n"),
+ _("Removing hello from peer '%s' (expired %ds ago).\n"),
&enc,
now - ntohl(helo->expirationTime));
identity->delHostFromKnown(peer, protocol);
@@ -567,7 +567,7 @@
count = coreAPI->forAllConnectedNodes(NULL,
NULL);
if (count > 0) {
- fcc.delay = (*probability) * HELO_BROADCAST_FREQUENCY; /* send before the
next round */
+ fcc.delay = (*probability) * hello_BROADCAST_FREQUENCY; /* send before
the next round */
fcc.msg = helo;
fcc.prob = count;
coreAPI->forAllConnectedNodes((PerNodeCallback) &forwardCallback,
@@ -577,17 +577,17 @@
}
/**
- * Forward HELOs from all known hosts to all connected hosts.
+ * Forward hellos from all known hosts to all connected hosts.
* We do on average 1 forwarding (by random selection of
* source and target).
*/
static void
-forwardHELO(void * unused) {
+forwardhello(void * unused) {
int count;
if (getCPULoad() > 100)
return; /* CPU load too high... */
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_CRON,
"Enter '%s'.\n",
__FUNCTION__);
@@ -596,9 +596,9 @@
NULL,
NULL);
identity->forEachHost(0, /* ignore blacklisting */
- &forwardHELOHelper,
+ &forwardhelloHelper,
&count);
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_CRON,
"Exit '%s'.\n",
__FUNCTION__);
@@ -606,29 +606,29 @@
}
/**
- * Type for a HELO send via an encrypted channel.
+ * Type for a hello send via an encrypted channel.
*/
static int
-eHELOHandler(const PeerIdentity * sender,
- const p2p_HEADER * message) {
- if (OK == receivedHELO(message)) {
- /* if the HELO was ok, update traffic preference
+ehelloHandler(const PeerIdentity * sender,
+ const P2P_MESSAGE_HEADER * message) {
+ if (OK == receivedhello(message)) {
+ /* if the hello was ok, update traffic preference
for the peer (depending on how much we like
to learn about other peers) */
coreAPI->preferTrafficFrom(sender,
getConnectPriority());
}
- return OK; /* even if we had errors processing the HELO, keep going */
+ return OK; /* even if we had errors processing the hello, keep going */
}
/**
- * Type for a HELO send in plaintext.
+ * Type for a hello send in plaintext.
*/
static int
-pHELOHandler(const PeerIdentity * sender,
- const p2p_HEADER * message,
+phelloHandler(const PeerIdentity * sender,
+ const P2P_MESSAGE_HEADER * message,
TSession * session) {
- receivedHELO(message);
+ receivedhello(message);
return OK;
}
@@ -643,35 +643,35 @@
if (testConfigurationString("NETWORK",
"DISABLE-ADVERTISEMENTS",
"YES"))
- delCronJob(&broadcastHELO,
- HELO_BROADCAST_FREQUENCY,
+ delCronJob(&broadcasthello,
+ hello_BROADCAST_FREQUENCY,
NULL);
activeCronJobs -= ACJ_ANNOUNCE;
} else {
if (testConfigurationString("NETWORK",
- "HELOEXCHANGE",
+ "helloEXCHANGE",
"YES"))
- addCronJob(&broadcastHELO,
+ addCronJob(&broadcasthello,
15 * cronSECONDS,
- HELO_BROADCAST_FREQUENCY,
+ hello_BROADCAST_FREQUENCY,
NULL);
activeCronJobs += ACJ_ANNOUNCE;
}
if (ACJ_FORWARD == (activeCronJobs & ACJ_FORWARD)) {
if (! testConfigurationString("NETWORK",
- "HELOEXCHANGE",
+ "helloEXCHANGE",
"YES"))
- delCronJob(&forwardHELO,
- HELO_FORWARD_FREQUENCY,
+ delCronJob(&forwardhello,
+ hello_FORWARD_FREQUENCY,
NULL); /* seven minutes: exchange */
activeCronJobs -= ACJ_FORWARD;
} else {
if (! testConfigurationString("NETWORK",
"DISABLE-ADVERTISEMENTS",
"YES"))
- addCronJob(&broadcastHELO,
+ addCronJob(&broadcasthello,
15 * cronSECONDS,
- HELO_BROADCAST_FREQUENCY,
+ hello_BROADCAST_FREQUENCY,
NULL);
activeCronJobs += ACJ_FORWARD;
}
@@ -717,27 +717,27 @@
}
stats = capi->requestService("stats");
if (stats != NULL) {
- stat_HELO_in = stats->create(gettext_noop("# Peer advertisements
received"));
- stat_HELO_out = stats->create(gettext_noop("# Self advertisments
transmitted"));
- stat_HELO_fwd = stats->create(gettext_noop("# Foreign advertisements
forwarded"));
+ stat_hello_in = stats->create(gettext_noop("# Peer advertisements
received"));
+ stat_hello_out = stats->create(gettext_noop("# Self advertisments
transmitted"));
+ stat_hello_fwd = stats->create(gettext_noop("# Foreign advertisements
forwarded"));
}
LOG(LOG_DEBUG,
_("'%s' registering handler %d (plaintext and ciphertext)\n"),
"advertising",
- p2p_PROTO_HELO);
+ p2p_PROTO_hello);
- capi->registerHandler(p2p_PROTO_HELO,
- &eHELOHandler);
- capi->registerPlaintextHandler(p2p_PROTO_HELO,
- &pHELOHandler);
+ capi->registerHandler(p2p_PROTO_hello,
+ &ehelloHandler);
+ capi->registerPlaintextHandler(p2p_PROTO_hello,
+ &phelloHandler);
registerConfigurationUpdateCallback(&configurationUpdateCallback);
if (! testConfigurationString("NETWORK",
"DISABLE-ADVERTISEMENTS",
"YES")) {
- addCronJob(&broadcastHELO,
+ addCronJob(&broadcasthello,
15 * cronSECONDS,
- HELO_BROADCAST_FREQUENCY,
+ hello_BROADCAST_FREQUENCY,
NULL);
activeCronJobs += ACJ_ANNOUNCE;
} else {
@@ -745,18 +745,18 @@
_("Network advertisements disabled by configuration!\n"));
}
if (testConfigurationString("NETWORK",
- "HELOEXCHANGE",
+ "helloEXCHANGE",
"YES") == YES) {
- addCronJob(&forwardHELO,
+ addCronJob(&forwardhello,
4 * cronMINUTES,
- HELO_FORWARD_FREQUENCY,
+ hello_FORWARD_FREQUENCY,
NULL);
activeCronJobs += ACJ_FORWARD;
}
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
else
LOG(LOG_DEBUG,
- "HELO forwarding disabled!\n");
+ "hello forwarding disabled!\n");
#endif
startBootstrap(capi);
@@ -773,22 +773,22 @@
void done_module_advertising() {
stopBootstrap();
if (ACJ_ANNOUNCE == (activeCronJobs & ACJ_ANNOUNCE)) {
- delCronJob(&broadcastHELO,
- HELO_BROADCAST_FREQUENCY,
+ delCronJob(&broadcasthello,
+ hello_BROADCAST_FREQUENCY,
NULL);
activeCronJobs -= ACJ_ANNOUNCE;
}
if (ACJ_FORWARD == (activeCronJobs & ACJ_FORWARD)) {
- delCronJob(&forwardHELO,
- HELO_FORWARD_FREQUENCY,
+ delCronJob(&forwardhello,
+ hello_FORWARD_FREQUENCY,
NULL); /* seven minutes: exchange */
activeCronJobs -= ACJ_FORWARD;
}
unregisterConfigurationUpdateCallback(&configurationUpdateCallback);
- coreAPI->unregisterHandler(p2p_PROTO_HELO,
- &eHELOHandler);
- coreAPI->unregisterPlaintextHandler(p2p_PROTO_HELO,
- &pHELOHandler);
+ coreAPI->unregisterHandler(p2p_PROTO_hello,
+ &ehelloHandler);
+ coreAPI->unregisterPlaintextHandler(p2p_PROTO_hello,
+ &phelloHandler);
coreAPI->releaseService(transport);
transport = NULL;
coreAPI->releaseService(identity);
Modified: GNUnet/src/applications/advertising/bootstrap.c
===================================================================
--- GNUnet/src/applications/advertising/bootstrap.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/advertising/bootstrap.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -30,7 +30,7 @@
#include "gnunet_protocols.h"
#include "gnunet_bootstrap_service.h"
-#define HELO_HELPER_TABLE_START_SIZE 64
+#define hello_HELPER_TABLE_START_SIZE 64
static CoreAPIForApplication * coreAPI;
@@ -43,15 +43,15 @@
static int abort_bootstrap = YES;
typedef struct {
- HELO_Message ** helos;
+ P2P_hello_MESSAGE ** helos;
int helosCount;
int helosLen;
-} HeloListClosure;
+} HelloListClosure;
-static void processHELOs(HeloListClosure * hcq) {
+static void processhellos(HelloListClosure * hcq) {
int rndidx;
int i;
- HELO_Message * msg;
+ P2P_hello_MESSAGE * msg;
if (NULL == hcq) {
BREAK();
@@ -59,15 +59,15 @@
}
while ( (abort_bootstrap == NO) &&
(hcq->helosCount > 0) ) {
- /* select HELO by random */
+ /* select hello by random */
rndidx = randomi(hcq->helosCount);
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_DEBUG,
- "%s chose HELO %d of %d\n",
+ "%s chose hello %d of %d\n",
__FUNCTION__,
rndidx, hcq->helosCount);
#endif
- msg = (HELO_Message*) hcq->helos[rndidx];
+ msg = (P2P_hello_MESSAGE*) hcq->helos[rndidx];
hcq->helos[rndidx]
= hcq->helos[hcq->helosCount-1];
GROW(hcq->helos,
@@ -76,7 +76,7 @@
coreAPI->injectMessage(&msg->senderIdentity,
(char*)msg,
- HELO_Message_size(msg),
+ P2P_hello_MESSAGE_size(msg),
NO,
NULL);
FREE(msg);
@@ -104,17 +104,17 @@
0);
}
-static void downloadHostlistCallback(const HELO_Message * helo,
- HeloListClosure * cls) {
+static void downloadHostlistCallback(const P2P_hello_MESSAGE * helo,
+ HelloListClosure * cls) {
if (cls->helosCount >= cls->helosLen) {
GROW(cls->helos,
cls->helosLen,
- cls->helosLen + HELO_HELPER_TABLE_START_SIZE);
+ cls->helosLen + hello_HELPER_TABLE_START_SIZE);
}
- cls->helos[cls->helosCount++] = MALLOC(HELO_Message_size(helo));
+ cls->helos[cls->helosCount++] = MALLOC(P2P_hello_MESSAGE_size(helo));
memcpy(cls->helos[cls->helosCount-1],
helo,
- HELO_Message_size(helo));
+ P2P_hello_MESSAGE_size(helo));
}
#define BOOTSTRAP_INFO "bootstrap-info"
@@ -166,7 +166,7 @@
}
static void processThread(void * unused) {
- HeloListClosure cls;
+ HelloListClosure cls;
ptPID = getpid();
cls.helos = NULL;
@@ -180,12 +180,12 @@
break;
cls.helosLen = 0;
cls.helosCount = 0;
- bootstrap->bootstrap((HELO_Callback)&downloadHostlistCallback,
+ bootstrap->bootstrap((hello_Callback)&downloadHostlistCallback,
&cls);
GROW(cls.helos,
cls.helosLen,
cls.helosCount);
- processHELOs(&cls);
+ processhellos(&cls);
}
ptPID = 0;
}
Modified: GNUnet/src/applications/advertising/bootstrap.h
===================================================================
--- GNUnet/src/applications/advertising/bootstrap.h 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/advertising/bootstrap.h 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -20,7 +20,7 @@
/**
* @file advertising/bootstrap.h
- * @brief Cron-jobs that obtain HELOs if we know
+ * @brief Cron-jobs that obtain hellos if we know
* too few peers
* @author Christian Grothoff
*/
Modified: GNUnet/src/applications/bootstrap_http/http.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/http.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/bootstrap_http/http.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -20,7 +20,7 @@
/**
* @file bootstrap_http/http.c
- * @brief HOSTLISTURL support. Downloads HELOs via http.
+ * @brief HOSTLISTURL support. Downloads hellos via http.
*
* @author Christian Grothoff
*/
@@ -47,15 +47,15 @@
static CoreAPIForApplication * coreAPI;
-static int stat_HELOdownloaded;
+static int stat_hellodownloaded;
/**
* Download hostlist from the web and call method
- * on each HELO.
+ * on each hello.
*/
static void
downloadHostlistHelper(char * url,
- HELO_Callback callback,
+ hello_Callback callback,
void * arg) {
unsigned short port;
char * hostname;
@@ -220,40 +220,40 @@
buffer = MALLOC(MAX_BUFFER_SIZE);
while (1) {
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
- helo = (HELO_Message*) &buffer[0];
- helo->header.type = htons(p2p_PROTO_HELO);
+ helo = (P2P_hello_MESSAGE*) &buffer[0];
+ helo->header.type = htons(p2p_PROTO_hello);
if (start + 300 * cronSECONDS < cronTime(NULL))
break; /* exit after 300s */
curpos = 0;
helo->senderAddressSize = 0;
- while (curpos < HELO_Message_size(helo)) {
+ while (curpos < P2P_hello_MESSAGE_size(helo)) {
if (start + 300 * cronSECONDS < cronTime(NULL))
break; /* exit after 300s */
success = RECV_NONBLOCKING(sock,
&((char*)helo)[curpos],
- HELO_Message_size(helo)-curpos,
+ P2P_hello_MESSAGE_size(helo)-curpos,
&ret);
if ( success == NO )
continue;
if (ret <= 0)
break; /* end of file or error*/
- if (HELO_Message_size(helo) >= MAX_BUFFER_SIZE)
+ if (P2P_hello_MESSAGE_size(helo) >= MAX_BUFFER_SIZE)
break; /* INVALID! Avoid overflow! */
curpos += ret;
}
- if (curpos != HELO_Message_size(helo)) {
+ if (curpos != P2P_hello_MESSAGE_size(helo)) {
if (curpos != 0)
LOG(LOG_WARNING,
- _("Parsing HELO from '%s' failed.\n"),
+ _("Parsing hello from '%s' failed.\n"),
url);
break;
}
- helo->header.size = htons(HELO_Message_size(helo));
+ helo->header.size = htons(P2P_hello_MESSAGE_size(helo));
if (stats != NULL)
- stats->change(stat_HELOdownloaded,
+ stats->change(stat_hellodownloaded,
1);
callback(helo,
arg);
@@ -264,7 +264,7 @@
}
-static void downloadHostlist(HELO_Callback callback,
+static void downloadHostlist(hello_Callback callback,
void * arg) {
char * url;
int i;
@@ -346,8 +346,8 @@
coreAPI = capi;
stats = coreAPI->requestService("stats");
if (stats != NULL) {
- stat_HELOdownloaded
- = stats->create(gettext_noop("# HELOs downloaded via http"));
+ stat_hellodownloaded
+ = stats->create(gettext_noop("# hellos downloaded via http"));
}
api.bootstrap = &downloadHostlist;
return &api;
Modified: GNUnet/src/applications/chat/chat.c
===================================================================
--- GNUnet/src/applications/chat/chat.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/applications/chat/chat.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -50,7 +50,7 @@
}
typedef struct {
- const p2p_HEADER * message;
+ const P2P_MESSAGE_HEADER * message;
unsigned int prio;
unsigned int delay;
} BCC;
@@ -63,7 +63,7 @@
bcc->delay);
}
-static void broadcastToConnected(const p2p_HEADER * message,
+static void broadcastToConnected(const P2P_MESSAGE_HEADER * message,
unsigned int prio,
unsigned int delay) {
BCC bcc;
@@ -75,24 +75,24 @@
}
static int handleChatMSG(const PeerIdentity * sender,
- const p2p_HEADER * message) {
+ const P2P_MESSAGE_HEADER * message) {
int i;
int j;
- CHAT_CS_MESSAGE * cmsg;
- CHAT_p2p_MESSAGE * pmsg;
+ CS_chat_MESSAGE * cmsg;
+ P2P_chat_MESSAGE * pmsg;
HashCode512 hc;
- if (ntohs(message->size) != sizeof(CHAT_p2p_MESSAGE)) {
+ if (ntohs(message->size) != sizeof(P2P_chat_MESSAGE)) {
LOG(LOG_WARNING,
_("Message received from peer is invalid.\n"));
return SYSERR;
}
- pmsg = (CHAT_p2p_MESSAGE*)message;
- cmsg = (CHAT_CS_MESSAGE*) message;
+ pmsg = (P2P_chat_MESSAGE*)message;
+ cmsg = (CS_chat_MESSAGE*) message;
/* check if we have seen this message already */
hash(pmsg,
- sizeof(CHAT_p2p_MESSAGE),
+ sizeof(P2P_chat_MESSAGE),
&hc);
j = -1;
MUTEX_LOCK(&chatMutex);
@@ -121,22 +121,22 @@
}
static void csHandleChatRequest(ClientHandle client,
- const CS_HEADER * message) {
+ const CS_MESSAGE_HEADER * message) {
int i;
int j;
- CHAT_CS_MESSAGE * cmsg;
- CHAT_p2p_MESSAGE * pmsg;
+ CS_chat_MESSAGE * cmsg;
+ P2P_chat_MESSAGE * pmsg;
HashCode512 hc;
- if (ntohs(message->size) != sizeof(CHAT_CS_MESSAGE)) {
+ if (ntohs(message->size) != sizeof(CS_chat_MESSAGE)) {
LOG(LOG_WARNING,
_("Message received from client is invalid\n"));
return; /* invalid message */
}
- pmsg = (CHAT_p2p_MESSAGE*)message;
- cmsg = (CHAT_CS_MESSAGE*) message;
+ pmsg = (P2P_chat_MESSAGE*)message;
+ cmsg = (CS_chat_MESSAGE*) message;
hash(pmsg,
- sizeof(CHAT_p2p_MESSAGE),
+ sizeof(P2P_chat_MESSAGE),
&hc);
MUTEX_LOCK(&chatMutex);
markSeen(&hc);
@@ -186,23 +186,23 @@
int initialize_module_chat(CoreAPIForApplication * capi) {
int ok = OK;
- GNUNET_ASSERT(CHAT_p2p_PROTO_MSG == CHAT_CS_PROTO_MSG);
- GNUNET_ASSERT(sizeof(CHAT_p2p_MESSAGE) == sizeof(CHAT_CS_MESSAGE));
+ GNUNET_ASSERT(P2P_PROTO_chat_MSG == CS_PROTO_chat_MSG);
+ GNUNET_ASSERT(sizeof(P2P_chat_MESSAGE) == sizeof(CS_chat_MESSAGE));
MUTEX_CREATE(&chatMutex);
clientCount = 0;
coreAPI = capi;
LOG(LOG_DEBUG,
_("'%s' registering handlers %d and %d\n"),
"chat",
- CHAT_p2p_PROTO_MSG,
- CHAT_CS_PROTO_MSG);
+ P2P_PROTO_chat_MSG,
+ CS_PROTO_chat_MSG);
- if (SYSERR == capi->registerHandler(CHAT_p2p_PROTO_MSG,
+ if (SYSERR == capi->registerHandler(P2P_PROTO_chat_MSG,
&handleChatMSG))
ok = SYSERR;
if (SYSERR == capi->registerClientExitHandler(&chatClientExitHandler))
ok = SYSERR;
- if (SYSERR == capi->registerClientHandler(CHAT_CS_PROTO_MSG,
+ if (SYSERR == capi->registerClientHandler(CS_PROTO_chat_MSG,
(CSHandler)&csHandleChatRequest))
ok = SYSERR;
setConfigurationString("ABOUT",
@@ -212,10 +212,10 @@
}
void done_module_chat() {
- coreAPI->unregisterHandler(CHAT_p2p_PROTO_MSG,
+ coreAPI->unregisterHandler(P2P_PROTO_chat_MSG,
&handleChatMSG);
coreAPI->unregisterClientExitHandler(&chatClientExitHandler);
- coreAPI->unregisterClientHandler(CHAT_CS_PROTO_MSG,
+ coreAPI->unregisterClientHandler(CS_PROTO_chat_MSG,
(CSHandler)&csHandleChatRequest);
MUTEX_DESTROY(&chatMutex);
coreAPI = NULL;
Modified: GNUnet/src/applications/chat/chat.h
===================================================================
--- GNUnet/src/applications/chat/chat.h 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/applications/chat/chat.h 2005-07-17 23:21:45 UTC (rev 1576)
@@ -31,16 +31,16 @@
#define CHAT_MSG_LENGTH 1024
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
char nick[CHAT_NICK_LENGTH];
char message[CHAT_MSG_LENGTH];
-} CHAT_p2p_MESSAGE;
+} P2P_chat_MESSAGE;
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
char nick[CHAT_NICK_LENGTH];
char message[CHAT_MSG_LENGTH];
-} CHAT_CS_MESSAGE;
+} CS_chat_MESSAGE;
Modified: GNUnet/src/applications/chat/gnunet-chat.c
===================================================================
--- GNUnet/src/applications/chat/gnunet-chat.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/chat/gnunet-chat.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -98,11 +98,11 @@
}
static void * receiveThread(GNUNET_TCP_SOCKET * sock) {
- CHAT_CS_MESSAGE * buffer;
+ CS_chat_MESSAGE * buffer;
buffer = MALLOC(MAX_BUFFER_SIZE);
while (OK == readFromSocket(sock,
- (CS_HEADER **)&buffer)) {
+ (CS_MESSAGE_HEADER **)&buffer)) {
char timebuf[64];
time_t timetmp;
struct tm * tmptr;
@@ -114,8 +114,8 @@
"%b %e %H:%M ",
tmptr);
- if ( (ntohs(buffer->header.size) != sizeof(CHAT_CS_MESSAGE)) ||
- (ntohs(buffer->header.type) != CHAT_CS_PROTO_MSG) )
+ if ( (ntohs(buffer->header.size) != sizeof(CS_chat_MESSAGE)) ||
+ (ntohs(buffer->header.type) != CS_PROTO_chat_MSG) )
continue;
buffer->nick[CHAT_NICK_LENGTH-1] = '\0';
buffer->message[CHAT_MSG_LENGTH-1] = '\0';
@@ -139,7 +139,7 @@
GNUNET_TCP_SOCKET * sock;
PTHREAD_T messageReceiveThread;
void * unused;
- CHAT_CS_MESSAGE msg;
+ CS_chat_MESSAGE msg;
char * nick;
if (SYSERR == initUtil(argc, argv, &parseOptions))
@@ -161,14 +161,14 @@
memset(&msg,
0,
- sizeof(CHAT_CS_MESSAGE));
+ sizeof(CS_chat_MESSAGE));
memcpy(&msg.message[0],
"Hi!\n",
strlen("Hi!\n"));
msg.header.size
- = htons(sizeof(CHAT_CS_MESSAGE));
+ = htons(sizeof(CS_chat_MESSAGE));
msg.header.type
- = htons(CHAT_CS_PROTO_MSG);
+ = htons(CS_PROTO_chat_MSG);
memcpy(&msg.nick[0],
nick,
strlen(nick));
Modified: GNUnet/src/applications/dht/module/cs.c
===================================================================
--- GNUnet/src/applications/dht/module/cs.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/dht/module/cs.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -98,38 +98,38 @@
*/
int status;
-} CS_TableHandlers;
+} DHT_CLIENT_TableHandlers;
typedef struct {
ClientHandle client;
struct DHT_PUT_RECORD * put_record;
DHT_TableId table;
unsigned int replicas; /* confirmed puts? */
-} CS_PUT_RECORD;
+} DHT_CLIENT_PUT_RECORD;
typedef struct {
ClientHandle client;
struct DHT_REMOVE_RECORD * remove_record;
DHT_TableId table;
unsigned int replicas; /* confirmed dels? */
-} CS_REMOVE_RECORD;
+} DHT_CLIENT_REMOVE_RECORD;
typedef struct {
ClientHandle client;
struct DHT_GET_RECORD * get_record;
DHT_TableId table;
unsigned int count;
-} CS_GET_RECORD;
+} DHT_CLIENT_GET_RECORD;
-static CS_GET_RECORD ** getRecords;
+static DHT_CLIENT_GET_RECORD ** getRecords;
static unsigned int getRecordsSize;
-static CS_PUT_RECORD ** putRecords;
+static DHT_CLIENT_PUT_RECORD ** putRecords;
static unsigned int putRecordsSize;
-static CS_REMOVE_RECORD ** removeRecords;
+static DHT_CLIENT_REMOVE_RECORD ** removeRecords;
static unsigned int removeRecordsSize;
@@ -137,7 +137,7 @@
* If clients provide a datastore implementation for a table,
* we keep the corresponding client handler in this array.
*/
-static CS_TableHandlers ** csHandlers;
+static DHT_CLIENT_TableHandlers ** csHandlers;
/**
* Size of the csHandlers array.
@@ -166,9 +166,9 @@
const HashCode512 * keys,
DataProcessor resultCallback,
void * resCallbackClosure) {
- DHT_CS_REQUEST_GET * req;
+ CS_dht_request_get_MESSAGE * req;
unsigned short size;
- CS_TableHandlers * handlers = closure;
+ DHT_CLIENT_TableHandlers * handlers = closure;
int ret;
if (keyCount < 1)
@@ -178,17 +178,17 @@
handlers->resultCallback = resultCallback;
handlers->resultCallbackClosure = resCallbackClosure;
handlers->status = 0;
- size = sizeof(DHT_CS_REQUEST_GET) +
+ size = sizeof(CS_dht_request_get_MESSAGE) +
(keyCount-1) * sizeof(HashCode512);
if (((unsigned int)size)
- != sizeof(DHT_CS_REQUEST_GET) +
+ != sizeof(CS_dht_request_get_MESSAGE) +
(keyCount-1) * sizeof(HashCode512)) {
SEMAPHORE_UP(handlers->prerequest);
return SYSERR; /* too many keys, size > rangeof(short) */
}
req = MALLOC(size);
req->header.size = htons(size);
- req->header.type = htons(DHT_CS_PROTO_REQUEST_GET);
+ req->header.type = htons(CS_PROTO_dht_REQUEST_GET);
req->type = htonl(type);
req->priority = htonl(prio);
req->table = handlers->table;
@@ -221,17 +221,17 @@
const HashCode512 * key,
const DataContainer * value,
unsigned int prio) {
- DHT_CS_REQUEST_PUT * req;
- CS_TableHandlers * handlers = closure;
+ CS_dht_request_put_MESSAGE * req;
+ DHT_CLIENT_TableHandlers * handlers = closure;
int ret;
size_t n;
- n = sizeof(DHT_CS_REQUEST_PUT) + ntohl(value->size);
+ n = sizeof(CS_dht_request_put_MESSAGE) + ntohl(value->size);
req = MALLOC(n);
SEMAPHORE_DOWN(handlers->prerequest);
handlers->status = 0;
req->header.size = htons(n);
- req->header.type = htons(DHT_CS_PROTO_REQUEST_PUT);
+ req->header.type = htons(CS_PROTO_dht_REQUEST_PUT);
req->table = handlers->table;
req->key = *key;
req->timeout = htonl(0);
@@ -267,19 +267,19 @@
static int tcp_del(void * closure,
const HashCode512 * key,
const DataContainer * value) {
- DHT_CS_REQUEST_REMOVE * req;
- CS_TableHandlers * handlers = closure;
+ CS_dht_request_remove_MESSAGE * req;
+ DHT_CLIENT_TableHandlers * handlers = closure;
int ret;
size_t n;
- n = sizeof(DHT_CS_REQUEST_REMOVE);
+ n = sizeof(CS_dht_request_remove_MESSAGE);
if (value != NULL)
n += htonl(value->size);
req = MALLOC(n);
SEMAPHORE_DOWN(handlers->prerequest);
handlers->status = 0;
req->header.size = htons(n);
- req->header.type = htons(DHT_CS_PROTO_REQUEST_REMOVE);
+ req->header.type = htons(CS_PROTO_dht_REQUEST_REMOVE);
req->table = handlers->table;
req->key = *key;
req->timeout = htonl(0);
@@ -311,16 +311,16 @@
static int tcp_iterate(void * closure,
DataProcessor processor,
void * cls) {
- DHT_CS_REQUEST_ITERATE req;
- CS_TableHandlers * handlers = closure;
+ CS_dht_request_iterate_MESSAGE req;
+ DHT_CLIENT_TableHandlers * handlers = closure;
int ret;
SEMAPHORE_DOWN(handlers->prerequest);
handlers->status = 0;
handlers->resultCallback = processor;
handlers->resultCallbackClosure = cls;
- req.header.size = htons(sizeof(DHT_CS_REQUEST_ITERATE));
- req.header.type = htons(DHT_CS_PROTO_REQUEST_ITERATE);
+ req.header.size = htons(sizeof(CS_dht_request_iterate_MESSAGE));
+ req.header.type = htons(CS_PROTO_dht_REQUEST_ITERATE);
if (OK != coreAPI->sendToClient(handlers->handler,
&req.header)) {
SEMAPHORE_UP(handlers->prerequest);
@@ -338,10 +338,10 @@
static int sendAck(ClientHandle client,
DHT_TableId * table,
int value) {
- DHT_CS_REPLY_ACK msg;
+ CS_dht_reply_ack_MESSAGE msg;
- msg.header.size = htons(sizeof(DHT_CS_REPLY_ACK));
- msg.header.type = htons(DHT_CS_PROTO_REPLY_ACK);
+ msg.header.size = htons(sizeof(CS_dht_reply_ack_MESSAGE));
+ msg.header.type = htons(CS_PROTO_dht_REPLY_ACK);
msg.status = htonl(value);
msg.table = *table;
return coreAPI->sendToClient(client,
@@ -352,16 +352,16 @@
* CS handler for joining existing DHT-table.
*/
static int csJoin(ClientHandle client,
- const CS_HEADER * message) {
- CS_TableHandlers * ptr;
- DHT_CS_REQUEST_JOIN * req;
+ const CS_MESSAGE_HEADER * message) {
+ DHT_CLIENT_TableHandlers * ptr;
+ CS_dht_request_join_MESSAGE * req;
int ret;
- if (ntohs(message->size) != sizeof(DHT_CS_REQUEST_JOIN))
+ if (ntohs(message->size) != sizeof(CS_dht_request_join_MESSAGE))
return SYSERR;
- req = (DHT_CS_REQUEST_JOIN*) message;
+ req = (CS_dht_request_join_MESSAGE*) message;
MUTEX_LOCK(&csLock);
- ptr = MALLOC(sizeof(CS_TableHandlers));
+ ptr = MALLOC(sizeof(DHT_CLIENT_TableHandlers));
ptr->store = MALLOC(sizeof(Blockstore));
ptr->store->iterate = &tcp_iterate;
ptr->store->del = &tcp_del;
@@ -398,15 +398,15 @@
* CS handler for leaving DHT-table.
*/
static int csLeave(ClientHandle client,
- const CS_HEADER * message) {
+ const CS_MESSAGE_HEADER * message) {
- DHT_CS_REQUEST_LEAVE * req;
+ CS_dht_request_leave_MESSAGE * req;
int i;
- CS_TableHandlers * ptr;
+ DHT_CLIENT_TableHandlers * ptr;
- if (ntohs(message->size) != sizeof(DHT_CS_REQUEST_LEAVE))
+ if (ntohs(message->size) != sizeof(CS_dht_request_leave_MESSAGE))
return SYSERR;
- req = (DHT_CS_REQUEST_LEAVE*) message;
+ req = (CS_dht_request_leave_MESSAGE*) message;
LOG(LOG_EVERYTHING,
"Client leaving request received!\n");
@@ -444,7 +444,7 @@
SYSERR);
}
-static void cs_put_abort(CS_PUT_RECORD * record) {
+static void cs_put_abort(DHT_CLIENT_PUT_RECORD * record) {
int i;
MUTEX_LOCK(&csLock);
@@ -473,17 +473,17 @@
* CS handler for inserting <key,value>-pair into DHT-table.
*/
static int csPut(ClientHandle client,
- const CS_HEADER * message) {
- DHT_CS_REQUEST_PUT * req;
+ const CS_MESSAGE_HEADER * message) {
+ CS_dht_request_put_MESSAGE * req;
DataContainer * data;
- CS_PUT_RECORD * ptr;
+ DHT_CLIENT_PUT_RECORD * ptr;
unsigned int size;
- if (ntohs(message->size) < sizeof(DHT_CS_REQUEST_PUT))
+ if (ntohs(message->size) < sizeof(CS_dht_request_put_MESSAGE))
return SYSERR;
- req = (DHT_CS_REQUEST_PUT*) message;
+ req = (CS_dht_request_put_MESSAGE*) message;
size = ntohs(req->header.size)
- - sizeof(DHT_CS_REQUEST_PUT)
+ - sizeof(CS_dht_request_put_MESSAGE)
+ sizeof(DataContainer);
GNUNET_ASSERT(size < MAX_BUFFER_SIZE);
if (size == 0) {
@@ -495,7 +495,7 @@
&req[1],
size - sizeof(DataContainer));
}
- ptr = MALLOC(sizeof(CS_PUT_RECORD));
+ ptr = MALLOC(sizeof(DHT_CLIENT_PUT_RECORD));
ptr->client = client;
ptr->replicas = 0;
ptr->table = req->table;
@@ -517,7 +517,7 @@
return OK;
}
-static void cs_remove_abort(CS_REMOVE_RECORD * record) {
+static void cs_remove_abort(DHT_CLIENT_REMOVE_RECORD * record) {
int i;
dhtAPI->remove_stop(record->remove_record);
@@ -544,16 +544,16 @@
struct CSRemoveClosure {
ClientHandle client;
- DHT_CS_REQUEST_REMOVE * message;
+ CS_dht_request_remove_MESSAGE * message;
};
/**
* CronJob for removing <key,value>-pairs inserted by this node.
*/
static void csRemoveJob(struct CSRemoveClosure * cpc) {
- DHT_CS_REQUEST_REMOVE * req;
+ CS_dht_request_remove_MESSAGE * req;
DataContainer * data;
- CS_REMOVE_RECORD * ptr;
+ DHT_CLIENT_REMOVE_RECORD * ptr;
ClientHandle client;
unsigned int size;
@@ -561,7 +561,7 @@
client = cpc->client;
FREE(cpc);
size = ntohs(req->header.size)
- - sizeof(DHT_CS_REQUEST_REMOVE)
+ - sizeof(CS_dht_request_remove_MESSAGE)
+ sizeof(DataContainer);
GNUNET_ASSERT(size < 0xFFFF);
if (size == 0) {
@@ -573,7 +573,7 @@
&req[1],
size - sizeof(DataContainer));
}
- ptr = MALLOC(sizeof(CS_REMOVE_RECORD));
+ ptr = MALLOC(sizeof(DHT_CLIENT_REMOVE_RECORD));
ptr->client = client;
ptr->replicas = 0;
ptr->table = req->table;
@@ -598,10 +598,10 @@
* CS handler for inserting <key,value>-pair into DHT-table.
*/
static int csRemove(ClientHandle client,
- const CS_HEADER * message) {
+ const CS_MESSAGE_HEADER * message) {
struct CSRemoveClosure * cpc;
- if (ntohs(message->size) < sizeof(DHT_CS_REQUEST_REMOVE))
+ if (ntohs(message->size) < sizeof(CS_dht_request_remove_MESSAGE))
return SYSERR;
cpc = MALLOC(sizeof(struct CSRemoveClosure));
cpc->message = MALLOC(ntohs(message->size));
@@ -620,11 +620,11 @@
static int cs_get_result_callback(const HashCode512 * key,
const DataContainer * value,
- CS_GET_RECORD * record) {
- DHT_CS_REPLY_RESULTS * msg;
+ DHT_CLIENT_GET_RECORD * record) {
+ CS_dht_reply_results_MESSAGE * msg;
size_t n;
- n = sizeof(DHT_CS_REPLY_RESULTS) + ntohl(value->size);
+ n = sizeof(CS_dht_reply_results_MESSAGE) + ntohl(value->size);
msg = MALLOC(n);
msg->key = *key;
memcpy(&msg[1],
@@ -637,7 +637,7 @@
&value[1]);
msg->table = record->table;
msg->header.size = htons(n);
- msg->header.type = htons(DHT_CS_PROTO_REPLY_GET);
+ msg->header.type = htons(CS_PROTO_dht_REPLY_GET);
if (OK != coreAPI->sendToClient(record->client,
&msg->header)) {
LOG(LOG_FAILURE,
@@ -649,7 +649,7 @@
return OK;
}
-static void cs_get_abort(CS_GET_RECORD * record) {
+static void cs_get_abort(DHT_CLIENT_GET_RECORD * record) {
int i;
dhtAPI->get_stop(record->get_record);
@@ -687,15 +687,15 @@
struct CSGetClosure {
ClientHandle client;
- DHT_CS_REQUEST_GET * message;
+ CS_dht_request_get_MESSAGE * message;
};
/**
* CS handler for fetching <key,value>-pairs from DHT-table.
*/
static int csGetJob(struct CSGetClosure * cpc) {
- DHT_CS_REQUEST_GET * req;
- CS_GET_RECORD * ptr;
+ CS_dht_request_get_MESSAGE * req;
+ DHT_CLIENT_GET_RECORD * ptr;
ClientHandle client;
unsigned int keyCount;
@@ -703,8 +703,8 @@
req = cpc->message;
FREE(cpc);
- keyCount = 1 + ((ntohs(req->header.size) - sizeof(DHT_CS_REQUEST_GET)) /
sizeof(HashCode512));
- ptr = MALLOC(sizeof(CS_GET_RECORD));
+ keyCount = 1 + ((ntohs(req->header.size) -
sizeof(CS_dht_request_get_MESSAGE)) / sizeof(HashCode512));
+ ptr = MALLOC(sizeof(DHT_CLIENT_GET_RECORD));
ptr->client = client;
ptr->count = 0;
ptr->table = req->table;
@@ -732,10 +732,10 @@
* CS handler for inserting <key,value>-pair into DHT-table.
*/
static int csGet(ClientHandle client,
- const CS_HEADER * message) {
+ const CS_MESSAGE_HEADER * message) {
struct CSGetClosure * cpc;
- if (ntohs(message->size) != sizeof(DHT_CS_REQUEST_GET))
+ if (ntohs(message->size) != sizeof(CS_dht_request_get_MESSAGE))
return SYSERR;
cpc = MALLOC(sizeof(struct CSGetClosure));
@@ -757,17 +757,17 @@
* that we received a reply.
*/
static int csACK(ClientHandle client,
- const CS_HEADER * message) {
- CS_TableHandlers * ptr;
- DHT_CS_REPLY_ACK * req;
+ const CS_MESSAGE_HEADER * message) {
+ DHT_CLIENT_TableHandlers * ptr;
+ CS_dht_reply_ack_MESSAGE * req;
int i;
- if (ntohs(message->size) != sizeof(DHT_CS_REPLY_ACK))
+ if (ntohs(message->size) != sizeof(CS_dht_reply_ack_MESSAGE))
return SYSERR;
- req =(DHT_CS_REPLY_ACK*) message;
+ req =(CS_dht_reply_ack_MESSAGE*) message;
LOG(LOG_EVERYTHING,
"'%s' received from client.\n",
- "DHT_CS_REPLY_ACK");
+ "CS_dht_reply_ack_MESSAGE");
MUTEX_LOCK(&csLock);
for (i=0;i<csHandlersCount;i++) {
ptr = csHandlers[i];
@@ -784,7 +784,7 @@
MUTEX_UNLOCK(&csLock);
LOG(LOG_ERROR,
_("Failed to deliver '%s' message.\n"),
- "DHT_CS_REPLY_ACK");
+ "CS_dht_reply_ack_MESSAGE");
return SYSERR; /* failed to signal */
}
@@ -794,25 +794,25 @@
* collected, signals using the semaphore.
*/
static int csResults(ClientHandle client,
- const CS_HEADER * message) {
- DHT_CS_REPLY_RESULTS * req;
- CS_TableHandlers * ptr;
+ const CS_MESSAGE_HEADER * message) {
+ CS_dht_reply_results_MESSAGE * req;
+ DHT_CLIENT_TableHandlers * ptr;
unsigned int dataLength;
int i;
- if (ntohs(message->size) < sizeof(DHT_CS_REPLY_RESULTS)) {
+ if (ntohs(message->size) < sizeof(CS_dht_reply_results_MESSAGE)) {
BREAK();
return SYSERR;
}
- req = (DHT_CS_REPLY_RESULTS*) message;
- dataLength = ntohs(message->size) - sizeof(DHT_CS_REPLY_RESULTS);
+ req = (CS_dht_reply_results_MESSAGE*) message;
+ dataLength = ntohs(message->size) - sizeof(CS_dht_reply_results_MESSAGE);
if (dataLength != ntohl(req->data.size)) {
BREAK();
return SYSERR;
}
LOG(LOG_EVERYTHING,
"'%s' received from client.\n",
- "DHT_CS_REPLY_RESULTS");
+ "CS_dht_reply_results_MESSAGE");
MUTEX_LOCK(&csLock);
for (i=0;i<csHandlersCount;i++) {
if ( (csHandlers[i]->handler == client) &&
@@ -837,7 +837,7 @@
MUTEX_UNLOCK(&csLock);
LOG(LOG_ERROR,
_("Failed to deliver '%s' message.\n"),
- "DHT_CS_REPLY_RESULTS");
+ "CS_dht_reply_results_MESSAGE");
return SYSERR; /* failed to deliver */
}
@@ -847,18 +847,18 @@
*/
static void csClientExit(ClientHandle client) {
int i;
- CS_GET_RECORD * gr;
- CS_PUT_RECORD * pr;
- CS_REMOVE_RECORD * rr;
+ DHT_CLIENT_GET_RECORD * gr;
+ DHT_CLIENT_PUT_RECORD * pr;
+ DHT_CLIENT_REMOVE_RECORD * rr;
int haveCron;
MUTEX_LOCK(&csLock);
for (i=0;i<csHandlersCount;i++) {
if (csHandlers[i]->handler == client) {
- DHT_CS_REQUEST_LEAVE message;
+ CS_dht_request_leave_MESSAGE message;
- message.header.size = ntohs(sizeof(DHT_CS_REQUEST_LEAVE));
- message.header.type = ntohs(DHT_CS_PROTO_REQUEST_LEAVE);
+ message.header.size = ntohs(sizeof(CS_dht_request_leave_MESSAGE));
+ message.header.type = ntohs(CS_PROTO_dht_REQUEST_LEAVE);
message.table = csHandlers[i]->table;
csLeave(client,
&message.header);
@@ -927,34 +927,34 @@
LOG(LOG_DEBUG,
"DHT registering client handlers: "
"%d %d %d %d %d %d %d\n",
- DHT_CS_PROTO_REQUEST_JOIN,
- DHT_CS_PROTO_REQUEST_LEAVE,
- DHT_CS_PROTO_REQUEST_PUT,
- DHT_CS_PROTO_REQUEST_GET,
- DHT_CS_PROTO_REQUEST_REMOVE,
- DHT_CS_PROTO_REPLY_GET,
- DHT_CS_PROTO_REPLY_ACK);
+ CS_PROTO_dht_REQUEST_JOIN,
+ CS_PROTO_dht_REQUEST_LEAVE,
+ CS_PROTO_dht_REQUEST_PUT,
+ CS_PROTO_dht_REQUEST_GET,
+ CS_PROTO_dht_REQUEST_REMOVE,
+ CS_PROTO_dht_REPLY_GET,
+ CS_PROTO_dht_REPLY_ACK);
status = OK;
MUTEX_CREATE_RECURSIVE(&csLock);
- if (SYSERR == capi->registerClientHandler(DHT_CS_PROTO_REQUEST_JOIN,
+ if (SYSERR == capi->registerClientHandler(CS_PROTO_dht_REQUEST_JOIN,
&csJoin))
status = SYSERR;
- if (SYSERR == capi->registerClientHandler(DHT_CS_PROTO_REQUEST_LEAVE,
+ if (SYSERR == capi->registerClientHandler(CS_PROTO_dht_REQUEST_LEAVE,
&csLeave))
status = SYSERR;
- if (SYSERR == capi->registerClientHandler(DHT_CS_PROTO_REQUEST_PUT,
+ if (SYSERR == capi->registerClientHandler(CS_PROTO_dht_REQUEST_PUT,
&csPut))
status = SYSERR;
- if (SYSERR == capi->registerClientHandler(DHT_CS_PROTO_REQUEST_GET,
+ if (SYSERR == capi->registerClientHandler(CS_PROTO_dht_REQUEST_GET,
&csGet))
status = SYSERR;
- if (SYSERR == capi->registerClientHandler(DHT_CS_PROTO_REQUEST_REMOVE,
+ if (SYSERR == capi->registerClientHandler(CS_PROTO_dht_REQUEST_REMOVE,
&csRemove))
status = SYSERR;
- if (SYSERR == capi->registerClientHandler(DHT_CS_PROTO_REPLY_GET,
+ if (SYSERR == capi->registerClientHandler(CS_PROTO_dht_REPLY_GET,
&csResults))
status = SYSERR;
- if (SYSERR == capi->registerClientHandler(DHT_CS_PROTO_REPLY_ACK,
+ if (SYSERR == capi->registerClientHandler(CS_PROTO_dht_REPLY_ACK,
&csACK))
status = SYSERR;
if (SYSERR == capi->registerClientExitHandler(&csClientExit))
@@ -971,25 +971,25 @@
status = OK;
LOG(LOG_DEBUG,
"DHT: shutdown\n");
- if (OK != coreAPI->unregisterClientHandler(DHT_CS_PROTO_REQUEST_JOIN,
+ if (OK != coreAPI->unregisterClientHandler(CS_PROTO_dht_REQUEST_JOIN,
&csJoin))
status = SYSERR;
- if (OK != coreAPI->unregisterClientHandler(DHT_CS_PROTO_REQUEST_LEAVE,
+ if (OK != coreAPI->unregisterClientHandler(CS_PROTO_dht_REQUEST_LEAVE,
&csLeave))
status = SYSERR;
- if (OK != coreAPI->unregisterClientHandler(DHT_CS_PROTO_REQUEST_PUT,
+ if (OK != coreAPI->unregisterClientHandler(CS_PROTO_dht_REQUEST_PUT,
&csPut))
status = SYSERR;
- if (OK != coreAPI->unregisterClientHandler(DHT_CS_PROTO_REQUEST_GET,
+ if (OK != coreAPI->unregisterClientHandler(CS_PROTO_dht_REQUEST_GET,
&csGet))
status = SYSERR;
- if (OK != coreAPI->unregisterClientHandler(DHT_CS_PROTO_REQUEST_REMOVE,
+ if (OK != coreAPI->unregisterClientHandler(CS_PROTO_dht_REQUEST_REMOVE,
&csRemove))
status = SYSERR;
- if (OK != coreAPI->unregisterClientHandler(DHT_CS_PROTO_REPLY_GET,
+ if (OK != coreAPI->unregisterClientHandler(CS_PROTO_dht_REPLY_GET,
&csResults))
status = SYSERR;
- if (OK != coreAPI->unregisterClientHandler(DHT_CS_PROTO_REPLY_ACK,
+ if (OK != coreAPI->unregisterClientHandler(CS_PROTO_dht_REPLY_ACK,
&csACK))
status = SYSERR;
if (OK != coreAPI->unregisterClientExitHandler(&csClientExit))
Modified: GNUnet/src/applications/dht/module/dht.c
===================================================================
--- GNUnet/src/applications/dht/module/dht.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/dht/module/dht.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -38,7 +38,7 @@
*
* Desirable features:
* 1) security: how to pick priorities? Access rights?
- * 2) performance: add optional HELO messages
+ * 2) performance: add optional hello messages
*/
#include "platform.h"
@@ -599,7 +599,7 @@
typedef struct {
CronJob job;
void * arg;
-} AbortEntry;
+} DHT_CronJobAbortEntry;
/* ***************** prototypes ******************** */
@@ -677,7 +677,7 @@
* before the DHT module can shutdown. All of these
* jobs are guaranteed to be triggered during the shutdown.
*/
-static AbortEntry * abortTable;
+static DHT_CronJobAbortEntry * abortTable;
static unsigned int abortTableSize;
@@ -916,7 +916,7 @@
*
* fields about the responder. Process those fields (if present).
* @param results::tables list of tables the responder participates in
(optional)
- * @param results::HELOs list of HELOs for responder (optional)
+ * @param results::hellos list of hellos for responder (optional)
*/
static void processOptionalFields(const PeerIdentity * responder,
RPC_Param * results) {
@@ -1037,7 +1037,7 @@
MUTEX_UNLOCK(lock);
}
- /* HERE: process other optional fields (HELOs) */
+ /* HERE: process other optional fields (hellos) */
}
@@ -1074,7 +1074,7 @@
}
FREE(tabs);
- /* FIXME: here: add other optional fields (HELOs) */
+ /* FIXME: here: add other optional fields (hellos) */
}
/**
@@ -2778,7 +2778,7 @@
*
* @param arguments do we need any?
* @param results::tables the tables we participate in (DHT_TableIds)
- * @param helos::HELOs for this peer (optional)
+ * @param helos::hellos for this peer (optional)
*/
static void rpc_DHT_ping(const PeerIdentity * sender,
RPC_Param * arguments,
Modified: GNUnet/src/applications/dht/module/dht_test.c
===================================================================
--- GNUnet/src/applications/dht/module/dht_test.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/dht/module/dht_test.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -38,7 +38,7 @@
}
static void sendToNode(const PeerIdentity * hostId,
- const p2p_HEADER * message,
+ const P2P_MESSAGE_HEADER * message,
unsigned int priority,
unsigned int maxdelay) {
}
Modified: GNUnet/src/applications/dht/tools/dht_api.c
===================================================================
--- GNUnet/src/applications/dht/tools/dht_api.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/dht/tools/dht_api.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -79,12 +79,12 @@
* Check if the given message is an ACK. If so,
* return the status, otherwise SYSERR.
*/
-static int checkACK(CS_HEADER * reply) {
+static int checkACK(CS_MESSAGE_HEADER * reply) {
LOG(LOG_DEBUG,
"received ACK from gnunetd\n");
- if ( (sizeof(DHT_CS_REPLY_ACK) == ntohs(reply->size)) &&
- (DHT_CS_PROTO_REPLY_ACK == ntohs(reply->type)) )
- return ntohl(((DHT_CS_REPLY_ACK*)reply)->status);
+ if ( (sizeof(CS_dht_reply_ack_MESSAGE) == ntohs(reply->size)) &&
+ (CS_PROTO_dht_REPLY_ACK == ntohs(reply->type)) )
+ return ntohl(((CS_dht_reply_ack_MESSAGE*)reply)->status);
return SYSERR;
}
@@ -94,12 +94,12 @@
static int sendAck(GNUNET_TCP_SOCKET * sock,
DHT_TableId * table,
int value) {
- DHT_CS_REPLY_ACK msg;
+ CS_dht_reply_ack_MESSAGE msg;
LOG(LOG_DEBUG,
"sending ACK to gnunetd\n");
- msg.header.size = htons(sizeof(DHT_CS_REPLY_ACK));
- msg.header.type = htons(DHT_CS_PROTO_REPLY_ACK);
+ msg.header.size = htons(sizeof(CS_dht_reply_ack_MESSAGE));
+ msg.header.type = htons(CS_PROTO_dht_REPLY_ACK);
msg.status = htonl(value);
msg.table = *table;
return writeToSocket(sock,
@@ -110,11 +110,11 @@
const DataContainer * value,
void * cls) {
TableList * list = (TableList*) cls;
- DHT_CS_REPLY_RESULTS * reply;
+ CS_dht_reply_results_MESSAGE * reply;
- reply = MALLOC(sizeof(DHT_CS_REPLY_RESULTS) + ntohl(value->size) +
sizeof(HashCode512));
- reply->header.size = htons(sizeof(DHT_CS_REPLY_RESULTS) + ntohl(value->size)
+ sizeof(HashCode512));
- reply->header.type = htons(DHT_CS_PROTO_REPLY_GET);
+ reply = MALLOC(sizeof(CS_dht_reply_results_MESSAGE) + ntohl(value->size) +
sizeof(HashCode512));
+ reply->header.size = htons(sizeof(CS_dht_reply_results_MESSAGE) +
ntohl(value->size) + sizeof(HashCode512));
+ reply->header.type = htons(CS_PROTO_dht_REPLY_GET);
reply->totalResults = htonl(1);
reply->table = list->table;
reply->key = *key;
@@ -125,7 +125,7 @@
&reply->header)) {
LOG(LOG_WARNING,
_("Failed to send '%s'. Closing connection.\n"),
- "DHT_CS_REPLY_RESULTS");
+ "CS_dht_reply_results_MESSAGE");
MUTEX_LOCK(&list->lock);
releaseClientSocket(list->sock);
list->sock = NULL;
@@ -143,13 +143,13 @@
* them to the implementation of list->store).
*/
static void * process_thread(TableList * list) {
- CS_HEADER * buffer;
- CS_HEADER * reply;
- DHT_CS_REQUEST_JOIN req;
+ CS_MESSAGE_HEADER * buffer;
+ CS_MESSAGE_HEADER * reply;
+ CS_dht_request_join_MESSAGE req;
int ok;
- req.header.size = htons(sizeof(DHT_CS_REQUEST_JOIN));
- req.header.type = htons(DHT_CS_PROTO_REQUEST_JOIN);
+ req.header.size = htons(sizeof(CS_dht_request_join_MESSAGE));
+ req.header.type = htons(CS_PROTO_dht_REQUEST_JOIN);
req.table = list->table;
while (list->leave_request == NO) {
@@ -191,12 +191,12 @@
ntohs(buffer->type));
switch (ntohs(buffer->type)) {
- case DHT_CS_PROTO_REQUEST_GET: {
- DHT_CS_REQUEST_GET * req;
+ case CS_PROTO_dht_REQUEST_GET: {
+ CS_dht_request_get_MESSAGE * req;
int resCount;
int keyCount;
- if (sizeof(DHT_CS_REQUEST_GET) != ntohs(buffer->size)) {
+ if (sizeof(CS_dht_request_get_MESSAGE) != ntohs(buffer->size)) {
LOG(LOG_ERROR,
_("Received invalid '%s' request (size %d)\n"),
"GET",
@@ -207,7 +207,7 @@
MUTEX_UNLOCK(&list->lock);
FREE(buffer);
}
- req = (DHT_CS_REQUEST_GET*) buffer;
+ req = (CS_dht_request_get_MESSAGE*) buffer;
if (! equalsHashCode512(&req->table,
&list->table)) {
LOG(LOG_ERROR,
@@ -220,7 +220,7 @@
break;
}
- keyCount = 1 + ( (ntohs(req->header.size) - sizeof(DHT_CS_REQUEST_GET))
/ sizeof(HashCode512));
+ keyCount = 1 + ( (ntohs(req->header.size) -
sizeof(CS_dht_request_get_MESSAGE)) / sizeof(HashCode512));
resCount = list->store->get(list->store->closure,
ntohl(req->type),
ntohl(req->priority),
@@ -244,11 +244,11 @@
}
- case DHT_CS_PROTO_REQUEST_PUT: {
- DHT_CS_REQUEST_PUT * req;
+ case CS_PROTO_dht_REQUEST_PUT: {
+ CS_dht_request_put_MESSAGE * req;
DataContainer * value;
- if (sizeof(DHT_CS_REQUEST_PUT) > ntohs(buffer->size)) {
+ if (sizeof(CS_dht_request_put_MESSAGE) > ntohs(buffer->size)) {
LOG(LOG_ERROR,
_("Received invalid '%s' request (size %d)\n"),
"PUT",
@@ -259,7 +259,7 @@
MUTEX_UNLOCK(&list->lock);
break;
}
- req = (DHT_CS_REQUEST_PUT*) buffer;
+ req = (CS_dht_request_put_MESSAGE*) buffer;
if (! equalsHashCode512(&req->table,
&list->table)) {
LOG(LOG_ERROR,
@@ -272,12 +272,12 @@
break;
}
value = MALLOC(sizeof(DataContainer) +
- ntohs(buffer->size) - sizeof(DHT_CS_REQUEST_PUT));
+ ntohs(buffer->size) -
sizeof(CS_dht_request_put_MESSAGE));
value->size = htonl(sizeof(DataContainer) +
- ntohs(buffer->size) - sizeof(DHT_CS_REQUEST_PUT));
+ ntohs(buffer->size) -
sizeof(CS_dht_request_put_MESSAGE));
memcpy(&value[1],
&req[1],
- ntohs(buffer->size) - sizeof(DHT_CS_REQUEST_PUT));
+ ntohs(buffer->size) - sizeof(CS_dht_request_put_MESSAGE));
if (OK !=
sendAck(list->sock,
&req->table,
@@ -298,11 +298,11 @@
}
- case DHT_CS_PROTO_REQUEST_REMOVE: {
- DHT_CS_REQUEST_REMOVE * req;
+ case CS_PROTO_dht_REQUEST_REMOVE: {
+ CS_dht_request_remove_MESSAGE * req;
DataContainer * value;
- if (sizeof(DHT_CS_REQUEST_REMOVE) > ntohs(buffer->size)) {
+ if (sizeof(CS_dht_request_remove_MESSAGE) > ntohs(buffer->size)) {
LOG(LOG_ERROR,
_("Received invalid '%s' request (size %d)\n"),
"REMOVE",
@@ -313,7 +313,7 @@
MUTEX_UNLOCK(&list->lock);
break;
}
- req = (DHT_CS_REQUEST_REMOVE*) buffer;
+ req = (CS_dht_request_remove_MESSAGE*) buffer;
if (! equalsHashCode512(&req->table,
&list->table)) {
LOG(LOG_ERROR,
@@ -327,12 +327,12 @@
}
value = MALLOC(sizeof(DataContainer) +
- ntohs(buffer->size) - sizeof(DHT_CS_REQUEST_REMOVE));
+ ntohs(buffer->size) -
sizeof(CS_dht_request_remove_MESSAGE));
value->size = htonl(sizeof(DataContainer) +
- ntohs(buffer->size) -
sizeof(DHT_CS_REQUEST_REMOVE));
+ ntohs(buffer->size) -
sizeof(CS_dht_request_remove_MESSAGE));
memcpy(&value[1],
&req[1],
- ntohs(buffer->size) - sizeof(DHT_CS_REQUEST_REMOVE));
+ ntohs(buffer->size) - sizeof(CS_dht_request_remove_MESSAGE));
if (OK !=
sendAck(list->sock,
&req->table,
@@ -351,11 +351,11 @@
break;
}
- case DHT_CS_PROTO_REQUEST_ITERATE: {
- DHT_CS_REQUEST_ITERATE * req;
+ case CS_PROTO_dht_REQUEST_ITERATE: {
+ CS_dht_request_iterate_MESSAGE * req;
int resCount;
- if (sizeof(DHT_CS_REQUEST_ITERATE) != ntohs(buffer->size)) {
+ if (sizeof(CS_dht_request_iterate_MESSAGE) != ntohs(buffer->size)) {
LOG(LOG_ERROR,
_("Received invalid '%s' request (size %d)\n"),
"ITERATE",
@@ -366,7 +366,7 @@
MUTEX_UNLOCK(&list->lock);
FREE(buffer);
}
- req = (DHT_CS_REQUEST_ITERATE*) buffer;
+ req = (CS_dht_request_iterate_MESSAGE*) buffer;
resCount = list->store->iterate(list->store->closure,
&sendAllResults,
list);
@@ -474,8 +474,8 @@
TableList * list;
int i;
void * unused;
- DHT_CS_REQUEST_LEAVE req;
- CS_HEADER * reply;
+ CS_dht_request_leave_MESSAGE req;
+ CS_MESSAGE_HEADER * reply;
int ret;
GNUNET_TCP_SOCKET * sock;
@@ -501,8 +501,8 @@
list->leave_request = YES;
/* send LEAVE message! */
- req.header.size = htons(sizeof(DHT_CS_REQUEST_LEAVE));
- req.header.type = htons(DHT_CS_PROTO_REQUEST_LEAVE);
+ req.header.size = htons(sizeof(CS_dht_request_leave_MESSAGE));
+ req.header.type = htons(CS_PROTO_dht_REQUEST_LEAVE);
req.table = *table;
ret = SYSERR;
@@ -518,17 +518,17 @@
else
LOG(LOG_WARNING,
_("gnunetd signaled error in response to '%s' message\n"),
- "DHT_CS_REQUEST_LEAVE");
+ "CS_dht_request_leave_MESSAGE");
FREE(reply);
} else {
LOG(LOG_WARNING,
_("Failed to receive response to '%s' message from gnunetd\n"),
- "DHT_CS_REQUEST_LEAVE");
+ "CS_dht_request_leave_MESSAGE");
}
} else {
LOG(LOG_WARNING,
_("Failed to send '%s' message to gnunetd\n"),
- "DHT_CS_REQUEST_LEAVE");
+ "CS_dht_request_leave_MESSAGE");
}
releaseClientSocket(sock);
}
@@ -573,9 +573,9 @@
DataProcessor processor,
void * closure) {
GNUNET_TCP_SOCKET * sock;
- DHT_CS_REQUEST_GET * req;
- DHT_CS_REPLY_RESULTS * res;
- CS_HEADER * reply;
+ CS_dht_request_get_MESSAGE * req;
+ CS_dht_reply_results_MESSAGE * res;
+ CS_MESSAGE_HEADER * reply;
int ret;
unsigned int size;
DataContainer * result;
@@ -584,11 +584,11 @@
if (sock == NULL)
return SYSERR;
- req = MALLOC(sizeof(DHT_CS_REQUEST_GET) +
+ req = MALLOC(sizeof(CS_dht_request_get_MESSAGE) +
(keyCount-1) * sizeof(HashCode512));
- req->header.size = htons(sizeof(DHT_CS_REQUEST_GET) +
+ req->header.size = htons(sizeof(CS_dht_request_get_MESSAGE) +
(keyCount-1) * sizeof(HashCode512));
- req->header.type = htons(DHT_CS_PROTO_REQUEST_GET);
+ req->header.type = htons(CS_PROTO_dht_REQUEST_GET);
req->type = htonl(type);
req->timeout = htonll(timeout);
req->table = *table;
@@ -609,15 +609,15 @@
releaseClientSocket(sock);
return SYSERR;
}
- if ( (sizeof(DHT_CS_REPLY_ACK) == ntohs(reply->size)) &&
- (DHT_CS_PROTO_REPLY_ACK == ntohs(reply->type)) ) {
+ if ( (sizeof(CS_dht_reply_ack_MESSAGE) == ntohs(reply->size)) &&
+ (CS_PROTO_dht_REPLY_ACK == ntohs(reply->type)) ) {
releaseClientSocket(sock);
ret = checkACK(reply);
FREE(reply);
break; /* termination message, end loop! */
}
- if ( (sizeof(DHT_CS_REPLY_RESULTS) > ntohs(reply->size)) ||
- (DHT_CS_PROTO_REPLY_GET != ntohs(reply->type)) ) {
+ if ( (sizeof(CS_dht_reply_results_MESSAGE) > ntohs(reply->size)) ||
+ (CS_PROTO_dht_REPLY_GET != ntohs(reply->type)) ) {
LOG(LOG_WARNING,
_("Unexpected reply to '%s' operation.\n"),
"GET");
@@ -626,10 +626,10 @@
return SYSERR;
}
/* ok, we got some replies! */
- res = (DHT_CS_REPLY_RESULTS*) reply;
+ res = (CS_dht_reply_results_MESSAGE*) reply;
ret = ntohl(res->totalResults);
- size = ntohs(reply->size) - sizeof(DHT_CS_REPLY_RESULTS);
+ size = ntohs(reply->size) - sizeof(CS_dht_reply_results_MESSAGE);
result = MALLOC(size + sizeof(DataContainer));
result->size = htonl(size + sizeof(DataContainer));
memcpy(&result[1],
@@ -662,8 +662,8 @@
cron_t timeout,
const DataContainer * value) {
GNUNET_TCP_SOCKET * sock;
- DHT_CS_REQUEST_PUT * req;
- CS_HEADER * reply;
+ CS_dht_request_put_MESSAGE * req;
+ CS_MESSAGE_HEADER * reply;
int ret;
LOG(LOG_DEBUG,
@@ -674,15 +674,15 @@
sock = getClientSocket();
if (sock == NULL)
return SYSERR;
- req = MALLOC(sizeof(DHT_CS_REQUEST_PUT) +
+ req = MALLOC(sizeof(CS_dht_request_put_MESSAGE) +
ntohl(value->size) -
sizeof(DataContainer));
req->header.size
- = htons(sizeof(DHT_CS_REQUEST_PUT) +
+ = htons(sizeof(CS_dht_request_put_MESSAGE) +
ntohl(value->size) -
sizeof(DataContainer));
req->header.type
- = htons(DHT_CS_PROTO_REQUEST_PUT);
+ = htons(CS_PROTO_dht_REQUEST_PUT);
req->table = *table;
req->key = *key;
req->priority = htonl(prio);
@@ -720,20 +720,20 @@
cron_t timeout,
const DataContainer * value) {
GNUNET_TCP_SOCKET * sock;
- DHT_CS_REQUEST_REMOVE * req;
- CS_HEADER * reply;
+ CS_dht_request_remove_MESSAGE * req;
+ CS_MESSAGE_HEADER * reply;
int ret;
size_t n;
sock = getClientSocket();
if (sock == NULL)
return SYSERR;
- n = sizeof(DHT_CS_REQUEST_REMOVE);
+ n = sizeof(CS_dht_request_remove_MESSAGE);
if (value != NULL)
n += ntohl(value->size) - sizeof(DataContainer);
req = MALLOC(n);
req->header.size = htons(n);
- req->header.type = htons(DHT_CS_PROTO_REQUEST_REMOVE);
+ req->header.type = htons(CS_PROTO_dht_REQUEST_REMOVE);
req->table = *table;
req->key = *key;
req->timeout = htonll(timeout);
Modified: GNUnet/src/applications/dht/tools/dhttest2.c
===================================================================
--- GNUnet/src/applications/dht/tools/dhttest2.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/dht/tools/dhttest2.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -91,7 +91,7 @@
"GNUNETD-CONFIG",
"peer2.conf"));
daemon2 = startGNUnetDaemon(NO);
- /* in case existing HELOs have expired */
+ /* in case existing hellos have expired */
gnunet_util_sleep(30 * cronSECONDS);
system("cp peer1/data/hosts/* peer2/data/hosts/");
system("cp peer2/data/hosts/* peer1/data/hosts/");
@@ -106,7 +106,7 @@
GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
}
- /* re-start, this time we're sure up-to-date HELOs are available */
+ /* re-start, this time we're sure up-to-date hellos are available */
FREENONNULL(setConfigurationString("GNUNET",
"GNUNETD-CONFIG",
"peer1.conf"));
Modified: GNUnet/src/applications/dht/tools/peer1.conf
===================================================================
--- GNUnet/src/applications/dht/tools/peer1.conf 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/dht/tools/peer1.conf 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -4,7 +4,7 @@
[GNUNETD]
GNUNETD_HOME = peer1
# VALGRIND = 300
-HELOEXPIRES = 60
+HELLOEXPIRES = 60
LOGLEVEL = WARNING
LOGFILE = $GNUNETD_HOME/log
KEEPLOG = 0
Modified: GNUnet/src/applications/dht/tools/peer2.conf
===================================================================
--- GNUnet/src/applications/dht/tools/peer2.conf 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/dht/tools/peer2.conf 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -4,7 +4,7 @@
[GNUNETD]
GNUNETD_HOME = peer2
# VALGRIND = 300
-HELOEXPIRES = 60
+HELLOEXPIRES = 60
LOGLEVEL = WARNING
LOGFILE = $GNUNETD_HOME/log
KEEPLOG = 0
Modified: GNUnet/src/applications/fragmentation/fragmentation.c
===================================================================
--- GNUnet/src/applications/fragmentation/fragmentation.c 2005-07-17
23:19:45 UTC (rev 1575)
+++ GNUnet/src/applications/fragmentation/fragmentation.c 2005-07-17
23:21:45 UTC (rev 1576)
@@ -42,7 +42,7 @@
* Message fragment.
*/
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
/**
* Fragment identity.
@@ -59,16 +59,16 @@
*/
unsigned short len;
-} FRAGMENT_Message;
+} P2P_fragmentation_MESSAGE;
/**
* Message fragment.
*/
typedef struct {
- FRAGMENT_Message fragment_message;
+ P2P_fragmentation_MESSAGE fragment_message;
char data[1];
-} FRAGMENT_Message_GENERIC;
+} P2P_fragmentation_MESSAGE_GENERIC;
/**
* How many buckets does the fragment hash table
@@ -88,7 +88,7 @@
*/
typedef struct FL {
struct FL * link;
- FRAGMENT_Message * frag;
+ P2P_fragmentation_MESSAGE * frag;
} FL;
/**
@@ -102,7 +102,7 @@
cron_t ttl;
} FC;
-#define FRAGSIZE(fl) ((ntohs(fl->frag->header.size)-sizeof(FRAGMENT_Message)))
+#define FRAGSIZE(fl)
((ntohs(fl->frag->header.size)-sizeof(P2P_fragmentation_MESSAGE)))
static CoreAPIForApplication * coreAPI;
@@ -216,7 +216,7 @@
pos = pep->head;
while (pos != NULL) {
memcpy(&msg[ntohs(pos->frag->off)],
- &((FRAGMENT_Message_GENERIC*)pos->frag)->data[0],
+ &((P2P_fragmentation_MESSAGE_GENERIC*)pos->frag)->data[0],
FRAGSIZE(pos));
pos = pos->link;
}
@@ -250,7 +250,7 @@
*/
static int tryJoin(FC * entry,
const PeerIdentity * sender,
- const FRAGMENT_Message * packet) {
+ const P2P_fragmentation_MESSAGE * packet) {
/* frame before ours; may end in the middle of
our frame or before it starts; NULL if we are
the earliest position we have received so far */
@@ -288,7 +288,7 @@
}
/* find the after-frame */
- end = ntohs(packet->off) + ntohs(packet->header.size) -
sizeof(FRAGMENT_Message);
+ end = ntohs(packet->off) + ntohs(packet->header.size) -
sizeof(P2P_fragmentation_MESSAGE);
if (end <= ntohs(packet->off)) {
LOG(LOG_DEBUG,
"Received invalid fragment at %s:%d\n",
@@ -382,11 +382,11 @@
* @return SYSERR if the fragment is invalid
*/
static int processFragment(const PeerIdentity * sender,
- const p2p_HEADER * frag) {
+ const P2P_MESSAGE_HEADER * frag) {
unsigned int hash;
FC * smf;
- if (ntohs(frag->size) < sizeof(FRAGMENT_Message))
+ if (ntohs(frag->size) < sizeof(P2P_fragmentation_MESSAGE))
return SYSERR;
MUTEX_LOCK(&defragCacheLock);
@@ -395,7 +395,7 @@
while (smf != NULL) {
if (OK == tryJoin(smf,
sender,
- (FRAGMENT_Message*) frag)) {
+ (P2P_fragmentation_MESSAGE*) frag)) {
MUTEX_UNLOCK(&defragCacheLock);
return OK;
}
@@ -413,7 +413,7 @@
smf->ttl = cronTime(NULL) + DEFRAGMENTATION_TIMEOUT;
smf->sender = *sender;
}
- smf->id = ntohl(((FRAGMENT_Message*)frag)->id);
+ smf->id = ntohl(((P2P_fragmentation_MESSAGE*)frag)->id);
smf->head = MALLOC(sizeof(FL));
smf->head->link = NULL;
smf->head->frag = MALLOC(ntohs(frag->size));
@@ -438,7 +438,7 @@
/**
* Send a message that had to be fragmented (right now!). First grabs
* the first part of the message (obtained from ctx->se) and stores
- * that in a FRAGMENT_Message envelope. The remaining fragments are
+ * that in a P2P_fragmentation_MESSAGE envelope. The remaining fragments are
* added to the send queue with EXTREME_PRIORITY (to ensure that they
* will be transmitted next). The logic here is that if the priority
* for the first fragment was sufficiently high, the priority should
@@ -452,7 +452,7 @@
FragmentBMC * ctx,
unsigned short len) {
static int idGen = 0;
- FRAGMENT_Message * frag;
+ P2P_fragmentation_MESSAGE * frag;
unsigned int pos;
int id;
unsigned short mlen;
@@ -466,37 +466,37 @@
stats->change(stat_fragmented, 1);
id = (idGen++) + randomi(512);
/* write first fragment to buf */
- frag = (FRAGMENT_Message*) buf;
+ frag = (P2P_fragmentation_MESSAGE*) buf;
frag->header.size = htons(len);
- frag->header.type = htons(p2p_PROTO_FRAGMENT);
+ frag->header.type = htons(P2P_PROTO_fragment);
frag->id = id;
frag->off = htons(0);
frag->len = htons(ctx->len);
- memcpy(&((FRAGMENT_Message_GENERIC*)frag)->data[0],
+ memcpy(&((P2P_fragmentation_MESSAGE_GENERIC*)frag)->data[0],
&ctx[1],
- len - sizeof(FRAGMENT_Message));
+ len - sizeof(P2P_fragmentation_MESSAGE));
/* create remaining fragments, add to queue! */
- pos = len - sizeof(FRAGMENT_Message);
+ pos = len - sizeof(P2P_fragmentation_MESSAGE);
frag = MALLOC(ctx->mtu);
while (pos < ctx->len) {
- mlen = sizeof(FRAGMENT_Message) + ctx->len - pos;
+ mlen = sizeof(P2P_fragmentation_MESSAGE) + ctx->len - pos;
if (mlen > ctx->mtu)
mlen = ctx->mtu;
- GNUNET_ASSERT(mlen > sizeof(FRAGMENT_Message));
+ GNUNET_ASSERT(mlen > sizeof(P2P_fragmentation_MESSAGE));
frag->header.size = htons(mlen);
- frag->header.type = htons(p2p_PROTO_FRAGMENT);
+ frag->header.type = htons(P2P_PROTO_fragment);
frag->id = id;
frag->off = htons(pos);
frag->len = htons(ctx->len);
- memcpy(&((FRAGMENT_Message_GENERIC*)frag)->data[0],
+ memcpy(&((P2P_fragmentation_MESSAGE_GENERIC*)frag)->data[0],
&ctx[1],
- mlen - sizeof(FRAGMENT_Message));
+ mlen - sizeof(P2P_fragmentation_MESSAGE));
coreAPI->unicast(&ctx->sender,
&frag->header,
EXTREME_PRIORITY,
ctx->transmissionTime - cronTime(NULL));
- pos += mlen - sizeof(FRAGMENT_Message);
+ pos += mlen - sizeof(P2P_fragmentation_MESSAGE);
}
GNUNET_ASSERT(pos == ctx->len);
FREE(frag);
@@ -521,7 +521,7 @@
int xlen;
GNUNET_ASSERT(len > mtu);
- GNUNET_ASSERT(mtu > sizeof(FRAGMENT_Message));
+ GNUNET_ASSERT(mtu > sizeof(P2P_fragmentation_MESSAGE));
fbmc = MALLOC(sizeof(FragmentBMC) + len);
fbmc->mtu = mtu;
fbmc->sender = *peer;
@@ -533,7 +533,7 @@
FREE(fbmc);
return;
}
- xlen = mtu - sizeof(FRAGMENT_Message);
+ xlen = mtu - sizeof(P2P_fragmentation_MESSAGE);
coreAPI->unicastCallback(peer,
(BuildMessageCallback) &fragmentBMC,
fbmc,
@@ -567,8 +567,8 @@
LOG(LOG_DEBUG,
_("'%s' registering handler %d\n"),
"fragmentation",
- p2p_PROTO_FRAGMENT);
- capi->registerHandler(p2p_PROTO_FRAGMENT,
+ P2P_PROTO_fragment);
+ capi->registerHandler(P2P_PROTO_fragment,
&processFragment);
ret.fragment = &fragment;
@@ -581,7 +581,7 @@
void release_module_fragmentation() {
int i;
- coreAPI->unregisterHandler(p2p_PROTO_FRAGMENT,
+ coreAPI->unregisterHandler(P2P_PROTO_fragment,
&processFragment);
delCronJob((CronJob) &defragmentationPurgeCron,
60 * cronSECONDS,
Modified: GNUnet/src/applications/fragmentation/fragmentationtest.c
===================================================================
--- GNUnet/src/applications/fragmentation/fragmentationtest.c 2005-07-17
23:19:45 UTC (rev 1575)
+++ GNUnet/src/applications/fragmentation/fragmentationtest.c 2005-07-17
23:21:45 UTC (rev 1576)
@@ -81,22 +81,22 @@
* @param length of the data portion
* @param id the identity of the fragment
*/
-static p2p_HEADER * makeFragment(unsigned short start,
+static P2P_MESSAGE_HEADER * makeFragment(unsigned short start,
unsigned short size,
unsigned short tot,
int id) {
- FRAGMENT_Message * frag;
+ P2P_fragmentation_MESSAGE * frag;
int i;
- frag = (FRAGMENT_Message*) masterBuffer;
+ frag = (P2P_fragmentation_MESSAGE*) masterBuffer;
frag->id = htonl(id);
frag->off = htons(start);
frag->len = htons(tot);
frag->header.size
- = htons(sizeof(FRAGMENT_Message) + size);
+ = htons(sizeof(P2P_fragmentation_MESSAGE) + size);
for (i=0;i<size;i++)
- ((FRAGMENT_Message_GENERIC*)frag)->data[i]
+ ((P2P_fragmentation_MESSAGE_GENERIC*)frag)->data[i]
= (char)i+id+start;
return &frag->header;
}
@@ -123,7 +123,7 @@
/* **************** actual testcases ***************** */
static void testSimpleFragment() {
- p2p_HEADER * pep;
+ P2P_MESSAGE_HEADER * pep;
pep = makeFragment(0, 16, 32, 42);
processFragment(&mySender, pep);
@@ -134,7 +134,7 @@
}
static void testSimpleFragmentTimeout() {
- p2p_HEADER * pep;
+ P2P_MESSAGE_HEADER * pep;
pep = makeFragment(0, 16, 32, 42);
processFragment(&mySender, pep);
@@ -149,7 +149,7 @@
}
static void testSimpleFragmentReverse() {
- p2p_HEADER * pep;
+ P2P_MESSAGE_HEADER * pep;
pep = makeFragment(16, 16, 32, 42);
processFragment(&mySender, pep);
@@ -160,7 +160,7 @@
}
static void testManyFragments() {
- p2p_HEADER * pep;
+ P2P_MESSAGE_HEADER * pep;
int i;
for (i=0;i<50;i++) {
@@ -174,7 +174,7 @@
}
static void testManyFragmentsMegaLarge() {
- p2p_HEADER * pep;
+ P2P_MESSAGE_HEADER * pep;
int i;
for (i=0;i<4000;i++) {
@@ -188,7 +188,7 @@
}
static void testLastFragmentEarly() {
- p2p_HEADER * pep;
+ P2P_MESSAGE_HEADER * pep;
int i;
for (i=0;i<5;i++) {
@@ -206,7 +206,7 @@
}
static void testManyInterleavedFragments() {
- p2p_HEADER * pep;
+ P2P_MESSAGE_HEADER * pep;
int i;
for (i=0;i<50;i++) {
@@ -225,7 +225,7 @@
}
static void testManyInterleavedOverlappingFragments() {
- p2p_HEADER * pep;
+ P2P_MESSAGE_HEADER * pep;
int i;
for (i=0;i<50;i++) {
@@ -244,7 +244,7 @@
}
static void testManyOverlappingFragments() {
- p2p_HEADER * pep;
+ P2P_MESSAGE_HEADER * pep;
int i;
for (i=0;i<50;i++) {
@@ -258,7 +258,7 @@
}
static void testManyOverlappingFragmentsTimeout() {
- p2p_HEADER * pep;
+ P2P_MESSAGE_HEADER * pep;
int i;
for (i=0;i<50;i++) {
@@ -278,7 +278,7 @@
}
static void testManyFragmentsMultiId() {
- p2p_HEADER * pep;
+ P2P_MESSAGE_HEADER * pep;
int i;
int id;
@@ -299,7 +299,7 @@
}
static void testManyFragmentsMultiIdCollisions() {
- p2p_HEADER * pep;
+ P2P_MESSAGE_HEADER * pep;
int i;
int id;
Modified: GNUnet/src/applications/fs/ecrs/check.conf
===================================================================
--- GNUnet/src/applications/fs/ecrs/check.conf 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/fs/ecrs/check.conf 2005-07-17 23:21:45 UTC (rev
1576)
@@ -4,7 +4,7 @@
[GNUNETD]
GNUNETD_HOME = /tmp/gnunet-check-ecrs
# VALGRIND = 300
-HELOEXPIRES = 60
+HELLOEXPIRES = 60
LOGLEVEL = NOTHING
LOGFILE = $GNUNETD_HOME/logs
KEEPLOG = 0
Modified: GNUnet/src/applications/fs/fsui/check.conf
===================================================================
--- GNUnet/src/applications/fs/fsui/check.conf 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/fs/fsui/check.conf 2005-07-17 23:21:45 UTC (rev
1576)
@@ -4,7 +4,7 @@
[GNUNETD]
GNUNETD_HOME = /tmp/gnunet-check-fsui
# VALGRIND = 300
-HELOEXPIRES = 60
+HELLOEXPIRES = 60
LOGLEVEL = ERROR
LOGFILE = $GNUNETD_HOME/logs
KEEPLOG = 0
Modified: GNUnet/src/applications/fs/lib/check.conf
===================================================================
--- GNUnet/src/applications/fs/lib/check.conf 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/fs/lib/check.conf 2005-07-17 23:21:45 UTC (rev
1576)
@@ -4,7 +4,7 @@
[GNUNETD]
GNUNETD_HOME = /tmp/gnunet-check-fslib
VALGRIND = 300
-HELOEXPIRES = 60
+HELLOEXPIRES = 60
LOGLEVEL = DEBUG
LOGFILE = $GNUNETD_HOME/logs
KEEPLOG = 0
Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/fs/lib/fslib.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -30,7 +30,7 @@
#include "ecrs_core.h"
typedef struct FS_SEARCH_HANDLE {
- RequestSearch * req;
+ CS_fs_request_search_MESSAGE * req;
Datum_Iterator callback;
void * closure;
} SEARCH_HANDLE;
@@ -50,9 +50,9 @@
* calls the appropriate callback.
*/
static void * processReplies(SEARCH_CONTEXT * ctx) {
- CS_HEADER * hdr;
+ CS_MESSAGE_HEADER * hdr;
int i;
- ReplyContent * rep;
+ CS_fs_reply_content_MESSAGE * rep;
HashCode512 query;
unsigned int size;
cron_t delay;
@@ -66,14 +66,14 @@
/* verify hdr, if reply, process, otherwise
signal protocol problem; if ok, find
matching callback, call on value */
- if ( (ntohs(hdr->size) < sizeof(ReplyContent)) ||
- (ntohs(hdr->type) != AFS_CS_PROTO_RESULT) ) {
+ if ( (ntohs(hdr->size) < sizeof(CS_fs_reply_content_MESSAGE)) ||
+ (ntohs(hdr->type) != CS_PROTO_gap_RESULT) ) {
BREAK();
FREE(hdr);
continue;
}
- rep = (ReplyContent*) hdr;
- size = ntohs(hdr->size) - sizeof(ReplyContent);
+ rep = (CS_fs_reply_content_MESSAGE*) hdr;
+ size = ntohs(hdr->size) - sizeof(CS_fs_reply_content_MESSAGE);
if (OK != getQueryFor(size,
(DBlock*)&rep[1],
&query)) {
@@ -172,13 +172,13 @@
Datum_Iterator callback,
void * closure) {
SEARCH_HANDLE * ret;
- RequestSearch * req;
+ CS_fs_request_search_MESSAGE * req;
EncName enc;
ret = MALLOC(sizeof(SEARCH_HANDLE));
- req = MALLOC(sizeof(RequestSearch) + (keyCount-1) * sizeof(HashCode512));
- req->header.size = htons(sizeof(RequestSearch) + (keyCount-1) *
sizeof(HashCode512));
- req->header.type = htons(AFS_CS_PROTO_QUERY_START);
+ req = MALLOC(sizeof(CS_fs_request_search_MESSAGE) + (keyCount-1) *
sizeof(HashCode512));
+ req->header.size = htons(sizeof(CS_fs_request_search_MESSAGE) + (keyCount-1)
* sizeof(HashCode512));
+ req->header.type = htons(CS_PROTO_gap_QUERY_START);
req->prio = htonl(prio);
req->anonymityLevel = htonl(anonymityLevel);
req->expiration = htonll(timeout);
@@ -220,7 +220,7 @@
SEARCH_HANDLE * handle) {
int i;
- handle->req->header.type = htons(AFS_CS_PROTO_QUERY_STOP);
+ handle->req->header.type = htons(CS_PROTO_gap_QUERY_STOP);
writeToSocket(ctx->sock,
&handle->req->header);
MUTEX_LOCK(ctx->lock);
@@ -239,11 +239,11 @@
* in the routing table like? Returns -1 on error.
*/
unsigned int FS_getAveragePriority(GNUNET_TCP_SOCKET * sock) {
- CS_HEADER req;
+ CS_MESSAGE_HEADER req;
unsigned int ret;
- req.size = htons(sizeof(CS_HEADER));
- req.type = htons(AFS_CS_PROTO_GET_AVG_PRIORITY);
+ req.size = htons(sizeof(CS_MESSAGE_HEADER));
+ req.type = htons(CS_PROTO_gap_GET_AVG_PRIORITY);
if (OK != writeToSocket(sock,
&req))
return -1;
@@ -262,7 +262,7 @@
int FS_insert(GNUNET_TCP_SOCKET * sock,
const Datastore_Value * block) {
int ret;
- RequestInsert * ri;
+ CS_fs_request_insert_MESSAGE * ri;
unsigned int size;
if (ntohl(block->size) <= sizeof(Datastore_Value)) {
@@ -270,9 +270,9 @@
return SYSERR;
}
size = ntohl(block->size) - sizeof(Datastore_Value);
- ri = MALLOC(sizeof(RequestInsert) + size);
- ri->header.size = htons(sizeof(RequestInsert) + size);
- ri->header.type = htons(AFS_CS_PROTO_INSERT);
+ ri = MALLOC(sizeof(CS_fs_request_insert_MESSAGE) + size);
+ ri->header.size = htons(sizeof(CS_fs_request_insert_MESSAGE) + size);
+ ri->header.type = htons(CS_PROTO_gap_INSERT);
ri->prio = block->prio;
ri->expiration = block->expirationTime;
ri->anonymityLevel = block->anonymityLevel;
@@ -299,14 +299,14 @@
const HashCode512 * fileHc,
const char * fn) {
int ret;
- RequestInitIndex *ri;
+ CS_fs_request_init_index_MESSAGE *ri;
unsigned int size, fnSize;
fnSize = strlen(fn);
- size = sizeof(RequestInitIndex) + fnSize;
+ size = sizeof(CS_fs_request_init_index_MESSAGE) + fnSize;
ri = MALLOC(size);
ri->header.size = htons(size);
- ri->header.type = htons(AFS_CS_PROTO_INIT_INDEX);
+ ri->header.type = htons(CS_PROTO_gap_INIT_INDEX);
ri->reserved = htonl(0);
ri->fileId = *fileHc;
memcpy(&ri[1], fn, fnSize);
@@ -340,13 +340,13 @@
const Datastore_Value * block,
unsigned long long offset) {
int ret;
- RequestIndex * ri;
+ CS_fs_request_index_MESSAGE * ri;
unsigned int size;
size = ntohl(block->size) - sizeof(Datastore_Value);
- ri = MALLOC(sizeof(RequestIndex) + size);
- ri->header.size = htons(sizeof(RequestIndex) + size);
- ri->header.type = htons(AFS_CS_PROTO_INDEX);
+ ri = MALLOC(sizeof(CS_fs_request_index_MESSAGE) + size);
+ ri->header.size = htons(sizeof(CS_fs_request_index_MESSAGE) + size);
+ ri->header.type = htons(CS_PROTO_gap_INDEX);
ri->prio = block->prio;
ri->expiration = block->expirationTime;
ri->anonymityLevel = block->anonymityLevel;
@@ -382,13 +382,13 @@
int FS_delete(GNUNET_TCP_SOCKET * sock,
const Datastore_Value * block) {
int ret;
- RequestDelete * rd;
+ CS_fs_request_delete_MESSAGE * rd;
unsigned int size;
size = ntohl(block->size) - sizeof(Datastore_Value);
- rd = MALLOC(sizeof(RequestDelete) + size);
- rd->header.size = htons(sizeof(RequestDelete) + size);
- rd->header.type = htons(AFS_CS_PROTO_DELETE);
+ rd = MALLOC(sizeof(CS_fs_request_delete_MESSAGE) + size);
+ rd->header.size = htons(sizeof(CS_fs_request_delete_MESSAGE) + size);
+ rd->header.type = htons(CS_PROTO_gap_DELETE);
memcpy(&rd[1],
&block[1],
size);
@@ -417,10 +417,10 @@
unsigned int blocksize,
const HashCode512 * hc) {
int ret;
- RequestUnindex ru;
+ CS_fs_request_unindex_MESSAGE ru;
- ru.header.size = htons(sizeof(RequestUnindex));
- ru.header.type = htons(AFS_CS_PROTO_UNINDEX);
+ ru.header.size = htons(sizeof(CS_fs_request_unindex_MESSAGE));
+ ru.header.type = htons(CS_PROTO_gap_UNINDEX);
ru.blocksize = htonl(blocksize);
ru.fileId = *hc;
if (OK != writeToSocket(sock,
@@ -444,7 +444,7 @@
int ret;
ri.header.size = htons(sizeof(RequestTestindex));
- ri.header.type = htons(AFS_CS_PROTO_TESTINDEX);
+ ri.header.type = htons(CS_PROTO_gap_TESTINDEX);
ri.reserved = htonl(0);
ri.fileId = *hc;
if (OK != writeToSocket(sock,
Modified: GNUnet/src/applications/fs/module/anonymity.c
===================================================================
--- GNUnet/src/applications/fs/module/anonymity.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/fs/module/anonymity.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -55,7 +55,7 @@
if (traffic == NULL)
return SYSERR;
if (OK != traffic->get(5 * cronSECONDS / TRAFFIC_TIME_UNIT, /*
TTL_DECREMENT/TTU */
- GAP_p2p_PROTO_RESULT,
+ P2P_PROTO_gap_RESULT,
TC_RECEIVED,
&count,
&peers,
Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/fs/module/fs.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -201,16 +201,16 @@
* @return SYSERR if the TCP connection should be closed, otherwise OK
*/
static int csHandleRequestQueryStart(ClientHandle sock,
- const CS_HEADER * req) {
- const RequestSearch * rs;
+ const CS_MESSAGE_HEADER * req) {
+ const CS_fs_request_search_MESSAGE * rs;
unsigned int keyCount;
EncName enc;
- if (ntohs(req->size) < sizeof(RequestSearch)) {
+ if (ntohs(req->size) < sizeof(CS_fs_request_search_MESSAGE)) {
BREAK();
return SYSERR;
}
- rs = (const RequestSearch*) req;
+ rs = (const CS_fs_request_search_MESSAGE*) req;
IFLOG(LOG_DEBUG,
hash2enc(&rs->query[0],
&enc));
@@ -220,7 +220,7 @@
trackQuery(&rs->query[0],
ntohl(rs->type),
sock);
- keyCount = 1 + (ntohs(req->size) - sizeof(RequestSearch)) /
sizeof(HashCode512);
+ keyCount = 1 + (ntohs(req->size) - sizeof(CS_fs_request_search_MESSAGE)) /
sizeof(HashCode512);
gap->get_start(ntohl(rs->type),
ntohl(rs->anonymityLevel),
keyCount,
@@ -252,15 +252,15 @@
* @return SYSERR if the TCP connection should be closed, otherwise OK
*/
static int csHandleRequestQueryStop(ClientHandle sock,
- const CS_HEADER * req) {
- RequestSearch * rs;
+ const CS_MESSAGE_HEADER * req) {
+ CS_fs_request_search_MESSAGE * rs;
EncName enc;
- if (ntohs(req->size) < sizeof(RequestSearch)) {
+ if (ntohs(req->size) < sizeof(CS_fs_request_search_MESSAGE)) {
BREAK();
return SYSERR;
}
- rs = (RequestSearch*) req;
+ rs = (CS_fs_request_search_MESSAGE*) req;
IFLOG(LOG_DEBUG,
hash2enc(&rs->query[0],
&enc));
@@ -271,7 +271,7 @@
/* FIXME 0.7.1: cancel with dht? */
}
gap->get_stop(ntohl(rs->type),
- 1 + (ntohs(req->size) - sizeof(RequestSearch)) /
sizeof(HashCode512),
+ 1 + (ntohs(req->size) - sizeof(CS_fs_request_search_MESSAGE)) /
sizeof(HashCode512),
&rs->query[0]);
untrackQuery(&rs->query[0], sock);
return OK;
@@ -282,28 +282,28 @@
*
* @return SYSERR if the TCP connection should be closed, otherwise OK
*/
-static int csHandleRequestInsert(ClientHandle sock,
- const CS_HEADER * req) {
- const RequestInsert * ri;
+static int csHandleCS_fs_request_insert_MESSAGE(ClientHandle sock,
+ const CS_MESSAGE_HEADER * req) {
+ const CS_fs_request_insert_MESSAGE * ri;
Datastore_Value * datum;
int ret;
HashCode512 query;
unsigned int type;
EncName enc;
- if (ntohs(req->size) < sizeof(RequestInsert)) {
+ if (ntohs(req->size) < sizeof(CS_fs_request_insert_MESSAGE)) {
BREAK();
return SYSERR;
}
- ri = (const RequestInsert*) req;
+ ri = (const CS_fs_request_insert_MESSAGE*) req;
datum = MALLOC(sizeof(Datastore_Value) +
- ntohs(req->size) - sizeof(RequestInsert));
+ ntohs(req->size) - sizeof(CS_fs_request_insert_MESSAGE));
datum->size = htonl(sizeof(Datastore_Value) +
- ntohs(req->size) - sizeof(RequestInsert));
+ ntohs(req->size) - sizeof(CS_fs_request_insert_MESSAGE));
datum->expirationTime = ri->expiration;
datum->prio = ri->prio;
datum->anonymityLevel = ri->anonymityLevel;
- if (OK != getQueryFor(ntohs(ri->header.size) - sizeof(RequestInsert),
+ if (OK != getQueryFor(ntohs(ri->header.size) -
sizeof(CS_fs_request_insert_MESSAGE),
(const DBlock*)&ri[1],
&query)) {
BREAK();
@@ -313,7 +313,7 @@
IFLOG(LOG_DEBUG,
hash2enc(&query,
&enc));
- type = getTypeOfBlock(ntohs(ri->header.size) - sizeof(RequestInsert),
+ type = getTypeOfBlock(ntohs(ri->header.size) -
sizeof(CS_fs_request_insert_MESSAGE),
(const DBlock*) &ri[1]);
LOG(LOG_DEBUG,
"FS received REQUEST INSERT (query: %s, type: %u)\n",
@@ -322,7 +322,7 @@
datum->type = htonl(type);
memcpy(&datum[1],
&ri[1],
- ntohs(req->size) - sizeof(RequestInsert));
+ ntohs(req->size) - sizeof(CS_fs_request_insert_MESSAGE));
MUTEX_LOCK(&lock);
ret = datastore->put(&query,
datum);
@@ -336,7 +336,7 @@
DHT_PUT_CLS * cls;
size = sizeof(GapWrapper) +
- ntohs(ri->header.size) - sizeof(RequestInsert) -
+ ntohs(ri->header.size) - sizeof(CS_fs_request_insert_MESSAGE) -
sizeof(Datastore_Value);
gw = MALLOC(size);
gw->reserved = 0;
@@ -372,21 +372,21 @@
/**
* Process a request to symlink a file
*/
-static int csHandleRequestInitIndex(ClientHandle sock,
- const CS_HEADER * req) {
+static int csHandleCS_fs_request_init_index_MESSAGE(ClientHandle sock,
+ const CS_MESSAGE_HEADER * req) {
int ret;
char *fn;
- RequestInitIndex *ri;
+ CS_fs_request_init_index_MESSAGE *ri;
int fnLen;
- if (ntohs(req->size) < sizeof(RequestInitIndex)) {
+ if (ntohs(req->size) < sizeof(CS_fs_request_init_index_MESSAGE)) {
BREAK();
return SYSERR;
}
- ri = (RequestInitIndex *) req;
+ ri = (CS_fs_request_init_index_MESSAGE *) req;
- fnLen = ntohs(ri->header.size) - sizeof(RequestInitIndex);
+ fnLen = ntohs(ri->header.size) - sizeof(CS_fs_request_init_index_MESSAGE);
#if WINDOWS
if (fnLen > _MAX_PATH)
return SYSERR;
@@ -412,23 +412,23 @@
*
* @return SYSERR if the TCP connection should be closed, otherwise OK
*/
-static int csHandleRequestIndex(ClientHandle sock,
- const CS_HEADER * req) {
+static int csHandleCS_fs_request_index_MESSAGE(ClientHandle sock,
+ const CS_MESSAGE_HEADER * req) {
int ret;
- const RequestIndex * ri;
+ const CS_fs_request_index_MESSAGE * ri;
- if (ntohs(req->size) < sizeof(RequestIndex)) {
+ if (ntohs(req->size) < sizeof(CS_fs_request_index_MESSAGE)) {
BREAK();
return SYSERR;
}
- ri = (const RequestIndex*) req;
+ ri = (const CS_fs_request_index_MESSAGE*) req;
ret = ONDEMAND_index(datastore,
ntohl(ri->prio),
ntohll(ri->expiration),
ntohll(ri->fileOffset),
ntohl(ri->anonymityLevel),
&ri->fileId,
- ntohs(ri->header.size) - sizeof(RequestIndex),
+ ntohs(ri->header.size) -
sizeof(CS_fs_request_index_MESSAGE),
(const DBlock*) &ri[1]);
LOG(LOG_DEBUG,
"Sending confirmation (%s) of index request to client\n",
@@ -471,31 +471,31 @@
*
* @return SYSERR if the TCP connection should be closed, otherwise OK
*/
-static int csHandleRequestDelete(ClientHandle sock,
- const CS_HEADER * req) {
+static int csHandleCS_fs_request_delete_MESSAGE(ClientHandle sock,
+ const CS_MESSAGE_HEADER * req) {
int ret;
- const RequestDelete * rd;
+ const CS_fs_request_delete_MESSAGE * rd;
Datastore_Value * value;
HashCode512 query;
unsigned int type;
EncName enc;
- if (ntohs(req->size) < sizeof(RequestDelete)) {
+ if (ntohs(req->size) < sizeof(CS_fs_request_delete_MESSAGE)) {
BREAK();
return SYSERR;
}
- rd = (const RequestDelete*) req;
+ rd = (const CS_fs_request_delete_MESSAGE*) req;
value = MALLOC(sizeof(Datastore_Value) +
- ntohs(req->size) - sizeof(RequestDelete));
+ ntohs(req->size) - sizeof(CS_fs_request_delete_MESSAGE));
value->size = ntohl(sizeof(Datastore_Value) +
- ntohs(req->size) - sizeof(RequestDelete));
- type = getTypeOfBlock(ntohs(rd->header.size) - sizeof(RequestDelete),
+ ntohs(req->size) - sizeof(CS_fs_request_delete_MESSAGE));
+ type = getTypeOfBlock(ntohs(rd->header.size) -
sizeof(CS_fs_request_delete_MESSAGE),
(const DBlock*)&rd[1]);
value->type = htonl(type);
memcpy(&value[1],
&rd[1],
- ntohs(req->size) - sizeof(RequestDelete));
- if (OK != getQueryFor(ntohs(rd->header.size) - sizeof(RequestDelete),
+ ntohs(req->size) - sizeof(CS_fs_request_delete_MESSAGE));
+ if (OK != getQueryFor(ntohs(rd->header.size) -
sizeof(CS_fs_request_delete_MESSAGE),
(const DBlock*)&rd[1],
&query)) {
FREE(value);
@@ -531,16 +531,16 @@
/**
* Process a client request unindex content.
*/
-static int csHandleRequestUnindex(ClientHandle sock,
- const CS_HEADER * req) {
+static int csHandleCS_fs_request_unindex_MESSAGE(ClientHandle sock,
+ const CS_MESSAGE_HEADER * req) {
int ret;
- RequestUnindex * ru;
+ CS_fs_request_unindex_MESSAGE * ru;
- if (ntohs(req->size) != sizeof(RequestUnindex)) {
+ if (ntohs(req->size) != sizeof(CS_fs_request_unindex_MESSAGE)) {
BREAK();
return SYSERR;
}
- ru = (RequestUnindex*) req;
+ ru = (CS_fs_request_unindex_MESSAGE*) req;
LOG(LOG_DEBUG,
"FS received REQUEST UNINDEX\n");
ret = ONDEMAND_unindex(datastore,
@@ -554,8 +554,8 @@
* Process a client request to test if certain
* data is indexed.
*/
-static int csHandleRequestTestIndexed(ClientHandle sock,
- const CS_HEADER * req) {
+static int csHandleCS_fs_request_test_index_MESSAGEed(ClientHandle sock,
+ const CS_MESSAGE_HEADER * req) {
int ret;
RequestTestindex * ru;
@@ -577,7 +577,7 @@
* averge priority.
*/
static int csHandleRequestGetAvgPriority(ClientHandle sock,
- const CS_HEADER * req) {
+ const CS_MESSAGE_HEADER * req) {
LOG(LOG_DEBUG,
"FS received REQUEST GETAVGPRIORITY\n");
return coreAPI->sendValueToClient(sock,
@@ -1001,33 +1001,33 @@
LOG(LOG_DEBUG,
_("'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"),
"fs",
- AFS_CS_PROTO_QUERY_START,
- AFS_CS_PROTO_QUERY_STOP,
- AFS_CS_PROTO_INSERT,
- AFS_CS_PROTO_INDEX,
- AFS_CS_PROTO_DELETE,
- AFS_CS_PROTO_UNINDEX,
- AFS_CS_PROTO_TESTINDEX,
- AFS_CS_PROTO_GET_AVG_PRIORITY,
- AFS_CS_PROTO_INIT_INDEX);
+ CS_PROTO_gap_QUERY_START,
+ CS_PROTO_gap_QUERY_STOP,
+ CS_PROTO_gap_INSERT,
+ CS_PROTO_gap_INDEX,
+ CS_PROTO_gap_DELETE,
+ CS_PROTO_gap_UNINDEX,
+ CS_PROTO_gap_TESTINDEX,
+ CS_PROTO_gap_GET_AVG_PRIORITY,
+ CS_PROTO_gap_INIT_INDEX);
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(AFS_CS_PROTO_QUERY_START,
+ GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_QUERY_START,
&csHandleRequestQueryStart));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(AFS_CS_PROTO_QUERY_STOP,
+ GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_QUERY_STOP,
&csHandleRequestQueryStop));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(AFS_CS_PROTO_INSERT,
- &csHandleRequestInsert));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(AFS_CS_PROTO_INDEX,
- &csHandleRequestIndex));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(AFS_CS_PROTO_INIT_INDEX,
-
&csHandleRequestInitIndex));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(AFS_CS_PROTO_DELETE,
- &csHandleRequestDelete));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(AFS_CS_PROTO_UNINDEX,
- &csHandleRequestUnindex));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(AFS_CS_PROTO_TESTINDEX,
-
&csHandleRequestTestIndexed));
- GNUNET_ASSERT(SYSERR !=
capi->registerClientHandler(AFS_CS_PROTO_GET_AVG_PRIORITY,
+ GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_INSERT,
+
&csHandleCS_fs_request_insert_MESSAGE));
+ GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_INDEX,
+
&csHandleCS_fs_request_index_MESSAGE));
+ GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_INIT_INDEX,
+
&csHandleCS_fs_request_init_index_MESSAGE));
+ GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_DELETE,
+
&csHandleCS_fs_request_delete_MESSAGE));
+ GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_UNINDEX,
+
&csHandleCS_fs_request_unindex_MESSAGE));
+ GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_TESTINDEX,
+
&csHandleCS_fs_request_test_index_MESSAGEed));
+ GNUNET_ASSERT(SYSERR !=
capi->registerClientHandler(CS_PROTO_gap_GET_AVG_PRIORITY,
&csHandleRequestGetAvgPriority));
initMigration(capi,
datastore,
@@ -1050,23 +1050,23 @@
"Leaving DHT complete.");
}
- GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(AFS_CS_PROTO_QUERY_START,
+ GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_QUERY_START,
&csHandleRequestQueryStart));
- GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(AFS_CS_PROTO_QUERY_STOP,
+ GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_QUERY_STOP,
&csHandleRequestQueryStop));
- GNUNET_ASSERT(SYSERR != coreAPI->unregisterClientHandler(AFS_CS_PROTO_INSERT,
-
&csHandleRequestInsert));
- GNUNET_ASSERT(SYSERR != coreAPI->unregisterClientHandler(AFS_CS_PROTO_INDEX,
-
&csHandleRequestIndex));
- GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(AFS_CS_PROTO_INIT_INDEX,
-
&csHandleRequestInitIndex));
- GNUNET_ASSERT(SYSERR != coreAPI->unregisterClientHandler(AFS_CS_PROTO_DELETE,
-
&csHandleRequestDelete));
- GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(AFS_CS_PROTO_UNINDEX,
-
&csHandleRequestUnindex));
- GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(AFS_CS_PROTO_TESTINDEX,
-
&csHandleRequestTestIndexed));
- GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(AFS_CS_PROTO_GET_AVG_PRIORITY,
+ GNUNET_ASSERT(SYSERR != coreAPI->unregisterClientHandler(CS_PROTO_gap_INSERT,
+
&csHandleCS_fs_request_insert_MESSAGE));
+ GNUNET_ASSERT(SYSERR != coreAPI->unregisterClientHandler(CS_PROTO_gap_INDEX,
+
&csHandleCS_fs_request_index_MESSAGE));
+ GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_INIT_INDEX,
+
&csHandleCS_fs_request_init_index_MESSAGE));
+ GNUNET_ASSERT(SYSERR != coreAPI->unregisterClientHandler(CS_PROTO_gap_DELETE,
+
&csHandleCS_fs_request_delete_MESSAGE));
+ GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_UNINDEX,
+
&csHandleCS_fs_request_unindex_MESSAGE));
+ GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_TESTINDEX,
+
&csHandleCS_fs_request_test_index_MESSAGEed));
+ GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_GET_AVG_PRIORITY,
&csHandleRequestGetAvgPriority));
doneQueryManager();
coreAPI->releaseService(datastore);
Modified: GNUnet/src/applications/fs/module/querymanager.c
===================================================================
--- GNUnet/src/applications/fs/module/querymanager.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/fs/module/querymanager.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -134,7 +134,7 @@
void processResponse(const HashCode512 * key,
const Datastore_Value * value) {
int i;
- ReplyContent * rc;
+ CS_fs_reply_content_MESSAGE * rc;
unsigned int matchCount;
GNUNET_ASSERT(ntohl(value->size) > sizeof(Datastore_Value));
@@ -146,11 +146,11 @@
( (trackers[i]->type == ANY_BLOCK) ||
(trackers[i]->type == ntohl(value->type)) ) ) {
matchCount++;
- rc = MALLOC(sizeof(ReplyContent) +
+ rc = MALLOC(sizeof(CS_fs_reply_content_MESSAGE) +
ntohl(value->size) - sizeof(Datastore_Value));
- rc->header.size = htons(sizeof(ReplyContent) +
+ rc->header.size = htons(sizeof(CS_fs_reply_content_MESSAGE) +
ntohl(value->size) - sizeof(Datastore_Value));
- rc->header.type = htons(AFS_CS_PROTO_RESULT);
+ rc->header.type = htons(CS_PROTO_gap_RESULT);
memcpy(&rc[1],
&value[1],
ntohl(value->size) - sizeof(Datastore_Value));
Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/applications/gap/gap.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -196,7 +196,7 @@
* be determined from the header size.
*/
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
/**
* Type of the query (block type).
@@ -224,17 +224,17 @@
*/
HashCode512 queries[1];
-} GAP_QUERY;
+} P2P_gap_query_MESSAGE;
/**
* Return message for search result.
*/
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
HashCode512 primaryKey;
-} GAP_REPLY;
+} P2P_gap_reply_MESSAGE;
/**
* In this struct, we store information about a
@@ -262,7 +262,7 @@
/**
* The message that we are sending.
*/
- GAP_QUERY * msg;
+ P2P_gap_query_MESSAGE * msg;
/**
* How important would it be to send the message to all peers in
@@ -721,7 +721,7 @@
MUTEX_LOCK(lock);
start = pos;
delta = 0;
- while (padding - delta > sizeof(GAP_QUERY)) {
+ while (padding - delta > sizeof(P2P_gap_query_MESSAGE)) {
if ( (queries[pos].expires > now) &&
(0 == getBit(&queries[pos], getIndex(receiver))) &&
(padding - delta >= ntohs(queries[pos].msg->header.size) ) ) {
@@ -823,7 +823,7 @@
* Take a query and forward it to the appropriate number of nodes
* (depending on load, queue, etc).
*/
-static void forwardQuery(const GAP_QUERY * msg,
+static void forwardQuery(const P2P_gap_query_MESSAGE * msg,
const PeerIdentity * excludePeer) {
cron_t now;
QueryRecord * qr;
@@ -851,7 +851,7 @@
(0 == memcmp(&queries[i].msg->queries[0],
&msg->queries[0],
ntohs(msg->header.size)
- - sizeof(GAP_QUERY)
+ - sizeof(P2P_gap_query_MESSAGE)
+ sizeof(HashCode512))) ) {
/* We have exactly this query pending already.
Replace existing query! */
@@ -997,13 +997,13 @@
* NULL for the local peer
*/
static int useContent(const PeerIdentity * hostId,
- const GAP_REPLY * pmsg);
+ const P2P_gap_reply_MESSAGE * pmsg);
/**
* Call useContent "later" and then free the pmsg.
*/
static void useContentLater(void * data) {
- GAP_REPLY * pmsg = data;
+ P2P_gap_reply_MESSAGE * pmsg = data;
useContent(NULL,
pmsg);
FREE(pmsg);
@@ -1025,7 +1025,7 @@
static void queueReply(const PeerIdentity * sender,
const HashCode512 * primaryKey,
const DataContainer * data) {
- GAP_REPLY * pmsg;
+ P2P_gap_reply_MESSAGE * pmsg;
IndirectionTableEntry * ite;
unsigned int size;
@@ -1046,7 +1046,7 @@
the same query. Well, at least we should not also
queue the delayed reply twice... */
}
- size = sizeof(GAP_REPLY) + ntohl(data->size) - sizeof(DataContainer);
+ size = sizeof(P2P_gap_reply_MESSAGE) + ntohl(data->size) -
sizeof(DataContainer);
if (size >= MAX_BUFFER_SIZE) {
BREAK();
return;
@@ -1056,12 +1056,12 @@
pmsg->header.size
= htons(size);
pmsg->header.type
- = htons(GAP_p2p_PROTO_RESULT);
+ = htons(P2P_PROTO_gap_RESULT);
pmsg->primaryKey
= *primaryKey;
memcpy(&pmsg[1],
&data[1],
- size - sizeof(GAP_REPLY));
+ size - sizeof(P2P_gap_reply_MESSAGE));
/* delay reply, delay longer if we are busy (makes it harder
to predict / analyze, too). */
addCronJob(&useContentLater,
@@ -1430,7 +1430,7 @@
* @param msg the message to route
*/
static void sendReply(IndirectionTableEntry * ite,
- const p2p_HEADER * msg) {
+ const P2P_MESSAGE_HEADER * msg) {
unsigned int j;
unsigned int maxDelay;
cron_t now;
@@ -1541,7 +1541,7 @@
unsigned int prio,
QUERY_POLICY policy,
int ttl,
- const GAP_QUERY * query) {
+ const P2P_gap_query_MESSAGE * query) {
IndirectionTableEntry * ite;
int isRouted;
struct qLRC cls;
@@ -1594,7 +1594,7 @@
ntohl(query->type),
prio,
1 + ( ntohs(query->header.size)
- - sizeof(GAP_QUERY)) / sizeof(HashCode512),
+ - sizeof(P2P_gap_query_MESSAGE)) / sizeof(HashCode512),
&query->queries[0],
(DataProcessor) &queryLocalResultCallback,
&cls);
@@ -1667,7 +1667,7 @@
* priority of the original request)
*/
static int useContent(const PeerIdentity * hostId,
- const GAP_REPLY * msg) {
+ const P2P_gap_reply_MESSAGE * msg) {
unsigned int i;
HashCode512 contentHC;
IndirectionTableEntry * ite;
@@ -1685,14 +1685,14 @@
LOG(LOG_DEBUG,
"GAP received content from '%s'\n",
(hostId != NULL) ? (const char*)&enc : "myself");
- if (ntohs(msg->header.size) < sizeof(GAP_REPLY)) {
+ if (ntohs(msg->header.size) < sizeof(P2P_gap_reply_MESSAGE)) {
BREAK();
return SYSERR; /* invalid! */
}
ite = &ROUTING_indTable_[computeRoutingIndex(&msg->primaryKey)];
ite->successful_local_lookup_in_delay_loop = NO;
- size = ntohs(msg->header.size) - sizeof(GAP_REPLY);
+ size = ntohs(msg->header.size) - sizeof(P2P_gap_reply_MESSAGE);
prio = 0;
if (rhf == NULL)
@@ -1845,11 +1845,11 @@
const HashCode512 * keys,
cron_t timeout,
unsigned int prio) {
- GAP_QUERY * msg;
+ P2P_gap_query_MESSAGE * msg;
unsigned int size;
int ret;
- size = sizeof(GAP_QUERY) + (keyCount-1) * sizeof(HashCode512);
+ size = sizeof(P2P_gap_query_MESSAGE) + (keyCount-1) * sizeof(HashCode512);
if (size >= MAX_BUFFER_SIZE) {
BREAK();
return SYSERR; /* too many keys! */
@@ -1870,7 +1870,7 @@
return SYSERR;
}
if (OK != traffic->get((TTL_DECREMENT + timeout) / TRAFFIC_TIME_UNIT,
- GAP_p2p_PROTO_QUERY,
+ P2P_PROTO_gap_QUERY,
TC_RECEIVED,
&count,
&peers,
@@ -1905,7 +1905,7 @@
msg->header.size
= htons(size);
msg->header.type
- = htons(GAP_p2p_PROTO_QUERY);
+ = htons(P2P_PROTO_gap_QUERY);
msg->type
= htonl(type);
msg->priority
@@ -1954,24 +1954,24 @@
const HashCode512 * primaryKey,
char * position,
unsigned int padding) {
- GAP_REPLY * reply;
+ P2P_gap_reply_MESSAGE * reply;
unsigned int size;
- size = sizeof(GAP_REPLY) + ntohl(data->size) - sizeof(DataContainer);
+ size = sizeof(P2P_gap_reply_MESSAGE) + ntohl(data->size) -
sizeof(DataContainer);
if (size > padding)
return 0;
if (size >= MAX_BUFFER_SIZE)
return 0;
- reply = (GAP_REPLY*) position;
+ reply = (P2P_gap_reply_MESSAGE*) position;
reply->header.type
- = htons(GAP_p2p_PROTO_RESULT);
+ = htons(P2P_PROTO_gap_RESULT);
reply->header.size
= htons(size);
reply->primaryKey
= *primaryKey;
memcpy(&reply[1],
&data[1],
- size - sizeof(GAP_REPLY));
+ size - sizeof(P2P_gap_reply_MESSAGE));
return size;
}
@@ -1980,9 +1980,9 @@
* lookup, forward or even indirect.
*/
static int handleQuery(const PeerIdentity * sender,
- const p2p_HEADER * msg) {
+ const P2P_MESSAGE_HEADER * msg) {
QUERY_POLICY policy;
- GAP_QUERY * qmsg;
+ P2P_gap_query_MESSAGE * qmsg;
unsigned int queries;
int ttl;
unsigned int prio;
@@ -1993,11 +1993,11 @@
return 0;
}
- queries = 1 + (ntohs(msg->size) - sizeof(GAP_QUERY))
+ queries = 1 + (ntohs(msg->size) - sizeof(P2P_gap_query_MESSAGE))
/ sizeof(HashCode512);
if ( (queries <= 0) ||
- (ntohs(msg->size) < sizeof(GAP_QUERY)) ||
- (ntohs(msg->size) != sizeof(GAP_QUERY) +
+ (ntohs(msg->size) < sizeof(P2P_gap_query_MESSAGE)) ||
+ (ntohs(msg->size) != sizeof(P2P_gap_query_MESSAGE) +
(queries-1) * sizeof(HashCode512)) ) {
BREAK();
return SYSERR; /* malformed query */
@@ -2095,8 +2095,8 @@
static GAP_ServiceAPI api;
unsigned int i;
- GNUNET_ASSERT(sizeof(GAP_REPLY) == 68);
- GNUNET_ASSERT(sizeof(GAP_QUERY) == 144);
+ GNUNET_ASSERT(sizeof(P2P_gap_reply_MESSAGE) == 68);
+ GNUNET_ASSERT(sizeof(P2P_gap_query_MESSAGE) == 144);
coreAPI = capi;
GROW(rewards,
@@ -2143,13 +2143,13 @@
LOG(LOG_DEBUG,
_("'%s' registering handlers %d %d\n"),
"gap",
- GAP_p2p_PROTO_QUERY,
- GAP_p2p_PROTO_RESULT);
- capi->registerHandler(GAP_p2p_PROTO_QUERY,
+ P2P_PROTO_gap_QUERY,
+ P2P_PROTO_gap_RESULT);
+ capi->registerHandler(P2P_PROTO_gap_QUERY,
&handleQuery);
- capi->registerHandler(GAP_p2p_PROTO_RESULT,
+ capi->registerHandler(P2P_PROTO_gap_RESULT,
(MessagePartHandler) &useContent);
- coreAPI->registerSendCallback(sizeof(GAP_QUERY),
+ coreAPI->registerSendCallback(sizeof(P2P_gap_query_MESSAGE),
&fillInQuery);
api.init = &init;
@@ -2165,11 +2165,11 @@
ResponseList * rpos;
ReplyTrackData * pos;
- coreAPI->unregisterHandler(GAP_p2p_PROTO_QUERY,
+ coreAPI->unregisterHandler(P2P_PROTO_gap_QUERY,
&handleQuery);
- coreAPI->unregisterHandler(GAP_p2p_PROTO_RESULT,
+ coreAPI->unregisterHandler(P2P_PROTO_gap_RESULT,
(MessagePartHandler) &useContent);
- coreAPI->unregisterSendCallback(sizeof(GAP_QUERY),
+ coreAPI->unregisterSendCallback(sizeof(P2P_gap_query_MESSAGE),
&fillInQuery);
delCronJob(&ageRTD,
Modified: GNUnet/src/applications/gap/gaptest.c
===================================================================
--- GNUnet/src/applications/gap/gaptest.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/gap/gaptest.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -278,7 +278,7 @@
"GNUNETD-CONFIG",
"peer2.conf"));
daemon2 = startGNUnetDaemon(NO);
- /* in case existing HELOs have expired */
+ /* in case existing hellos have expired */
sleep(5);
system("cp ./peer1/data/hosts/* peer2/data/hosts/");
system("cp ./peer2/data/hosts/* peer1/data/hosts/");
@@ -293,7 +293,7 @@
GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
}
- /* re-start, this time we're sure up-to-date HELOs are available */
+ /* re-start, this time we're sure up-to-date hellos are available */
FREENONNULL(setConfigurationString("GNUNET",
"GNUNETD-CONFIG",
"peer1.conf"));
Added: GNUnet/src/applications/gap/peer1/.hostkey
===================================================================
(Binary files differ)
Property changes on: GNUnet/src/applications/gap/peer1/.hostkey
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: GNUnet/src/applications/gap/peer1.conf
===================================================================
--- GNUnet/src/applications/gap/peer1.conf 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/gap/peer1.conf 2005-07-17 23:21:45 UTC (rev
1576)
@@ -4,7 +4,7 @@
[GNUNETD]
GNUNETD_HOME = peer1
# VALGRIND = 300
-HELOEXPIRES = 60
+HELLOEXPIRES = 60
LOGLEVEL = WARNING
LOGFILE = $GNUNETD_HOME/log
KEEPLOG = 0
Added: GNUnet/src/applications/gap/peer2/.hostkey
===================================================================
(Binary files differ)
Property changes on: GNUnet/src/applications/gap/peer2/.hostkey
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: GNUnet/src/applications/gap/peer2.conf
===================================================================
--- GNUnet/src/applications/gap/peer2.conf 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/gap/peer2.conf 2005-07-17 23:21:45 UTC (rev
1576)
@@ -4,7 +4,7 @@
[GNUNETD]
GNUNETD_HOME = peer2
# VALGRIND = 300
-HELOEXPIRES = 60
+HELLOEXPIRES = 60
LOGLEVEL = WARNING
LOGFILE = $GNUNETD_HOME/log
KEEPLOG = 0
Modified: GNUnet/src/applications/getoption/clientapi.c
===================================================================
--- GNUnet/src/applications/getoption/clientapi.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/getoption/clientapi.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -39,18 +39,18 @@
char * getConfigurationOptionValue(GNUNET_TCP_SOCKET * sock,
const char * section,
const char * option) {
- CS_GET_OPTION_REQUEST req;
- CS_GET_OPTION_REPLY * reply;
+ CS_getoption_request_MESSAGE req;
+ CS_getoption_reply_MESSAGE * reply;
int res;
char * ret;
memset(&req,
0,
- sizeof(CS_GET_OPTION_REQUEST));
+ sizeof(CS_getoption_request_MESSAGE));
req.header.type = htons(CS_PROTO_GET_OPTION_REQUEST);
- req.header.size = htons(sizeof(CS_GET_OPTION_REQUEST));
- if ( (strlen(section) >= CS_GET_OPTION_REQUEST_OPT_LEN) ||
- (strlen(option) >= CS_GET_OPTION_REQUEST_OPT_LEN) )
+ req.header.size = htons(sizeof(CS_getoption_request_MESSAGE));
+ if ( (strlen(section) >= CS_getoption_request_MESSAGE_OPT_LEN) ||
+ (strlen(option) >= CS_getoption_request_MESSAGE_OPT_LEN) )
return NULL;
strcpy(&req.section[0],
section);
@@ -62,14 +62,14 @@
return NULL;
reply = NULL;
res = readFromSocket(sock,
- (CS_HEADER**)&reply);
+ (CS_MESSAGE_HEADER**)&reply);
if (res != OK)
return NULL;
- ret = MALLOC(ntohs(reply->header.size) - sizeof(CS_HEADER) + 1);
+ ret = MALLOC(ntohs(reply->header.size) - sizeof(CS_MESSAGE_HEADER) + 1);
memcpy(ret,
&reply->value[0],
- ntohs(reply->header.size) - sizeof(CS_HEADER));
- ret[ntohs(reply->header.size) - sizeof(CS_HEADER)] = '\0';
+ ntohs(reply->header.size) - sizeof(CS_MESSAGE_HEADER));
+ ret[ntohs(reply->header.size) - sizeof(CS_MESSAGE_HEADER)] = '\0';
FREE(reply);
return ret;
}
Modified: GNUnet/src/applications/getoption/getoption.c
===================================================================
--- GNUnet/src/applications/getoption/getoption.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/getoption/getoption.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -34,17 +34,17 @@
static CoreAPIForApplication * coreAPI;
static int handleGetOption(ClientHandle sock,
- const CS_HEADER * message) {
- CS_GET_OPTION_REQUEST * req;
- CS_GET_OPTION_REPLY * rep;
+ const CS_MESSAGE_HEADER * message) {
+ CS_getoption_request_MESSAGE * req;
+ CS_getoption_reply_MESSAGE * rep;
char * val;
int ret;
- if (ntohs(message->size) != sizeof(CS_GET_OPTION_REQUEST))
+ if (ntohs(message->size) != sizeof(CS_getoption_request_MESSAGE))
return SYSERR;
- req = (CS_GET_OPTION_REQUEST*)message;
- req->section[CS_GET_OPTION_REQUEST_OPT_LEN-1] = '\0';
- req->option[CS_GET_OPTION_REQUEST_OPT_LEN-1] = '\0';
+ req = (CS_getoption_request_MESSAGE*)message;
+ req->section[CS_getoption_request_MESSAGE_OPT_LEN-1] = '\0';
+ req->option[CS_getoption_request_MESSAGE_OPT_LEN-1] = '\0';
val = getConfigurationString(req->section,
req->option);
if (val == NULL) {
@@ -56,8 +56,8 @@
"%d",
ival);
}
- rep = MALLOC(sizeof(CS_HEADER) + strlen(val) + 1);
- rep->header.size = htons(sizeof(CS_HEADER) + strlen(val) + 1);
+ rep = MALLOC(sizeof(CS_MESSAGE_HEADER) + strlen(val) + 1);
+ rep->header.size = htons(sizeof(CS_MESSAGE_HEADER) + strlen(val) + 1);
memcpy(rep->value,
val,
strlen(val)+1);
Modified: GNUnet/src/applications/getoption/getoption.h
===================================================================
--- GNUnet/src/applications/getoption/getoption.h 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/getoption/getoption.h 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -20,24 +20,24 @@
#ifndef GETOPTION_H
#define GETOPTION_H
-#define CS_GET_OPTION_REQUEST_OPT_LEN 32
+#define CS_getoption_request_MESSAGE_OPT_LEN 32
/**
* Request for option value.
*/
typedef struct {
- CS_HEADER header;
- char section[CS_GET_OPTION_REQUEST_OPT_LEN];
- char option[CS_GET_OPTION_REQUEST_OPT_LEN];
-} CS_GET_OPTION_REQUEST;
+ CS_MESSAGE_HEADER header;
+ char section[CS_getoption_request_MESSAGE_OPT_LEN];
+ char option[CS_getoption_request_MESSAGE_OPT_LEN];
+} CS_getoption_request_MESSAGE;
/**
* Reply with option value (variable size,
* value is 0-terminated).
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
char value[1];
-} CS_GET_OPTION_REPLY;
+} CS_getoption_reply_MESSAGE;
#endif
Modified: GNUnet/src/applications/identity/check.conf
===================================================================
--- GNUnet/src/applications/identity/check.conf 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/identity/check.conf 2005-07-17 23:21:45 UTC (rev
1576)
@@ -4,7 +4,7 @@
[GNUNETD]
GNUNETD_HOME = /tmp/gnunet-check-identity
VALGRIND = 300
-HELOEXPIRES = 60
+HELLOEXPIRES = 60
LOGLEVEL = NOTHING
LOGFILE = $GNUNETD_HOME/logs
KEEPLOG = 0
Modified: GNUnet/src/applications/identity/identity.c
===================================================================
--- GNUnet/src/applications/identity/identity.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/identity/identity.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -24,7 +24,7 @@
*
* Code to maintain the list of currently known hosts (in memory
* structure of data/hosts) and (temporary) blacklisting information
- * and a list of HELOs that are temporary unless confirmed via PONG
+ * and a list of hellos that are temporary unless confirmed via PONG
* (used to give the transport module the required information for the
* PING).
*
@@ -72,9 +72,9 @@
cron_t delta;
/**
- * HELOs for the peer (maybe NULL)!
+ * hellos for the peer (maybe NULL)!
*/
- HELO_Message ** helos;
+ P2P_hello_MESSAGE ** helos;
unsigned int heloCount;
@@ -118,7 +118,7 @@
static Mutex lock_;
/**
- * Directory where the HELOs are stored in (data/hosts)
+ * Directory where the hellos are stored in (data/hosts)
*/
static char * networkIdDirectory;
@@ -130,7 +130,7 @@
/**
* The list of temporarily known hosts
*/
-static HELO_Message * tempHosts[MAX_TEMP_HOSTS];
+static P2P_hello_MESSAGE * tempHosts[MAX_TEMP_HOSTS];
/**
* tempHosts is a ringbuffer, this is the current
@@ -141,7 +141,7 @@
static PeerIdentity myIdentity;
/**
- * Get the filename under which we would store the HELO_Message
+ * Get the filename under which we would store the P2P_hello_MESSAGE
* for the given host and protocol.
* @return filename of the form DIRECTORY/HOSTID.PROTOCOL
*/
@@ -371,13 +371,13 @@
/**
* Add a host to the temporary list.
*/
-static void addHostTemporarily(const HELO_Message * tmp) {
- HELO_Message * msg;
+static void addHostTemporarily(const P2P_hello_MESSAGE * tmp) {
+ P2P_hello_MESSAGE * msg;
- msg = MALLOC(HELO_Message_size(tmp));
+ msg = MALLOC(P2P_hello_MESSAGE_size(tmp));
memcpy(msg,
tmp,
- HELO_Message_size(tmp));
+ P2P_hello_MESSAGE_size(tmp));
MUTEX_LOCK(&lock_);
FREENONNULL(tempHosts[tempHostsNextSlot]);
tempHosts[tempHostsNextSlot++] = msg;
@@ -422,7 +422,7 @@
entry->heloCount-1);
}
}
- /* also remove HELO file itself */
+ /* also remove hello file itself */
fn = getHostFileName(identity,
protocol);
if (0 != UNLINK(fn))
@@ -452,12 +452,12 @@
/**
* Bind a host address (helo) to a hostId.
- * @param msg the verified (!) HELO message
+ * @param msg the verified (!) hello message
*/
-static void bindAddress(const HELO_Message * msg) {
+static void bindAddress(const P2P_hello_MESSAGE * msg) {
char * fn;
char * buffer;
- HELO_Message * oldMsg;
+ P2P_hello_MESSAGE * oldMsg;
int size;
EncName enc;
HostEntry * host;
@@ -480,17 +480,17 @@
size = readFile(fn,
MAX_BUFFER_SIZE,
buffer);
- oldMsg = (HELO_Message*) buffer;
- if ((unsigned int)size == HELO_Message_size(oldMsg)) {
+ oldMsg = (P2P_hello_MESSAGE*) buffer;
+ if ((unsigned int)size == P2P_hello_MESSAGE_size(oldMsg)) {
if (ntohl(oldMsg->expirationTime) > ntohl(msg->expirationTime)) {
FREE(fn);
FREE(buffer);
- return; /* have more recent HELO in stock */
+ return; /* have more recent hello in stock */
}
}
writeFile(fn,
msg,
- HELO_Message_size(msg),
+ P2P_hello_MESSAGE_size(msg),
"644");
FREE(fn);
FREE(buffer);
@@ -513,33 +513,33 @@
host->heloCount,
host->heloCount+1);
host->helos[i]
- = MALLOC(HELO_Message_size(msg));
+ = MALLOC(P2P_hello_MESSAGE_size(msg));
memcpy(host->helos[i],
msg,
- HELO_Message_size(msg));
+ P2P_hello_MESSAGE_size(msg));
MUTEX_UNLOCK(&lock_);
GNUNET_ASSERT(numberOfHosts_ <= sizeOfHosts_);
}
/**
* Obtain the public key and address of a known host. If no specific
- * protocol is specified (ANY_PROTOCOL_NUMBER), HELOs for cheaper
+ * protocol is specified (ANY_PROTOCOL_NUMBER), hellos for cheaper
* protocols are returned with preference (randomness!).
*
* @param hostId the host id
* @param protocol the protocol that we need,
* ANY_PROTOCOL_NUMBER if we do not care which protocol
- * @param tryTemporaryList is it ok to check the unverified HELOs?
+ * @param tryTemporaryList is it ok to check the unverified hellos?
* @param result where to store the result
* @returns SYSERR on failure, OK on success
*/
-static HELO_Message * identity2Helo(const PeerIdentity * hostId,
+static P2P_hello_MESSAGE * identity2Helo(const PeerIdentity * hostId,
unsigned short protocol,
int tryTemporaryList) {
- HELO_Message * result;
+ P2P_hello_MESSAGE * result;
HostEntry * host;
char * fn;
- HELO_Message buffer;
+ P2P_hello_MESSAGE buffer;
int size;
int i;
int j;
@@ -564,10 +564,10 @@
&tempHosts[j]->senderIdentity) &&
( (ntohs(tempHosts[j]->protocol) == protocol) ||
(protocol == ANY_PROTOCOL_NUMBER) ) ) {
- result = MALLOC(HELO_Message_size(tempHosts[j]));
+ result = MALLOC(P2P_hello_MESSAGE_size(tempHosts[j]));
memcpy(result,
tempHosts[j],
- HELO_Message_size(tempHosts[j]));
+ P2P_hello_MESSAGE_size(tempHosts[j]));
MUTEX_UNLOCK(&lock_);
FREENONNULL(perm);
return result;
@@ -589,10 +589,10 @@
for (i=0;i<host->heloCount;i++) {
if (host->helos[i]->protocol == protocol) {
result
- = MALLOC(HELO_Message_size(host->helos[i]));
+ = MALLOC(P2P_hello_MESSAGE_size(host->helos[i]));
memcpy(result,
host->helos[i],
- HELO_Message_size(host->helos[i]));
+ P2P_hello_MESSAGE_size(host->helos[i]));
MUTEX_UNLOCK(&lock_);
return result;
}
@@ -602,16 +602,16 @@
fn = getHostFileName(hostId,
protocol);
size = readFile(fn,
- sizeof(HELO_Message),
+ sizeof(P2P_hello_MESSAGE),
&buffer);
- if (size != sizeof(HELO_Message)) {
+ if (size != sizeof(P2P_hello_MESSAGE)) {
struct stat buf;
if (0 == STAT(fn,
&buf)) {
if (0 == UNLINK(fn))
LOG(LOG_WARNING,
- _("Removed file '%s' containing invalid HELO data.\n"),
+ _("Removed file '%s' containing invalid hello data.\n"),
fn);
else
LOG_FILE_STRERROR(LOG_ERROR,
@@ -622,14 +622,14 @@
MUTEX_UNLOCK(&lock_);
return NULL;
}
- result = MALLOC(HELO_Message_size(&buffer));
+ result = MALLOC(P2P_hello_MESSAGE_size(&buffer));
size = readFile(fn,
- HELO_Message_size(&buffer),
+ P2P_hello_MESSAGE_size(&buffer),
result);
- if ((unsigned int)size != HELO_Message_size(&buffer)) {
+ if ((unsigned int)size != P2P_hello_MESSAGE_size(&buffer)) {
if (0 == UNLINK(fn))
LOG(LOG_WARNING,
- _("Removed file '%s' containing invalid HELO data.\n"),
+ _("Removed file '%s' containing invalid hello data.\n"),
fn);
else
LOG_FILE_STRERROR(LOG_ERROR,
@@ -645,10 +645,10 @@
host->heloCount,
host->heloCount+1);
host->helos[host->heloCount-1]
- = MALLOC(HELO_Message_size(&buffer));
+ = MALLOC(P2P_hello_MESSAGE_size(&buffer));
memcpy(host->helos[host->heloCount-1],
result,
- HELO_Message_size(&buffer));
+ P2P_hello_MESSAGE_size(&buffer));
MUTEX_UNLOCK(&lock_);
return result;
}
@@ -666,7 +666,7 @@
const void * message,
int size,
const Signature * sig) {
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
int res;
helo = identity2Helo(signer,
Modified: GNUnet/src/applications/identity/identitytest.c
===================================================================
--- GNUnet/src/applications/identity/identitytest.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/identity/identitytest.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -48,13 +48,13 @@
PeerIdentity pid;
const PublicKey * pkey;
Signature sig;
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
transport = requestService("transport");
identity = requestService("identity");
- helo = transport->createHELO(ANY_PROTOCOL_NUMBER);
+ helo = transport->createhello(ANY_PROTOCOL_NUMBER);
if (NULL == helo) {
- printf("Cannot run test, failed to create any HELO.\n");
+ printf("Cannot run test, failed to create any hello.\n");
releaseService(identity);
releaseService(transport);
return OK;
@@ -94,7 +94,7 @@
pkey));
/* to test:
- HELO verification, temporary storage,
+ hello verification, temporary storage,
permanent storage, blacklisting, etc. */
releaseService(identity);
releaseService(transport);
Modified: GNUnet/src/applications/pingpong/pingpong.c
===================================================================
--- GNUnet/src/applications/pingpong/pingpong.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/pingpong/pingpong.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -46,11 +46,11 @@
* the underlying protocol and that it is a GNUnet node.
* <br>
* The challenge prevents an inept adversary from sending
- * us a HELO and then an arbitrary PONG reply (adversary
+ * us a hello and then an arbitrary PONG reply (adversary
* must at least be able to sniff our outbound traffic).
*/
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
/**
* Which peer is the target of the ping? This is important since for
@@ -67,7 +67,7 @@
*/
int challenge;
-} PINGPONG_Message;
+} P2P_pingpong_MESSAGE;
#define DEBUG_PINGPONG NO
@@ -112,10 +112,10 @@
* We received a PING message, send the PONG reply.
*/
static int pingReceived(const PeerIdentity * sender,
- const p2p_HEADER * msg) {
- PINGPONG_Message * pmsg;
+ const P2P_MESSAGE_HEADER * msg) {
+ P2P_pingpong_MESSAGE * pmsg;
- if (ntohs(msg->size) != sizeof(PINGPONG_Message) ) {
+ if (ntohs(msg->size) != sizeof(P2P_pingpong_MESSAGE) ) {
LOG(LOG_WARNING,
_("Received malformed '%s' message. Dropping.\n"),
"ping");
@@ -123,7 +123,7 @@
}
if (stats != NULL)
stats->change(stat_pingReceived, 1);
- pmsg = (PINGPONG_Message *) msg;
+ pmsg = (P2P_pingpong_MESSAGE *) msg;
if (!hostIdentityEquals(coreAPI->myIdentity,
&pmsg->receiver)) {
LOG(LOG_WARNING,
@@ -143,7 +143,7 @@
}
static int sendPlaintext(const PeerIdentity * peer,
- const PINGPONG_Message * msg) {
+ const P2P_pingpong_MESSAGE * msg) {
TSession * mytsession;
int ret;
@@ -152,7 +152,7 @@
return SYSERR;
ret = coreAPI->sendPlaintext(mytsession,
(char*)msg,
- sizeof(PINGPONG_Message));
+ sizeof(P2P_pingpong_MESSAGE));
transport->disconnect(mytsession);
return ret;
}
@@ -162,17 +162,17 @@
* connection module that the session is still life.
*/
static int plaintextPingReceived(const PeerIdentity * sender,
- const p2p_HEADER * hmsg,
+ const P2P_MESSAGE_HEADER * hmsg,
TSession * tsession) {
- PINGPONG_Message * pmsg;
+ P2P_pingpong_MESSAGE * pmsg;
- if (ntohs(hmsg->size) != sizeof(PINGPONG_Message) ) {
+ if (ntohs(hmsg->size) != sizeof(P2P_pingpong_MESSAGE) ) {
LOG(LOG_WARNING,
_("Received malformed '%s' message. Dropping.\n"),
"ping");
return SYSERR;
}
- pmsg = (PINGPONG_Message *) hmsg;
+ pmsg = (P2P_pingpong_MESSAGE *) hmsg;
if (!hostIdentityEquals(coreAPI->myIdentity,
&pmsg->receiver)) {
LOG(LOG_INFO,
@@ -185,7 +185,7 @@
if ( (tsession != NULL) &&
(OK == coreAPI->sendPlaintext(tsession,
(char*) pmsg,
- sizeof(PINGPONG_Message))) )
+ sizeof(P2P_pingpong_MESSAGE))) )
return OK;
return sendPlaintext(sender, pmsg);
}
@@ -194,17 +194,17 @@
* Handler for a pong.
*/
static int pongReceived(const PeerIdentity * sender,
- const p2p_HEADER * msg) {
+ const P2P_MESSAGE_HEADER * msg) {
int i;
- PINGPONG_Message * pmsg;
+ P2P_pingpong_MESSAGE * pmsg;
PingPongEntry * entry;
int matched;
#if DEBUG_PINGPONG
EncName enc;
#endif
- pmsg = (PINGPONG_Message *) msg;
- if ( (ntohs(msg->size) != sizeof(PINGPONG_Message)) ||
+ pmsg = (P2P_pingpong_MESSAGE *) msg;
+ if ( (ntohs(msg->size) != sizeof(P2P_pingpong_MESSAGE)) ||
!hostIdentityEquals(sender,
&pmsg->receiver)) {
LOG(LOG_WARNING,
@@ -258,18 +258,18 @@
* Handler for a pong.
*/
static int plaintextPongReceived(const PeerIdentity * sender,
- const p2p_HEADER * msg,
+ const P2P_MESSAGE_HEADER * msg,
TSession * session) {
int i;
- PINGPONG_Message * pmsg;
+ P2P_pingpong_MESSAGE * pmsg;
PingPongEntry * entry;
int matched;
#if DEBUG_PINGPONG
EncName enc;
#endif
- pmsg = (PINGPONG_Message *) msg;
- if ( (ntohs(msg->size) != sizeof(PINGPONG_Message)) ||
+ pmsg = (P2P_pingpong_MESSAGE *) msg;
+ if ( (ntohs(msg->size) != sizeof(P2P_pingpong_MESSAGE)) ||
!hostIdentityEquals(sender,
&pmsg->receiver)) {
LOG(LOG_WARNING,
@@ -324,7 +324,7 @@
* @param plaintext is the PONG expected to be in plaintext (YES/NO)
* @returns NULL on error, otherwise the PING message
*/
-static p2p_HEADER *
+static P2P_MESSAGE_HEADER *
createPing(const PeerIdentity * receiver,
CronJob method,
void * data,
@@ -334,7 +334,7 @@
TIME_T min;
PingPongEntry * entry;
TIME_T now;
- PINGPONG_Message * pmsg;
+ P2P_pingpong_MESSAGE * pmsg;
MUTEX_LOCK(pingPongLock);
now = TIME(&min); /* set both, tricky... */
@@ -359,8 +359,8 @@
FREENONNULL(entry->data);
entry->data = data;
entry->receiverIdentity = *receiver;
- pmsg = MALLOC(sizeof(PINGPONG_Message));
- pmsg->header.size = htons(sizeof(PINGPONG_Message));
+ pmsg = MALLOC(sizeof(P2P_pingpong_MESSAGE));
+ pmsg->header.size = htons(sizeof(P2P_pingpong_MESSAGE));
pmsg->header.type = htons(p2p_PROTO_PING);
memcpy(&pmsg->receiver,
receiver,
@@ -386,9 +386,9 @@
int usePlaintext,
CronJob method,
void * data) {
- PINGPONG_Message * pmsg;
+ P2P_pingpong_MESSAGE * pmsg;
- pmsg = (PINGPONG_Message*) createPing(receiver,
+ pmsg = (P2P_pingpong_MESSAGE*) createPing(receiver,
method,
data,
usePlaintext);
@@ -423,9 +423,9 @@
CronJob method,
void * data,
TSession * session) {
- PINGPONG_Message * pmsg;
+ P2P_pingpong_MESSAGE * pmsg;
- pmsg = (PINGPONG_Message*) createPing(receiver,
+ pmsg = (P2P_pingpong_MESSAGE*) createPing(receiver,
method,
data,
YES);
@@ -435,7 +435,7 @@
stats->change(stat_plaintextPingSent, 1);
coreAPI->sendPlaintext(session,
(char*)pmsg,
- sizeof(PINGPONG_Message));
+ sizeof(P2P_pingpong_MESSAGE));
FREE(pmsg);
return OK;
}
@@ -448,7 +448,7 @@
provide_module_pingpong(CoreAPIForApplication * capi) {
static Pingpong_ServiceAPI ret;
- GNUNET_ASSERT(sizeof(PINGPONG_Message) == 72);
+ GNUNET_ASSERT(sizeof(P2P_pingpong_MESSAGE) == 72);
coreAPI = capi;
identity = capi->requestService("identity");
if (identity == NULL) {
Modified: GNUnet/src/applications/rpc/rpc.c
===================================================================
--- GNUnet/src/applications/rpc/rpc.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/applications/rpc/rpc.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -402,7 +402,7 @@
* Ensure replies and requests have different IDs when dealing
* with the same peer.
*/
-#define MINGLE(a,b) (((b) == RPC_p2p_PROTO_RES) ? (a) : (a) ^ 0x12345678)
+#define MINGLE(a,b) (((b) == P2P_PROTO_rpc_RES) ? (a) : (a) ^ 0x12345678)
/**
* Notification: we sent a message to the peer.
@@ -488,23 +488,23 @@
* indicate the number of return values.
*/
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
TIME_T timestamp;
unsigned int sequenceNumber;
unsigned int importance;
unsigned short argumentCount;
unsigned short functionNameLength;
-} RPC_Message;
+} P2P_rpc_MESSAGE;
typedef struct {
- RPC_Message rpc_message;
+ P2P_rpc_MESSAGE rpc_message;
/**
* functionNameLength characters describing the function name
* followed by a serialization of argumentCount arguments.
*/
char data[1];
-} RPC_Message_GENERIC;
+} P2P_rpc_MESSAGE_GENERIC;
/**
@@ -514,7 +514,7 @@
* times out).
*/
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
/**
* The number of the original request for which this is the
* ACK.
@@ -553,7 +553,7 @@
* The message we are transmitting (either the request or the
* reply).
*/
- RPC_Message * msg;
+ P2P_rpc_MESSAGE * msg;
/**
* Time where this record times out (timeout value for original
@@ -668,12 +668,12 @@
MINGLE(call->sequenceNumber,
ntohs(call->msg->header.type)));
#if DEBUG_RPC
- if (ntohs(call->msg->header.type) == RPC_p2p_PROTO_REQ) {
+ if (ntohs(call->msg->header.type) == P2P_PROTO_rpc_REQ) {
LOG(LOG_DEBUG,
"Sending RPC request %p: '%.*s' (expires in %llums, last attempt
%llums ago; attempt %u).\n",
call,
ntohs(call->msg->functionNameLength),
- &((RPC_Message_GENERIC*)call->msg)->data[0],
+ &((P2P_rpc_MESSAGE_GENERIC*)call->msg)->data[0],
call->expirationTime - now,
now - call->lastAttempt,
call->attempts);
@@ -713,7 +713,7 @@
RPC_ACK_Message msg;
msg.header.size = htons(sizeof(RPC_ACK_Message));
- msg.header.type = htons(RPC_p2p_PROTO_ACK);
+ msg.header.type = htons(P2P_PROTO_rpc_ACK);
msg.sequenceNumber = htonl(sequenceNumber);
coreAPI->unicast(receiver,
&msg.header,
@@ -721,33 +721,33 @@
maxDelay);
}
-static char * getFunctionName(RPC_Message * req) {
+static char * getFunctionName(P2P_rpc_MESSAGE * req) {
char * ret;
unsigned short slen;
slen = ntohs(req->functionNameLength);
- if (ntohs(req->header.size) < sizeof(RPC_Message) + slen)
+ if (ntohs(req->header.size) < sizeof(P2P_rpc_MESSAGE) + slen)
return NULL; /* invalid! */
ret = MALLOC(slen+1);
memcpy(ret,
- &((RPC_Message_GENERIC*)req)->data[0],
+ &((P2P_rpc_MESSAGE_GENERIC*)req)->data[0],
slen);
ret[slen] = '\0';
return ret;
}
-static RPC_Param * deserializeArguments(RPC_Message * req) {
+static RPC_Param * deserializeArguments(P2P_rpc_MESSAGE * req) {
unsigned short slen;
RPC_Param * ret;
- if (ntohs(req->header.type) == RPC_p2p_PROTO_REQ)
+ if (ntohs(req->header.type) == P2P_PROTO_rpc_REQ)
slen = ntohs(req->functionNameLength);
else
slen = 0;
- if (ntohs(req->header.size) < sizeof(RPC_Message) + slen)
+ if (ntohs(req->header.size) < sizeof(P2P_rpc_MESSAGE) + slen)
return NULL; /* invalid! */
- ret = RPC_paramDeserialize(&((RPC_Message_GENERIC*)req)->data[slen],
- ntohs(req->header.size) - sizeof(RPC_Message) -
slen);
+ ret = RPC_paramDeserialize(&((P2P_rpc_MESSAGE_GENERIC*)req)->data[slen],
+ ntohs(req->header.size) - sizeof(P2P_rpc_MESSAGE)
- slen);
if (RPC_paramCount(ret) != ntohs(req->argumentCount)) {
RPC_paramFree(ret);
return NULL; /* invalid! */
@@ -765,13 +765,13 @@
* @param values the arguments or return values, maybe NULL
* @return the RPC message to transmit, caller must free
*/
-static RPC_Message * buildMessage(unsigned short errorCode,
+static P2P_rpc_MESSAGE * buildMessage(unsigned short errorCode,
const char * name,
unsigned int sequenceNumber,
unsigned int importance,
RPC_Param * values) {
- RPC_Message * ret;
- size_t size = sizeof(RPC_Message);
+ P2P_rpc_MESSAGE * ret;
+ size_t size = sizeof(P2P_rpc_MESSAGE);
int slen;
if (name != NULL) {
@@ -794,17 +794,17 @@
ret->functionNameLength = htons(slen);
ret->argumentCount = htons(RPC_paramCount(values));
if (name != NULL) {
- memcpy(&((RPC_Message_GENERIC*)ret)->data[0],
+ memcpy(&((P2P_rpc_MESSAGE_GENERIC*)ret)->data[0],
name,
slen);
}
RPC_paramSerialize(values,
- &((RPC_Message_GENERIC*)ret)->data[slen]);
+ &((P2P_rpc_MESSAGE_GENERIC*)ret)->data[slen]);
if (name == NULL)
- ret->header.type = htons(RPC_p2p_PROTO_RES);
+ ret->header.type = htons(P2P_PROTO_rpc_RES);
else
- ret->header.type = htons(RPC_p2p_PROTO_REQ);
+ ret->header.type = htons(P2P_PROTO_rpc_REQ);
return ret;
}
@@ -854,8 +854,8 @@
* reply.
*/
static int handleRPCMessageReq(const PeerIdentity *sender,
- const p2p_HEADER * message) {
- RPC_Message * req;
+ const P2P_MESSAGE_HEADER * message) {
+ P2P_rpc_MESSAGE * req;
CallInstance * calls;
unsigned int sq;
unsigned short errorCode;
@@ -865,14 +865,14 @@
RegisteredRPC * rpc;
unsigned int minSQ;
- if ( (ntohs(message->type) != RPC_p2p_PROTO_REQ) ||
- (ntohs(message->size) < sizeof(RPC_Message)) ) {
+ if ( (ntohs(message->type) != P2P_PROTO_rpc_REQ) ||
+ (ntohs(message->size) < sizeof(P2P_rpc_MESSAGE)) ) {
LOG (LOG_WARNING,
_("Invalid message of type %u received. Dropping.\n"),
ntohs(message->type));
return SYSERR;
}
- req = (RPC_Message *) message;
+ req = (P2P_rpc_MESSAGE *) message;
sq = ntohl(req->sequenceNumber);
#if DEBUG_RPC
LOG(LOG_DEBUG,
@@ -992,18 +992,18 @@
* Also always sends an ACK.
*/
static int handleRPCMessageRes(const PeerIdentity * sender,
- const p2p_HEADER * message) {
- RPC_Message * res;
+ const P2P_MESSAGE_HEADER * message) {
+ P2P_rpc_MESSAGE * res;
CallInstance * call;
- if ( (ntohs(message->type) != RPC_p2p_PROTO_RES) ||
- (ntohs(message->size) < sizeof(RPC_Message)) ) {
+ if ( (ntohs(message->type) != P2P_PROTO_rpc_RES) ||
+ (ntohs(message->size) < sizeof(P2P_rpc_MESSAGE)) ) {
LOG(LOG_WARNING,
_("Invalid message of type %u received. Dropping.\n"),
ntohs(message->type));
return SYSERR;
}
- res = (RPC_Message *) message;
+ res = (P2P_rpc_MESSAGE *) message;
#if DEBUG_RPC
LOG(LOG_DEBUG,
"Received RPC reply with id %u.\n",
@@ -1023,17 +1023,17 @@
}
if (NULL != call) {
RPC_Param * reply;
- RPC_Message_GENERIC * gen;
+ P2P_rpc_MESSAGE_GENERIC * gen;
unsigned short error;
RPC_STATUS("", "received reply", call);
- gen = (RPC_Message_GENERIC*)res;
+ gen = (P2P_rpc_MESSAGE_GENERIC*)res;
reply = NULL;
error = ntohs(res->functionNameLength);
if (error == RPC_ERROR_OK) {
reply = RPC_paramDeserialize(&gen->data[0],
- ntohs(message->size) - sizeof(RPC_Message));
+ ntohs(message->size) -
sizeof(P2P_rpc_MESSAGE));
if (ntohs(res->argumentCount) != RPC_paramCount(reply)) {
RPC_paramFree(reply);
reply = NULL;
@@ -1051,7 +1051,7 @@
call);
notifyPeerReply(sender,
MINGLE(call->sequenceNumber,
- RPC_p2p_PROTO_REQ));
+ P2P_PROTO_rpc_REQ));
delCronJob((CronJob) &retryRPCJob,
0,
call);
@@ -1071,14 +1071,14 @@
/**
- * Handle a peer-to-peer message of type RPC_p2p_PROTO_ACK.
+ * Handle a peer-to-peer message of type P2P_PROTO_rpc_ACK.
*/
static int handleRPCMessageAck(const PeerIdentity *sender,
- const p2p_HEADER * message) {
+ const P2P_MESSAGE_HEADER * message) {
RPC_ACK_Message * ack;
CallInstance *call;
- if ( (ntohs(message->type) != RPC_p2p_PROTO_ACK) ||
+ if ( (ntohs(message->type) != P2P_PROTO_rpc_ACK) ||
(ntohs(message->size) != sizeof(RPC_ACK_Message)) ) {
LOG (LOG_WARNING,
_("Invalid message of type %u received. Dropping.\n"),
@@ -1109,7 +1109,7 @@
RPC_STATUS("", "acknowledged reply", call);
notifyPeerReply(sender,
MINGLE(ntohl(ack->sequenceNumber),
- RPC_p2p_PROTO_RES));
+ P2P_PROTO_rpc_RES));
delCronJob((CronJob) &retryRPCJob,
0,
call);
@@ -1344,11 +1344,11 @@
delCronJob(&agePeerStats,
PEER_TRACKING_TIME_INTERVAL,
NULL);
- coreAPI->unregisterHandler(RPC_p2p_PROTO_REQ,
+ coreAPI->unregisterHandler(P2P_PROTO_rpc_REQ,
&handleRPCMessageReq);
- coreAPI->unregisterHandler(RPC_p2p_PROTO_RES,
+ coreAPI->unregisterHandler(P2P_PROTO_rpc_RES,
&handleRPCMessageRes);
- coreAPI->unregisterHandler(RPC_p2p_PROTO_ACK,
+ coreAPI->unregisterHandler(P2P_PROTO_rpc_ACK,
&handleRPCMessageAck);
if (NULL != peerInformation) {
while(vectorSize(peerInformation) > 0)
@@ -1413,19 +1413,19 @@
LOG(LOG_DEBUG,
_("'%s' registering handlers %d %d %d\n"),
"rpc",
- RPC_p2p_PROTO_REQ,
- RPC_p2p_PROTO_RES,
- RPC_p2p_PROTO_ACK);
+ P2P_PROTO_rpc_REQ,
+ P2P_PROTO_rpc_RES,
+ P2P_PROTO_rpc_ACK);
rvalue = OK;
- if (capi->registerHandler(RPC_p2p_PROTO_REQ,
+ if (capi->registerHandler(P2P_PROTO_rpc_REQ,
&handleRPCMessageReq) ==
SYSERR)
rvalue = SYSERR;
- if (capi->registerHandler(RPC_p2p_PROTO_RES,
+ if (capi->registerHandler(P2P_PROTO_rpc_RES,
&handleRPCMessageRes) ==
SYSERR)
rvalue = SYSERR;
- if (capi->registerHandler (RPC_p2p_PROTO_ACK,
+ if (capi->registerHandler (P2P_PROTO_rpc_ACK,
&handleRPCMessageAck) ==
SYSERR)
rvalue = SYSERR;
Modified: GNUnet/src/applications/session/connect.c
===================================================================
--- GNUnet/src/applications/session/connect.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/session/connect.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -35,7 +35,7 @@
#include "gnunet_stats_service.h"
#include "gnunet_topology_service.h"
-#define HELO_HELPER_TABLE_START_SIZE 64
+#define hello_HELPER_TABLE_START_SIZE 64
#define DEBUG_SESSION NO
@@ -65,7 +65,7 @@
* @brief message for session key exchange.
*/
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
/**
* time when this key was created (network byte order)
* Must be the first field after the header since
@@ -84,7 +84,7 @@
*/
Signature signature;
-} SKEY_Message;
+} P2P_setkey_MESSAGE;
#if 0
/**
@@ -147,7 +147,7 @@
* @return SYSERR if invalid, OK if valid
*/
static int verifySKS(const PeerIdentity * hostId,
- SKEY_Message * sks) {
+ P2P_setkey_MESSAGE * sks) {
char * limited;
if ( (sks == NULL) ||
@@ -197,7 +197,7 @@
if (OK != identity->verifyPeerSignature
(hostId,
sks,
- sizeof(SKEY_Message) - sizeof(Signature),
+ sizeof(P2P_setkey_MESSAGE) - sizeof(Signature),
&sks->signature)) {
EncName enc;
@@ -224,15 +224,15 @@
* session key message
* @return message on success, NULL on failure
*/
-static SKEY_Message *
+static P2P_setkey_MESSAGE *
makeSessionKeySigned(const PeerIdentity * hostId,
const SESSIONKEY * sk,
TIME_T created,
- const p2p_HEADER * ping,
- const p2p_HEADER * pong) {
- HELO_Message * foreignHelo;
+ const P2P_MESSAGE_HEADER * ping,
+ const P2P_MESSAGE_HEADER * pong) {
+ P2P_hello_MESSAGE * foreignHelo;
int size;
- SKEY_Message * msg;
+ P2P_setkey_MESSAGE * msg;
char * pt;
GNUNET_ASSERT(sk != NULL);
@@ -246,7 +246,7 @@
return NULL; /* other host not known */
}
- size = sizeof(SKEY_Message);
+ size = sizeof(P2P_setkey_MESSAGE);
if (ping != NULL)
size += ntohs(ping->size);
if (pong != NULL)
@@ -274,11 +274,11 @@
/* complete header */
msg->header.size = htons(size);
- msg->header.type = htons(p2p_PROTO_SKEY);
+ msg->header.type = htons(P2P_PROTO_setkey);
msg->creationTime = htonl(created);
GNUNET_ASSERT(SYSERR !=
identity->signData(msg,
- sizeof(SKEY_Message)
+ sizeof(P2P_setkey_MESSAGE)
- sizeof(Signature),
&msg->signature));
#if EXTRA_CHECKS
@@ -324,7 +324,7 @@
}
/**
- * Perform a session key exchange for entry be. First sends a HELO
+ * Perform a session key exchange for entry be. First sends a hello
* and then the new SKEY (in two plaintext packets). When called, the
* semaphore of at the given index must already be down
*
@@ -334,13 +334,13 @@
*/
static int exchangeKey(const PeerIdentity * receiver,
TSession * tsession,
- p2p_HEADER * pong) {
- HELO_Message * helo;
- SKEY_Message * skey;
+ P2P_MESSAGE_HEADER * pong) {
+ P2P_hello_MESSAGE * helo;
+ P2P_setkey_MESSAGE * skey;
char * sendBuffer;
SESSIONKEY sk;
TIME_T age;
- p2p_HEADER * ping;
+ P2P_MESSAGE_HEADER * ping;
PeerIdentity * sndr;
int size;
EncName enc;
@@ -406,18 +406,18 @@
return SYSERR;
}
- /* create HELO */
- helo = transport->createHELO(ANY_PROTOCOL_NUMBER);
+ /* create hello */
+ helo = transport->createhello(ANY_PROTOCOL_NUMBER);
if (NULL == helo) {
LOG(LOG_INFO,
- "Could not create any HELO advertisement. Not good.");
+ "Could not create any hello advertisement. Not good.");
}
size = ntohs(skey->header.size);
if (helo != NULL)
- size += HELO_Message_size(helo);
+ size += P2P_hello_MESSAGE_size(helo);
sendBuffer = MALLOC(size);
if (helo != NULL) {
- size = HELO_Message_size(helo);
+ size = P2P_hello_MESSAGE_size(helo);
memcpy(sendBuffer,
helo,
size);
@@ -465,12 +465,12 @@
* @return SYSERR or OK
*/
static int acceptSessionKey(const PeerIdentity * sender,
- const p2p_HEADER * msg,
+ const P2P_MESSAGE_HEADER * msg,
TSession * tsession) {
SESSIONKEY key;
- p2p_HEADER * ping;
- p2p_HEADER * pong;
- SKEY_Message * sessionkeySigned;
+ P2P_MESSAGE_HEADER * ping;
+ P2P_MESSAGE_HEADER * pong;
+ P2P_setkey_MESSAGE * sessionkeySigned;
int size;
int pos;
char * plaintext;
@@ -491,14 +491,14 @@
"Received session key from peer '%s'.\n",
&enc);
#endif
- if (ntohs(msg->size) < sizeof(SKEY_Message)) {
+ if (ntohs(msg->size) < sizeof(P2P_setkey_MESSAGE)) {
LOG(LOG_WARNING,
"Session key received from peer '%s' "
"has invalid format (discarded).\n",
&enc);
return SYSERR;
}
- sessionkeySigned = (SKEY_Message *) msg;
+ sessionkeySigned = (P2P_setkey_MESSAGE *) msg;
if (SYSERR == verifySKS(sender,
sessionkeySigned)) {
LOG(LOG_INFO,
@@ -546,13 +546,13 @@
sender,
ntohl(sessionkeySigned->creationTime),
NO);
- pos = sizeof(SKEY_Message);
+ pos = sizeof(P2P_setkey_MESSAGE);
ping = NULL;
pong = NULL;
plaintext = NULL;
size = ntohs(sessionkeySigned->header.size);
- if (sizeof(SKEY_Message) < size) {
- size -= sizeof(SKEY_Message);
+ if (sizeof(P2P_setkey_MESSAGE) < size) {
+ size -= sizeof(P2P_setkey_MESSAGE);
plaintext = MALLOC(size);
#if DEBUG_SESSION
LOG(LOG_DEBUG,
@@ -564,15 +564,15 @@
GNUNET_ASSERT(-1 !=
decryptBlock
(&key,
- &((char*)sessionkeySigned)[sizeof(SKEY_Message)],
+ &((char*)sessionkeySigned)[sizeof(P2P_setkey_MESSAGE)],
size,
(const INITVECTOR*) &sessionkeySigned->signature,
plaintext));
pos = 0;
/* find pings & pongs! */
- while (pos + sizeof(p2p_HEADER) < size) {
- p2p_HEADER * hdr;
- hdr = (p2p_HEADER*) &plaintext[pos];
+ while (pos + sizeof(P2P_MESSAGE_HEADER) < size) {
+ P2P_MESSAGE_HEADER * hdr;
+ hdr = (P2P_MESSAGE_HEADER*) &plaintext[pos];
if (htons(hdr->size) + pos > size) {
LOG(LOG_WARNING,
_("Error parsing encrypted session key, "
@@ -680,7 +680,7 @@
* value. (Rekeying).
*/
static int acceptSessionKeyUpdate(const PeerIdentity * sender,
- const p2p_HEADER * msg) {
+ const P2P_MESSAGE_HEADER * msg) {
acceptSessionKey(sender,
msg,
NULL);
@@ -695,7 +695,7 @@
provide_module_session(CoreAPIForApplication * capi) {
static Session_ServiceAPI ret;
- GNUNET_ASSERT(sizeof(SKEY_Message) == 520)
+ GNUNET_ASSERT(sizeof(P2P_setkey_MESSAGE) == 520)
coreAPI = capi;
identity = capi->requestService("identity");
if (identity == NULL) {
@@ -734,10 +734,10 @@
LOG(LOG_DEBUG,
_("'%s' registering handler %d (plaintext and ciphertext)\n"),
"session",
- p2p_PROTO_SKEY);
- coreAPI->registerPlaintextHandler(p2p_PROTO_SKEY,
+ P2P_PROTO_setkey);
+ coreAPI->registerPlaintextHandler(P2P_PROTO_setkey,
&acceptSessionKey);
- coreAPI->registerHandler(p2p_PROTO_SKEY,
+ coreAPI->registerHandler(P2P_PROTO_setkey,
&acceptSessionKeyUpdate);
ret.tryConnect = &tryConnect;
return &ret;
@@ -747,9 +747,9 @@
* Shutdown the module.
*/
int release_module_session() {
- coreAPI->unregisterPlaintextHandler(p2p_PROTO_SKEY,
+ coreAPI->unregisterPlaintextHandler(P2P_PROTO_setkey,
&acceptSessionKey);
- coreAPI->unregisterHandler(p2p_PROTO_SKEY,
+ coreAPI->unregisterHandler(P2P_PROTO_setkey,
&acceptSessionKeyUpdate);
if (topology != NULL) {
coreAPI->releaseService(topology);
Modified: GNUnet/src/applications/session/peer1.conf
===================================================================
--- GNUnet/src/applications/session/peer1.conf 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/session/peer1.conf 2005-07-17 23:21:45 UTC (rev
1576)
@@ -4,7 +4,7 @@
[GNUNETD]
GNUNETD_HOME = peer1
# VALGRIND = 300
-HELOEXPIRES = 60
+HELLOEXPIRES = 60
LOGLEVEL = WARNING
LOGFILE = $GNUNETD_HOME/log
KEEPLOG = 0
Modified: GNUnet/src/applications/session/peer2.conf
===================================================================
--- GNUnet/src/applications/session/peer2.conf 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/session/peer2.conf 2005-07-17 23:21:45 UTC (rev
1576)
@@ -4,7 +4,7 @@
[GNUNETD]
GNUNETD_HOME = peer2
# VALGRIND = 300
-HELOEXPIRES = 60
+HELLOEXPIRES = 60
LOGLEVEL = WARNING
LOGFILE = $GNUNETD_HOME/log
KEEPLOG = 0
Modified: GNUnet/src/applications/session/sessiontest.c
===================================================================
--- GNUnet/src/applications/session/sessiontest.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/session/sessiontest.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -82,7 +82,7 @@
"GNUNETD-CONFIG",
"peer2.conf"));
daemon2 = startGNUnetDaemon(NO);
- /* in case existing HELOs have expired */
+ /* in case existing hellos have expired */
gnunet_util_sleep(30 * cronSECONDS);
system("cp peer1/data/hosts/* peer2/data/hosts/");
system("cp peer2/data/hosts/* peer1/data/hosts/");
@@ -97,7 +97,7 @@
GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
}
- /* re-start, this time we're sure up-to-date HELOs are available */
+ /* re-start, this time we're sure up-to-date hellos are available */
FREENONNULL(setConfigurationString("GNUNET",
"GNUNETD-CONFIG",
"peer1.conf"));
Modified: GNUnet/src/applications/stats/clientapi.c
===================================================================
--- GNUnet/src/applications/stats/clientapi.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/stats/clientapi.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -38,11 +38,11 @@
const char *name = NULL;
switch( type ) {
- case p2p_PROTO_HELO :
- name = "p2p_PROTO_HELO";
+ case p2p_PROTO_hello :
+ name = "p2p_PROTO_hello";
break;
- case p2p_PROTO_SKEY :
- name = "p2p_PROTO_SKEY";
+ case P2P_PROTO_setkey :
+ name = "P2P_PROTO_setkey";
break;
case p2p_PROTO_PING :
name = "p2p_PROTO_PING";
@@ -50,26 +50,26 @@
case p2p_PROTO_PONG :
name = "p2p_PROTO_PONG";
break;
- case p2p_PROTO_NOISE :
- name = "p2p_PROTO_NOISE";
+ case P2P_PROTO_noise :
+ name = "P2P_PROTO_noise";
break;
- case p2p_PROTO_HANGUP :
- name = "p2p_PROTO_HANGUP";
+ case P2P_PROTO_hangup :
+ name = "P2P_PROTO_hangup";
break;
- case CHAT_p2p_PROTO_MSG :
- name = "CHAT_p2p_PROTO_MSG";
+ case P2P_PROTO_chat_MSG :
+ name = "P2P_PROTO_chat_MSG";
break;
- case TRACEKIT_p2p_PROTO_PROBE :
- name = "TRACEKIT_p2p_PROTO_PROBE";
+ case P2P_PROTO_tracekit_PROBE :
+ name = "P2P_PROTO_tracekit_PROBE";
break;
- case TRACEKIT_p2p_PROTO_REPLY :
- name = "TRACEKIT_p2p_PROTO_REPLY";
+ case P2P_PROTO_tracekit_REPLY :
+ name = "P2P_PROTO_tracekit_REPLY";
break;
- case TBENCH_p2p_PROTO_REQUEST :
- name = "TBENCH_p2p_PROTO_REQUEST";
+ case P2P_PROTO_tbench_REQUEST :
+ name = "P2P_PROTO_tbench_REQUEST";
break;
- case TBENCH_p2p_PROTO_REPLY :
- name = "TBENCH_p2p_PROTO_REPLY";
+ case P2P_PROTO_tbench_REPLY :
+ name = "P2P_PROTO_tbench_REPLY";
break;
default:
name = NULL;
@@ -89,41 +89,41 @@
case CS_PROTO_RETURN_VALUE :
name = "CS_PROTO_RETURN_VALUE";
break;
- case CS_PROTO_CLIENT_COUNT :
- name = "CS_PROTO_CLIENT_COUNT";
+ case CS_PROTO_traffic_COUNT :
+ name = "CS_PROTO_traffic_COUNT";
break;
- case CS_PROTO_TRAFFIC_QUERY :
- name = "CS_PROTO_TRAFFIC_QUERY";
+ case CS_PROTO_traffic_QUERY :
+ name = "CS_PROTO_traffic_QUERY";
break;
- case CS_PROTO_TRAFFIC_INFO :
- name = "CS_PROTO_TRAFFIC_INFO";
+ case CS_PROTO_traffic_INFO :
+ name = "CS_PROTO_traffic_INFO";
break;
- case STATS_CS_PROTO_GET_STATISTICS :
- name = "STATS_CS_PROTO_GET_STATISTICS";
+ case CS_PROTO_stats_GET_STATISTICS :
+ name = "CS_PROTO_stats_GET_STATISTICS";
break;
- case STATS_CS_PROTO_STATISTICS :
- name = "STATS_CS_PROTO_STATISTICS";
+ case CS_PROTO_stats_STATISTICS :
+ name = "CS_PROTO_stats_STATISTICS";
break;
- case STATS_CS_PROTO_GET_CS_MESSAGE_SUPPORTED :
- name = "STATS_CS_PROTO_GET_CS_MESSAGE_SUPPORTED";
+ case CS_PROTO_stats_GET_CS_MESSAGE_SUPPORTED :
+ name = "CS_PROTO_stats_GET_CS_MESSAGE_SUPPORTED";
break;
- case STATS_CS_PROTO_GET_P2P_MESSAGE_SUPPORTED :
- name = "STATS_CS_PROTO_GET_P2P_MESSAGE_SUPPORTED";
+ case CS_PROTO_stats_GET_P2P_MESSAGE_SUPPORTED :
+ name = "CS_PROTO_stats_GET_P2P_MESSAGE_SUPPORTED";
break;
- case CHAT_CS_PROTO_MSG :
- name = "CHAT_CS_PROTO_MSG";
+ case CS_PROTO_chat_MSG :
+ name = "CS_PROTO_chat_MSG";
break;
- case TRACEKIT_CS_PROTO_PROBE :
- name = "TRACEKIT_CS_PROTO_PROBE";
+ case CS_PROTO_tracekit_PROBE :
+ name = "CS_PROTO_tracekit_PROBE";
break;
- case TRACEKIT_CS_PROTO_REPLY :
- name = "TRACEKIT_CS_PROTO_REPLY";
+ case CS_PROTO_tracekit_REPLY :
+ name = "CS_PROTO_tracekit_REPLY";
break;
- case TBENCH_CS_PROTO_REQUEST :
- name = "TBENCH_CS_PROTO_REQUEST";
+ case CS_PROTO_tbench_REQUEST :
+ name = "CS_PROTO_tbench_REQUEST";
break;
- case TBENCH_CS_PROTO_REPLY :
- name = "TBENCH_CS_PROTO_REPLY";
+ case CS_PROTO_tbench_REPLY :
+ name = "CS_PROTO_tbench_REPLY";
break;
default:
name = NULL;
@@ -141,8 +141,8 @@
int requestStatistics(GNUNET_TCP_SOCKET * sock,
StatisticsProcessor processor,
void * cls) {
- STATS_CS_MESSAGE * statMsg;
- CS_HEADER csHdr;
+ CS_stats_reply_MESSAGE * statMsg;
+ CS_MESSAGE_HEADER csHdr;
unsigned int count;
unsigned int i;
int mpos;
@@ -150,9 +150,9 @@
ret = OK;
csHdr.size
- = htons(sizeof(CS_HEADER));
+ = htons(sizeof(CS_MESSAGE_HEADER));
csHdr.type
- = htons(STATS_CS_PROTO_GET_STATISTICS);
+ = htons(CS_PROTO_stats_GET_STATISTICS);
if (SYSERR == writeToSocket(sock,
&csHdr))
return SYSERR;
@@ -165,11 +165,11 @@
/* printf("reading from socket starting %u of %d\n",
count, ntohl(statMsg->totalCounters) );*/
if (SYSERR == readFromSocket(sock,
- (CS_HEADER**)&statMsg)) {
+ (CS_MESSAGE_HEADER**)&statMsg)) {
FREE(statMsg);
return SYSERR;
}
- if (ntohs(statMsg->header.size) < sizeof(STATS_CS_MESSAGE)) {
+ if (ntohs(statMsg->header.size) < sizeof(CS_stats_reply_MESSAGE)) {
BREAK();
ret = SYSERR;
break;
@@ -182,18 +182,18 @@
cls);
}
for (i=0;i<ntohl(statMsg->statCounters);i++) {
- if
(mpos+strlen(&((char*)(((STATS_CS_MESSAGE_GENERIC*)statMsg)->values))[mpos])+1 >
- ntohs(statMsg->header.size) - sizeof(STATS_CS_MESSAGE)) {
+ if
(mpos+strlen(&((char*)(((CS_stats_reply_MESSAGE_GENERIC*)statMsg)->values))[mpos])+1
>
+ ntohs(statMsg->header.size) - sizeof(CS_stats_reply_MESSAGE)) {
BREAK();
ret = SYSERR;
break; /* out of bounds! */
}
if (ret != SYSERR) {
- ret =
processor(&((char*)(((STATS_CS_MESSAGE_GENERIC*)statMsg)->values))[mpos],
- ntohll(((STATS_CS_MESSAGE_GENERIC*)statMsg)->values[i]),
+ ret =
processor(&((char*)(((CS_stats_reply_MESSAGE_GENERIC*)statMsg)->values))[mpos],
+
ntohll(((CS_stats_reply_MESSAGE_GENERIC*)statMsg)->values[i]),
cls);
}
- mpos +=
strlen(&((char*)(((STATS_CS_MESSAGE_GENERIC*)statMsg)->values))[mpos])+1;
+ mpos +=
strlen(&((char*)(((CS_stats_reply_MESSAGE_GENERIC*)statMsg)->values))[mpos])+1;
}
count += ntohl(statMsg->statCounters);
} /* end while */
@@ -211,7 +211,7 @@
int requestAvailableProtocols(GNUNET_TCP_SOCKET * sock,
ProtocolProcessor processor,
void * cls) {
- STATS_CS_GET_MESSAGE_SUPPORTED csStatMsg;
+ CS_stats_get_supported_MESSAGE csStatMsg;
unsigned short i;
unsigned short j;
int supported;
@@ -219,9 +219,9 @@
ret = OK;
csStatMsg.header.size
- = htons(sizeof(STATS_CS_GET_MESSAGE_SUPPORTED));
+ = htons(sizeof(CS_stats_get_supported_MESSAGE));
csStatMsg.header.type
- = htons(STATS_CS_PROTO_GET_P2P_MESSAGE_SUPPORTED);
+ = htons(CS_PROTO_stats_GET_P2P_MESSAGE_SUPPORTED);
for (j=2;j<4;j++) {
csStatMsg.handlerType = htons(j);
for (i=0;i<65535;i++) {
@@ -242,7 +242,7 @@
}
}
csStatMsg.header.type
- = htons(STATS_CS_PROTO_GET_CS_MESSAGE_SUPPORTED);
+ = htons(CS_PROTO_stats_GET_CS_MESSAGE_SUPPORTED);
for (i=0;i<65535;i++) {
csStatMsg.type = htons(i);
if (SYSERR == writeToSocket(sock,
Modified: GNUnet/src/applications/stats/statistics.c
===================================================================
--- GNUnet/src/applications/stats/statistics.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/stats/statistics.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -230,17 +230,17 @@
* @param originalRequestMessage ignored at this point.
*/
static int sendStatistics(ClientHandle sock,
- const CS_HEADER * originalRequestMessage) {
- STATS_CS_MESSAGE * statMsg;
+ const CS_MESSAGE_HEADER * originalRequestMessage) {
+ CS_stats_reply_MESSAGE * statMsg;
int pos; /* position in the values-descriptions */
int start;
int end;
int mpos; /* postion in the message */
immediateUpdates();
- statMsg = (STATS_CS_MESSAGE*)MALLOC(MAX_BUFFER_SIZE);
+ statMsg = (CS_stats_reply_MESSAGE*)MALLOC(MAX_BUFFER_SIZE);
statMsg->header.type
- = htons(STATS_CS_PROTO_STATISTICS);
+ = htons(CS_PROTO_stats_STATISTICS);
statMsg->totalCounters
= htonl(statCounters);
statMsg->statCounters
@@ -257,7 +257,7 @@
while ( (pos < statCounters) &&
(mpos + sizeof(unsigned long long)
+ strlen(descriptions[pos]) + 1
- < MAX_BUFFER_SIZE - sizeof(STATS_CS_MESSAGE)) ) {
+ < MAX_BUFFER_SIZE - sizeof(CS_stats_reply_MESSAGE)) ) {
mpos += sizeof(unsigned long long); /* value */
mpos += strlen(descriptions[pos])+1;
pos++;
@@ -265,17 +265,17 @@
end = pos;
/* second pass: copy values and messages to message */
for (pos=start;pos<end;pos++)
- ((STATS_CS_MESSAGE_GENERIC*)statMsg)->values[pos-start] =
htonll(values[pos]);
+ ((CS_stats_reply_MESSAGE_GENERIC*)statMsg)->values[pos-start] =
htonll(values[pos]);
mpos = sizeof(unsigned long long) * (end - start);
for (pos=start;pos<end;pos++) {
- strcpy(&((char*)(((STATS_CS_MESSAGE_GENERIC*)statMsg))->values)[mpos],
+
strcpy(&((char*)(((CS_stats_reply_MESSAGE_GENERIC*)statMsg))->values)[mpos],
descriptions[pos]);
mpos += strlen(descriptions[pos])+1;
}
statMsg->statCounters = htonl(end - start);
- GNUNET_ASSERT(mpos + sizeof(STATS_CS_MESSAGE) < MAX_BUFFER_SIZE);
+ GNUNET_ASSERT(mpos + sizeof(CS_stats_reply_MESSAGE) < MAX_BUFFER_SIZE);
- statMsg->header.size = htons(mpos + sizeof(STATS_CS_MESSAGE));
+ statMsg->header.size = htons(mpos + sizeof(CS_stats_reply_MESSAGE));
/* printf("writing message of size %d with stats %d to %d out of %d to
socket\n",
ntohs(statMsg->header.size),
start, end, statCounters);*/
@@ -292,17 +292,17 @@
* Handle a request to see if a particular p2p message is supported.
*/
static int handlep2pMessageSupported(ClientHandle sock,
- const CS_HEADER * message) {
+ const CS_MESSAGE_HEADER * message) {
unsigned short type;
unsigned short htype;
int supported;
- STATS_CS_GET_MESSAGE_SUPPORTED * cmsg;
+ CS_stats_get_supported_MESSAGE * cmsg;
- if (ntohs(message->size) != sizeof(STATS_CS_GET_MESSAGE_SUPPORTED)) {
+ if (ntohs(message->size) != sizeof(CS_stats_get_supported_MESSAGE)) {
BREAK();
return SYSERR;
}
- cmsg = (STATS_CS_GET_MESSAGE_SUPPORTED *) message;
+ cmsg = (CS_stats_get_supported_MESSAGE *) message;
type = ntohs(cmsg->type);
htype = ntohs(cmsg->handlerType);
supported = coreAPI->isHandlerRegistered(type, htype);
@@ -318,8 +318,8 @@
* @returns OK if ok, SYSERR if not.
*/
static int processGetConnectionCountRequest(ClientHandle client,
- const CS_HEADER * msg) {
- if (ntohs(msg->size) != sizeof(CS_HEADER)) {
+ const CS_MESSAGE_HEADER * msg) {
+ if (ntohs(msg->size) != sizeof(CS_MESSAGE_HEADER)) {
BREAK();
return SYSERR;
}
@@ -332,7 +332,7 @@
* Handler for processing noise.
*/
static int processNoise(const PeerIdentity * sender,
- const p2p_HEADER * msg) {
+ const P2P_MESSAGE_HEADER * msg) {
statChange(stat_bytes_noise_received,
ntohs(msg->size));
return OK;
@@ -355,17 +355,17 @@
LOG(LOG_DEBUG,
"'%s' registering client handlers %d %d %d and p2p handler %d\n",
"stats",
- CS_PROTO_CLIENT_COUNT,
- STATS_CS_PROTO_GET_STATISTICS,
- STATS_CS_PROTO_GET_P2P_MESSAGE_SUPPORTED,
- p2p_PROTO_NOISE);
- capi->registerClientHandler(STATS_CS_PROTO_GET_STATISTICS,
+ CS_PROTO_traffic_COUNT,
+ CS_PROTO_stats_GET_STATISTICS,
+ CS_PROTO_stats_GET_P2P_MESSAGE_SUPPORTED,
+ P2P_PROTO_noise);
+ capi->registerClientHandler(CS_PROTO_stats_GET_STATISTICS,
&sendStatistics);
- capi->registerClientHandler(STATS_CS_PROTO_GET_P2P_MESSAGE_SUPPORTED,
+ capi->registerClientHandler(CS_PROTO_stats_GET_P2P_MESSAGE_SUPPORTED,
&handlep2pMessageSupported);
- capi->registerClientHandler(CS_PROTO_CLIENT_COUNT,
+ capi->registerClientHandler(CS_PROTO_traffic_COUNT,
&processGetConnectionCountRequest);
- capi->registerHandler(p2p_PROTO_NOISE,
+ capi->registerHandler(P2P_PROTO_noise,
&processNoise);
setConfigurationString("ABOUT",
"stats",
@@ -375,13 +375,13 @@
int done_module_stats() {
GNUNET_ASSERT(myCoreAPI != NULL);
- coreAPI->unregisterClientHandler(STATS_CS_PROTO_GET_STATISTICS,
+ coreAPI->unregisterClientHandler(CS_PROTO_stats_GET_STATISTICS,
&sendStatistics);
- coreAPI->unregisterClientHandler(STATS_CS_PROTO_GET_P2P_MESSAGE_SUPPORTED,
+ coreAPI->unregisterClientHandler(CS_PROTO_stats_GET_P2P_MESSAGE_SUPPORTED,
&handlep2pMessageSupported);
- coreAPI->unregisterClientHandler(CS_PROTO_CLIENT_COUNT,
+ coreAPI->unregisterClientHandler(CS_PROTO_traffic_COUNT,
&processGetConnectionCountRequest);
- coreAPI->unregisterHandler(p2p_PROTO_NOISE,
+ coreAPI->unregisterHandler(P2P_PROTO_noise,
&processNoise);
myCoreAPI->releaseService(myApi);
myApi = NULL;
Modified: GNUnet/src/applications/stats/statistics.h
===================================================================
--- GNUnet/src/applications/stats/statistics.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/stats/statistics.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -33,7 +33,7 @@
* numbers. If needed, several messages are used.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
/**
* For 64-bit alignment...
*/
@@ -45,14 +45,14 @@
/* number of statistical counters in this message */
int statCounters;
-} STATS_CS_MESSAGE;
+} CS_stats_reply_MESSAGE;
/**
- * Generic version of STATS_CS_MESSAGE with field for finding the end
+ * Generic version of CS_stats_reply_MESSAGE with field for finding the end
* of the struct. Use the other version for allocation.
*/
typedef struct {
- STATS_CS_MESSAGE stats_cs_message;
+ CS_stats_reply_MESSAGE stats_cs_message;
/* values[statCounters] */
unsigned long long values[1];
@@ -62,14 +62,14 @@
last description is also terminated
by a '\0'; again statCounters entries */
/* char descriptions[0]; */
-} STATS_CS_MESSAGE_GENERIC;
+} CS_stats_reply_MESSAGE_GENERIC;
/**
* Query protocol supported message. Contains the type of
* the message we are requesting the status of.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
/**
* The type of the message (XX_CS_PROTO_XXXX)
@@ -85,6 +85,6 @@
*/
unsigned short handlerType;
-} STATS_CS_GET_MESSAGE_SUPPORTED;
+} CS_stats_get_supported_MESSAGE;
#endif
Modified: GNUnet/src/applications/tbench/gnunet-tbench.c
===================================================================
--- GNUnet/src/applications/tbench/gnunet-tbench.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/tbench/gnunet-tbench.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -202,8 +202,8 @@
*/
int main(int argc, char ** argv) {
GNUNET_TCP_SOCKET * sock;
- TBENCH_CS_MESSAGE msg;
- TBENCH_CS_REPLY * buffer;
+ CS_tbench_request_MESSAGE msg;
+ CS_tbench_reply_MESSAGE * buffer;
float messagesPercentLoss;
if (SYSERR == initUtil(argc, argv, &parseOptions))
@@ -212,8 +212,8 @@
if (sock == NULL)
errexit(_("Could not connect to gnunetd.\n"));
- msg.header.size = htons(sizeof(TBENCH_CS_MESSAGE));
- msg.header.type = htons(TBENCH_CS_PROTO_REQUEST);
+ msg.header.size = htons(sizeof(CS_tbench_request_MESSAGE));
+ msg.header.type = htons(CS_PROTO_tbench_REQUEST);
msg.msgSize = htonl(messageSize);
msg.msgCnt = htonl(messageCnt);
msg.iterations = htonl(messageIterations);
@@ -235,9 +235,9 @@
buffer = NULL;
if (OK == readFromSocket(sock,
- (CS_HEADER**)&buffer)) {
+ (CS_MESSAGE_HEADER**)&buffer)) {
GNUNET_ASSERT(ntohs(buffer->header.size) ==
- sizeof(TBENCH_CS_REPLY));
+ sizeof(CS_tbench_reply_MESSAGE));
if ((float)buffer->mean_loss <= 0){
BREAK();
messagesPercentLoss = 0.0;
Modified: GNUnet/src/applications/tbench/peer1.conf
===================================================================
--- GNUnet/src/applications/tbench/peer1.conf 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/tbench/peer1.conf 2005-07-17 23:21:45 UTC (rev
1576)
@@ -4,7 +4,7 @@
[GNUNETD]
GNUNETD_HOME = peer1
# VALGRIND = 300
-HELOEXPIRES = 60
+HELLOEXPIRES = 60
LOGLEVEL = WARNING
# LOGFILE =
KEEPLOG = 0
Modified: GNUnet/src/applications/tbench/peer2.conf
===================================================================
--- GNUnet/src/applications/tbench/peer2.conf 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/tbench/peer2.conf 2005-07-17 23:21:45 UTC (rev
1576)
@@ -4,7 +4,7 @@
[GNUNETD]
GNUNETD_HOME = peer2
# VALGRIND = 300
-HELOEXPIRES = 60
+HELLOEXPIRES = 60
LOGLEVEL = WARNING
# LOGFILE =
KEEPLOG = 0
Modified: GNUnet/src/applications/tbench/tbench.c
===================================================================
--- GNUnet/src/applications/tbench/tbench.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/tbench/tbench.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -43,13 +43,13 @@
* transport performance.
*/
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
unsigned int iterationNum;
unsigned int packetNum;
unsigned int priority;
unsigned int nounce;
unsigned int crc;
-} TBENCH_p2p_MESSAGE;
+} P2P_tbench_MESSAGE;
/**
* Lock for access to semaphores.
@@ -128,17 +128,17 @@
* around and send it back.
*/
static int handleTBenchReq(const PeerIdentity * sender,
- const p2p_HEADER * message) {
- p2p_HEADER * reply;
- TBENCH_p2p_MESSAGE * msg;
+ const P2P_MESSAGE_HEADER * message) {
+ P2P_MESSAGE_HEADER * reply;
+ P2P_tbench_MESSAGE * msg;
- if ( ntohs(message->size) < sizeof(TBENCH_p2p_MESSAGE)) {
+ if ( ntohs(message->size) < sizeof(P2P_tbench_MESSAGE)) {
BREAK();
return SYSERR;
}
- msg = (TBENCH_p2p_MESSAGE*) message;
+ msg = (P2P_tbench_MESSAGE*) message;
if (crc32N(&msg[1],
- ntohs(message->size) - sizeof(TBENCH_p2p_MESSAGE))
+ ntohs(message->size) - sizeof(P2P_tbench_MESSAGE))
!= ntohl(msg->crc)) {
BREAK();
return SYSERR;
@@ -155,7 +155,7 @@
memcpy(reply,
message,
ntohs(message->size));
- reply->type = htons(TBENCH_p2p_PROTO_REPLY);
+ reply->type = htons(P2P_PROTO_tbench_REPLY);
coreAPI->unicast(sender,
reply,
ntohl(msg->priority), /* medium importance */
@@ -168,16 +168,16 @@
* We received a tbench-reply. Check and count stats.
*/
static int handleTBenchReply(const PeerIdentity * sender,
- const p2p_HEADER * message) {
- TBENCH_p2p_MESSAGE * pmsg;
+ const P2P_MESSAGE_HEADER * message) {
+ P2P_tbench_MESSAGE * pmsg;
- if (ntohs(message->size) < sizeof(TBENCH_p2p_MESSAGE)) {
+ if (ntohs(message->size) < sizeof(P2P_tbench_MESSAGE)) {
BREAK();
return SYSERR;
}
- pmsg = (TBENCH_p2p_MESSAGE*) message;
+ pmsg = (P2P_tbench_MESSAGE*) message;
if (crc32N(&pmsg[1],
- ntohs(message->size) - sizeof(TBENCH_p2p_MESSAGE))
+ ntohs(message->size) - sizeof(P2P_tbench_MESSAGE))
!= ntohl(pmsg->crc)) {
BREAK();
return SYSERR;
@@ -223,10 +223,10 @@
* Handle client request (main function)
*/
static int csHandleTBenchRequest(ClientHandle client,
- const CS_HEADER * message) {
- TBENCH_CS_MESSAGE * msg;
- TBENCH_CS_REPLY reply;
- TBENCH_p2p_MESSAGE * p2p;
+ const CS_MESSAGE_HEADER * message) {
+ CS_tbench_request_MESSAGE * msg;
+ CS_tbench_reply_MESSAGE reply;
+ P2P_tbench_MESSAGE * p2p;
unsigned short size;
unsigned int iteration;
unsigned int packetNum;
@@ -248,12 +248,12 @@
unsigned int msgCnt;
unsigned int iterations;
- if ( ntohs(message->size) != sizeof(TBENCH_CS_MESSAGE) )
+ if ( ntohs(message->size) != sizeof(CS_tbench_request_MESSAGE) )
return SYSERR;
- msg = (TBENCH_CS_MESSAGE*) message;
- size = sizeof(TBENCH_p2p_MESSAGE) + ntohl(msg->msgSize);
- if (size < sizeof(TBENCH_p2p_MESSAGE))
+ msg = (CS_tbench_request_MESSAGE*) message;
+ size = sizeof(P2P_tbench_MESSAGE) + ntohl(msg->msgSize);
+ if (size < sizeof(P2P_tbench_MESSAGE))
return SYSERR;
delay = ntohll(msg->intPktSpace);
iterations = ntohl(msg->iterations);
@@ -272,7 +272,7 @@
0,
size);
p2p->header.size = htons(size);
- p2p->header.type = htons(TBENCH_p2p_PROTO_REQUEST);
+ p2p->header.type = htons(P2P_PROTO_tbench_REQUEST);
p2p->priority = msg->priority;
MUTEX_LOCK(&lock);
@@ -296,10 +296,10 @@
= htonl(currIteration);
memset(&p2p[1],
randomi(256),
- size - sizeof(TBENCH_p2p_MESSAGE));
+ size - sizeof(P2P_tbench_MESSAGE));
p2p->crc
= htonl(crc32N(&p2p[1],
- size - sizeof(TBENCH_p2p_MESSAGE)));
+ size - sizeof(P2P_tbench_MESSAGE)));
MUTEX_UNLOCK(&lock); /* allow receiving */
@@ -408,8 +408,8 @@
}
/* send collected stats back to client */
- reply.header.size = htons(sizeof(TBENCH_CS_REPLY));
- reply.header.type = htons(TBENCH_CS_PROTO_REPLY);
+ reply.header.size = htons(sizeof(CS_tbench_reply_MESSAGE));
+ reply.header.type = htons(CS_PROTO_tbench_REPLY);
reply.max_loss = htonl(max_loss);
reply.min_loss = htonl(min_loss);
reply.mean_loss = ((float)sum_loss/(float)iterations);
@@ -433,13 +433,13 @@
MUTEX_CREATE(&lock);
coreAPI = capi;
- if (SYSERR == capi->registerHandler(TBENCH_p2p_PROTO_REPLY,
+ if (SYSERR == capi->registerHandler(P2P_PROTO_tbench_REPLY,
&handleTBenchReply))
ok = SYSERR;
- if (SYSERR == capi->registerHandler(TBENCH_p2p_PROTO_REQUEST,
+ if (SYSERR == capi->registerHandler(P2P_PROTO_tbench_REQUEST,
&handleTBenchReq))
ok = SYSERR;
- if (SYSERR == capi->registerClientHandler(TBENCH_CS_PROTO_REQUEST,
+ if (SYSERR == capi->registerClientHandler(CS_PROTO_tbench_REQUEST,
&csHandleTBenchRequest))
ok = SYSERR;
setConfigurationString("ABOUT",
@@ -450,11 +450,11 @@
}
void done_module_tbench() {
- coreAPI->unregisterHandler(TBENCH_p2p_PROTO_REQUEST,
+ coreAPI->unregisterHandler(P2P_PROTO_tbench_REQUEST,
&handleTBenchReq);
- coreAPI->unregisterHandler(TBENCH_p2p_PROTO_REPLY,
+ coreAPI->unregisterHandler(P2P_PROTO_tbench_REPLY,
&handleTBenchReply);
- coreAPI->unregisterClientHandler(TBENCH_CS_PROTO_REQUEST,
+ coreAPI->unregisterClientHandler(CS_PROTO_tbench_REQUEST,
&csHandleTBenchRequest);
MUTEX_DESTROY(&lock);
coreAPI = NULL;
Modified: GNUnet/src/applications/tbench/tbench.h
===================================================================
--- GNUnet/src/applications/tbench/tbench.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/tbench/tbench.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -31,7 +31,7 @@
* Client requests peer to perform some profiling.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
/**
* How big is each message (plus headers).
* Note that GNUnet is limited to 64k messages.
@@ -69,13 +69,13 @@
* Which priority should be used?
*/
unsigned int priority;
-} TBENCH_CS_MESSAGE;
+} CS_tbench_request_MESSAGE;
/**
* Response from server with statistics.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
unsigned int max_loss;
unsigned int min_loss;
float mean_loss;
@@ -85,6 +85,6 @@
cron_t min_time;
float mean_time;
float variance_time;
-} TBENCH_CS_REPLY;
+} CS_tbench_reply_MESSAGE;
#endif
Modified: GNUnet/src/applications/tbench/tbenchtest.c
===================================================================
--- GNUnet/src/applications/tbench/tbenchtest.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/tbench/tbenchtest.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -50,16 +50,16 @@
unsigned int messageTrainSize,
cron_t messageTimeOut /* in milli-seconds */) {
int ret;
- TBENCH_CS_MESSAGE msg;
- TBENCH_CS_REPLY * buffer;
+ CS_tbench_request_MESSAGE msg;
+ CS_tbench_reply_MESSAGE * buffer;
float messagesPercentLoss;
printf(_("Using %u messages of size %u for %u times.\n"),
messageCnt,
messageSize,
messageIterations);
- msg.header.size = htons(sizeof(TBENCH_CS_MESSAGE));
- msg.header.type = htons(TBENCH_CS_PROTO_REQUEST);
+ msg.header.size = htons(sizeof(CS_tbench_request_MESSAGE));
+ msg.header.type = htons(CS_PROTO_tbench_REQUEST);
msg.msgSize = htonl(messageSize);
msg.msgCnt = htonl(messageCnt);
msg.iterations = htonl(messageIterations);
@@ -75,7 +75,7 @@
ret = 0;
buffer = NULL;
- if (OK == readFromSocket(sock, (CS_HEADER**)&buffer)) {
+ if (OK == readFromSocket(sock, (CS_MESSAGE_HEADER**)&buffer)) {
if ((float)buffer->mean_loss <= 0){
messagesPercentLoss = 0.0;
} else {
@@ -164,7 +164,7 @@
"GNUNETD-CONFIG",
"peer2.conf"));
daemon2 = startGNUnetDaemon(NO);
- /* in case existing HELOs have expired */
+ /* in case existing hellos have expired */
sleep(5);
system("cp peer1/data/hosts/* peer2/data/hosts/");
system("cp peer2/data/hosts/* peer1/data/hosts/");
@@ -179,7 +179,7 @@
GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
}
- /* re-start, this time we're sure up-to-date HELOs are available */
+ /* re-start, this time we're sure up-to-date hellos are available */
FREENONNULL(setConfigurationString("GNUNET",
"GNUNETD-CONFIG",
"peer1.conf"));
Modified: GNUnet/src/applications/template/gnunet-template.c
===================================================================
--- GNUnet/src/applications/template/gnunet-template.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/template/gnunet-template.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -96,7 +96,7 @@
buffer = MALLOC(MAX_BUFFER_SIZE);
while (OK == readFromSocket(sock,
- (CS_HEADER**)&buffer)) {
+ (CS_MESSAGE_HEADER**)&buffer)) {
/* process */
}
FREE(buffer);
Modified: GNUnet/src/applications/template/template.c
===================================================================
--- GNUnet/src/applications/template/template.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/template/template.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -20,6 +20,8 @@
/**
* @file applications/template/template.c
+ * @author Christian Grothoff
+ * @brief template for a GNUnet module
*/
#include "platform.h"
@@ -32,12 +34,12 @@
static Mutex lock;
static int handlep2pMSG(const PeerIdentity * sender,
- const p2p_HEADER * message) {
+ const P2P_MESSAGE_HEADER * message) {
return OK;
}
static int csHandle(ClientHandle client,
- const CS_HEADER * message) {
+ const CS_MESSAGE_HEADER * message) {
return OK;
}
@@ -58,24 +60,24 @@
LOG(LOG_DEBUG,
_("'%s' registering client handler %d and %d\n"),
"template",
- MAX_CS_PROTO_USED,
- MAX_p2p_PROTO_USED);
- if (SYSERR == capi->registerHandler(MAX_p2p_PROTO_USED,
+ CS_PROTO_MAX_USED,
+ P2P_PROTO_MAX_USED);
+ if (SYSERR == capi->registerHandler(P2P_PROTO_MAX_USED,
&handlep2pMSG))
ok = SYSERR;
if (SYSERR == capi->registerClientExitHandler(&clientExitHandler))
ok = SYSERR;
- if (SYSERR == capi->registerClientHandler(MAX_CS_PROTO_USED,
+ if (SYSERR == capi->registerClientHandler(CS_PROTO_MAX_USED,
&csHandle))
ok = SYSERR;
return ok;
}
void done_module_template() {
- coreAPI->unregisterHandler(MAX_p2p_PROTO_USED,
+ coreAPI->unregisterHandler(P2P_PROTO_MAX_USED,
&handlep2pMSG);
coreAPI->unregisterClientExitHandler(&clientExitHandler);
- coreAPI->unregisterClientHandler(MAX_CS_PROTO_USED,
+ coreAPI->unregisterClientHandler(CS_PROTO_MAX_USED,
&csHandle);
MUTEX_DESTROY(&lock);
coreAPI = NULL;
Modified: GNUnet/src/applications/testbed/commands.c
===================================================================
--- GNUnet/src/applications/testbed/commands.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/testbed/commands.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -52,8 +52,8 @@
char * ips;
/** socket to communicate with the peer */
GNUNET_TCP_SOCKET sock;
- /** HELO message identifying the peer in the network */
- HELO_Message * helo;
+ /** hello message identifying the peer in the network */
+ P2P_hello_MESSAGE * helo;
/** if we're using ssh, what is the PID of the
ssh process? (-1 for unencrypted direct connections) */
pid_t ssh;
@@ -119,7 +119,7 @@
msg->header.size
= htons(msgsz);
msg->header.type
- = htons(TESTBED_CS_PROTO_REQUEST);
+ = htons(CS_PROTO_testbed_REQUEST);
msg->msgType
= htonl(msgType);
memcpy(&((TESTBED_CS_MESSAGE_GENERIC*)msg)->data[0],
@@ -162,8 +162,8 @@
*/
static int addNode(int argc, char * argv[]) {
int currindex;
- TESTBED_HELO_MESSAGE * hdr;
- TESTBED_GET_HELO_MESSAGE req;
+ TESTBED_hello_MESSAGE * hdr;
+ TESTBED_GET_hello_MESSAGE req;
int port;
int i;
@@ -205,10 +205,10 @@
return -1;
}
- /* request HELO */
- if (OK != sendMessage(TESTBED_GET_HELO,
+ /* request hello */
+ if (OK != sendMessage(TESTBED_GET_hello,
currindex,
-
sizeof(TESTBED_GET_HELO_MESSAGE)-sizeof(TESTBED_CS_MESSAGE),
+
sizeof(TESTBED_GET_hello_MESSAGE)-sizeof(TESTBED_CS_MESSAGE),
&req.proto)) {
/* send message already printed an error message */
destroySocket(&nodes[currindex].sock);
@@ -221,7 +221,7 @@
hdr = NULL;
if (SYSERR == readFromSocket(&nodes[currindex].sock,
- (CS_HEADER**)&hdr)) {
+ (CS_MESSAGE_HEADER**)&hdr)) {
XPRINTF(" peer %s is not responding.\n",
nodes[currindex].ips);
destroySocket(&nodes[currindex].sock);
@@ -229,20 +229,20 @@
GROW(nodes, nnodes, nnodes-1);
return -1;
}
- if ( (ntohs(hdr->header.header.type) == TESTBED_CS_PROTO_REPLY) &&
- (ntohs(hdr->header.header.size) >= sizeof(TESTBED_HELO_MESSAGE)) &&
- (ntohl(hdr->header.msgType) == TESTBED_HELO_RESPONSE) &&
- (ntohs(hdr->header.header.size) - sizeof(TESTBED_CS_MESSAGE) >=
sizeof(HELO_Message)) &&
- (ntohs(hdr->header.header.size) - sizeof(TESTBED_CS_MESSAGE) ==
HELO_Message_size(&hdr->helo)) ) {
+ if ( (ntohs(hdr->header.header.type) == CS_PROTO_testbed_REPLY) &&
+ (ntohs(hdr->header.header.size) >= sizeof(TESTBED_hello_MESSAGE)) &&
+ (ntohl(hdr->header.msgType) == TESTBED_hello_RESPONSE) &&
+ (ntohs(hdr->header.header.size) - sizeof(TESTBED_CS_MESSAGE) >=
sizeof(P2P_hello_MESSAGE)) &&
+ (ntohs(hdr->header.header.size) - sizeof(TESTBED_CS_MESSAGE) ==
P2P_hello_MESSAGE_size(&hdr->helo)) ) {
nodes[currindex].helo
- = MALLOC(HELO_Message_size(&hdr->helo));
+ = MALLOC(P2P_hello_MESSAGE_size(&hdr->helo));
memcpy(nodes[currindex].helo,
&hdr->helo,
- HELO_Message_size(&hdr->helo));
+ P2P_hello_MESSAGE_size(&hdr->helo));
} else {
FREE(hdr);
destroySocket(&nodes[currindex].sock);
- XPRINTF(" peer %s did not respond with proper HELO.\n",
+ XPRINTF(" peer %s did not respond with proper hello.\n",
nodes[currindex].ips);
FREE(nodes[currindex].ips);
GROW(nodes, nnodes, nnodes-1);
@@ -263,8 +263,8 @@
*/
static int addSshNode(int argc, char * argv[]) {
int currindex;
- TESTBED_HELO_MESSAGE * hdr;
- TESTBED_GET_HELO_MESSAGE req;
+ TESTBED_hello_MESSAGE * hdr;
+ TESTBED_GET_hello_MESSAGE req;
int port;
int i;
pid_t pid;
@@ -396,10 +396,10 @@
return -1;
}
- /* request HELO */
- if (OK != sendMessage(TESTBED_GET_HELO,
+ /* request hello */
+ if (OK != sendMessage(TESTBED_GET_hello,
currindex,
-
sizeof(TESTBED_GET_HELO_MESSAGE)-sizeof(TESTBED_CS_MESSAGE),
+
sizeof(TESTBED_GET_hello_MESSAGE)-sizeof(TESTBED_CS_MESSAGE),
&req.proto)) {
/* send message already printed an error message */
destroySocket(&nodes[currindex].sock);
@@ -418,7 +418,7 @@
hdr = NULL;
if (SYSERR == readFromSocket(&nodes[currindex].sock,
- (CS_HEADER**)&hdr)) {
+ (CS_MESSAGE_HEADER**)&hdr)) {
XPRINTF(" peer %s is not responding.\n",
nodes[currindex].ips);
destroySocket(&nodes[currindex].sock);
@@ -432,20 +432,20 @@
GROW(nodes, nnodes, nnodes-1);
return -1;
}
- if ( (ntohs(hdr->header.header.type) == TESTBED_CS_PROTO_REPLY) &&
- (ntohs(hdr->header.header.size) >= sizeof(TESTBED_HELO_MESSAGE)) &&
- (ntohl(hdr->header.msgType) == TESTBED_HELO_RESPONSE) &&
- (ntohs(hdr->header.header.size) - sizeof(TESTBED_CS_MESSAGE) >=
sizeof(HELO_Message)) &&
- (ntohs(hdr->header.header.size) - sizeof(TESTBED_CS_MESSAGE) ==
HELO_Message_size(&hdr->helo)) ) {
+ if ( (ntohs(hdr->header.header.type) == CS_PROTO_testbed_REPLY) &&
+ (ntohs(hdr->header.header.size) >= sizeof(TESTBED_hello_MESSAGE)) &&
+ (ntohl(hdr->header.msgType) == TESTBED_hello_RESPONSE) &&
+ (ntohs(hdr->header.header.size) - sizeof(TESTBED_CS_MESSAGE) >=
sizeof(P2P_hello_MESSAGE)) &&
+ (ntohs(hdr->header.header.size) - sizeof(TESTBED_CS_MESSAGE) ==
P2P_hello_MESSAGE_size(&hdr->helo)) ) {
nodes[currindex].helo
- = MALLOC(HELO_Message_size(&hdr->helo));
+ = MALLOC(P2P_hello_MESSAGE_size(&hdr->helo));
memcpy(nodes[currindex].helo,
&hdr->helo,
- HELO_Message_size(&hdr->helo));
+ P2P_hello_MESSAGE_size(&hdr->helo));
} else {
FREE(hdr);
destroySocket(&nodes[currindex].sock);
- XPRINTF(" peer %s did not respond with proper HELO.\n",
+ XPRINTF(" peer %s did not respond with proper hello.\n",
nodes[currindex].ips);
FREE(nodes[currindex].ips);
/* fixme: check error conditions on kill/waidpid! */
@@ -536,7 +536,7 @@
CHECK_SRC_DST(src, dst, argv[0], argv[1]);
if (SYSERR == sendMessage(TESTBED_ADD_PEER,
src,
- HELO_Message_size(nodes[dst].helo),
+ P2P_hello_MESSAGE_size(nodes[dst].helo),
nodes[dst].helo))
return -1;
if (OK != readResult(src,
@@ -615,9 +615,9 @@
}
/**
- * Disable HELO at a peer.
+ * Disable hello at a peer.
*/
-static int disableHELO(int argc, char *argv[]) {
+static int disablehello(int argc, char *argv[]) {
int dst, value;
if (argc != 1) {
@@ -625,7 +625,7 @@
return -1;
}
CHECK_PEER(dst, argv[0]);
- if (SYSERR == sendMessage(TESTBED_DISABLE_HELO,
+ if (SYSERR == sendMessage(TESTBED_DISABLE_hello,
dst,
0,
NULL))
@@ -633,7 +633,7 @@
if (SYSERR == readResult(dst, &value))
return -1;
if (value != OK) {
- XPRINTF(" could disable HELO\n");
+ XPRINTF(" could disable hello\n");
return -1;
} else {
XPRINTF("OK.\n");
@@ -642,9 +642,9 @@
}
/**
- * Enable HELO at a peer.
+ * Enable hello at a peer.
*/
-static int enableHELO(int argc, char *argv[]) {
+static int enablehello(int argc, char *argv[]) {
int dst, value;
if (argc != 1) {
@@ -652,7 +652,7 @@
return -1;
}
CHECK_PEER(dst, argv[0]);
- if (SYSERR == sendMessage(TESTBED_ENABLE_HELO,
+ if (SYSERR == sendMessage(TESTBED_ENABLE_hello,
dst,
0,
NULL))
@@ -660,7 +660,7 @@
if (SYSERR == readResult(dst, &value))
return -1;
if (value != OK) {
- XPRINTF(" could enable HELO\n");
+ XPRINTF(" could enable hello\n");
return -1;
} else {
XPRINTF("OK.\n");
@@ -971,7 +971,7 @@
reply = NULL;
if (SYSERR == readFromSocket(&nodes[dst].sock,
- (CS_HEADER**)&reply)) {
+ (CS_MESSAGE_HEADER**)&reply)) {
XPRINTF(" peer %s is not responding after %d of %d bytes.\n",
nodes[dst].ips,
pos,
@@ -1250,7 +1250,7 @@
msg->header.header.size
= htons(sizeof(TESTBED_UPLOAD_FILE_MESSAGE)+flen);
msg->header.header.type
- = htons(TESTBED_CS_PROTO_REQUEST);
+ = htons(CS_PROTO_testbed_REQUEST);
msg->header.msgType
= htonl(TESTBED_UPLOAD_FILE);
msg->type
@@ -1760,11 +1760,11 @@
"destroy all connections between peers",
&delAllConnections },
{ "helo-disable",
- "disable HELO advertisements",
- &disableHELO },
+ "disable hello advertisements",
+ &disablehello },
{ "helo-enable",
- "enable HELO advertisements",
- &enableHELO },
+ "enable hello advertisements",
+ &enablehello },
{ "autoconnect-disable", "", &disableAUTOCONNECT },
{ "autoconnect-enable", "", &enableAUTOCONNECT },
{ "process-start",
Modified: GNUnet/src/applications/testbed/testbed.c
===================================================================
--- GNUnet/src/applications/testbed/testbed.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/testbed/testbed.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -66,7 +66,7 @@
*/
static void tb_ADD_PEER(ClientHandle client,
TESTBED_CS_MESSAGE * msg) {
- p2p_HEADER noise;
+ P2P_MESSAGE_HEADER noise;
TESTBED_ADD_PEER_MESSAGE * hm
= (TESTBED_ADD_PEER_MESSAGE*) msg;
@@ -79,7 +79,7 @@
"ADD_PEER");
return;
}
- if (HELO_Message_size(&hm->helo) !=
+ if (P2P_hello_MESSAGE_size(&hm->helo) !=
ntohs(msg->header.size) - sizeof(TESTBED_CS_MESSAGE) ) {
LOG(LOG_ERROR,
_("size of '%s' message is wrong. Ignoring.\n"),
@@ -88,8 +88,8 @@
}
identity->addHost(&hm->helo);
- noise.size = htons(sizeof(p2p_HEADER));
- noise.type = htons(p2p_PROTO_NOISE);
+ noise.size = htons(sizeof(P2P_MESSAGE_HEADER));
+ noise.type = htons(P2P_PROTO_noise);
coreAPI->unicast(&hm->helo.senderIdentity,
&noise,
EXTREME_PRIORITY,
@@ -122,11 +122,11 @@
}
/**
- * Get a HELO message for this peer.
+ * Get a hello message for this peer.
*/
-static void tb_GET_HELO(ClientHandle client,
- TESTBED_GET_HELO_MESSAGE * msg) {
- HELO_Message * helo;
+static void tb_GET_hello(ClientHandle client,
+ TESTBED_GET_hello_MESSAGE * msg) {
+ P2P_hello_MESSAGE * helo;
unsigned int proto = ntohs(msg->proto);
helo = identity->identity2Helo(coreAPI->myIdentity,
@@ -134,18 +134,18 @@
NO);
if (NULL == helo) {
LOG(LOG_WARNING,
- _("TESTBED could not generate HELO message for protocol %u\n"),
+ _("TESTBED could not generate hello message for protocol %u\n"),
proto);
sendAcknowledgement(client, SYSERR);
} else {
- TESTBED_HELO_MESSAGE * reply
+ TESTBED_hello_MESSAGE * reply
= MALLOC(ntohs(helo->header.size) + sizeof(TESTBED_CS_MESSAGE));
reply->header.header.size
= htons(ntohs(helo->header.size) + sizeof(TESTBED_CS_MESSAGE));
reply->header.header.type
- = htons(TESTBED_CS_PROTO_REPLY);
+ = htons(CS_PROTO_testbed_REPLY);
reply->header.msgType
- = htonl(TESTBED_HELO_RESPONSE);
+ = htonl(TESTBED_hello_RESPONSE);
memcpy(&reply->helo,
helo,
ntohs(helo->header.size));
@@ -313,13 +313,13 @@
* peer (by making it drop a certain percentage of the messages at
* random).
*/
-static void tb_DISABLE_HELO(ClientHandle client,
- TESTBED_DISABLE_HELO_MESSAGE * msg) {
+static void tb_DISABLE_hello(ClientHandle client,
+ TESTBED_DISABLE_hello_MESSAGE * msg) {
FREENONNULL(setConfigurationString("NETWORK",
"DISABLE-ADVERTISEMENTS",
"YES"));
FREENONNULL(setConfigurationString("NETWORK",
- "HELOEXCHANGE",
+ "helloEXCHANGE",
"NO"));
triggerGlobalConfigurationRefresh();
sendAcknowledgement(client, OK);
@@ -330,13 +330,13 @@
* peer (by making it drop a certain percentage of the messages at
* random).
*/
-static void tb_ENABLE_HELO(ClientHandle client,
- TESTBED_ENABLE_HELO_MESSAGE * msg) {
+static void tb_ENABLE_hello(ClientHandle client,
+ TESTBED_ENABLE_hello_MESSAGE * msg) {
FREENONNULL(setConfigurationString("NETWORK",
"DISABLE-ADVERTISEMENTS",
"NO"));
FREENONNULL(setConfigurationString("NETWORK",
- "HELOEXCHANGE",
+ "helloEXCHANGE",
"YES"));
triggerGlobalConfigurationRefresh();
sendAcknowledgement(client, OK);
@@ -756,7 +756,7 @@
msg = MALLOC(65532);
msg->header.header.type
- = htons(TESTBED_CS_PROTO_REPLY);
+ = htons(CS_PROTO_testbed_REPLY);
msg->header.msgType
= htonl(TESTBED_OUTPUT_RESPONSE);
@@ -938,10 +938,10 @@
*/
static HD handlers[] = {
TBSENTRY(undefined), /* For IDs that should never be received */
- TBDENTRY(ADD_PEER), /* RF: Why was this as TBDENTRY? Because HELO is
variable size! */
+ TBDENTRY(ADD_PEER), /* RF: Why was this as TBDENTRY? Because hello is
variable size! */
TBSENTRY(DEL_PEER),
TBSENTRY(DEL_ALL_PEERS),
- TBSENTRY(GET_HELO),
+ TBSENTRY(GET_hello),
TBSENTRY(SET_TVALUE),
TBSENTRY(GET_TVALUE),
TBSENTRY(undefined),
@@ -949,8 +949,8 @@
TBDENTRY(LOAD_MODULE),
TBDENTRY(UNLOAD_MODULE),
TBDENTRY(UPLOAD_FILE),
- TBSENTRY(DISABLE_HELO),
- TBSENTRY(ENABLE_HELO),
+ TBSENTRY(DISABLE_hello),
+ TBSENTRY(ENABLE_hello),
TBSENTRY(DISABLE_AUTOCONNECT),
TBSENTRY(ENABLE_AUTOCONNECT),
TBDENTRY(ALLOW_CONNECT),
@@ -970,7 +970,7 @@
* on the testbed-message type.
*/
static void csHandleTestbedRequest(ClientHandle client,
- CS_HEADER * message) {
+ CS_MESSAGE_HEADER * message) {
TESTBED_CS_MESSAGE * msg;
unsigned short size;
unsigned int id;
@@ -1268,7 +1268,7 @@
LOG(LOG_WARNING,
_("Exit register (error: no http response read).\n"));
}
-#if DEBUG_HELOEXCHANGE
+#if DEBUG_helloEXCHANGE
LOG(LOG_INFO,
"Exit register (%d seconds before timeout)\n",
(int)(start + 300 * cronSECONDS - cronTime(NULL))/cronSECONDS);
@@ -1346,10 +1346,10 @@
MUTEX_CREATE(&lock);
LOG(LOG_DEBUG,
"TESTBED registering handler %d!\n",
- TESTBED_CS_PROTO_REQUEST);
+ CS_PROTO_testbed_REQUEST);
coreAPI = capi;
GNUNET_ASSERT(SYSERR !=
capi->registerClientExitHandler(&testbedClientExitHandler));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(TESTBED_CS_PROTO_REQUEST,
+ GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_testbed_REQUEST,
(CSHandler)&csHandleTestbedRequest));
httpRegister("startup");
setConfigurationString("ABOUT",
@@ -1386,8 +1386,8 @@
MUTEX_DESTROY(&lock);
LOG(LOG_DEBUG,
"TESTBED unregistering handler %d\n",
- TESTBED_CS_PROTO_REQUEST);
- coreAPI->unregisterClientHandler(TESTBED_CS_PROTO_REQUEST,
+ CS_PROTO_testbed_REQUEST);
+ coreAPI->unregisterClientHandler(CS_PROTO_testbed_REQUEST,
(CSHandler)&csHandleTestbedRequest);
coreAPI->unregisterClientExitHandler(&testbedClientExitHandler);
coreAPI->releaseService(identity);
Modified: GNUnet/src/applications/testbed/testbed.h
===================================================================
--- GNUnet/src/applications/testbed/testbed.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/testbed/testbed.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -32,11 +32,11 @@
#include "gnunet_core.h"
/* */
-#define TESTBED_HELO_RESPONSE 0 /* peer responds with a HELO */
+#define TESTBED_hello_RESPONSE 0 /* peer responds with a hello */
#define TESTBED_ADD_PEER 1 /* Add a peer to a peer connection pool
*/
#define TESTBED_DEL_PEER 2 /* Delete a peer from a peer connection
pool */
#define TESTBED_DEL_ALL_PEERS 3 /* Delete all peers from a peer
connection pool */
-#define TESTBED_GET_HELO 4 /* Get the complete host information
(ID, IP, ...) */
+#define TESTBED_GET_hello 4 /* Get the complete host information
(ID, IP, ...) */
#define TESTBED_SET_TVALUE 5 /* Set trust value for a peer
*/
#define TESTBED_GET_TVALUE 6 /* Get trust value of a peer
*/
#define TESTBED_OUTPUT_RESPONSE 7 /* Reply to GET_OUTPUT
*/
@@ -45,8 +45,8 @@
#define TESTBED_LOAD_MODULE 10 /* load a module
*/
#define TESTBED_UNLOAD_MODULE 11 /* unload a module
*/
#define TESTBED_UPLOAD_FILE 12 /* Upload a file to a peer
*/
-#define TESTBED_DISABLE_HELO 13 /* stop sending HELOs */
-#define TESTBED_ENABLE_HELO 14 /* start sending HELOs */
+#define TESTBED_DISABLE_hello 13 /* stop sending hellos */
+#define TESTBED_ENABLE_hello 14 /* start sending hellos */
#define TESTBED_DISABLE_AUTOCONNECT 15 /* stop automatically
connecting to other peers */
#define TESTBED_ENABLE_AUTOCONNECT 16 /* start trying to
automatically connect to other peers */
#define TESTBED_ALLOW_CONNECT 17 /* only allow connections from a
certain group of peers */
@@ -72,7 +72,7 @@
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
unsigned int msgType; /* The message types listed above */
} TESTBED_CS_MESSAGE;
@@ -89,7 +89,7 @@
TESTBED_CS_MESSAGE header;
unsigned short proto;
unsigned short reserved; /* for alignment */
-} TESTBED_GET_HELO_MESSAGE;
+} TESTBED_GET_hello_MESSAGE;
typedef struct {
TESTBED_CS_MESSAGE header;
@@ -99,12 +99,12 @@
typedef struct {
TESTBED_CS_MESSAGE header;
- HELO_Message helo;
-} TESTBED_HELO_MESSAGE;
+ P2P_hello_MESSAGE helo;
+} TESTBED_hello_MESSAGE;
typedef struct {
TESTBED_CS_MESSAGE header;
- HELO_Message helo;
+ P2P_hello_MESSAGE helo;
} TESTBED_ADD_PEER_MESSAGE;
typedef struct {
@@ -173,11 +173,11 @@
typedef struct {
TESTBED_CS_MESSAGE header;
-} TESTBED_DISABLE_HELO_MESSAGE;
+} TESTBED_DISABLE_hello_MESSAGE;
typedef struct {
TESTBED_CS_MESSAGE header;
-} TESTBED_ENABLE_HELO_MESSAGE;
+} TESTBED_ENABLE_hello_MESSAGE;
typedef struct {
TESTBED_CS_MESSAGE header;
Modified: GNUnet/src/applications/tracekit/gnunet-tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/gnunet-tracekit.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/tracekit/gnunet-tracekit.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -158,7 +158,7 @@
}
static void * receiveThread(GNUNET_TCP_SOCKET * sock) {
- TRACEKIT_CS_REPLY * buffer;
+ CS_tracekit_reply_MESSAGE * buffer;
int format;
PeerIdentity * peersSeen;
int psCount;
@@ -184,11 +184,11 @@
if (format == 2)
printf("graph: {\n");
while (OK == readFromSocket(sock,
- (CS_HEADER**)&buffer)) {
+ (CS_MESSAGE_HEADER**)&buffer)) {
int count;
EncName enc;
- count = ntohs(buffer->header.size) - sizeof(TRACEKIT_CS_REPLY);
+ count = ntohs(buffer->header.size) - sizeof(CS_tracekit_reply_MESSAGE);
if (count < 0) {
BREAK();
break; /* faulty reply */
@@ -211,7 +211,7 @@
}
count = count / sizeof(PeerIdentity);
if (ntohs(buffer->header.size) !=
- sizeof(TRACEKIT_CS_REPLY) +
+ sizeof(CS_tracekit_reply_MESSAGE) +
count * sizeof(PeerIdentity)) {
BREAK();
break;
@@ -240,7 +240,7 @@
for (i=0;i<count;i++) {
match = NO;
for (j=0;j<psCount;j++)
- if
(equalsHashCode512(&((TRACEKIT_CS_REPLY_GENERIC*)buffer)->peerList[i].hashPubKey,
+ if
(equalsHashCode512(&((CS_tracekit_reply_MESSAGE_GENERIC*)buffer)->peerList[i].hashPubKey,
&peersSeen[j].hashPubKey))
match = YES;
if (match == NO) {
@@ -249,11 +249,11 @@
psSize,
psSize * 2);
memcpy(&peersSeen[psCount++],
- &((TRACEKIT_CS_REPLY_GENERIC*)buffer)->peerList[i].hashPubKey,
+
&((CS_tracekit_reply_MESSAGE_GENERIC*)buffer)->peerList[i].hashPubKey,
sizeof(PeerIdentity));
}
- hash2enc(&((TRACEKIT_CS_REPLY_GENERIC*)buffer)->peerList[i].hashPubKey,
+
hash2enc(&((CS_tracekit_reply_MESSAGE_GENERIC*)buffer)->peerList[i].hashPubKey,
&other);
switch (format) {
case 0:
@@ -352,7 +352,7 @@
GNUNET_TCP_SOCKET * sock;
PTHREAD_T messageReceiveThread;
void * unused;
- TRACEKIT_CS_PROBE probe;
+ CS_tracekit_probe_MESSAGE probe;
int sleepTime;
if (SYSERR == initUtil(argc, argv, &parseOptions))
@@ -372,9 +372,9 @@
DIE_STRERROR("pthread_create");
probe.header.size
- = htons(sizeof(TRACEKIT_CS_PROBE));
+ = htons(sizeof(CS_tracekit_probe_MESSAGE));
probe.header.type
- = htons(TRACEKIT_CS_PROTO_PROBE);
+ = htons(CS_PROTO_tracekit_PROBE);
probe.hops
= htonl(getConfigurationInt("GNUNET-TRACEKIT",
"HOPS"));
Modified: GNUnet/src/applications/tracekit/tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/tracekit.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/tracekit/tracekit.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -46,25 +46,25 @@
static RTE * routeTable[MAXROUTE];
static int handlep2pReply(const PeerIdentity * sender,
- const p2p_HEADER * message) {
+ const P2P_MESSAGE_HEADER * message) {
unsigned int i;
unsigned int hostCount;
- TRACEKIT_p2p_REPLY * reply;
+ P2P_tracekit_reply_MESSAGE * reply;
EncName initiator;
EncName sen;
hash2enc(&sender->hashPubKey,
&sen);
- hostCount =
(ntohs(message->size)-sizeof(TRACEKIT_p2p_REPLY))/sizeof(PeerIdentity);
+ hostCount =
(ntohs(message->size)-sizeof(P2P_tracekit_reply_MESSAGE))/sizeof(PeerIdentity);
if (ntohs(message->size) !=
- sizeof(TRACEKIT_p2p_REPLY)+hostCount*sizeof(PeerIdentity)) {
+ sizeof(P2P_tracekit_reply_MESSAGE)+hostCount*sizeof(PeerIdentity)) {
LOG(LOG_WARNING,
_("Received invalid '%s' message from '%s'.\n"),
- "TRACEKIT_p2p_PROBE",
+ "P2P_tracekit_probe_MESSAGE",
&sen);
return SYSERR;
}
- reply = (TRACEKIT_p2p_REPLY*)message;
+ reply = (P2P_tracekit_reply_MESSAGE*)message;
hash2enc(&reply->initiatorId.hashPubKey,
&initiator);
LOG(LOG_DEBUG,
@@ -82,7 +82,7 @@
if (equalsHashCode512(&coreAPI->myIdentity->hashPubKey,
&routeTable[i]->replyTo.hashPubKey) ) {
unsigned int idx;
- TRACEKIT_CS_REPLY * csReply;
+ CS_tracekit_reply_MESSAGE * csReply;
idx = ntohl(reply->clientId);
LOG(LOG_DEBUG,
@@ -98,16 +98,16 @@
continue; /* discard */
}
- csReply =
MALLOC(sizeof(TRACEKIT_CS_REPLY)+hostCount*sizeof(PeerIdentity));
+ csReply =
MALLOC(sizeof(CS_tracekit_reply_MESSAGE)+hostCount*sizeof(PeerIdentity));
/* build msg */
csReply->header.size
- = htons(sizeof(TRACEKIT_CS_REPLY)+hostCount*sizeof(PeerIdentity));
+ =
htons(sizeof(CS_tracekit_reply_MESSAGE)+hostCount*sizeof(PeerIdentity));
csReply->header.type
- = htons(TRACEKIT_CS_PROTO_REPLY);
+ = htons(CS_PROTO_tracekit_REPLY);
csReply->responderId
= reply->responderId;
- memcpy(&((TRACEKIT_CS_REPLY_GENERIC*)csReply)->peerList[0],
- &((TRACEKIT_p2p_REPLY_GENERIC*)reply)->peerList[0],
+ memcpy(&((CS_tracekit_reply_MESSAGE_GENERIC*)csReply)->peerList[0],
+ &((P2P_tracekit_reply_MESSAGE_GENERIC*)reply)->peerList[0],
hostCount * sizeof(PeerIdentity));
coreAPI->sendToClient(clients[idx],
&csReply->header);
@@ -133,21 +133,28 @@
typedef struct {
- TRACEKIT_p2p_REPLY_GENERIC * reply;
- int max;
+ PeerIdentity * peers;
+ unsigned int max;
int pos;
-} Closure;
+} Tracekit_Collect_Trace_Closure;
static void getPeerCallback(const PeerIdentity * id,
- Closure * closure) {
+ void * cls) {
+ Tracekit_Collect_Trace_Closure * closure = cls;
+ if (closure->pos == closure->max) {
+ GROW(closure->peers,
+ closure->max,
+ closure->max + 32);
+ }
if (closure->pos < closure->max) {
/* check needed since #connections may change anytime! */
- closure->reply->peerList[closure->pos++] = *id;
+ closure->peers[closure->pos++] = *id;
}
}
static void transmit(const PeerIdentity * id,
- TRACEKIT_p2p_PROBE * pro) {
+ void * cls) {
+ P2P_tracekit_probe_MESSAGE * pro = cls;
if (! hostIdentityEquals(id,
&pro->initiatorId))
coreAPI->unicast(id,
@@ -157,10 +164,10 @@
}
static int handlep2pProbe(const PeerIdentity * sender,
- const p2p_HEADER * message) {
- TRACEKIT_p2p_REPLY * reply;
- TRACEKIT_p2p_PROBE * msg;
- Closure closure;
+ const P2P_MESSAGE_HEADER * message) {
+ P2P_tracekit_reply_MESSAGE * reply;
+ P2P_tracekit_probe_MESSAGE * msg;
+ Tracekit_Collect_Trace_Closure closure;
int i;
int sel;
int hops;
@@ -174,17 +181,17 @@
hash2enc(&sender->hashPubKey,
&sen);
if (ntohs(message->size) !=
- sizeof(TRACEKIT_p2p_PROBE)) {
+ sizeof(P2P_tracekit_probe_MESSAGE)) {
LOG(LOG_WARNING,
_("Received invalid '%s' message from '%s'.\n"),
- "TRACEKIT_p2p_PROBE",
+ "P2P_tracekit_probe_MESSAGE",
&sen);
return SYSERR;
}
LOG(LOG_DEBUG,
"TRACEKIT: received probe\n");
TIME(&now);
- msg = (TRACEKIT_p2p_PROBE*) message;
+ msg = (P2P_tracekit_probe_MESSAGE*) message;
if ((TIME_T)ntohl(msg->timestamp) > 3600 + now) {
LOG(LOG_DEBUG,
"TRACEKIT: probe has timestamp in the far future (%d > %d), dropping\n",
@@ -253,47 +260,40 @@
&init,
sel,
ntohl(msg->hopsToGo));
- count = coreAPI->forAllConnectedNodes(NULL, NULL);
hops = ntohl(msg->hopsToGo);
/* forward? */
if (hops > 0) {
msg->hopsToGo = htonl(hops-1);
- coreAPI->forAllConnectedNodes((PerNodeCallback) & transmit,
+ coreAPI->forAllConnectedNodes(&transmit,
msg);
}
- /* build local reply */
- size = sizeof(TRACEKIT_p2p_REPLY) + count*sizeof(PeerIdentity);
- reply = MALLOC(size);
- closure.reply = (TRACEKIT_p2p_REPLY_GENERIC*) reply;
- closure.max = count;
+ closure.peers = NULL;
+ closure.max = 0;
closure.pos = 0;
- coreAPI->forAllConnectedNodes((PerNodeCallback)&getPeerCallback,
+ coreAPI->forAllConnectedNodes(&getPeerCallback,
&closure);
- reply->header.type
- = htons(TRACEKIT_p2p_PROTO_REPLY);
- reply->initiatorId
- = msg->initiatorId;
- reply->responderId
- = *(coreAPI->myIdentity);
- reply->initiatorTimestamp
- = msg->timestamp;
- reply->clientId
- = msg->clientId;
- /* break up into chunks of MTU size! */
- while (size >= sizeof(TRACEKIT_p2p_REPLY)) {
- int rest;
- int maxBytes;
- int batchSize;
-
- if (size > 1024) {
- batchSize = (1024 - sizeof(TRACEKIT_p2p_REPLY) / sizeof(PeerIdentity));
- maxBytes = sizeof(TRACEKIT_p2p_REPLY) + sizeof(PeerIdentity) * batchSize;
- } else {
- batchSize = (size - sizeof(TRACEKIT_p2p_REPLY)) / sizeof(PeerIdentity);
- maxBytes = size;
- }
+ /* build local reply */
+ while (closure.pos > 0) {
+ count = closure.pos;
+ if (count > 60000 / sizeof(PeerIdentity))
+ count = 60000 / sizeof(PeerIdentity);
+ size = sizeof(P2P_tracekit_reply_MESSAGE) + count*sizeof(PeerIdentity);
+ reply = MALLOC(size);
reply->header.size
- = htons(maxBytes);
+ = htons(size);
+ reply->header.type
+ = htons(P2P_PROTO_tracekit_REPLY);
+ reply->initiatorId
+ = msg->initiatorId;
+ reply->responderId
+ = *(coreAPI->myIdentity);
+ reply->initiatorTimestamp
+ = msg->timestamp;
+ reply->clientId
+ = msg->clientId;
+ memcpy(&reply[1],
+ &closure.peers[closure.pos - count],
+ count * sizeof(PeerIdentity));
if (equalsHashCode512(&coreAPI->myIdentity->hashPubKey,
&sender->hashPubKey)) {
handlep2pReply(coreAPI->myIdentity,
@@ -304,35 +304,32 @@
ntohl(msg->priority),
0);
}
- rest = size - maxBytes;
- memcpy(&((TRACEKIT_p2p_REPLY_GENERIC*)reply)->peerList[0],
- &((TRACEKIT_p2p_REPLY_GENERIC*)reply)->peerList[maxBytes -
sizeof(TRACEKIT_p2p_REPLY)],
- rest);
- size -= maxBytes;
- if (rest == 0)
- break;
+ closure.pos -= count;
+ FREE(reply);
}
- FREE(reply);
+ GROW(closure.peers,
+ closure.max,
+ 0);
return OK;
}
static int csHandle(ClientHandle client,
- const CS_HEADER * message) {
+ const CS_MESSAGE_HEADER * message) {
int i;
int idx;
- TRACEKIT_CS_PROBE * csProbe;
- TRACEKIT_p2p_PROBE p2pProbe;
+ CS_tracekit_probe_MESSAGE * csProbe;
+ P2P_tracekit_probe_MESSAGE p2pProbe;
LOG(LOG_DEBUG,
"TRACEKIT: client sends probe request\n");
/* build probe, broadcast */
- csProbe = (TRACEKIT_CS_PROBE*) message;
+ csProbe = (CS_tracekit_probe_MESSAGE*) message;
if (ntohs(csProbe->header.size) !=
- sizeof(TRACEKIT_CS_PROBE) ) {
+ sizeof(CS_tracekit_probe_MESSAGE) ) {
LOG(LOG_WARNING,
_("TRACEKIT: received invalid '%s' message\n"),
- "TRACEKIT_CS_PROBE");
+ "CS_tracekit_probe_MESSAGE");
return SYSERR;
}
@@ -362,9 +359,9 @@
idx);
p2pProbe.header.size
- = htons(sizeof(TRACEKIT_p2p_PROBE));
+ = htons(sizeof(P2P_tracekit_probe_MESSAGE));
p2pProbe.header.type
- = htons(TRACEKIT_p2p_PROTO_PROBE);
+ = htons(P2P_PROTO_tracekit_PROBE);
p2pProbe.clientId
= htonl(idx);
p2pProbe.hopsToGo
@@ -412,21 +409,21 @@
coreAPI = capi;
LOG(LOG_DEBUG,
"TRACEKIT registering handlers %d %d and %d\n",
- TRACEKIT_p2p_PROTO_PROBE,
- TRACEKIT_p2p_PROTO_REPLY,
- TRACEKIT_CS_PROTO_PROBE);
+ P2P_PROTO_tracekit_PROBE,
+ P2P_PROTO_tracekit_REPLY,
+ CS_PROTO_tracekit_PROBE);
memset(routeTable,
0,
MAXROUTE*sizeof(RTE*));
- if (SYSERR == capi->registerHandler(TRACEKIT_p2p_PROTO_PROBE,
+ if (SYSERR == capi->registerHandler(P2P_PROTO_tracekit_PROBE,
&handlep2pProbe))
ok = SYSERR;
- if (SYSERR == capi->registerHandler(TRACEKIT_p2p_PROTO_REPLY,
+ if (SYSERR == capi->registerHandler(P2P_PROTO_tracekit_REPLY,
&handlep2pReply))
ok = SYSERR;
if (SYSERR == capi->registerClientExitHandler(&clientExitHandler))
ok = SYSERR;
- if (SYSERR == capi->registerClientHandler(TRACEKIT_CS_PROTO_PROBE,
+ if (SYSERR == capi->registerClientHandler(CS_PROTO_tracekit_PROBE,
(CSHandler)&csHandle))
ok = SYSERR;
setConfigurationString("ABOUT",
@@ -438,12 +435,12 @@
void done_module_tracekit() {
int i;
- coreAPI->unregisterHandler(TRACEKIT_p2p_PROTO_PROBE,
+ coreAPI->unregisterHandler(P2P_PROTO_tracekit_PROBE,
&handlep2pProbe);
- coreAPI->unregisterHandler(TRACEKIT_p2p_PROTO_REPLY,
+ coreAPI->unregisterHandler(P2P_PROTO_tracekit_REPLY,
&handlep2pReply);
coreAPI->unregisterClientExitHandler(&clientExitHandler);
- coreAPI->unregisterClientHandler(TRACEKIT_CS_PROTO_PROBE,
+ coreAPI->unregisterClientHandler(CS_PROTO_tracekit_PROBE,
(CSHandler)&csHandle);
for (i=0;i<MAXROUTE;i++) {
FREENONNULL(routeTable[i]);
Modified: GNUnet/src/applications/tracekit/tracekit.h
===================================================================
--- GNUnet/src/applications/tracekit/tracekit.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/tracekit/tracekit.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -29,7 +29,7 @@
#include "gnunet_core.h"
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
/**
* When was this probe started? (NBO)
@@ -57,10 +57,10 @@
*/
PeerIdentity initiatorId;
-} TRACEKIT_p2p_PROBE;
+} P2P_tracekit_probe_MESSAGE;
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
/**
* Which peer is the ultimate receiver of this
@@ -85,21 +85,21 @@
*/
unsigned int clientId;
-} TRACEKIT_p2p_REPLY;
+} P2P_tracekit_reply_MESSAGE;
typedef struct {
- TRACEKIT_p2p_REPLY p2p_reply;
+ P2P_tracekit_reply_MESSAGE p2p_reply;
/**
* List of peers that the responder is
* currently connected to.
*/
PeerIdentity peerList[1];
-} TRACEKIT_p2p_REPLY_GENERIC;
+} P2P_tracekit_reply_MESSAGE_GENERIC;
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
/**
* How many more hops should this probe go (NBO)
@@ -110,10 +110,10 @@
* How important is the probe for the sender? (NBO)
*/
unsigned int priority;
-} TRACEKIT_CS_PROBE;
+} CS_tracekit_probe_MESSAGE;
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
/**
* Which peer is the ultimate responder responsible
@@ -121,16 +121,16 @@
*/
PeerIdentity responderId;
-} TRACEKIT_CS_REPLY;
+} CS_tracekit_reply_MESSAGE;
typedef struct {
- TRACEKIT_CS_REPLY cs_reply;
+ CS_tracekit_reply_MESSAGE cs_reply;
/**
* List of peers that the responder is
* currently connected to.
*/
PeerIdentity peerList[1];
-} TRACEKIT_CS_REPLY_GENERIC;
+} CS_tracekit_reply_MESSAGE_GENERIC;
#endif
Modified: GNUnet/src/applications/traffic/clientapi.c
===================================================================
--- GNUnet/src/applications/traffic/clientapi.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/traffic/clientapi.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -51,14 +51,14 @@
unsigned int * avg_size,
unsigned int * peers,
unsigned int * time) {
- CS_TRAFFIC_INFO * info;
- CS_TRAFFIC_REQUEST req;
+ CS_traffic_info_MESSAGE * info;
+ CS_traffic_request_MESSAGE req;
int i;
req.header.size
- = htons(sizeof(CS_TRAFFIC_REQUEST));
+ = htons(sizeof(CS_traffic_request_MESSAGE));
req.header.type
- = htons(CS_PROTO_TRAFFIC_QUERY);
+ = htons(CS_PROTO_traffic_QUERY);
req.timePeriod
= htonl(timeframe);
if (SYSERR == writeToSocket(sock,
@@ -69,21 +69,21 @@
}
info = NULL;
if (SYSERR == readFromSocket(sock,
- (CS_HEADER**)&info)) {
+ (CS_MESSAGE_HEADER**)&info)) {
LOG(LOG_WARNING,
_("Did not receive reply from gnunetd about traffic conditions.\n"));
return SYSERR;
}
if ( (ntohs(info->header.type) !=
- CS_PROTO_TRAFFIC_INFO) ||
+ CS_PROTO_traffic_INFO) ||
(ntohs(info->header.size) !=
- sizeof(CS_TRAFFIC_INFO) + ntohl(info->count)*sizeof(TRAFFIC_COUNTER)) )
{
+ sizeof(CS_traffic_info_MESSAGE) +
ntohl(info->count)*sizeof(TRAFFIC_COUNTER)) ) {
BREAK();
return SYSERR;
}
for (i=ntohl(info->count)-1;i>=0;i--) {
- TRAFFIC_COUNTER * tc = &((CS_TRAFFIC_INFO_GENERIC*)info)->counters[i];
+ TRAFFIC_COUNTER * tc =
&((CS_traffic_info_MESSAGE_GENERIC*)info)->counters[i];
if ((tc->flags & TC_TYPE_MASK) == direction) {
*count = ntohl(tc->count);
*avg_size = ntohl(tc->avrg_size);
Modified: GNUnet/src/applications/traffic/traffic.c
===================================================================
--- GNUnet/src/applications/traffic/traffic.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/traffic/traffic.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -57,11 +57,11 @@
#endif
#if KEEP_RECEIVE_STATS
-static int stat_traffic_received_by_type[MAX_p2p_PROTO_USED];
+static int stat_traffic_received_by_type[P2P_PROTO_MAX_USED];
#endif
#if KEEP_TRANSMITTED_STATS
-static int stat_traffic_transmitted_by_type[MAX_p2p_PROTO_USED];
+static int stat_traffic_transmitted_by_type[P2P_PROTO_MAX_USED];
#endif
/**
@@ -287,8 +287,8 @@
/**
* Build a reply message for the client.
*/
-static CS_TRAFFIC_INFO * buildReply(unsigned int countTimeUnits) {
- CS_TRAFFIC_INFO * reply;
+static CS_traffic_info_MESSAGE * buildReply(unsigned int countTimeUnits) {
+ CS_traffic_info_MESSAGE * reply;
unsigned int count;
unsigned int i;
@@ -301,23 +301,23 @@
if (counters[i]->receive.slots != 0)
count++;
}
- reply = MALLOC(sizeof(CS_TRAFFIC_INFO)+
+ reply = MALLOC(sizeof(CS_traffic_info_MESSAGE)+
count * sizeof(TRAFFIC_COUNTER));
- reply->header.type = htons(CS_PROTO_TRAFFIC_INFO);
- reply->header.size = htons(sizeof(CS_TRAFFIC_INFO)+
+ reply->header.type = htons(CS_PROTO_traffic_INFO);
+ reply->header.size = htons(sizeof(CS_traffic_info_MESSAGE)+
count * sizeof(TRAFFIC_COUNTER));
reply->count = htonl(count);
count = 0;
for (i=0;i<max_message_type;i++)
if (counters[i] != NULL) {
if (counters[i]->send.slots != 0)
- buildSummary(&((CS_TRAFFIC_INFO_GENERIC*)reply)->counters[count++],
+
buildSummary(&((CS_traffic_info_MESSAGE_GENERIC*)reply)->counters[count++],
&counters[i]->send,
TC_SENT,
countTimeUnits,
i);
if (counters[i]->receive.slots != 0)
- buildSummary(&((CS_TRAFFIC_INFO_GENERIC*)reply)->counters[count++],
+
buildSummary(&((CS_traffic_info_MESSAGE_GENERIC*)reply)->counters[count++],
&counters[i]->receive,
TC_RECEIVED,
countTimeUnits,
@@ -329,14 +329,14 @@
}
static int trafficQueryHandler(ClientHandle sock,
- const CS_HEADER * message) {
- CS_TRAFFIC_REQUEST * msg;
- CS_TRAFFIC_INFO * reply;
+ const CS_MESSAGE_HEADER * message) {
+ CS_traffic_request_MESSAGE * msg;
+ CS_traffic_info_MESSAGE * reply;
int ret;
- if (sizeof(CS_TRAFFIC_REQUEST) != ntohs(message->size))
+ if (sizeof(CS_traffic_request_MESSAGE) != ntohs(message->size))
return SYSERR;
- msg = (CS_TRAFFIC_REQUEST*) message;
+ msg = (CS_traffic_request_MESSAGE*) message;
reply = buildReply(ntohl(msg->timePeriod));
ret = coreAPI->sendToClient(sock, &reply->header);
FREE(reply);
@@ -435,7 +435,7 @@
static void updateTrafficSendCounter(unsigned short ptyp,
unsigned short plen) {
#if KEEP_TRANSMITTED_STATS
- if (ptyp >= MAX_p2p_PROTO_USED)
+ if (ptyp >= P2P_PROTO_MAX_USED)
return; /* not tracked */
if (0 == stat_traffic_transmitted_by_type[ptyp]) {
char * s;
@@ -456,7 +456,7 @@
static void updateTrafficReceiveCounter(unsigned short ptyp,
unsigned short plen) {
#if KEEP_RECEIVE_STATS
- if (ptyp < MAX_p2p_PROTO_USED) {
+ if (ptyp < P2P_PROTO_MAX_USED) {
if (0 == stat_traffic_received_by_type[ptyp]) {
char * s;
s = MALLOC(256);
@@ -482,7 +482,7 @@
* @param sender the identity of the sender
*/
static int trafficReceive(const PeerIdentity * sender,
- const p2p_HEADER * header) {
+ const P2P_MESSAGE_HEADER * header) {
unsigned short port;
port = ntohs(header->type);
@@ -505,7 +505,7 @@
* @param receiver the identity of the receiver
*/
static int trafficSend(const PeerIdentity * receiver,
- const p2p_HEADER * header) {
+ const P2P_MESSAGE_HEADER * header) {
unsigned short port;
port = ntohs(header->type);
@@ -534,12 +534,12 @@
coreAPI = capi;
api.get = &getTrafficStats;
#if KEEP_TRANSMITTED_STATS
- for (i=0;i<MAX_p2p_PROTO_USED;i++)
+ for (i=0;i<P2P_PROTO_MAX_USED;i++)
stat_traffic_transmitted_by_type[i] = 0;
coreAPI->registerSendNotify(&trafficSend);
#endif
#if KEEP_RECEIVE_STATS
- for (i=0;i<MAX_p2p_PROTO_USED;i++) {
+ for (i=0;i<P2P_PROTO_MAX_USED;i++) {
stat_traffic_received_by_type[i] = 0;
coreAPI->registerHandler(i,
&trafficReceive);
@@ -561,7 +561,7 @@
unsigned int i;
#if KEEP_RECEIVE_STATS
- for (i=0;i<MAX_p2p_PROTO_USED;i++)
+ for (i=0;i<P2P_PROTO_MAX_USED;i++)
coreAPI->unregisterHandler(i,
&trafficReceive);
#endif
@@ -598,7 +598,7 @@
myCoreAPI = NULL;
return SYSERR;
}
- capi->registerClientHandler(CS_PROTO_TRAFFIC_QUERY,
+ capi->registerClientHandler(CS_PROTO_traffic_QUERY,
&trafficQueryHandler);
setConfigurationString("ABOUT",
"traffic",
@@ -611,7 +611,7 @@
*/
void done_module_traffic() {
GNUNET_ASSERT(myCoreAPI != NULL);
- GNUNET_ASSERT(SYSERR !=
myCoreAPI->unregisterClientHandler(CS_PROTO_TRAFFIC_QUERY,
+ GNUNET_ASSERT(SYSERR !=
myCoreAPI->unregisterClientHandler(CS_PROTO_traffic_QUERY,
&trafficQueryHandler));
myCoreAPI->releaseService(myApi);
myApi = NULL;
Modified: GNUnet/src/applications/traffic/traffic.h
===================================================================
--- GNUnet/src/applications/traffic/traffic.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/applications/traffic/traffic.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -70,7 +70,7 @@
* if it sends a CS_TRAFFIC_QUERY to gnunetd.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
/**
* The number of different message types we have seen
@@ -78,33 +78,27 @@
*/
unsigned int count;
-} CS_TRAFFIC_INFO;
+} CS_traffic_info_MESSAGE;
/**
- * Generic version of CS_TRAFFIC_INFO with field for accessing end of struct
+ * Generic version of CS_traffic_info_MESSAGE with field for accessing end of
struct
* (use the other version for allocation).
*/
typedef struct {
- CS_TRAFFIC_INFO cs_traffic_info;
+ CS_traffic_info_MESSAGE cs_traffic_info;
/**
- * The number of different message types we have seen
- * in the last time.
- */
- unsigned int count;
-
- /**
* "count" traffic counters.
*/
TRAFFIC_COUNTER counters[1];
-} CS_TRAFFIC_INFO_GENERIC;
+} CS_traffic_info_MESSAGE_GENERIC;
/**
- * Request for CS_TRAFFIC_INFO.
+ * Request for CS_traffic_info_MESSAGE.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
/**
* How many time units back should the statistics returned contain?
@@ -112,7 +106,7 @@
*/
unsigned int timePeriod;
-} CS_TRAFFIC_REQUEST;
+} CS_traffic_request_MESSAGE;
#endif
Modified: GNUnet/src/applications/transport/transport.c
===================================================================
--- GNUnet/src/applications/transport/transport.c 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/applications/transport/transport.c 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -42,21 +42,21 @@
static unsigned int helo_live;
static Mutex tapis_lock;
-#define HELO_RECREATE_FREQ (5 * cronMINUTES)
+#define hello_RECREATE_FREQ (5 * cronMINUTES)
/**
- * Create signed HELO for this transport and put it into
+ * Create signed hello for this transport and put it into
* the cache tapi->helo.
*/
-static void createSignedHELO(TransportAPI * tapi) {
+static void createSignedhello(TransportAPI * tapi) {
MUTEX_LOCK(&tapis_lock);
FREENONNULL(tapi->helo);
- tapi->helo = tapi->createHELO();
+ tapi->helo = tapi->createhello();
if (NULL == tapi->helo) {
LOG(LOG_INFO,
- "Transport '%s' failed to create HELO\n",
+ "Transport '%s' failed to create hello\n",
tapi->transName);
MUTEX_UNLOCK(&tapis_lock);
return;
@@ -70,14 +70,14 @@
tapi->helo->expirationTime
= htonl(TIME(NULL) + helo_live);
tapi->helo->header.type
- = htons(p2p_PROTO_HELO);
+ = htons(p2p_PROTO_hello);
tapi->helo->header.size
- = htons(HELO_Message_size(tapi->helo));
+ = htons(P2P_hello_MESSAGE_size(tapi->helo));
if (SYSERR == identity->signData(&(tapi->helo)->senderIdentity,
- HELO_Message_size(tapi->helo)
+ P2P_hello_MESSAGE_size(tapi->helo)
- sizeof(Signature)
- sizeof(PublicKey)
- - sizeof(p2p_HEADER),
+ - sizeof(P2P_MESSAGE_HEADER),
&tapi->helo->signature)) {
FREE(tapi->helo);
tapi->helo = NULL;
@@ -108,17 +108,17 @@
tapi->protocolNumber+1);
tapis[tapi->protocolNumber] = tapi;
tapi->helo = NULL;
- addCronJob((CronJob)&createSignedHELO,
- HELO_RECREATE_FREQ,
- HELO_RECREATE_FREQ,
+ addCronJob((CronJob)&createSignedhello,
+ hello_RECREATE_FREQ,
+ hello_RECREATE_FREQ,
tapi);
return OK;
}
/**
- * Convert HELO to string.
+ * Convert hello to string.
*/
-static char * heloToString(const HELO_Message * helo) {
+static char * heloToString(const P2P_hello_MESSAGE * helo) {
TransportAPI * tapi;
unsigned short prot;
@@ -168,12 +168,12 @@
* transport layer. This may fail if the appropriate
* transport mechanism is not available.
*
- * @param helo the HELO of the target node. The
- * callee is responsible for freeing the HELO (!), except
+ * @param helo the hello of the target node. The
+ * callee is responsible for freeing the hello (!), except
* if SYSERR is returned!
* @return OK on success, SYSERR on error
*/
-static TSession * transportConnect(const HELO_Message * helo) {
+static TSession * transportConnect(const P2P_hello_MESSAGE * helo) {
TransportAPI * tapi;
unsigned short prot;
TSession * tsession;
@@ -211,7 +211,7 @@
static TSession * transportConnectFreely(const PeerIdentity * peer,
int useTempList) {
int i;
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
int * perm;
TSession * ret;
@@ -396,12 +396,12 @@
}
/**
- * Verify that a HELO is ok. Call a method
+ * Verify that a hello is ok. Call a method
* if the verification was successful.
* @return OK if the attempt to verify is on the way,
* SYSERR if the transport mechanism is not supported
*/
-static int transportVerifyHelo(const HELO_Message * helo) {
+static int transportVerifyHelo(const P2P_hello_MESSAGE * helo) {
TransportAPI * tapi;
if (ntohs(helo->protocol) >= tapis_count) {
@@ -438,12 +438,12 @@
}
/**
- * Create a HELO advertisement for the given
+ * Create a hello advertisement for the given
* transport type for this node.
*/
-static HELO_Message * transportCreateHELO(unsigned short ttype) {
+static P2P_hello_MESSAGE * transportCreatehello(unsigned short ttype) {
TransportAPI * tapi;
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
MUTEX_LOCK(&tapis_lock);
if (ttype == ANY_PROTOCOL_NUMBER) {
@@ -481,16 +481,16 @@
}
if (tapi->helo == NULL) {
LOG(LOG_DEBUG,
- "Transport of type %d configured for sending only (no HELO).\n",
+ "Transport of type %d configured for sending only (no hello).\n",
ttype);
MUTEX_UNLOCK(&tapis_lock);
return NULL;
}
- helo = MALLOC(HELO_Message_size(tapi->helo));
+ helo = MALLOC(P2P_hello_MESSAGE_size(tapi->helo));
memcpy(helo,
tapi->helo,
- HELO_Message_size(tapi->helo));
+ P2P_hello_MESSAGE_size(tapi->helo));
MUTEX_UNLOCK(&tapis_lock);
return helo;
}
@@ -504,15 +504,15 @@
* addresses in one message, thus the caller can bound the size of the
* advertisements.
*
- * @param maxLen the maximum size of the HELO message collection in bytes
- * @param buff where to write the HELO messages
+ * @param maxLen the maximum size of the hello message collection in bytes
+ * @param buff where to write the hello messages
* @return the number of bytes written to buff, -1 on error
*/
-static int getAdvertisedHELOs(unsigned int maxLen,
+static int getAdvertisedhellos(unsigned int maxLen,
char * buff) {
int i;
int tcount;
- HELO_Message ** helos;
+ P2P_hello_MESSAGE ** helos;
int used;
MUTEX_LOCK(&tapis_lock);
@@ -521,11 +521,11 @@
if (tapis[i] != NULL)
tcount++;
- helos = MALLOC(tcount * sizeof(HELO_Message*));
+ helos = MALLOC(tcount * sizeof(P2P_hello_MESSAGE*));
tcount = 0;
for (i=0;i<tapis_count;i++) {
if (tapis[i] != NULL) {
- helos[tcount] = transportCreateHELO(i);
+ helos[tcount] = transportCreatehello(i);
if (NULL != helos[tcount])
tcount++;
}
@@ -533,17 +533,17 @@
MUTEX_UNLOCK(&tapis_lock);
if (tcount == 0) {
LOG(LOG_DEBUG,
- "%s failed: no transport succeeded in creating a HELO\n");
+ "%s failed: no transport succeeded in creating a hello\n");
return SYSERR;
}
used = 0;
while (tcount > 0) {
- i = weak_randomi(tcount); /* select a HELO at random */
- if ((unsigned int)HELO_Message_size(helos[i]) <= maxLen - used) {
+ i = weak_randomi(tcount); /* select a hello at random */
+ if ((unsigned int)P2P_hello_MESSAGE_size(helos[i]) <= maxLen - used) {
memcpy(&buff[used],
helos[i],
- HELO_Message_size(helos[i]));
- used += HELO_Message_size(helos[i]);
+ P2P_hello_MESSAGE_size(helos[i]));
+ used += P2P_hello_MESSAGE_size(helos[i]);
}
FREE(helos[i]);
helos[i] = helos[--tcount];
@@ -553,7 +553,7 @@
FREE(helos);
if (used == 0)
LOG(LOG_DEBUG,
- "%s failed: no HELOs fit in %u bytes\n",
+ "%s failed: no hellos fit in %u bytes\n",
maxLen);
return used;
}
@@ -563,7 +563,7 @@
* Actually start the transport services and begin
* receiving messages.
*/
-static void startTransports(MessagePackProcessor mpp) {
+static void startTransports(P2P_PACKETProcessor mpp) {
int i;
ctapi.receive = mpp;
for (i=0;i<tapis_count;i++)
@@ -584,10 +584,10 @@
static void initHelper(TransportAPI * tapi,
void * unused) {
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
- createSignedHELO(tapi);
- helo = transportCreateHELO(tapi->protocolNumber);
+ createSignedhello(tapi);
+ helo = transportCreatehello(tapi->protocolNumber);
if (NULL != helo) {
identity->addHost(helo);
FREE(helo);
@@ -611,7 +611,7 @@
void * lib;
EncName myself;
- GNUNET_ASSERT(sizeof(HELO_Message) == 600);
+ GNUNET_ASSERT(sizeof(P2P_hello_MESSAGE) == 600);
identity = capi->requestService("identity");
if (identity == NULL) {
BREAK();
@@ -625,16 +625,16 @@
ctapi.releaseService = coreAPI->releaseService;
helo_live = getConfigurationInt("GNUNETD",
- "HELOEXPIRES") * 60; /* minutes to seconds */
- if (helo_live > MAX_HELO_EXPIRES)
- helo_live = MAX_HELO_EXPIRES;
+ "HELLOEXPIRES") * 60; /* minutes to seconds */
+ if (helo_live > MAX_hello_EXPIRES)
+ helo_live = MAX_hello_EXPIRES;
if (helo_live <= 0) {
helo_live = 60 * 60;
LOG(LOG_WARNING,
_("Option '%s' not set in configuration in section '%s',"
" setting to %dm.\n"),
- "HELOEXPIRES", "GNUNETD", helo_live / 60);
+ "HELLOEXPIRES", "GNUNETD", helo_live / 60);
}
GROW(tapis,
tapis_count,
@@ -710,11 +710,11 @@
ret.send = &transportSend;
ret.sendReliable = &transportSendReliable;
ret.disconnect = &transportDisconnect;
- ret.verifyHELO = &transportVerifyHelo;
+ ret.verifyhello = &transportVerifyHelo;
ret.heloToString = &heloToString;
ret.getMTU = &transportGetMTU;
- ret.createHELO = &transportCreateHELO;
- ret.getAdvertisedHELOs = &getAdvertisedHELOs;
+ ret.createhello = &transportCreatehello;
+ ret.getAdvertisedhellos = &getAdvertisedhellos;
return &ret;
}
@@ -729,8 +729,8 @@
for (i=0;i<tapis_count;i++) {
if (tapis[i] != NULL) {
- delCronJob((CronJob)&createSignedHELO,
- HELO_RECREATE_FREQ,
+ delCronJob((CronJob)&createSignedhello,
+ hello_RECREATE_FREQ,
tapis[i]);
ptr = bindDynamicMethod(tapis[i]->libHandle,
"donetransport_",
Modified: GNUnet/src/conf/wizard_curs.c
===================================================================
--- GNUnet/src/conf/wizard_curs.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/conf/wizard_curs.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -516,7 +516,7 @@
if (!isOSUserAddCapable(group_name, user_name))
showCursErr(_("Unable to create user account:"),
STRERROR(errno));
- if (!isOSAutostartCapable(autostart, user_name, group_name))
+ if (!isOSAutostartCapable())
showCursErr(_("Unable to change startup process:"),
STRERROR(errno));
init_dialog();
Modified: GNUnet/src/include/fs.h
===================================================================
--- GNUnet/src/include/fs.h 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/include/fs.h 2005-07-17 23:21:45 UTC (rev 1576)
@@ -34,7 +34,7 @@
* on the type).
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
/**
* Priority of the search.
@@ -64,17 +64,17 @@
*/
HashCode512 query[1];
-} RequestSearch;
+} CS_fs_request_search_MESSAGE;
/**
- * Server to client: content (in response to a RequestSearch). The
+ * Server to client: content (in response to a CS_fs_request_search_MESSAGE).
The
* header is followed by variable size data (the data portion
* of the Datastore_Value).
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
-} ReplyContent;
+} CS_fs_reply_content_MESSAGE;
/**
@@ -83,7 +83,7 @@
* number of bytes of content.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
/**
* Priority for the on-demand encoded entry.
@@ -102,7 +102,7 @@
*/
unsigned int anonymityLevel;
-} RequestInsert;
+} CS_fs_request_insert_MESSAGE;
/**
* Client to server: initialize to index content
@@ -110,7 +110,7 @@
* by the filename to index.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
unsigned int reserved;
@@ -120,7 +120,7 @@
*/
HashCode512 fileId;
-} RequestInitIndex;
+} CS_fs_request_init_index_MESSAGE;
/**
* Client to server: index content (for on-demand
@@ -128,7 +128,7 @@
* number of bytes of content.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
/**
* Priority for the on-demand encoded entry.
@@ -160,23 +160,23 @@
*/
unsigned int anonymityLevel;
-} RequestIndex;
+} CS_fs_request_index_MESSAGE;
/**
* Client to server: delete content. This struct is followed by a
* variable number of bytes of the content that is to be deleted.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
-} RequestDelete;
+} CS_fs_request_delete_MESSAGE;
/**
* Client to server: unindex file.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
/**
* Size of each block of the file.
@@ -189,13 +189,13 @@
*/
HashCode512 fileId;
-} RequestUnindex;
+} CS_fs_request_unindex_MESSAGE;
/**
* Client to server: test if file is indexed
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
unsigned int reserved;
Modified: GNUnet/src/include/gnunet_blockstore.h
===================================================================
--- GNUnet/src/include/gnunet_blockstore.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/include/gnunet_blockstore.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
Modified: GNUnet/src/include/gnunet_bootstrap_service.h
===================================================================
--- GNUnet/src/include/gnunet_bootstrap_service.h 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/include/gnunet_bootstrap_service.h 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
@@ -23,17 +24,17 @@
* @author Christian Grothoff
*/
-#ifndef HTTPHELO_H
-#define HTTPHELO_H
+#ifndef HTTPhello_H
+#define HTTPhello_H
#include "gnunet_core.h"
/**
* Definition of a callback function that processes
- * HELO messages generated by the bootstrap API.
+ * hello messages generated by the bootstrap API.
*/
-typedef void (*HELO_Callback)(const HELO_Message * helo,
- void * arg);
+typedef void (*hello_Callback)(const P2P_hello_MESSAGE * helo,
+ void * arg);
/**
* @brief Definition of the bootstrap API.
@@ -41,13 +42,13 @@
typedef struct {
/**
- * Obtain HELOs (i.e. by downloading form the web) and call the
- * callback on each HELO.
+ * Obtain hellos (i.e. by downloading form the web) and call the
+ * callback on each hello.
*
* @param callback the method to call
* @param arg extra argument to the method
*/
- void (*bootstrap)(HELO_Callback callback,
+ void (*bootstrap)(hello_Callback callback,
void * arg);
} Bootstrap_ServiceAPI;
Modified: GNUnet/src/include/gnunet_core.h
===================================================================
--- GNUnet/src/include/gnunet_core.h 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/include/gnunet_core.h 2005-07-17 23:21:45 UTC (rev 1576)
@@ -40,7 +40,7 @@
* roughly the main GNUnet version scheme, but is
* more a compatibility ID.
*/
-#define GNUNET_CORE_VERSION 0x00060900
+#define GNUNET_CORE_VERSION 0x00070000
/**
@@ -49,6 +49,12 @@
*/
#define EXTREME_PRIORITY 0xFFFFFF
+/**
+ * Overhead of the core for encapsulating P2P messages.
+ * Should be subtracted from the transport MTU to compute
+ * the amount of space available for an unfragmented
+ * message.
+ */
#define P2P_MESSAGE_OVERHEAD 76
/**
@@ -61,7 +67,7 @@
} TSession;
/**
- * @brief HELO. A HELO body contains the current HostAddress, the
+ * @brief hello. A hello body contains the current HostAddress, the
* host identity (hash), the time how long the HostAddress is valid, a
* signature signing the information above and the public key of the
* host. The hash of the public key must match the host identity.<p>
@@ -71,7 +77,7 @@
* long, what is actually signed is the hash of these bytes.
*/
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
/**
* The signature
@@ -107,26 +113,16 @@
/**
* protocol supported by the node (only one protocol
- * can be advertised by the same HELO)
+ * can be advertised by the same hello)
* Examples are UDP, TCP, etc. This field is
* in network byte order
*/
unsigned short protocol;
-} HELO_Message;
+} P2P_hello_MESSAGE;
-typedef struct {
- HELO_Message helo_message;
+#define P2P_hello_MESSAGE_size(helo) ((sizeof(P2P_hello_MESSAGE) +
ntohs((helo)->senderAddressSize)))
- /**
- * address of the node in a protocol specific format
- */
- char senderAddress[1];
-
-} HELO_Message_GENERIC;
-
-#define HELO_Message_size(helo) ((sizeof(HELO_Message) +
ntohs((helo)->senderAddressSize)))
-
/**
* Opaque handle for client connections passed by
* the core to the CSHandlers.
@@ -137,7 +133,7 @@
* Type of a handler for messages from clients.
*/
typedef int (*CSHandler)(ClientHandle client,
- const CS_HEADER * message);
+ const CS_MESSAGE_HEADER * message);
/**
* Method called whenever a given client disconnects.
@@ -148,7 +144,7 @@
* Type of a handler for some message type.
*/
typedef int (*MessagePartHandler)(const PeerIdentity * sender,
- const p2p_HEADER * message);
+ const P2P_MESSAGE_HEADER * message);
/**
* Type of a handler for plaintext messages. Since we cannot
@@ -156,7 +152,7 @@
* the callback.
*/
typedef int (*PlaintextMessagePartHandler)(const PeerIdentity * sender,
- const p2p_HEADER * message,
+ const P2P_MESSAGE_HEADER * message,
TSession * session);
/**
@@ -204,7 +200,7 @@
* transfer happens asynchronously.
*/
typedef int (*SendToClientCallback)(ClientHandle handle,
- const CS_HEADER * message);
+ const CS_MESSAGE_HEADER * message);
/**
* GNUnet CORE API for applications and services that are implemented
@@ -281,7 +277,7 @@
* from the GNUnet core.
*
* @param session the transport session
- * @param msg the message to transmit, should contain p2p_HEADERs
+ * @param msg the message to transmit, should contain P2P_MESSAGE_HEADERs
* @return OK on success, SYSERR on failure
*/
int (*sendPlaintext)(TSession * session,
@@ -298,7 +294,7 @@
* @param maxdelay how long can the message be delayed?
*/
void (*unicast)(const PeerIdentity * receiver,
- const p2p_HEADER * msg,
+ const P2P_MESSAGE_HEADER * msg,
unsigned int importance,
unsigned int maxdelay);
Modified: GNUnet/src/include/gnunet_dht.h
===================================================================
--- GNUnet/src/include/gnunet_dht.h 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/include/gnunet_dht.h 2005-07-17 23:21:45 UTC (rev 1576)
@@ -60,22 +60,22 @@
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
DHT_TableId table;
-} DHT_CS_REQUEST_JOIN;
+} CS_dht_request_join_MESSAGE;
/**
* TCP communication: client to gnunetd: leave table
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
DHT_TableId table;
-} DHT_CS_REQUEST_LEAVE;
+} CS_dht_request_leave_MESSAGE;
/**
@@ -84,7 +84,7 @@
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
DHT_TableId table;
@@ -94,15 +94,15 @@
unsigned int priority; /* nbo */
-} DHT_CS_REQUEST_PUT;
+} CS_dht_request_put_MESSAGE;
/**
* TCP communication: get <key,value>-mappings
- * for given key. Reply is a DHT_CS_REPLY_RESULTS message.
+ * for given key. Reply is a CS_dht_reply_results_MESSAGE message.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
unsigned int type; /* nbo */
@@ -115,14 +115,14 @@
/* one or more keys */
HashCode512 keys;
-} DHT_CS_REQUEST_GET;
+} CS_dht_request_get_MESSAGE;
/**
* remove value. Reply is just an ACK.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
DHT_TableId table;
@@ -130,26 +130,26 @@
HashCode512 key;
-} DHT_CS_REQUEST_REMOVE;
+} CS_dht_request_remove_MESSAGE;
/**
* gnunetd to client: iterate over all values. Reply is
- * a DHT_CS_REPLY_RESULTS message.
+ * a CS_dht_reply_results_MESSAGE message.
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
-} DHT_CS_REQUEST_ITERATE;
+} CS_dht_request_iterate_MESSAGE;
/**
* TCP communication: Results for a request. Uses a separate message
- * for each result; DHT_CS_REPLY_RESULTS maybe repeated many
+ * for each result; CS_dht_reply_results_MESSAGE maybe repeated many
* times (the total number is given in totalResults).
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
unsigned int totalResults;
@@ -159,19 +159,19 @@
DataContainer data;
-} DHT_CS_REPLY_RESULTS;
+} CS_dht_reply_results_MESSAGE;
/**
* TCP communication: status response for a request
*/
typedef struct {
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
int status; /* NBO */
DHT_TableId table;
-} DHT_CS_REPLY_ACK;
+} CS_dht_reply_ack_MESSAGE;
#endif /* GNUNET_DHT_H */
Modified: GNUnet/src/include/gnunet_dht_lib.h
===================================================================
--- GNUnet/src/include/gnunet_dht_lib.h 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/include/gnunet_dht_lib.h 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
Modified: GNUnet/src/include/gnunet_dht_service.h
===================================================================
--- GNUnet/src/include/gnunet_dht_service.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/include/gnunet_dht_service.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
Modified: GNUnet/src/include/gnunet_fragmentation_service.h
===================================================================
--- GNUnet/src/include/gnunet_fragmentation_service.h 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/include/gnunet_fragmentation_service.h 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
Modified: GNUnet/src/include/gnunet_gap_service.h
===================================================================
--- GNUnet/src/include/gnunet_gap_service.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/include/gnunet_gap_service.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
Modified: GNUnet/src/include/gnunet_getoption_lib.h
===================================================================
--- GNUnet/src/include/gnunet_getoption_lib.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/include/gnunet_getoption_lib.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
Modified: GNUnet/src/include/gnunet_identity_service.h
===================================================================
--- GNUnet/src/include/gnunet_identity_service.h 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/include/gnunet_identity_service.h 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (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
@@ -32,11 +33,11 @@
#include "gnunet_core.h"
/**
- * How long may a HELO be valid (in seconds). We use 10 days, do not
+ * How long may a hello be valid (in seconds). We use 10 days, do not
* change (would break compatibility with peers that have a different
* limit).
*/
-#define MAX_HELO_EXPIRES (60 * 60 * 24 * 10)
+#define MAX_hello_EXPIRES (60 * 60 * 24 * 10)
/**
* Type of an iterator over the hosts. Note that each
@@ -107,13 +108,13 @@
/**
* Add a host to the temporary list.
*/
- void (*addHostTemporarily)(const HELO_Message * tmp);
+ void (*addHostTemporarily)(const P2P_hello_MESSAGE * tmp);
/**
* Add a host to the persistent list.
- * @param msg the verified (!) HELO message
+ * @param msg the verified (!) hello message
*/
- void (*addHost)(const HELO_Message * msg);
+ void (*addHost)(const P2P_hello_MESSAGE * msg);
/**
* Call a method for each known host.
@@ -129,17 +130,17 @@
/**
* Obtain the public key and address of a known host. If no specific
- * protocol is specified (ANY_PROTOCOL_NUMBER), the HELO for the
+ * protocol is specified (ANY_PROTOCOL_NUMBER), the hello for the
* cheapest confirmed protocol is returned.
*
* @param hostId the host id
* @param protocol the protocol that we need,
* ANY_PROTOCOL_NUMBER if we do not care which protocol
- * @return NULL on failure, the HELO on success
+ * @return NULL on failure, the hello on success
*/
- HELO_Message * (*identity2Helo)(const PeerIdentity * hostId,
- unsigned short protocol,
- int tryTemporaryList);
+ P2P_hello_MESSAGE * (*identity2Helo)(const PeerIdentity * hostId,
+ unsigned short protocol,
+ int tryTemporaryList);
/**
*
Modified: GNUnet/src/include/gnunet_pingpong_service.h
===================================================================
--- GNUnet/src/include/gnunet_pingpong_service.h 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/include/gnunet_pingpong_service.h 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -79,7 +79,7 @@
* NULL and the ping does not come back, ping will FREE data!
* @returns NULL on error, otherwise the PING message
*/
- p2p_HEADER * (*pingUser)(const PeerIdentity * receiver,
+ P2P_MESSAGE_HEADER * (*pingUser)(const PeerIdentity * receiver,
CronJob method,
void * data,
int plaintext);
Modified: GNUnet/src/include/gnunet_protocols.h
===================================================================
--- GNUnet/src/include/gnunet_protocols.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/include/gnunet_protocols.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -119,71 +119,71 @@
/**
* client to gnunetd: send queries
*/
-#define AFS_CS_PROTO_QUERY_START 8
+#define CS_PROTO_gap_QUERY_START 8
/**
* client to gnunetd: stop query
*/
-#define AFS_CS_PROTO_QUERY_STOP 9
+#define CS_PROTO_gap_QUERY_STOP 9
/**
* gnunetd to client: here is your answer
*/
-#define AFS_CS_PROTO_RESULT 9
+#define CS_PROTO_gap_RESULT 9
/**
* client to gnunetd: insert CHK content (no index)
*/
-#define AFS_CS_PROTO_INSERT 10
+#define CS_PROTO_gap_INSERT 10
/**
* client to gnunetd: index content
*/
-#define AFS_CS_PROTO_INDEX 11
+#define CS_PROTO_gap_INDEX 11
/**
* client to gnunetd: delete content
*/
-#define AFS_CS_PROTO_DELETE 12
+#define CS_PROTO_gap_DELETE 12
/**
* client to gnunetd: unindex content
*/
-#define AFS_CS_PROTO_UNINDEX 13
+#define CS_PROTO_gap_UNINDEX 13
/**
* client to gnunetd: test if content is indexed
*/
-#define AFS_CS_PROTO_TESTINDEX 14
+#define CS_PROTO_gap_TESTINDEX 14
/**
* Client to gnunetd: what is the average priority of entries in the
* routing table?
*/
-#define AFS_CS_PROTO_GET_AVG_PRIORITY 15
+#define CS_PROTO_gap_GET_AVG_PRIORITY 15
/**
* client to gnunetd: initialize to index file
*/
-#define AFS_CS_PROTO_INIT_INDEX 16
+#define CS_PROTO_gap_INIT_INDEX 16
/* *********** messages for traffic module ************* */
/**
* client to traffic module: to how many nodes are we connected?
- * reply is a CS_RETURN_VALUE message.
+ * reply is a CS_returnvalue_MESSAGE message.
*/
-#define CS_PROTO_CLIENT_COUNT 32
+#define CS_PROTO_traffic_COUNT 32
/**
* Client to traffic module: how much traffic do we have at the moment?
*/
-#define CS_PROTO_TRAFFIC_QUERY 33
+#define CS_PROTO_traffic_QUERY 33
/**
* traffic module to client: traffic statistics
*/
-#define CS_PROTO_TRAFFIC_INFO 34
+#define CS_PROTO_traffic_INFO 34
/* *********** messages for stats module ************* */
@@ -191,45 +191,45 @@
/**
* client to stats module: request statistics
*/
-#define STATS_CS_PROTO_GET_STATISTICS 36
+#define CS_PROTO_stats_GET_STATISTICS 36
/**
* stats module to client: statistics
*/
-#define STATS_CS_PROTO_STATISTICS 37
+#define CS_PROTO_stats_STATISTICS 37
/**
* client to stats module: is client server message supported
*/
-#define STATS_CS_PROTO_GET_CS_MESSAGE_SUPPORTED 38
+#define CS_PROTO_stats_GET_CS_MESSAGE_SUPPORTED 38
/**
* client to stats module: is p2p message supported
*/
-#define STATS_CS_PROTO_GET_P2P_MESSAGE_SUPPORTED 39
+#define CS_PROTO_stats_GET_P2P_MESSAGE_SUPPORTED 39
/* ********** CS TBENCH application messages ********** */
-#define TBENCH_CS_PROTO_REQUEST 40
-#define TBENCH_CS_PROTO_REPLY 41
+#define CS_PROTO_tbench_REQUEST 40
+#define CS_PROTO_tbench_REPLY 41
/* ********** CS TRACEKIT application messages ********* */
-#define TRACEKIT_CS_PROTO_PROBE 42
-#define TRACEKIT_CS_PROTO_REPLY 43
+#define CS_PROTO_tracekit_PROBE 42
+#define CS_PROTO_tracekit_REPLY 43
/* ********** CS CHAT application messages ********** */
-#define CHAT_CS_PROTO_MSG 44
+#define CS_PROTO_chat_MSG 44
/* ********** CS TESTBED application messages ********** */
-#define TESTBED_CS_PROTO_REQUEST 50
-#define TESTBED_CS_PROTO_REPLY 51
+#define CS_PROTO_testbed_REQUEST 50
+#define CS_PROTO_testbed_REPLY 51
/* ********** CS DHT application messages ********** */
@@ -237,45 +237,45 @@
/**
* client to CS: join table
*/
-#define DHT_CS_PROTO_REQUEST_JOIN 72
+#define CS_PROTO_dht_REQUEST_JOIN 72
/**
* client to CS: leave table
*/
-#define DHT_CS_PROTO_REQUEST_LEAVE 73
+#define CS_PROTO_dht_REQUEST_LEAVE 73
/**
* Client to CS or CS to client: get from table
*/
-#define DHT_CS_PROTO_REQUEST_GET 74
+#define CS_PROTO_dht_REQUEST_GET 74
/**
* Client to CS or CS to client: put into table
*/
-#define DHT_CS_PROTO_REQUEST_PUT 75
+#define CS_PROTO_dht_REQUEST_PUT 75
/**
* Client to CS or CS to client: remove from table
*/
-#define DHT_CS_PROTO_REQUEST_REMOVE 76
+#define CS_PROTO_dht_REQUEST_REMOVE 76
/**
* Client to CS or CS to client: results from get
*/
-#define DHT_CS_PROTO_REPLY_GET 77
+#define CS_PROTO_dht_REPLY_GET 77
/**
* Client to CS or CS to client: confirmed
*/
-#define DHT_CS_PROTO_REPLY_ACK 78
+#define CS_PROTO_dht_REPLY_ACK 78
/**
* Client to CS: iterate over table
*/
-#define DHT_CS_PROTO_REQUEST_ITERATE 79
+#define CS_PROTO_dht_REQUEST_ITERATE 79
-#define MAX_CS_PROTO_USED 80
+#define CS_PROTO_MAX_USED 80
/* ******** node-to-node (p2p) messages (over anything) ********* */
@@ -284,12 +284,12 @@
/**
* announcement of public key
*/
-#define p2p_PROTO_HELO 0
+#define p2p_PROTO_hello 0
/**
* session key exchange, session key is encrypted with hostkey
*/
-#define p2p_PROTO_SKEY 1
+#define P2P_PROTO_setkey 1
/**
* PING
@@ -305,58 +305,58 @@
* termination of connection (other host is nice
* and tells us, there is NO requirement to do so!)
*/
-#define p2p_PROTO_HANGUP 4
+#define P2P_PROTO_hangup 4
/**
* Fragmented message.
*/
-#define p2p_PROTO_FRAGMENT 5
+#define P2P_PROTO_fragment 5
/**
* noise, used to fill packets to sizes >1k.
*/
-#define p2p_PROTO_NOISE 6
+#define P2P_PROTO_noise 6
/* ************* p2p GAP application messages *********** */
/**
* Query for content.
*/
-#define GAP_p2p_PROTO_QUERY 16
+#define P2P_PROTO_gap_QUERY 16
/**
* receive content
*/
-#define GAP_p2p_PROTO_RESULT 17
+#define P2P_PROTO_gap_RESULT 17
/* ************** p2p CHAT application messages *********** */
/**
* chat message
*/
-#define CHAT_p2p_PROTO_MSG 32
+#define P2P_PROTO_chat_MSG 32
/* *************** p2p TRACEKIT application messages ******** */
-#define TRACEKIT_p2p_PROTO_PROBE 36
+#define P2P_PROTO_tracekit_PROBE 36
-#define TRACEKIT_p2p_PROTO_REPLY 37
+#define P2P_PROTO_tracekit_REPLY 37
/* ********** p2p TBENCH application messages ********** */
/**
* benchmark message: send back reply asap
*/
-#define TBENCH_p2p_PROTO_REQUEST 40
-#define TBENCH_p2p_PROTO_REPLY 41
+#define P2P_PROTO_tbench_REQUEST 40
+#define P2P_PROTO_tbench_REPLY 41
/************** p2p RPC application messages ************/
-#define RPC_p2p_PROTO_REQ 42
-#define RPC_p2p_PROTO_RES 43
-#define RPC_p2p_PROTO_ACK 44
+#define P2P_PROTO_rpc_REQ 42
+#define P2P_PROTO_rpc_RES 43
+#define P2P_PROTO_rpc_ACK 44
-#define MAX_p2p_PROTO_USED 45
+#define P2P_PROTO_MAX_USED 45
Modified: GNUnet/src/include/gnunet_sqstore_service.h
===================================================================
--- GNUnet/src/include/gnunet_sqstore_service.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/include/gnunet_sqstore_service.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
Modified: GNUnet/src/include/gnunet_topology_service.h
===================================================================
--- GNUnet/src/include/gnunet_topology_service.h 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/include/gnunet_topology_service.h 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
Modified: GNUnet/src/include/gnunet_traffic_lib.h
===================================================================
--- GNUnet/src/include/gnunet_traffic_lib.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/include/gnunet_traffic_lib.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
Modified: GNUnet/src/include/gnunet_transport.h
===================================================================
--- GNUnet/src/include/gnunet_transport.h 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/include/gnunet_transport.h 2005-07-17 23:21:45 UTC (rev
1576)
@@ -41,7 +41,7 @@
* roughly the main GNUnet version scheme, but is
* more a compatibility ID.
*/
-#define GNUNET_TRANSPORT_VERSION 0x00060900
+#define GNUNET_TRANSPORT_VERSION 0x00070000
/**
* Type of a struct passed to receive.
@@ -71,7 +71,7 @@
*/
unsigned int size;
-} MessagePack;
+} P2P_PACKET;
/**
* Function that is to be used to process messages
@@ -79,7 +79,7 @@
*
* @param mp the message, freed by the callee once processed!
*/
-typedef void (*MessagePackProcessor)(MessagePack * mp);
+typedef void (*P2P_PACKETProcessor)(P2P_PACKET * mp);
/**
* This header file contains a draft for the gnunetd
@@ -105,7 +105,7 @@
* Data was received (potentially encrypted), make the core process
* it.
*/
- MessagePackProcessor receive;
+ P2P_PACKETProcessor receive;
/**
* Load a service module of the given name. This function must be
@@ -167,13 +167,13 @@
char * transName;
/**
- * This field holds a cached HELO for this
- * transport. HELOs must be signed with RSA,
+ * This field holds a cached hello for this
+ * transport. hellos must be signed with RSA,
* so caching the result for a while is a good
* idea. The field is updated by a cron job
* periodically.
*/
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
/**
* The number of the protocol that is supported by this transport
@@ -197,44 +197,44 @@
unsigned int cost;
/**
- * Verify that a HELO-Message is correct (a node
+ * Verify that a hello-Message is correct (a node
* is potentially reachable at that address). Core
* will only play ping pong after this verification passed.
- * @param helo the HELO message to verify
+ * @param helo the hello message to verify
* (the signature/crc have been verified before)
* @return OK if the helo is well-formed
*/
- int (*verifyHelo)(const HELO_Message * helo);
+ int (*verifyHelo)(const P2P_hello_MESSAGE * helo);
/**
- * Create a HELO-Message for the current node. The HELO is
+ * Create a hello-Message for the current node. The hello is
* created without signature, timestamp, senderIdentity
* or publicKey. The GNUnet core will sign the message
* and add these other fields. The callee is only
* responsible for filling in the protocol number,
* senderAddressSize and the senderAddress itself.
*
- * @param helo address where to store the pointer to the HELO
+ * @param helo address where to store the pointer to the hello
* message
* @return OK on success, SYSERR on error (e.g. send-only
* transports return SYSERR here)
*/
- HELO_Message * (*createHELO)(void);
+ P2P_hello_MESSAGE * (*createhello)(void);
/**
* Establish a connection to a remote node.
*
- * @param helo the HELO-Message for the target node
+ * @param helo the hello-Message for the target node
* @param tsession the session handle that is to be set
* @return OK on success, SYSERR if the operation failed
*/
- int (*connect)(const HELO_Message * helo,
+ int (*connect)(const P2P_hello_MESSAGE * helo,
TSession ** tsession);
/**
* Send a message to the specified remote node.
* @param tsession an opaque session handle (e.g. a socket
- * or the HELO_message from connect)
+ * or the hello_message from connect)
* @param msg the message
* @param size the size of the message, <= mtu
* @return SYSERR on error, NO on temporary error (retry),
@@ -253,7 +253,7 @@
* up to the transport).
*
* @param tsession an opaque session handle (e.g. a socket
- * or the HELO_message from connect)
+ * or the hello_message from connect)
* @param msg the message
* @param size the size of the message, <= mtu
* @return SYSERR on error, OK on success; after any error,
@@ -322,7 +322,7 @@
/**
* Convert transport address to human readable string.
*/
- char * (*addressToString)(const HELO_Message * helo);
+ char * (*addressToString)(const P2P_hello_MESSAGE * helo);
} TransportAPI;
Modified: GNUnet/src/include/gnunet_transport_service.h
===================================================================
--- GNUnet/src/include/gnunet_transport_service.h 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet/src/include/gnunet_transport_service.h 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -44,7 +44,7 @@
* Actually start the transport services and begin
* receiving messages.
*/
- void (*start)(MessagePackProcessor mpp);
+ void (*start)(P2P_PACKETProcessor mpp);
/**
* Stop the transport services, stop receiving messages.
@@ -76,17 +76,17 @@
* layer. This may fail if the appropriate transport mechanism is
* not available.
*
- * @param helo the HELO of the target node
+ * @param helo the hello of the target node
* @return session handle on success, NULL on error
*/
- TSession * (*connect)(const HELO_Message * helo);
+ TSession * (*connect)(const P2P_hello_MESSAGE * helo);
/**
* Connect to another peer, picking any transport that
* works.
*
* @param peer which peer to connect to
- * @param allowTempLists may we even select HELOs that have
+ * @param allowTempLists may we even select hellos that have
* not yet been confirmed?
* @return session handle on success, NULL on error
*/
@@ -148,17 +148,17 @@
int (*disconnect)(TSession * session);
/**
- * Verify that a HELO is ok. Call a method
+ * Verify that a hello is ok. Call a method
* if the verification was successful.
* @return OK if the attempt to verify is on the way,
* SYSERR if the transport mechanism is not supported
*/
- int (*verifyHELO)(const HELO_Message * helo);
+ int (*verifyhello)(const P2P_hello_MESSAGE * helo);
/**
- * Convert HELO to string.
+ * Convert hello to string.
*/
- char * (*heloToString)(const HELO_Message * helo);
+ char * (*heloToString)(const P2P_hello_MESSAGE * helo);
/**
* Get the MTU for a given transport type.
@@ -166,10 +166,10 @@
int (*getMTU)(unsigned short ttype);
/**
- * Create a HELO advertisement for the given
+ * Create a hello advertisement for the given
* transport type for this node.
*/
- HELO_Message * (*createHELO)(unsigned short ttype);
+ P2P_hello_MESSAGE * (*createhello)(unsigned short ttype);
/**
* Get a message consisting of (if possible) all addresses that this
@@ -180,11 +180,11 @@
* addresses in one message, thus the caller can bound the size of the
* advertisements.
*
- * @param maxLen the maximum size of the HELO message collection in bytes
- * @param buff where to write the HELO messages
+ * @param maxLen the maximum size of the hello message collection in bytes
+ * @param buff where to write the hello messages
* @return the number of bytes written to buff, -1 on error
*/
- int (*getAdvertisedHELOs)(unsigned int maxLen,
+ int (*getAdvertisedhellos)(unsigned int maxLen,
char * buff);
} Transport_ServiceAPI;
Modified: GNUnet/src/include/gnunet_util.h
===================================================================
--- GNUnet/src/include/gnunet_util.h 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/include/gnunet_util.h 2005-07-17 23:21:45 UTC (rev 1576)
@@ -129,8 +129,8 @@
*/
#define DEFAULT_CLIENT_CONFIG_FILE "~/.gnunet/gnunet.conf"
#define DEFAULT_DAEMON_CONFIG_FILE "/etc/gnunet.conf"
-#define VAR_DAEMON_CONFIG_FILE "/var/lib/GNUnet/gnunet.conf"
-#define HOME_DAEMON_CONFIG_FILE "~/.gnunet/gnunet.root"
+#define VAR_DAEMON_CONFIG_FILE "/var/lib/GNUnet/gnunet.conf"
+#define HOME_DAEMON_CONFIG_FILE "~/.gnunet/gnunet.root"
/**
* @brief Length of RSA encrypted data (2048 bit)
@@ -205,22 +205,22 @@
*/
unsigned short type;
-} CS_HEADER;
+} CS_MESSAGE_HEADER;
/**
* CS communication: simple return value
*/
typedef struct {
/**
- * The CS header (values: sizeof(CS_RETURN_VALUE), CS_PROTO_RETURN_VALUE)
+ * The CS header (values: sizeof(CS_returnvalue_MESSAGE),
CS_PROTO_RETURN_VALUE)
*/
- CS_HEADER header;
+ CS_MESSAGE_HEADER header;
/**
* The return value (network byte order)
*/
int return_value;
-} CS_RETURN_VALUE;
+} CS_returnvalue_MESSAGE;
/**
* p2p message part header
@@ -235,7 +235,7 @@
* type of the request, XX_p2p_PROTO_XXX (network byte order)
*/
unsigned short type;
-} p2p_HEADER;
+} P2P_MESSAGE_HEADER;
typedef void (*NotifyConfigurationUpdateCallback)(void);
@@ -303,6 +303,9 @@
unsigned int addr[4]; /* struct in6_addr addr; */
} IP6addr;
+/**
+ * @brief IPV6 network in CIDR notation.
+ */
struct CIDR6Network;
/**
@@ -315,12 +318,15 @@
*/
typedef void * (*PThreadMain)(void*);
+/**
+ * Encapsulation of a pthread handle.
+ */
typedef struct PTHREAD_T {
void * internal;
} PTHREAD_T;
/**
- * @brief A 512-bit hashcode
+ * @brief 512-bit hashcode
*/
typedef struct {
unsigned int bits[512 / 8 / sizeof(unsigned int)]; /* = 16 */
@@ -421,6 +427,9 @@
void * cond;
} Semaphore;
+/**
+ * @brief Inter-process semaphore.
+ */
typedef struct IPC_Semaphore{
void * platform;
} IPC_Semaphore;
@@ -1064,9 +1073,9 @@
* memory is available.
*/
void * xrealloc_(void * ptr,
- const size_t n,
- const char * filename,
- const int linenumber);
+ const size_t n,
+ const char * filename,
+ const int linenumber);
/**
* Wrapper around realloc. Rellocates size bytes of memory.
@@ -1744,7 +1753,7 @@
* to re-establish the connection [temporary error]).
*/
int readFromSocket(GNUNET_TCP_SOCKET * sock,
- CS_HEADER ** buffer);
+ CS_MESSAGE_HEADER ** buffer);
/**
* Write to a GNUnet TCP socket.
@@ -1753,7 +1762,7 @@
* @return OK if the write was sucessful, otherwise SYSERR.
*/
int writeToSocket(GNUNET_TCP_SOCKET * sock,
- const CS_HEADER * buffer);
+ const CS_MESSAGE_HEADER * buffer);
/**
* Write to a GNUnet TCP socket non-blocking.
@@ -1763,7 +1772,7 @@
* otherwise SYSERR.
*/
int writeToSocketNonBlocking(GNUNET_TCP_SOCKET * sock,
- const CS_HEADER * buffer);
+ const CS_MESSAGE_HEADER * buffer);
/**
* Close a GNUnet TCP socket for now (use to temporarily close
@@ -2308,10 +2317,6 @@
#endif
/**
- * Helper functions
- */
-
-/**
* @brief Enumerate all network interfaces
* @param callback the callback function
*/
@@ -2321,7 +2326,7 @@
* @brief Checks if we can start GNUnet automatically
* @return 1 if yes, 0 otherwise
*/
-int isOSAutostartCapable();
+int isOSAutostartCapable(void);
/**
* @brief Make GNUnet start automatically
@@ -2344,7 +2349,7 @@
* @return 1 if yes, 0 otherwise
* @todo support for groupadd(8)
*/
-int isOSGroupAddCapable();
+int isOSGroupAddCapable(void);
/**
* @brief Add a service account for GNUnet
@@ -2362,7 +2367,7 @@
/**
* Checks if gnunetd is running
*
- * Uses CS_PROTO_CLIENT_COUNT query to determine if gnunetd is
+ * Uses CS_PROTO_traffic_COUNT query to determine if gnunetd is
* running.
*
* @return OK if gnunetd is running, SYSERR if not
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/server/connection.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -155,20 +155,20 @@
*
* Protocol goes like this:
* DOWN
- * -> HELO+SKEY+PING(1) ->
+ * -> hello+SKEY+PING(1) ->
* SKEY_SENT
- * <- HELO+SKEY+PONG(1)+PING(2) <-
+ * <- hello+SKEY+PONG(1)+PING(2) <-
* -> PONG(2) ->
* UP
*
- * Note that the second HELO may not be necessary from a protocol
+ * Note that the second hello may not be necessary from a protocol
* point of view, but makes sense for symmetry and to provide the
- * other side with an up-to-date HELO. For the other side, it looks
+ * other side with an up-to-date hello. For the other side, it looks
* like this:
*
* DOWN
- * <- HELO+SKEY+PING(1) <-
- * -> HELO+SKEY+PONG(1)+PING(2) ->
+ * <- hello+SKEY+PING(1) <-
+ * -> hello+SKEY+PONG(1)+PING(2) ->
* SKEY_RECEIVED
* <- PONG(2) <-
* UP
@@ -194,9 +194,9 @@
*/
#define STAT_DOWN 0
-/* HELO and SKEY sent (PING included) */
+/* hello and SKEY sent (PING included) */
#define STAT_SKEY_SENT 1
-/* SKEY received, HELO and SKEY sent (PING included) */
+/* SKEY received, hello and SKEY sent (PING included) */
#define STAT_SKEY_RECEIVED 2
/* PING confirmed with (encrypted) PONG */
#define STAT_UP 7
@@ -257,9 +257,9 @@
* well-behaved, non-malicious nodes that like each other).
*/
typedef struct {
- p2p_HEADER header;
+ P2P_MESSAGE_HEADER header;
PeerIdentity sender;
-} HANGUP_Message;
+} P2P_hangup_MESSAGE;
/* *********** flags for SendEntry.flags ********** */
@@ -877,7 +877,7 @@
(*priority) = 0;
if (be->session.mtu == 0) {
- totalMessageSize = sizeof(P2P_Message);
+ totalMessageSize = sizeof(P2P_PACKET_HEADER);
i = 0;
/* assumes entries are sorted by priority! */
while (i < be->sendBufferSize) {
@@ -909,7 +909,7 @@
(*priority) += entry->pri;
} else {
entry->knapsackSolution = NO;
- if (totalMessageSize == sizeof(P2P_Message)) {
+ if (totalMessageSize == sizeof(P2P_PACKET_HEADER)) {
/* if the highest-priority message does not yet
fit, wait for send window to grow so that
we can get it out (otherwise we would starve
@@ -919,9 +919,9 @@
}
i++;
}
- if ( (totalMessageSize == sizeof(P2P_Message)) ||
+ if ( (totalMessageSize == sizeof(P2P_PACKET_HEADER)) ||
( ((*priority) < EXTREME_PRIORITY) &&
- ((totalMessageSize / sizeof(P2P_Message)) < 4) &&
+ ((totalMessageSize / sizeof(P2P_PACKET_HEADER)) < 4) &&
(randomi(16) != 0) ) ) {
/* randomization necessary to ensure we eventually send
a small message if there is nothing else to do! */
@@ -938,13 +938,13 @@
/* control CPU load probabilistically! */
if (randomi(1+approxProb) == 0) {
(*priority) = approximateKnapsack(be,
- be->session.mtu -
sizeof(P2P_Message));
+ be->session.mtu -
sizeof(P2P_PACKET_HEADER));
#if DEBUG_COLLECT_PRIO == YES
FPRINTF(prioFile, "%llu 0 %d\n", cronTime(NULL), priority);
#endif
} else {
(*priority) = solveKnapsack(be,
- be->session.mtu - sizeof(P2P_Message));
+ be->session.mtu -
sizeof(P2P_PACKET_HEADER));
#if DEBUG_COLLECT_PRIO == YES
FPRINTF(prioFile,
"%llu 1 %d\n",
@@ -954,7 +954,7 @@
}
} else { /* never approximate < 50% CPU load */
(*priority) = solveKnapsack(be,
- be->session.mtu - sizeof(P2P_Message));
+ be->session.mtu - sizeof(P2P_PACKET_HEADER));
#if DEBUG_COLLECT_PRIO == YES
FPRINTF(prioFile,
"%llu 2 %d\n",
@@ -972,7 +972,7 @@
"solveKnapsack",
j,
be->sendBufferSize,
- be->session.mtu - sizeof(P2P_Message));
+ be->session.mtu - sizeof(P2P_PACKET_HEADER));
for (j=0;j<be->sendBufferSize;j++)
LOG(LOG_ERROR,
@@ -1221,10 +1221,10 @@
/* assumes entries are sorted by priority! */
while (i < ret) {
entry = entries[i];
- if (entry->len > be->session.mtu - sizeof(P2P_Message)) {
+ if (entry->len > be->session.mtu - sizeof(P2P_PACKET_HEADER)) {
entries[i] = entries[--ret];
fragmentation->fragment(&be->session.sender,
- be->session.mtu - sizeof(P2P_Message),
+ be->session.mtu - sizeof(P2P_PACKET_HEADER),
entry->pri,
entry->transmissionTime,
entry->len,
@@ -1259,7 +1259,7 @@
unsigned int p;
unsigned int rsi;
SendCallbackList * pos;
- P2P_Message * p2pHdr;
+ P2P_PACKET_HEADER * p2pHdr;
int priority;
int * perm;
char * plaintextMsg;
@@ -1303,7 +1303,7 @@
be->inSendBuffer = NO;
return; /* deferr further */
}
- totalMessageSize += sizeof(P2P_Message);
+ totalMessageSize += sizeof(P2P_PACKET_HEADER);
/* check if we (sender) have enough bandwidth available
if so, trigger callbacks on selected entries; if either
@@ -1321,14 +1321,14 @@
/* build message (start with sequence number) */
plaintextMsg = MALLOC(totalMessageSize);
- p2pHdr = (P2P_Message*) plaintextMsg;
+ p2pHdr = (P2P_PACKET_HEADER*) plaintextMsg;
p2pHdr->timeStamp
= htonl(TIME(NULL));
p2pHdr->sequenceNumber
= htonl(be->lastSequenceNumberSend);
p2pHdr->bandwidth
= htonl(be->idealized_limit);
- p = sizeof(P2P_Message);
+ p = sizeof(P2P_PACKET_HEADER);
for (i=0;i<be->sendBufferSize;i++) {
SendEntry * entry = be->sendBuffer[perm[i]];
@@ -1358,17 +1358,17 @@
}
/* finally padd with noise */
- if ( (p + sizeof(p2p_HEADER) <= totalMessageSize) &&
+ if ( (p + sizeof(P2P_MESSAGE_HEADER) <= totalMessageSize) &&
(disable_random_padding == NO) ) {
- p2p_HEADER * part;
+ P2P_MESSAGE_HEADER * part;
unsigned short noiseLen = totalMessageSize - p;
- part = (p2p_HEADER *) &plaintextMsg[p];
+ part = (P2P_MESSAGE_HEADER *) &plaintextMsg[p];
part->size
= htons(noiseLen);
part->type
- = htons(p2p_PROTO_NOISE);
- for (i=p+sizeof(p2p_HEADER);
+ = htons(P2P_PROTO_noise);
+ for (i=p+sizeof(P2P_MESSAGE_HEADER);
i < totalMessageSize;
i++)
plaintextMsg[i] = (char) rand();
@@ -1386,7 +1386,7 @@
p - sizeof(HashCode512),
&be->skey_local,
(const INITVECTOR*) encryptedMsg, /* IV */
- &((P2P_Message*)encryptedMsg)->sequenceNumber);
+ &((P2P_PACKET_HEADER*)encryptedMsg)->sequenceNumber);
if (stats != NULL)
stats->change(stat_encrypted,
p - sizeof(HashCode512));
@@ -1415,11 +1415,11 @@
= (be->idealized_limit + be->max_transmitted_limit*3)/4;
if (rsnSize > 0) {
- j = sizeof(P2P_Message);
+ j = sizeof(P2P_PACKET_HEADER);
while (j < p) {
- p2p_HEADER * part = (p2p_HEADER*) &plaintextMsg[j];
+ P2P_MESSAGE_HEADER * part = (P2P_MESSAGE_HEADER*) &plaintextMsg[j];
unsigned short plen = htons(part->size);
- if (plen < sizeof(p2p_HEADER)) {
+ if (plen < sizeof(P2P_MESSAGE_HEADER)) {
BREAK();
break;
}
@@ -1466,10 +1466,10 @@
return;
}
if ( (be->session.mtu != 0) &&
- (se->len > be->session.mtu - sizeof(P2P_Message)) ) {
+ (se->len > be->session.mtu - sizeof(P2P_PACKET_HEADER)) ) {
/* this message is so big that it must be fragmented! */
fragmentation->fragment(&be->session.sender,
- be->session.mtu - sizeof(P2P_Message),
+ be->session.mtu - sizeof(P2P_PACKET_HEADER),
se->pri,
se->transmissionTime,
se->len,
@@ -1693,7 +1693,7 @@
* @param be the connection to shutdown
*/
static void shutdownConnection(BufferEntry * be) {
- HANGUP_Message hangup;
+ P2P_hangup_MESSAGE hangup;
unsigned int i;
EncName enc;
@@ -1710,14 +1710,14 @@
SendEntry * se;
hangup.header.type
- = htons(p2p_PROTO_HANGUP);
+ = htons(P2P_PROTO_hangup);
hangup.header.size
- = htons(sizeof(HANGUP_Message));
+ = htons(sizeof(P2P_hangup_MESSAGE));
identity->getPeerIdentity(identity->getPublicPrivateKey(),
&hangup.sender);
se = MALLOC(sizeof(SendEntry));
se->len
- = sizeof(HANGUP_Message);
+ = sizeof(P2P_hangup_MESSAGE);
se->flags
= SE_FLAG_PLACE_TAIL;
se->pri
@@ -1727,10 +1727,10 @@
se->callback
= ©Callback;
se->closure
- = MALLOC(sizeof(HANGUP_Message));
+ = MALLOC(sizeof(P2P_hangup_MESSAGE));
memcpy(se->closure,
&hangup,
- sizeof(HANGUP_Message));
+ sizeof(P2P_hangup_MESSAGE));
appendToBuffer(be, se);
if (stats != NULL)
stats->change(stat_hangupSent,
@@ -2135,7 +2135,7 @@
* SYSERR if it was malformed
*/
int checkHeader(const PeerIdentity * sender,
- P2P_Message * msg,
+ P2P_PACKET_HEADER * msg,
unsigned short size) {
BufferEntry * be;
int res;
@@ -2150,7 +2150,7 @@
GNUNET_ASSERT(sender != NULL);
hash2enc(&sender->hashPubKey,
&enc);
- if (size < sizeof(P2P_Message)) {
+ if (size < sizeof(P2P_PACKET_HEADER)) {
LOG(LOG_WARNING,
_("Message from '%s' discarded: invalid format.\n"),
&enc);
@@ -2274,15 +2274,15 @@
* @return OK on success, SYSERR on error
*/
static int handleHANGUP(const PeerIdentity * sender,
- const p2p_HEADER * msg) {
+ const P2P_MESSAGE_HEADER * msg) {
BufferEntry * be;
EncName enc;
ENTRY();
- if (ntohs(msg->size) != sizeof(HANGUP_Message))
+ if (ntohs(msg->size) != sizeof(P2P_hangup_MESSAGE))
return SYSERR;
if (!hostIdentityEquals(sender,
- &((HANGUP_Message*)msg)->sender))
+ &((P2P_hangup_MESSAGE*)msg)->sender))
return SYSERR;
IFLOG(LOG_INFO,
hash2enc(&sender->hashPubKey,
@@ -2604,8 +2604,8 @@
*/
void initConnection() {
GNUNET_ASSERT(P2P_MESSAGE_OVERHEAD
- == sizeof(P2P_Message));
- GNUNET_ASSERT(sizeof(HANGUP_Message) == 68);
+ == sizeof(P2P_PACKET_HEADER));
+ GNUNET_ASSERT(sizeof(P2P_hangup_MESSAGE) == 68);
ENTRY();
scl_nextHead
= NULL;
@@ -2615,7 +2615,7 @@
registerConfigurationUpdateCallback(&connectionConfigChangeCallback);
CONNECTION_MAX_HOSTS_ = 0;
connectionConfigChangeCallback();
- registerp2pHandler(p2p_PROTO_HANGUP,
+ registerp2pHandler(P2P_PROTO_hangup,
&handleHANGUP);
addCronJob(&cronDecreaseLiveness,
1 * cronSECONDS,
@@ -2874,7 +2874,7 @@
* from the GNUnet core.
*
* @param session the transport session
- * @param msg the message to transmit, should contain p2p_HEADERs
+ * @param msg the message to transmit, should contain P2P_MESSAGE_HEADERs
* @return OK on success, SYSERR on failure, NO on temporary failure
*/
int sendPlaintext(TSession * tsession,
@@ -2882,28 +2882,28 @@
unsigned int size) {
char * buf;
int ret;
- P2P_Message * hdr;
+ P2P_PACKET_HEADER * hdr;
GNUNET_ASSERT(tsession != NULL);
if ( (transport->getMTU(tsession->ttype)>0) &&
- (transport->getMTU(tsession->ttype)<size + sizeof(P2P_Message)) ) {
+ (transport->getMTU(tsession->ttype)<size + sizeof(P2P_PACKET_HEADER)) )
{
BREAK();
return SYSERR;
}
- buf = MALLOC(size + sizeof(P2P_Message));
- hdr = (P2P_Message*) buf;
+ buf = MALLOC(size + sizeof(P2P_PACKET_HEADER));
+ hdr = (P2P_PACKET_HEADER*) buf;
hdr->sequenceNumber = 0;
hdr->timeStamp = 0;
hdr->bandwidth = 0;
- memcpy(&buf[sizeof(P2P_Message)],
+ memcpy(&buf[sizeof(P2P_PACKET_HEADER)],
msg,
size);
hash(&hdr->sequenceNumber,
- size + sizeof(P2P_Message) - sizeof(HashCode512),
+ size + sizeof(P2P_PACKET_HEADER) - sizeof(HashCode512),
&hdr->hash);
ret = transport->send(tsession,
buf,
- size + sizeof(P2P_Message));
+ size + sizeof(P2P_PACKET_HEADER));
FREE(buf);
return ret;
}
@@ -2970,7 +2970,7 @@
* @param maxdelay how long can the message be delayed?
*/
void unicast(const PeerIdentity * receiver,
- const p2p_HEADER * msg,
+ const P2P_MESSAGE_HEADER * msg,
unsigned int importance,
unsigned int maxdelay) {
char * closure;
Modified: GNUnet/src/server/connection.h
===================================================================
--- GNUnet/src/server/connection.h 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/server/connection.h 2005-07-17 23:21:45 UTC (rev 1576)
@@ -36,7 +36,7 @@
* decrypting the message. It provides a timestamp and sequence
* number (to guard against replay attacks). The header is followed
* by the 'data' which contains a sequence of GNUnet p2p messages,
- * each with its own p2p_HEADER.
+ * each with its own P2P_MESSAGE_HEADER.
*/
typedef struct {
/* hash of the plaintext, used to verify message integrity;
@@ -48,7 +48,7 @@
TIME_T timeStamp;
/* desired bandwidth, 0 for plaintext messages! */
unsigned int bandwidth;
-} P2P_Message; /* 76 bytes */
+} P2P_PACKET_HEADER; /* 76 bytes */
/* ***************** GNUnet core internals ************ */
@@ -80,7 +80,7 @@
* SYSERR if it was malformed
*/
int checkHeader(const PeerIdentity * sender,
- P2P_Message * msg,
+ P2P_PACKET_HEADER * msg,
unsigned short size);
/**
@@ -121,7 +121,7 @@
* from the GNUnet core.
*
* @param session the transport session
- * @param msg the message to transmit, should contain p2p_HEADERs
+ * @param msg the message to transmit, should contain P2P_MESSAGE_HEADERs
* @return OK on success, SYSERR on failure
*/
int sendPlaintext(TSession * tsession,
@@ -189,7 +189,7 @@
* @param maxdelay how long can the message be delayed?
*/
void unicast(const PeerIdentity * receiver,
- const p2p_HEADER * msg,
+ const P2P_MESSAGE_HEADER * msg,
unsigned int importance,
unsigned int maxdelay);
Modified: GNUnet/src/server/gnunet-peer-info.c
===================================================================
--- GNUnet/src/server/gnunet-peer-info.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/server/gnunet-peer-info.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -130,7 +130,7 @@
const unsigned short proto,
int verified,
void * data) {
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
char * info;
EncName enc;
@@ -146,11 +146,11 @@
return;
}
if (SYSERR == verifySig(&helo->senderIdentity,
- HELO_Message_size(helo) - sizeof(Signature) -
sizeof(PublicKey) - sizeof(p2p_HEADER),
+ P2P_hello_MESSAGE_size(helo) - sizeof(Signature) -
sizeof(PublicKey) - sizeof(P2P_MESSAGE_HEADER),
&helo->signature,
&helo->publicKey)) {
LOG(LOG_WARNING,
- _("HELO message invalid (signature invalid).\n"));
+ _("hello message invalid (signature invalid).\n"));
}
info = transport->heloToString(helo);
FREE(helo);
Modified: GNUnet/src/server/gnunet-transport-check.c
===================================================================
--- GNUnet/src/server/gnunet-transport-check.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet/src/server/gnunet-transport-check.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -72,10 +72,10 @@
}
static int noiseHandler(const PeerIdentity *peer,
- const p2p_HEADER * msg,
+ const P2P_MESSAGE_HEADER * msg,
TSession * s) {
if ( (ntohs(msg->size) ==
- sizeof(p2p_HEADER) + expectedSize) &&
+ sizeof(P2P_MESSAGE_HEADER) + expectedSize) &&
(0 == memcmp(expectedValue,
&msg[1],
expectedSize)) )
@@ -89,12 +89,12 @@
*/
static void testTAPI(TransportAPI * tapi,
int * res) {
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
TSession * tsession;
unsigned int repeat;
cron_t start;
cron_t end;
- CS_HEADER * noise;
+ CS_MESSAGE_HEADER * noise;
if (tapi == NULL)
errexit("Could not initialize transport!\n");
@@ -102,10 +102,10 @@
*res = OK;
return; /* NAT cannot be tested */
}
- helo = tapi->createHELO();
+ helo = tapi->createhello();
if (helo == NULL) {
fprintf(stderr,
- _("'%s': Could not create HELO.\n"),
+ _("'%s': Could not create hello.\n"),
tapi->transName);
*res = SYSERR;
return;
@@ -131,9 +131,9 @@
}
sem = SEMAPHORE_NEW(0);
cronTime(&start);
- noise = MALLOC(expectedSize + sizeof(p2p_HEADER));
- noise->type = htons(p2p_PROTO_NOISE);
- noise->size = htons(expectedSize + sizeof(p2p_HEADER));
+ noise = MALLOC(expectedSize + sizeof(P2P_MESSAGE_HEADER));
+ noise->type = htons(P2P_PROTO_noise);
+ noise->size = htons(expectedSize + sizeof(P2P_MESSAGE_HEADER));
memcpy(&noise[1],
expectedValue,
expectedSize);
@@ -202,12 +202,12 @@
SEMAPHORE_UP(sem);
}
-static void testPING(HELO_Message * xhelo,
+static void testPING(P2P_hello_MESSAGE * xhelo,
int * stats) {
TSession * tsession;
- HELO_Message * helo;
- HELO_Message * myHelo;
- p2p_HEADER * ping;
+ P2P_hello_MESSAGE * helo;
+ P2P_hello_MESSAGE * myHelo;
+ P2P_MESSAGE_HEADER * ping;
char * msg;
int len;
PeerIdentity peer;
@@ -234,7 +234,7 @@
FREE(helo);
return;
}
- myHelo = transport->createHELO(ntohs(xhelo->protocol));
+ myHelo = transport->createhello(ntohs(xhelo->protocol));
if (myHelo == NULL) {
FREE(helo);
return;
@@ -576,7 +576,7 @@
}
initCore();
initConnection();
- registerPlaintextHandler(p2p_PROTO_NOISE,
+ registerPlaintextHandler(P2P_PROTO_noise,
&noiseHandler);
enableCoreProcessing();
identity = requestService("identity");
@@ -595,7 +595,7 @@
stats[0] = 0;
stats[1] = 0;
stats[2] = 0;
- bootstrap->bootstrap((HELO_Callback)&testPING,
+ bootstrap->bootstrap((hello_Callback)&testPING,
&stats[0]);
printf(_("%d out of %d peers contacted successfully (%d times transport
unavailable).\n"),
stats[2],
@@ -612,7 +612,7 @@
releaseService(transport);
releaseService(pingpong);
disableCoreProcessing();
- unregisterPlaintextHandler(p2p_PROTO_NOISE,
+ unregisterPlaintextHandler(P2P_PROTO_noise,
&noiseHandler);
doneConnection();
doneCore();
Modified: GNUnet/src/server/handler.c
===================================================================
--- GNUnet/src/server/handler.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/server/handler.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -57,7 +57,7 @@
static Identity_ServiceAPI * identity;
-static MessagePack * bufferQueue_[QUEUE_LENGTH];
+static P2P_PACKET * bufferQueue_[QUEUE_LENGTH];
static int bq_firstFree_;
static int bq_lastFree_;
static int bq_firstFull_;
@@ -342,9 +342,9 @@
int wasEncrypted,
TSession * session) {
unsigned int pos;
- const p2p_HEADER * part;
- p2p_HEADER cpart;
- p2p_HEADER * copy;
+ const P2P_MESSAGE_HEADER * part;
+ P2P_MESSAGE_HEADER cpart;
+ P2P_MESSAGE_HEADER * copy;
EncName enc;
int last;
@@ -356,7 +356,7 @@
memcpy(&cpart,
&msg[pos],
- sizeof(p2p_HEADER));
+ sizeof(P2P_MESSAGE_HEADER));
plen = htons(cpart.size);
if (pos + plen > size) {
IFLOG(LOG_WARNING,
@@ -381,7 +381,7 @@
plen);
part = copy;
} else {
- part = (const p2p_HEADER*) &msg[pos];
+ part = (const P2P_MESSAGE_HEADER*) &msg[pos];
}
pos += plen;
@@ -460,7 +460,7 @@
return;
}
ret = checkHeader(sender,
- (P2P_Message*) msg,
+ (P2P_PACKET_HEADER*) msg,
size);
if (ret == SYSERR)
return; /* message malformed */
@@ -468,8 +468,8 @@
if (OK == transport->associate(tsession))
considerTakeover(sender, tsession);
injectMessage(sender,
- &msg[sizeof(P2P_Message)],
- size - sizeof(P2P_Message),
+ &msg[sizeof(P2P_PACKET_HEADER)],
+ size - sizeof(P2P_PACKET_HEADER),
ret,
tsession);
}
@@ -480,7 +480,7 @@
* (defined in handler.c) on the packet.
*/
static void * threadMain(int id) {
- MessagePack * mp;
+ P2P_PACKET * mp;
while (mainShutdownSignal == NULL) {
SEMAPHORE_DOWN(bufferQueueRead_);
@@ -517,7 +517,7 @@
* Processing of a message from the transport layer
* (receive implementation).
*/
-void core_receive(MessagePack * mp) {
+void core_receive(P2P_PACKET * mp) {
if ( (threads_running == NO) ||
(mainShutdownSignal != NULL) ||
(SYSERR == SEMAPHORE_DOWN_NONBLOCKING(bufferQueueWrite_)) ) {
Modified: GNUnet/src/server/handler.h
===================================================================
--- GNUnet/src/server/handler.h 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/server/handler.h 2005-07-17 23:21:45 UTC (rev 1576)
@@ -68,7 +68,7 @@
* implementation). Detects if the message is encrypted, possibly
* decrypts and calls injectMessage.
*/
-void core_receive(MessagePack * mp);
+void core_receive(P2P_PACKET * mp);
/**
* Register a method as a handler for specific message
Modified: GNUnet/src/server/startup.c
===================================================================
--- GNUnet/src/server/startup.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/server/startup.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -115,10 +115,10 @@
}
static int shutdownHandler(ClientHandle client,
- const CS_HEADER * msg) {
+ const CS_MESSAGE_HEADER * msg) {
int ret;
- if (ntohs(msg->size) != sizeof(CS_HEADER)) {
+ if (ntohs(msg->size) != sizeof(CS_MESSAGE_HEADER)) {
LOG(LOG_WARNING,
_("The '%s' request received from client is malformed.\n"),
"shutdown");
@@ -256,8 +256,8 @@
* Check if the compiler did a decent job aligning the structs...
*/
void checkCompiler() {
- GNUNET_ASSERT(sizeof(HELO_Message) == 600);
- GNUNET_ASSERT(sizeof(p2p_HEADER) == 4);
+ GNUNET_ASSERT(sizeof(P2P_hello_MESSAGE) == 600);
+ GNUNET_ASSERT(sizeof(P2P_MESSAGE_HEADER) == 4);
}
/* *********** PID file handling *************** */
Modified: GNUnet/src/server/tcpserver.c
===================================================================
--- GNUnet/src/server/tcpserver.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/server/tcpserver.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -101,7 +101,7 @@
char * writeBuffer;
unsigned int writeBufferSize;
- CS_HEADER ** writeQueue;
+ CS_MESSAGE_HEADER ** writeQueue;
unsigned int writeQueueSize;
ClientHandle next;
@@ -229,8 +229,8 @@
* transfer happens asynchronously.
*/
int sendToClient(ClientHandle handle,
- const CS_HEADER * message) {
- CS_HEADER * cpy;
+ const CS_MESSAGE_HEADER * message) {
+ CS_MESSAGE_HEADER * cpy;
#if DEBUG_TCPHANDLER
LOG(LOG_DEBUG,
@@ -255,7 +255,7 @@
* message by calling the registered handler for
* each message part.
*/
-static int processHelper(CS_HEADER * msg,
+static int processHelper(CS_MESSAGE_HEADER * msg,
ClientHandle sender) {
unsigned short ptyp;
CSHandler callback;
@@ -339,9 +339,9 @@
handle->readBufferPos += ret;
ret = OK;
while (ret == OK) {
- if (handle->readBufferPos < sizeof(CS_HEADER))
+ if (handle->readBufferPos < sizeof(CS_MESSAGE_HEADER))
return OK;
- len = ntohs(((CS_HEADER*)handle->readBuffer)->size);
+ len = ntohs(((CS_MESSAGE_HEADER*)handle->readBuffer)->size);
#if DEBUG_TCPHANDLER
LOG(LOG_DEBUG,
"Total size is %u bytes, have %u.\n",
@@ -359,7 +359,7 @@
select-thread can possibly free handle/readbuffer,
releasing the lock here is safe. */
MUTEX_UNLOCK(&clientlock);
- ret = processHelper((CS_HEADER*)handle->readBuffer,
+ ret = processHelper((CS_MESSAGE_HEADER*)handle->readBuffer,
handle);
MUTEX_LOCK(&clientlock);
/* finally, shrink buffer adequately */
@@ -853,10 +853,10 @@
*/
int sendTCPResultToClient(ClientHandle sock,
int ret) {
- CS_RETURN_VALUE rv;
+ CS_returnvalue_MESSAGE rv;
rv.header.size
- = htons(sizeof(CS_RETURN_VALUE));
+ = htons(sizeof(CS_returnvalue_MESSAGE));
rv.header.type
= htons(CS_PROTO_RETURN_VALUE);
rv.return_value
Modified: GNUnet/src/server/tcpserver.h
===================================================================
--- GNUnet/src/server/tcpserver.h 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/server/tcpserver.h 2005-07-17 23:21:45 UTC (rev 1576)
@@ -85,7 +85,7 @@
* transfer happens asynchronously.
*/
int sendToClient(ClientHandle handle,
- const CS_HEADER * message);
+ const CS_MESSAGE_HEADER * message);
/**
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/transports/http.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
@@ -97,7 +98,7 @@
/**
* Initial handshake message. Note that the beginning
- * must match the CS_HEADER since we are using tcpio.
+ * must match the CS_MESSAGE_HEADER since we are using tcpio.
*/
typedef struct {
/**
@@ -514,7 +515,7 @@
HTTPSession * httpSession;
unsigned int len;
int ret;
- MessagePack * mp;
+ P2P_PACKET * mp;
tsession = tsessions[i];
if (SYSERR == httpAssociate(tsession))
@@ -634,7 +635,7 @@
}
/* Full normal message received; pass on to core! */
- mp = MALLOC(sizeof(MessagePack));
+ mp = MALLOC(sizeof(P2P_PACKET));
mp->sender = httpSession->sender;
mp->tsession = tsession;
GNUNET_ASSERT(httpSession->rbuff != NULL);
@@ -1049,21 +1050,21 @@
}
/**
- * Verify that a HELO-Message is correct (a node
+ * Verify that a hello-Message is correct (a node
* is reachable at that address). Since the reply
* will be asynchronous, a method must be called on
* success.
- * @param helo the HELO message to verify
+ * @param helo the hello message to verify
* (the signature/crc have been verified before)
* @return OK on success, SYSERR on error
*/
-static int verifyHelo(const HELO_Message * helo) {
+static int verifyHelo(const P2P_hello_MESSAGE * helo) {
HostAddress * haddr;
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (HostAddress*) &helo[1];
if ( (ntohs(helo->senderAddressSize) != sizeof(HostAddress)) ||
- (ntohs(helo->header.size) != HELO_Message_size(helo)) ||
- (ntohs(helo->header.type) != p2p_PROTO_HELO) ||
+ (ntohs(helo->header.size) != P2P_hello_MESSAGE_size(helo)) ||
+ (ntohs(helo->header.type) != p2p_PROTO_hello) ||
(ntohs(helo->protocol) != HTTP_PROTOCOL_NUMBER) ||
(YES == isBlacklisted(haddr->ip)) )
return SYSERR; /* obviously invalid */
@@ -1072,14 +1073,14 @@
}
/**
- * Create a HELO-Message for the current node. The HELO is
+ * Create a hello-Message for the current node. The hello is
* created without signature and without a timestamp. The
* GNUnet core will sign the message and add an expiration time.
*
- * @return HELO on success, NULL on error
+ * @return hello on success, NULL on error
*/
-static HELO_Message * createHELO() {
- HELO_Message * msg;
+static P2P_hello_MESSAGE * createhello() {
+ P2P_hello_MESSAGE * msg;
HostAddress * haddr;
unsigned short port;
@@ -1089,8 +1090,8 @@
"HTTP port is 0, will only send using HTTP.\n");
return NULL; /* HTTP transport is configured SEND-only! */
}
- msg = (HELO_Message *) MALLOC(sizeof(HELO_Message) + sizeof(HostAddress));
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)msg)->senderAddress[0];
+ msg = (P2P_hello_MESSAGE *) MALLOC(sizeof(P2P_hello_MESSAGE) +
sizeof(HostAddress));
+ haddr = (HostAddress*) &msg[1];
if (SYSERR == getPublicIPAddress(&haddr->ip)) {
FREE(msg);
@@ -1112,11 +1113,11 @@
/**
* Establish a connection to a remote node.
*
- * @param helo the HELO-Message for the target node
+ * @param helo the hello-Message for the target node
* @param tsessionPtr the session handle that is set
* @return OK on success, SYSERR if the operation failed
*/
-static int httpConnect(const HELO_Message * helo,
+static int httpConnect(const P2P_hello_MESSAGE * helo,
TSession ** tsessionPtr) {
int i;
HostAddress * haddr;
@@ -1128,7 +1129,7 @@
if (http_shutdown == YES)
return SYSERR;
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (HostAddress*) &helo[1];
#if DEBUG_HTTP
LOG(LOG_DEBUG,
"Creating HTTP connection to %u.%u.%u.%u:%u.\n",
@@ -1228,7 +1229,7 @@
/**
* Send a message to the specified remote node.
*
- * @param tsession the HELO_Message identifying the remote node
+ * @param tsession the P2P_hello_MESSAGE identifying the remote node
* @param msg the message
* @param size the size of the message
* @return SYSERR on error, OK on success, NO if queue is full
@@ -1404,12 +1405,12 @@
/**
* Convert HTTP address to a string.
*/
-static char * addressToString(const HELO_Message * helo) {
+static char * addressToString(const P2P_hello_MESSAGE * helo) {
char * ret;
HostAddress * haddr;
size_t n;
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (HostAddress*) &helo[1];
n = 4*4+6+16;
ret = MALLOC(n);
SNPRINTF(ret,
@@ -1479,7 +1480,7 @@
httpAPI.mtu = 0;
httpAPI.cost = 20000; /* about equal to udp */
httpAPI.verifyHelo = &verifyHelo;
- httpAPI.createHELO = &createHELO;
+ httpAPI.createhello = &createhello;
httpAPI.connect = &httpConnect;
httpAPI.associate = &httpAssociate;
httpAPI.send = &httpSend;
Modified: GNUnet/src/transports/nat.c
===================================================================
--- GNUnet/src/transports/nat.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/transports/nat.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
@@ -48,24 +49,24 @@
/* *************** API implementation *************** */
/**
- * Verify that a HELO-Message is correct (a node is reachable at that
+ * Verify that a hello-Message is correct (a node is reachable at that
* address).
*
- * @param helo the HELO message to verify
+ * @param helo the hello message to verify
* (the signature/crc have been verified before)
* @return OK on success, SYSERR on failure
*/
-static int verifyHelo(const HELO_Message * helo) {
+static int verifyHelo(const P2P_hello_MESSAGE * helo) {
if ( (ntohs(helo->senderAddressSize) != sizeof(HostAddress)) ||
- (ntohs(helo->header.size) != HELO_Message_size(helo)) ||
- (ntohs(helo->header.type) != p2p_PROTO_HELO) ) {
+ (ntohs(helo->header.size) != P2P_hello_MESSAGE_size(helo)) ||
+ (ntohs(helo->header.type) != p2p_PROTO_hello) ) {
return SYSERR; /* obviously invalid */
} else {
if (testConfigurationString("NAT",
"LIMITED",
"YES")) {
- /* if WE are a NAT and this is not our HELO,
+ /* if WE are a NAT and this is not our hello,
it is invalid since NAT-to-NAT is not possible! */
if (equalsHashCode512(&coreAPI->myIdentity->hashPubKey,
&helo->senderIdentity.hashPubKey))
@@ -78,21 +79,21 @@
}
/**
- * Create a HELO-Message for the current node. The HELO is created
+ * Create a hello-Message for the current node. The hello is created
* without signature and without a timestamp. The GNUnet core will
* sign the message and add an expiration time.
*
- * @return HELO on success, NULL on error
+ * @return hello on success, NULL on error
*/
-static HELO_Message * createHELO() {
- HELO_Message * msg;
+static P2P_hello_MESSAGE * createhello() {
+ P2P_hello_MESSAGE * msg;
if (! testConfigurationString("NAT",
"LIMITED",
"YES"))
return NULL;
- msg = MALLOC(sizeof(HELO_Message) + sizeof(HostAddress));
+ msg = MALLOC(sizeof(P2P_hello_MESSAGE) + sizeof(HostAddress));
msg->senderAddressSize = htons(sizeof(HostAddress));
msg->protocol = htons(NAT_PROTOCOL_NUMBER);
msg->MTU = htonl(0);
@@ -101,11 +102,11 @@
/**
* Establish a connection to a remote node.
- * @param helo the HELO-Message for the target node
+ * @param helo the hello-Message for the target node
* @param tsessionPtr the session handle that is to be set
* @return always fails (returns SYSERR)
*/
-static int natConnect(const HELO_Message * helo,
+static int natConnect(const P2P_hello_MESSAGE * helo,
TSession ** tsessionPtr) {
return SYSERR;
}
@@ -128,7 +129,7 @@
/**
* Send a message to the specified remote node.
*
- * @param tsession the HELO_Message identifying the remote node
+ * @param tsession the P2P_hello_MESSAGE identifying the remote node
* @param message what to send
* @param size the size of the message
* @return SYSERR (always fails)
@@ -175,7 +176,7 @@
/**
* Convert NAT address to a string.
*/
-static char * addressToString(const HELO_Message * helo) {
+static char * addressToString(const P2P_hello_MESSAGE * helo) {
return STRDUP("NAT");
}
@@ -190,7 +191,7 @@
natAPI.mtu = 0;
natAPI.cost = 30000;
natAPI.verifyHelo = &verifyHelo;
- natAPI.createHELO = &createHELO;
+ natAPI.createhello = &createhello;
natAPI.connect = &natConnect;
natAPI.send = &natSend;
natAPI.sendReliable = &natSend; /* can't increase reliability */
Modified: GNUnet/src/transports/smtp.c
===================================================================
--- GNUnet/src/transports/smtp.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/transports/smtp.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2003, 2004 Christian Grothoff (and other contributing authors)
+ (C) 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
@@ -439,7 +439,7 @@
char * boundary;
char * out;
unsigned int size;
- MessagePack * coreMP;
+ P2P_PACKET * coreMP;
smtp_pipe = fileopen(pipename, O_RDONLY);
fdes = fdopen(smtp_pipe, "r");
@@ -488,7 +488,7 @@
ntohl(mp->size));
goto END;
}
- coreMP = MALLOC(sizeof(MessagePack));
+ coreMP = MALLOC(sizeof(P2P_PACKET));
coreMP->msg = out;
coreMP->size = size - sizeof(SMTPMessage);
coreMP->tsession = NULL;
@@ -513,25 +513,25 @@
/* *************** API implementation *************** */
/**
- * Verify that a HELO-Message is correct (a node is reachable at that
+ * Verify that a hello-Message is correct (a node is reachable at that
* address). Since the reply will be asynchronous, a method must be
* called on success.
*
- * @param helo the HELO message to verify
+ * @param helo the hello message to verify
* (the signature/crc have been verified before)
* @return OK on success, SYSERR on error
*/
-static int verifyHelo(const HELO_Message * helo) {
+static int verifyHelo(const P2P_hello_MESSAGE * helo) {
EmailAddress * maddr;
- maddr = (EmailAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ maddr = (EmailAddress*) &helo[1];
if ((ntohs(helo->header.size)!=
- sizeof(HELO_Message)+ntohs(helo->senderAddressSize)) ||
+ sizeof(P2P_hello_MESSAGE)+ntohs(helo->senderAddressSize)) ||
(maddr->senderAddress[ntohs(helo->senderAddressSize)-1-FILTER_STRING_SIZE]!='\0'))
{
LOG(LOG_WARNING,
- " received invalid SMTP address advertisement (HELO) %d != %d or %d !=
0\n",
+ " received invalid SMTP address advertisement (hello) %d != %d or %d !=
0\n",
ntohs(helo->header.size),
- sizeof(HELO_Message)+ntohs(helo->senderAddressSize),
+ sizeof(P2P_hello_MESSAGE)+ntohs(helo->senderAddressSize),
maddr->senderAddress[ntohs(helo->senderAddressSize)-1-FILTER_STRING_SIZE]);
BREAK();
return SYSERR; /* obviously invalid */
@@ -544,14 +544,14 @@
}
/**
- * Create a HELO-Message for the current node. The HELO is created
+ * Create a hello-Message for the current node. The hello is created
* without signature and without a timestamp. The GNUnet core will
* sign the message and add an expiration time.
*
- * @return HELO on success, NULL on error
+ * @return hello on success, NULL on error
*/
-static HELO_Message * createHELO() {
- HELO_Message * msg;
+static P2P_hello_MESSAGE * createhello() {
+ P2P_hello_MESSAGE * msg;
char * email;
char * filter;
EmailAddress * haddr;
@@ -579,11 +579,11 @@
filter);
}
i = (strlen(email) + 8) & (~7); /* make multiple of 8 */
- msg = MALLOC(sizeof(HELO_Message) + sizeof(EmailAddress) + i);
+ msg = MALLOC(sizeof(P2P_hello_MESSAGE) + sizeof(EmailAddress) + i);
memset(msg,
0,
- sizeof(HELO_Message) + sizeof(EmailAddress) + i);
- haddr = (EmailAddress*) &((HELO_Message_GENERIC*)msg)->senderAddress[0];
+ sizeof(P2P_hello_MESSAGE) + sizeof(EmailAddress) + i);
+ haddr = (EmailAddress*) &msg[1];
memset(&haddr->filter[0],
0,
FILTER_STRING_SIZE);
@@ -596,7 +596,7 @@
msg->protocol = htons(SMTP_PROTOCOL_NUMBER);
msg->MTU = htonl(smtpAPI.mtu);
msg->header.size
- = htons(HELO_Message_size(msg));
+ = htons(P2P_hello_MESSAGE_size(msg));
FREE(email);
if (verifyHelo(msg) == SYSERR)
GNUNET_ASSERT(0);
@@ -605,19 +605,19 @@
/**
* Establish a connection to a remote node.
- * @param helo the HELO-Message for the target node
+ * @param helo the hello-Message for the target node
* @param tsessionPtr the session handle that is to be set
* @return OK on success, SYSERR if the operation failed
*/
-static int smtpConnect(const HELO_Message * helo,
+static int smtpConnect(const P2P_hello_MESSAGE * helo,
TSession ** tsessionPtr) {
TSession * tsession;
tsession = MALLOC(sizeof(TSession));
- tsession->internal = MALLOC(HELO_Message_size(helo));
+ tsession->internal = MALLOC(P2P_hello_MESSAGE_size(helo));
memcpy(tsession->internal,
helo,
- HELO_Message_size(helo));
+ P2P_hello_MESSAGE_size(helo));
tsession->ttype = smtpAPI.protocolNumber;
(*tsessionPtr) = tsession;
return OK;
@@ -643,7 +643,7 @@
/**
* Send a message to the specified remote node.
*
- * @param tsession the HELO_Message identifying the remote node
+ * @param tsession the P2P_hello_MESSAGE identifying the remote node
* @param message what to send
* @param size the size of the message
* @return SYSERR on error, OK on success
@@ -653,7 +653,7 @@
const unsigned int size) {
char * msg;
SMTPMessage * mp;
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
EmailAddress * haddr;
char * ebody;
int res;
@@ -669,11 +669,11 @@
BREAK();
return SYSERR;
}
- helo = (HELO_Message*)tsession->internal;
+ helo = (P2P_hello_MESSAGE*)tsession->internal;
if (helo == NULL)
return SYSERR;
- haddr = (EmailAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (EmailAddress*) &helo[1];
ssize2 = ssize = size + sizeof(SMTPMessage);
msg = MALLOC(ssize);
mp = (SMTPMessage*) &msg[size];
@@ -801,7 +801,7 @@
}
email = NULL; /* abusing email as a flag... */
if (OK == writeSMTPLine(smtp_sock,
- "HELO %s\r\n",
+ "hello %s\r\n",
getConfigurationString("SMTP",
"SENDERHOSTNAME")))
if (OK == readSMTPLine(smtp_sock,
@@ -851,12 +851,12 @@
/**
* Convert TCP address to a string.
*/
-static char * addressToString(const HELO_Message * helo) {
+static char * addressToString(const P2P_hello_MESSAGE * helo) {
char * ret;
EmailAddress * addr;
size_t n;
- addr = (EmailAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ addr = (EmailAddress*) &helo[1];
n = FILTER_STRING_SIZE + strlen(addr->senderAddress) + 16;
ret = MALLOC(n);
SNPRINTF(ret,
@@ -897,7 +897,7 @@
smtpAPI.mtu = mtu - sizeof(SMTPMessage);
smtpAPI.cost = 50;
smtpAPI.verifyHelo = &verifyHelo;
- smtpAPI.createHELO = &createHELO;
+ smtpAPI.createhello = &createhello;
smtpAPI.connect = &smtpConnect;
smtpAPI.send = &smtpSend;
smtpAPI.sendReliable = &smtpSend; /* is always blocking, so we can't
really do better */
Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/transports/tcp.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
@@ -83,14 +84,14 @@
* This struct is followed by MESSAGE_PARTs - until size is reached
* There is no "end of message".
*/
-} TCPMessagePack;
+} TCPP2P_PACKET;
/**
* Initial handshake message. Note that the beginning
- * must match the CS_HEADER since we are using tcpio.
+ * must match the CS_MESSAGE_HEADER since we are using tcpio.
*/
typedef struct {
- TCPMessagePack header;
+ TCPP2P_PACKET header;
/**
* Identity of the node connecting (TCP client)
@@ -382,8 +383,8 @@
TCPSession * tcpSession;
unsigned int len;
int ret;
- TCPMessagePack * pack;
- MessagePack * mp;
+ TCPP2P_PACKET * pack;
+ P2P_PACKET * mp;
tsession = tsessions[i];
if (SYSERR == tcpAssociate(tsession))
@@ -431,8 +432,8 @@
tcpSession->pos += ret;
while (tcpSession->pos > 2) {
- len = ntohs(((TCPMessagePack*)&tcpSession->rbuff[0])->size)
- + sizeof(TCPMessagePack);
+ len = ntohs(((TCPP2P_PACKET*)&tcpSession->rbuff[0])->size)
+ + sizeof(TCPP2P_PACKET);
if (len > tcpSession->rsize) /* if message larger than read buffer, grow!
*/
GROW(tcpSession->rbuff,
tcpSession->rsize,
@@ -459,7 +460,7 @@
welcome = (TCPWelcome*) &tcpSession->rbuff[0];
if ( (ntohs(welcome->header.reserved) != 0) ||
(ntohs(welcome->header.size)
- != sizeof(TCPWelcome) - sizeof(TCPMessagePack)) ) {
+ != sizeof(TCPWelcome) - sizeof(TCPP2P_PACKET)) ) {
LOG(LOG_WARNING,
_("Expected welcome message on tcp connection, "
"got garbage (%u, %u). Closing.\n"),
@@ -482,8 +483,8 @@
&tcpSession->rbuff[sizeof(TCPWelcome)],
tcpSession->pos - sizeof(TCPWelcome));
tcpSession->pos -= sizeof(TCPWelcome);
- len = ntohs(((TCPMessagePack*)&tcpSession->rbuff[0])->size)
- + sizeof(TCPMessagePack);
+ len = ntohs(((TCPP2P_PACKET*)&tcpSession->rbuff[0])->size)
+ + sizeof(TCPP2P_PACKET);
}
if ( (tcpSession->pos < 2) ||
(tcpSession->pos < len) ) {
@@ -491,9 +492,9 @@
return OK;
}
- pack = (TCPMessagePack*)&tcpSession->rbuff[0];
+ pack = (TCPP2P_PACKET*)&tcpSession->rbuff[0];
/* send msg to core! */
- if (len <= sizeof(TCPMessagePack)) {
+ if (len <= sizeof(TCPP2P_PACKET)) {
LOG(LOG_WARNING,
_("Received malformed message (size %u)"
" from tcp-peer connection. Closing.\n"),
@@ -501,13 +502,13 @@
tcpDisconnect(tsession);
return SYSERR;
}
- mp = MALLOC(sizeof(MessagePack));
- mp->msg = MALLOC(len - sizeof(TCPMessagePack));
+ mp = MALLOC(sizeof(P2P_PACKET));
+ mp->msg = MALLOC(len - sizeof(TCPP2P_PACKET));
memcpy(mp->msg,
&pack[1],
- len - sizeof(TCPMessagePack));
+ len - sizeof(TCPP2P_PACKET));
mp->sender = tcpSession->sender;
- mp->size = len - sizeof(TCPMessagePack);
+ mp->size = len - sizeof(TCPP2P_PACKET);
mp->tsession = tsession;
#if DEBUG_TCP
LOG(LOG_DEBUG,
@@ -564,7 +565,7 @@
tcpSession = MALLOC(sizeof(TCPSession));
tcpSession->pos = 0;
- tcpSession->rsize = 2 * 1024 + sizeof(TCPMessagePack);
+ tcpSession->rsize = 2 * 1024 + sizeof(TCPP2P_PACKET);
tcpSession->rbuff = MALLOC(tcpSession->rsize);
tcpSession->wpos = 0;
tcpSession->wbuff = NULL;
@@ -972,7 +973,7 @@
* increased reliability (i.e. grow TCP send buffer
* above one frame if needed).
*
- * @param tsession the HELO_Message identifying the remote node
+ * @param tsession the P2P_hello_MESSAGE identifying the remote node
* @param msg the message
* @param size the size of the message
* @return SYSERR on error, OK on success, NO on temporary error
@@ -980,7 +981,7 @@
static int tcpSendReliable(TSession * tsession,
const void * msg,
const unsigned int size) {
- TCPMessagePack * mp;
+ TCPP2P_PACKET * mp;
int ok;
if (size >= MAX_BUFFER_SIZE)
@@ -993,7 +994,7 @@
}
if (((TCPSession*)tsession->internal)->sock == -1)
return SYSERR; /* other side closed connection */
- mp = MALLOC(sizeof(TCPMessagePack) + size);
+ mp = MALLOC(sizeof(TCPP2P_PACKET) + size);
memcpy(&mp[1],
msg,
size);
@@ -1001,27 +1002,27 @@
mp->reserved = 0;
ok = tcpDirectSendReliable(tsession->internal,
mp,
- size + sizeof(TCPMessagePack));
+ size + sizeof(TCPP2P_PACKET));
FREE(mp);
return ok;
}
/**
- * Verify that a HELO-Message is correct (a node
+ * Verify that a Hello-Message is correct (a node
* is reachable at that address). Since the reply
* will be asynchronous, a method must be called on
* success.
- * @param helo the HELO message to verify
+ * @param helo the Hello message to verify
* (the signature/crc have been verified before)
* @return OK on success, SYSERR on error
*/
-static int verifyHelo(const HELO_Message * helo) {
+static int verifyHelo(const P2P_hello_MESSAGE * helo) {
HostAddress * haddr;
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (HostAddress*) &helo[1];
if ( (ntohs(helo->senderAddressSize) != sizeof(HostAddress)) ||
- (ntohs(helo->header.size) != HELO_Message_size(helo)) ||
- (ntohs(helo->header.type) != p2p_PROTO_HELO) ||
+ (ntohs(helo->header.size) != P2P_hello_MESSAGE_size(helo)) ||
+ (ntohs(helo->header.type) != p2p_PROTO_hello) ||
(ntohs(helo->protocol) != TCP_PROTOCOL_NUMBER) ||
(YES == isBlacklisted(haddr->ip)) )
return SYSERR; /* obviously invalid */
@@ -1030,14 +1031,14 @@
}
/**
- * Create a HELO-Message for the current node. The HELO is
+ * Create a hello-Message for the current node. The hello is
* created without signature and without a timestamp. The
* GNUnet core will sign the message and add an expiration time.
*
- * @return HELO on success, NULL on error
+ * @return hello on success, NULL on error
*/
-static HELO_Message * createHELO() {
- HELO_Message * msg;
+static P2P_hello_MESSAGE * createhello() {
+ P2P_hello_MESSAGE * msg;
HostAddress * haddr;
unsigned short port;
@@ -1047,8 +1048,8 @@
"TCP port is 0, will only send using TCP.\n");
return NULL; /* TCP transport is configured SEND-only! */
}
- msg = (HELO_Message *) MALLOC(sizeof(HELO_Message) + sizeof(HostAddress));
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)msg)->senderAddress[0];
+ msg = (P2P_hello_MESSAGE *) MALLOC(sizeof(P2P_hello_MESSAGE) +
sizeof(HostAddress));
+ haddr = (HostAddress*) &msg[1];
if (SYSERR == getPublicIPAddress(&haddr->ip)) {
FREE(msg);
@@ -1070,11 +1071,11 @@
/**
* Establish a connection to a remote node.
*
- * @param helo the HELO-Message for the target node
+ * @param helo the hello-Message for the target node
* @param tsessionPtr the session handle that is set
* @return OK on success, SYSERR if the operation failed
*/
-static int tcpConnect(const HELO_Message * helo,
+static int tcpConnect(const P2P_hello_MESSAGE * helo,
TSession ** tsessionPtr) {
int i;
HostAddress * haddr;
@@ -1086,7 +1087,7 @@
if (tcp_shutdown == YES)
return SYSERR;
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (HostAddress*) &helo[1];
#if DEBUG_TCP
LOG(LOG_DEBUG,
"Creating TCP connection to %u.%u.%u.%u:%u.\n",
@@ -1138,7 +1139,7 @@
tcpSession->wpos = 0;
tcpSession->wbuff = NULL;
tcpSession->wsize = 0;
- tcpSession->rsize = 2 * 1024 + sizeof(TCPMessagePack);
+ tcpSession->rsize = 2 * 1024 + sizeof(TCPP2P_PACKET);
tcpSession->rbuff = MALLOC(tcpSession->rsize);
tsession = MALLOC(sizeof(TSession));
tsession->internal = tcpSession;
@@ -1155,7 +1156,7 @@
/* send our node identity to the other side to fully establish the
connection! */
welcome.header.size
- = htons(sizeof(TCPWelcome) - sizeof(TCPMessagePack));
+ = htons(sizeof(TCPWelcome) - sizeof(TCPP2P_PACKET));
welcome.header.reserved
= htons(0);
welcome.clientIdentity
@@ -1178,7 +1179,7 @@
/**
* Send a message to the specified remote node.
*
- * @param tsession the HELO_Message identifying the remote node
+ * @param tsession the P2P_hello_MESSAGE identifying the remote node
* @param msg the message
* @param size the size of the message
* @return SYSERR on error, OK on success
@@ -1186,7 +1187,7 @@
static int tcpSend(TSession * tsession,
const void * msg,
const unsigned int size) {
- TCPMessagePack * mp;
+ TCPP2P_PACKET * mp;
int ok;
#if DEBUG_TCP
@@ -1223,7 +1224,7 @@
size);
return SYSERR; /* other side closed connection */
}
- mp = MALLOC(sizeof(TCPMessagePack) + size);
+ mp = MALLOC(sizeof(TCPP2P_PACKET) + size);
memcpy(&mp[1],
msg,
size);
@@ -1234,11 +1235,11 @@
if (((TCPSession*)tsession->internal)->wpos + size < TARGET_BUFFER_SIZE)
ok = tcpDirectSendReliable(tsession->internal,
mp,
- size + sizeof(TCPMessagePack));
+ size + sizeof(TCPP2P_PACKET));
else
ok = tcpDirectSend(tsession->internal,
mp,
- size + sizeof(TCPMessagePack));
+ size + sizeof(TCPP2P_PACKET));
FREE(mp);
return ok;
}
@@ -1382,12 +1383,12 @@
/**
* Convert TCP address to a string.
*/
-static char * addressToString(const HELO_Message * helo) {
+static char * addressToString(const P2P_hello_MESSAGE * helo) {
char * ret;
HostAddress * haddr;
size_t n;
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (HostAddress*) &helo[1];
n = 4*4+6+6;
ret = MALLOC(n);
SNPRINTF(ret,
@@ -1407,7 +1408,7 @@
*/
TransportAPI * inittransport_tcp(CoreAPIForTransport * core) {
GNUNET_ASSERT(sizeof(HostAddress) == 8);
- GNUNET_ASSERT(sizeof(TCPMessagePack) == 4);
+ GNUNET_ASSERT(sizeof(TCPP2P_PACKET) == 4);
GNUNET_ASSERT(sizeof(TCPWelcome) == 68);
MUTEX_CREATE_RECURSIVE(&tcplock);
reloadConfiguration();
@@ -1430,7 +1431,7 @@
tcpAPI.mtu = 0;
tcpAPI.cost = 20000; /* about equal to udp */
tcpAPI.verifyHelo = &verifyHelo;
- tcpAPI.createHELO = &createHELO;
+ tcpAPI.createhello = &createhello;
tcpAPI.connect = &tcpConnect;
tcpAPI.associate = &tcpAssociate;
tcpAPI.send = &tcpSend;
Modified: GNUnet/src/transports/tcp6.c
===================================================================
--- GNUnet/src/transports/tcp6.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/transports/tcp6.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (C) 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
@@ -75,14 +76,14 @@
*/
unsigned short reserved;
-} TCP6MessagePack;
+} TCP6P2P_PACKET;
/**
* Initial handshake message. Note that the beginning
- * must match the CS_HEADER since we are using tcp6io.
+ * must match the CS_MESSAGE_HEADER since we are using tcp6io.
*/
typedef struct {
- TCP6MessagePack header;
+ TCP6P2P_PACKET header;
/**
* Identity of the node connecting (TCP6 client)
@@ -362,8 +363,8 @@
TCP6Session * tcp6Session;
unsigned int len;
int ret;
- TCP6MessagePack * pack;
- MessagePack * mp;
+ TCP6P2P_PACKET * pack;
+ P2P_PACKET * mp;
tsession = tsessions[i];
if (SYSERR == tcp6Associate(tsession))
@@ -407,7 +408,7 @@
tcp6Session->pos += ret;
while (tcp6Session->pos > 2) {
- len = ntohs(((TCP6MessagePack*)&tcp6Session->rbuff[0])->size) +
sizeof(TCP6MessagePack);
+ len = ntohs(((TCP6P2P_PACKET*)&tcp6Session->rbuff[0])->size) +
sizeof(TCP6P2P_PACKET);
if (len > tcp6Session->rsize) /* if MTU larger than expected, grow! */
GROW(tcp6Session->rbuff,
tcp6Session->rsize,
@@ -433,7 +434,7 @@
welcome = (TCP6Welcome*) &tcp6Session->rbuff[0];
if ( (ntohs(welcome->header.reserved) != 0) ||
- (ntohs(welcome->header.size) != sizeof(TCP6Welcome) -
sizeof(TCP6MessagePack)) ) {
+ (ntohs(welcome->header.size) != sizeof(TCP6Welcome) -
sizeof(TCP6P2P_PACKET)) ) {
LOG(LOG_WARNING,
_("Expected welcome message on tcp connection, got garbage.
Closing.\n"));
tcp6Disconnect(tsession);
@@ -453,7 +454,7 @@
&tcp6Session->rbuff[sizeof(TCP6Welcome)],
tcp6Session->pos - sizeof(TCP6Welcome));
tcp6Session->pos -= sizeof(TCP6Welcome);
- len = ntohs(((TCP6MessagePack*)&tcp6Session->rbuff[0])->size) +
sizeof(TCP6MessagePack);
+ len = ntohs(((TCP6P2P_PACKET*)&tcp6Session->rbuff[0])->size) +
sizeof(TCP6P2P_PACKET);
}
if ( (tcp6Session->pos < 2) ||
(tcp6Session->pos < len) ) {
@@ -461,21 +462,21 @@
return OK;
}
- pack = (TCP6MessagePack*)&tcp6Session->rbuff[0];
+ pack = (TCP6P2P_PACKET*)&tcp6Session->rbuff[0];
/* send msg to core! */
- if (len <= sizeof(TCP6MessagePack)) {
+ if (len <= sizeof(TCP6P2P_PACKET)) {
LOG(LOG_WARNING,
_("Received malformed message from tcp6-peer connection. Closing
connection.\n"));
tcp6Disconnect(tsession);
return SYSERR;
}
- mp = MALLOC(sizeof(MessagePack));
- mp->msg = MALLOC(len - sizeof(TCP6MessagePack));
+ mp = MALLOC(sizeof(P2P_PACKET));
+ mp->msg = MALLOC(len - sizeof(TCP6P2P_PACKET));
memcpy(mp->msg,
&pack[1],
- len - sizeof(TCP6MessagePack));
+ len - sizeof(TCP6P2P_PACKET));
mp->sender = tcp6Session->sender;
- mp->size = len - sizeof(TCP6MessagePack);
+ mp->size = len - sizeof(TCP6P2P_PACKET);
mp->tsession = tsession;
#if DEBUG_TCP6
LOG(LOG_DEBUG,
@@ -538,7 +539,7 @@
tcp6Session = MALLOC(sizeof(TCP6Session));
tcp6Session->pos = 0;
- tcp6Session->rsize = 2 * 1024 + sizeof(TCP6MessagePack);
+ tcp6Session->rsize = 2 * 1024 + sizeof(TCP6P2P_PACKET);
tcp6Session->rbuff = MALLOC(tcp6Session->rsize);
tcp6Session->wpos = 0;
tcp6Session->wbuff = NULL;
@@ -872,7 +873,7 @@
/**
* Send a message to the specified remote node.
*
- * @param tsession the HELO_Message identifying the remote node
+ * @param tsession the P2P_hello_MESSAGE identifying the remote node
* @param msg the message
* @param size the size of the message
* @return SYSERR on error, OK on success, NO if queue is full
@@ -880,7 +881,7 @@
static int tcp6SendReliable(TSession * tsession,
const void * msg,
const unsigned int size) {
- TCP6MessagePack * mp;
+ TCP6P2P_PACKET * mp;
int ok;
if (size >= MAX_BUFFER_SIZE)
@@ -893,7 +894,7 @@
}
if (((TCP6Session*)tsession->internal)->sock == -1)
return SYSERR; /* other side closed connection */
- mp = MALLOC(sizeof(TCP6MessagePack) + size);
+ mp = MALLOC(sizeof(TCP6P2P_PACKET) + size);
memcpy(&mp[1],
msg,
size);
@@ -901,28 +902,28 @@
mp->reserved = 0;
ok = tcp6DirectSendReliable(tsession->internal,
mp,
- size + sizeof(TCP6MessagePack));
+ size + sizeof(TCP6P2P_PACKET));
FREE(mp);
return ok;
}
/**
- * Verify that a HELO-Message is correct (a node
+ * Verify that a hello-Message is correct (a node
* is reachable at that address). Since the reply
* will be asynchronous, a method must be called on
* success.
- * @param helo the HELO message to verify
+ * @param helo the hello message to verify
* (the signature/crc have been verified before)
* @return OK on success, SYSERR on error
*/
-static int verifyHelo(const HELO_Message * helo) {
+static int verifyHelo(const P2P_hello_MESSAGE * helo) {
Host6Address * haddr;
- haddr = (Host6Address*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (Host6Address*) &helo[1];
if ( (ntohs(helo->senderAddressSize) != sizeof(Host6Address)) ||
- (ntohs(helo->header.size) != HELO_Message_size(helo)) ||
- (ntohs(helo->header.type) != p2p_PROTO_HELO) ||
+ (ntohs(helo->header.size) != P2P_hello_MESSAGE_size(helo)) ||
+ (ntohs(helo->header.type) != p2p_PROTO_hello) ||
(ntohs(helo->protocol) != TCP6_PROTOCOL_NUMBER) ||
(YES == isBlacklisted(&haddr->ip)) )
return SYSERR; /* obviously invalid */
@@ -931,14 +932,14 @@
}
/**
- * Create a HELO-Message for the current node. The HELO is
+ * Create a hello-Message for the current node. The hello is
* created without signature and without a timestamp. The
* GNUnet core will sign the message and add an expiration time.
*
- * @return HELO on success, NULL on error
+ * @return hello on success, NULL on error
*/
-static HELO_Message * createHELO() {
- HELO_Message * msg;
+static P2P_hello_MESSAGE * createhello() {
+ P2P_hello_MESSAGE * msg;
Host6Address * haddr;
unsigned short port;
@@ -948,8 +949,8 @@
"TCP6 port is 0, will only send using TCP6\n");
return NULL; /* TCP6 transport is configured SEND-only! */
}
- msg = (HELO_Message *) MALLOC(sizeof(HELO_Message) + sizeof(Host6Address));
- haddr = (Host6Address*) &((HELO_Message_GENERIC*)msg)->senderAddress[0];
+ msg = (P2P_hello_MESSAGE *) MALLOC(sizeof(P2P_hello_MESSAGE) +
sizeof(Host6Address));
+ haddr = (Host6Address*) &msg[1];
if (SYSERR == getPublicIP6Address(&haddr->ip)) {
FREE(msg);
@@ -968,11 +969,11 @@
/**
* Establish a connection to a remote node.
*
- * @param helo the HELO-Message for the target node
+ * @param helo the hello-Message for the target node
* @param tsessionPtr the session handle that is set
* @return OK on success, SYSERR if the operation failed
*/
-static int tcp6Connect(const HELO_Message * helo,
+static int tcp6Connect(const P2P_hello_MESSAGE * helo,
TSession ** tsessionPtr) {
int i;
Host6Address * haddr;
@@ -986,7 +987,7 @@
if (tcp6_shutdown == YES)
return SYSERR;
- haddr = (Host6Address*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (Host6Address*) &helo[1];
memset(&hints, 0, sizeof(hints));
hints.ai_family = PF_INET6;
@@ -1056,7 +1057,7 @@
tcp6Session->sock = sock;
tcp6Session->wpos = 0;
tcp6Session->wbuff = NULL;
- tcp6Session->rsize = 2 * 1024 + sizeof(TCP6MessagePack);
+ tcp6Session->rsize = 2 * 1024 + sizeof(TCP6P2P_PACKET);
tcp6Session->rbuff = MALLOC(tcp6Session->rsize);
tsession = MALLOC(sizeof(TSession));
tsession->internal = tcp6Session;
@@ -1074,7 +1075,7 @@
/* send our node identity to the other side to fully establish the
connection! */
- welcome.header.size = htons(sizeof(TCP6Welcome) - sizeof(TCP6MessagePack));
+ welcome.header.size = htons(sizeof(TCP6Welcome) - sizeof(TCP6P2P_PACKET));
welcome.header.reserved = htons(0);
memcpy(&welcome.clientIdentity,
coreAPI->myIdentity,
@@ -1097,7 +1098,7 @@
/**
* Send a message to the specified remote node.
*
- * @param tsession the HELO_Message identifying the remote node
+ * @param tsession the P2P_hello_MESSAGE identifying the remote node
* @param msg the message
* @param size the size of the message
* @return SYSERR on error, OK on success
@@ -1105,7 +1106,7 @@
static int tcp6Send(TSession * tsession,
const void * msg,
const unsigned int size) {
- TCP6MessagePack * mp;
+ TCP6P2P_PACKET * mp;
int ok;
if (size >= MAX_BUFFER_SIZE)
@@ -1118,7 +1119,7 @@
}
if (((TCP6Session*)tsession->internal)->sock == -1)
return SYSERR; /* other side closed connection */
- mp = MALLOC(sizeof(TCP6MessagePack) + size);
+ mp = MALLOC(sizeof(TCP6P2P_PACKET) + size);
memcpy(&mp[1],
msg,
size);
@@ -1127,11 +1128,11 @@
if (((TCP6Session*)tsession->internal)->wpos + size < TARGET_BUFFER_SIZE)
ok = tcp6DirectSendReliable(tsession->internal,
mp,
- size + sizeof(TCP6MessagePack));
+ size + sizeof(TCP6P2P_PACKET));
else
ok = tcp6DirectSend(tsession->internal,
mp,
- size + sizeof(TCP6MessagePack));
+ size + sizeof(TCP6P2P_PACKET));
FREE(mp);
return ok;
}
@@ -1275,12 +1276,12 @@
/**
* Convert TCP6 address to a string.
*/
-static char * addressToString(const HELO_Message * helo) {
+static char * addressToString(const P2P_hello_MESSAGE * helo) {
char * ret;
char inet6[INET6_ADDRSTRLEN];
Host6Address * haddr;
- haddr = (Host6Address*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (Host6Address*) &helo[1];
ret = MALLOC(INET6_ADDRSTRLEN+16);
SNPRINTF(ret,
INET6_ADDRSTRLEN+16,
@@ -1313,7 +1314,7 @@
tcp6API.mtu = 0;
tcp6API.cost = 19950; /* about equal to udp6 */
tcp6API.verifyHelo = &verifyHelo;
- tcp6API.createHELO = &createHELO;
+ tcp6API.createhello = &createhello;
tcp6API.connect = &tcp6Connect;
tcp6API.associate = &tcp6Associate;
tcp6API.send = &tcp6Send;
Modified: GNUnet/src/transports/udp.c
===================================================================
--- GNUnet/src/transports/udp.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/transports/udp.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,5 +1,6 @@
/*
This file is part of GNUnet
+ (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
@@ -205,13 +206,13 @@
socklen_t addrlen = sizeof(incoming);
int size;
EncName enc;
- MessagePack * mp;
+ P2P_PACKET * mp;
UDPMessage udpm;
IPaddr ipaddr;
SEMAPHORE_UP(serverSignal);
while (udp_shutdown == NO) {
- mp = MALLOC(sizeof(MessagePack));
+ mp = MALLOC(sizeof(P2P_PACKET));
mp->msg = MALLOC(udpAPI.mtu + sizeof(UDPMessage));
RETRY:
memset(&incoming,
@@ -303,21 +304,21 @@
/* *************** API implementation *************** */
/**
- * Verify that a HELO-Message is correct (a node is reachable at that
+ * Verify that a hello-Message is correct (a node is reachable at that
* address). Since the reply will be asynchronous, a method must be
* called on success.
*
- * @param helo the HELO message to verify
+ * @param helo the hello message to verify
* (the signature/crc have been verified before)
* @return OK on success, SYSERR on failure
*/
-static int verifyHelo(const HELO_Message * helo) {
+static int verifyHelo(const P2P_hello_MESSAGE * helo) {
HostAddress * haddr;
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (HostAddress*) &helo[1];
if ( (ntohs(helo->senderAddressSize) != sizeof(HostAddress)) ||
- (ntohs(helo->header.size) != HELO_Message_size(helo)) ||
- (ntohs(helo->header.type) != p2p_PROTO_HELO) ||
+ (ntohs(helo->header.size) != P2P_hello_MESSAGE_size(helo)) ||
+ (ntohs(helo->header.type) != p2p_PROTO_hello) ||
(YES == isBlacklisted(haddr->senderIP)) )
return SYSERR; /* obviously invalid */
else {
@@ -332,22 +333,22 @@
}
/**
- * Create a HELO-Message for the current node. The HELO is created
+ * Create a hello-Message for the current node. The hello is created
* without signature and without a timestamp. The GNUnet core will
* sign the message and add an expiration time.
*
- * @return HELO on success, NULL on error
+ * @return hello on success, NULL on error
*/
-static HELO_Message * createHELO() {
- HELO_Message * msg;
+static P2P_hello_MESSAGE * createhello() {
+ P2P_hello_MESSAGE * msg;
HostAddress * haddr;
if ( ( (udp_shutdown == YES) && (getGNUnetUDPPort() == 0) ) ||
( (udp_shutdown == NO) && (port == 0) ) )
return NULL; /* UDP transport configured send-only */
- msg = MALLOC(sizeof(HELO_Message) + sizeof(HostAddress));
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)msg)->senderAddress[0];
+ msg = MALLOC(sizeof(P2P_hello_MESSAGE) + sizeof(HostAddress));
+ haddr = (HostAddress*) &msg[1];
if (SYSERR == getPublicIPAddress(&haddr->senderIP)) {
FREE(msg);
@@ -371,22 +372,22 @@
/**
* Establish a connection to a remote node.
- * @param helo the HELO-Message for the target node
+ * @param helo the hello-Message for the target node
* @param tsessionPtr the session handle that is to be set
* @return OK on success, SYSERR if the operation failed
*/
-static int udpConnect(const HELO_Message * helo,
+static int udpConnect(const P2P_hello_MESSAGE * helo,
TSession ** tsessionPtr) {
TSession * tsession;
HostAddress * haddr;
tsession = MALLOC(sizeof(TSession));
- tsession->internal = MALLOC(HELO_Message_size(helo));
+ tsession->internal = MALLOC(P2P_hello_MESSAGE_size(helo));
memcpy(tsession->internal,
helo,
- HELO_Message_size(helo));
+ P2P_hello_MESSAGE_size(helo));
tsession->ttype = udpAPI.protocolNumber;
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (HostAddress*) &helo[1];
#if DEBUG_UDP
LOG(LOG_DEBUG,
"Connecting via UDP to %u.%u.%u.%u:%u.\n",
@@ -415,7 +416,7 @@
/**
* Send a message to the specified remote node.
*
- * @param tsession the HELO_Message identifying the remote node
+ * @param tsession the P2P_hello_MESSAGE identifying the remote node
* @param message what to send
* @param size the size of the message
* @return SYSERR on error, OK on success
@@ -425,7 +426,7 @@
const unsigned int size) {
char * msg;
UDPMessage mp;
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
HostAddress * haddr;
struct sockaddr_in sin; /* an Internet endpoint address */
int ok;
@@ -441,11 +442,11 @@
BREAK();
return SYSERR;
}
- helo = (HELO_Message*)tsession->internal;
+ helo = (P2P_hello_MESSAGE*)tsession->internal;
if (helo == NULL)
return SYSERR;
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (HostAddress*) &helo[1];
ssize = size + sizeof(UDPMessage);
msg = MALLOC(ssize);
mp.size = htons(ssize);
@@ -604,12 +605,12 @@
/**
* Convert UDP address to a string.
*/
-static char * addressToString(const HELO_Message * helo) {
+static char * addressToString(const P2P_hello_MESSAGE * helo) {
char * ret;
HostAddress * haddr;
size_t n;
- haddr = (HostAddress*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (HostAddress*) &helo[1];
n = 4*4+6+6;
ret = MALLOC(n);
SNPRINTF(ret,
@@ -661,7 +662,7 @@
udpAPI.mtu = mtu - sizeof(UDPMessage);
udpAPI.cost = 20000;
udpAPI.verifyHelo = &verifyHelo;
- udpAPI.createHELO = &createHELO;
+ udpAPI.createhello = &createhello;
udpAPI.connect = &udpConnect;
udpAPI.send = &udpSend;
udpAPI.sendReliable = &udpSend; /* can't increase reliability */
Modified: GNUnet/src/transports/udp6.c
===================================================================
--- GNUnet/src/transports/udp6.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/transports/udp6.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,5 +1,6 @@
/*
-o This file is part of GNUnet
+ This file is part of GNUnet
+ (C) 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
@@ -190,13 +191,13 @@
socklen_t addrlen = sizeof(incoming);
int size;
EncName enc;
- MessagePack * mp;
+ P2P_PACKET * mp;
UDP6Message udp6m;
char inet6[INET6_ADDRSTRLEN];
SEMAPHORE_UP(serverSignal);
while (udp6_shutdown == NO) {
- mp = MALLOC(sizeof(MessagePack));
+ mp = MALLOC(sizeof(P2P_PACKET));
mp->msg = MALLOC(udp6API.mtu + sizeof(UDP6Message));
RETRY:
memset(&incoming,
@@ -295,21 +296,21 @@
/* *************** API implementation *************** */
/**
- * Verify that a HELO-Message is correct (a node is reachable at that
+ * Verify that a hello-Message is correct (a node is reachable at that
* address). Since the reply will be asynchronous, a method must be
* called on success.
*
- * @param helo the HELO message to verify
+ * @param helo the hello message to verify
* (the signature/crc have been verified before)
* @return OK on success, SYSERR on failure
*/
-static int verifyHelo(const HELO_Message * helo) {
+static int verifyHelo(const P2P_hello_MESSAGE * helo) {
Host6Address * haddr;
- haddr = (Host6Address*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (Host6Address*) &helo[1];
if ( (ntohs(helo->senderAddressSize) != sizeof(Host6Address)) ||
- (ntohs(helo->header.size) != HELO_Message_size(helo)) ||
- (ntohs(helo->header.type) != p2p_PROTO_HELO) ||
+ (ntohs(helo->header.size) != P2P_hello_MESSAGE_size(helo)) ||
+ (ntohs(helo->header.type) != p2p_PROTO_hello) ||
(YES == isBlacklisted(&haddr->senderIP)) )
return SYSERR; /* obviously invalid */
else {
@@ -328,14 +329,14 @@
}
/**
- * Create a HELO-Message for the current node. The HELO is created
+ * Create a hello-Message for the current node. The hello is created
* without signature and without a timestamp. The GNUnet core will
* sign the message and add an expiration time.
*
- * @return HELO on success, NULL on error
+ * @return hello on success, NULL on error
*/
-static HELO_Message * createHELO() {
- HELO_Message * msg;
+static P2P_hello_MESSAGE * createhello() {
+ P2P_hello_MESSAGE * msg;
Host6Address * haddr;
unsigned short port;
@@ -343,8 +344,8 @@
if (port == 0)
return NULL; /* UDP6 transport configured send-only */
- msg = MALLOC(sizeof(HELO_Message) + sizeof(Host6Address));
- haddr = (Host6Address*) &((HELO_Message_GENERIC*)msg)->senderAddress[0];
+ msg = MALLOC(sizeof(P2P_hello_MESSAGE) + sizeof(Host6Address));
+ haddr = (Host6Address*) &msg[1];
if (SYSERR == getPublicIP6Address(&haddr->senderIP)) {
FREE(msg);
@@ -362,11 +363,11 @@
/**
* Establish a connection to a remote node.
- * @param helo the HELO-Message for the target node
+ * @param helo the hello-Message for the target node
* @param tsessionPtr the session handle that is to be set
* @return OK on success, SYSERR if the operation failed
*/
-static int udp6Connect(const HELO_Message * helo,
+static int udp6Connect(const P2P_hello_MESSAGE * helo,
TSession ** tsessionPtr) {
TSession * tsession;
Host6Address * haddr;
@@ -375,12 +376,12 @@
#endif
tsession = MALLOC(sizeof(TSession));
- tsession->internal = MALLOC(HELO_Message_size(helo));
+ tsession->internal = MALLOC(P2P_hello_MESSAGE_size(helo));
memcpy(tsession->internal,
helo,
- HELO_Message_size(helo));
+ P2P_hello_MESSAGE_size(helo));
tsession->ttype = udp6API.protocolNumber;
- haddr = (Host6Address*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (Host6Address*) &helo[1];
#if DEBUG_UDP6
tmp = MALLOC(INET6_ADDRSTRLEN);
LOG(LOG_DEBUG,
@@ -414,7 +415,7 @@
/**
* Send a message to the specified remote node.
*
- * @param tsession the HELO_Message identifying the remote node
+ * @param tsession the P2P_hello_MESSAGE identifying the remote node
* @param message what to send
* @param size the size of the message
* @return SYSERR on error, OK on success
@@ -424,7 +425,7 @@
const unsigned int size) {
char * msg;
UDP6Message mp;
- HELO_Message * helo;
+ P2P_hello_MESSAGE * helo;
Host6Address * haddr;
struct sockaddr_in6 sin; /* an Internet endpoint address */
int ok;
@@ -443,11 +444,11 @@
BREAK();
return SYSERR;
}
- helo = (HELO_Message*)tsession->internal;
+ helo = (P2P_hello_MESSAGE*)tsession->internal;
if (helo == NULL)
return SYSERR;
- haddr = (Host6Address*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (Host6Address*) &helo[1];
ssize = size + sizeof(UDP6Message);
msg = MALLOC(ssize);
mp.size = htons(ssize);
@@ -591,12 +592,12 @@
/**
* Convert UDP6 address to a string.
*/
-static char * addressToString(const HELO_Message * helo) {
+static char * addressToString(const P2P_hello_MESSAGE * helo) {
char * ret;
char inet6[INET6_ADDRSTRLEN];
Host6Address * haddr;
- haddr = (Host6Address*) &((HELO_Message_GENERIC*)helo)->senderAddress[0];
+ haddr = (Host6Address*) &helo[1];
ret = MALLOC(INET6_ADDRSTRLEN+16);
SNPRINTF(ret,
INET6_ADDRSTRLEN+16,
@@ -639,7 +640,7 @@
udp6API.mtu = mtu - sizeof(UDP6Message);
udp6API.cost = 19950;
udp6API.verifyHelo = &verifyHelo;
- udp6API.createHELO = &createHELO;
+ udp6API.createhello = &createhello;
udp6API.connect = &udp6Connect;
udp6API.send = &udp6Send;
udp6API.sendReliable = &udp6Send; /* can't increase reliability */
Added: GNUnet/src/util/check.conf
===================================================================
--- GNUnet/src/util/check.conf 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/util/check.conf 2005-07-17 23:21:45 UTC (rev 1576)
@@ -0,0 +1,31 @@
+# This is the configuration for the GNUnet daemon when running
+# the test in this directory (make check).
+
+[GNUNETD]
+GNUNETD_HOME = /tmp/gnunet-util-test
+# VALGRIND = 300
+HELLOEXPIRES = 60
+LOGLEVEL = ERROR
+LOGFILE = $GNUNETD_HOME/log
+KEEPLOG = 0
+PIDFILE = $GNUNETD_HOME/gnunetd.pid
+HOSTS = $GNUNETD_HOME/data/hosts/
+APPLICATIONS = "traffic getoption stats"
+
+[MODULES]
+topology = topology_default
+
+
+[NETWORK]
+PORT = 2087
+INTERFACE = eth0
+HELOEXCHANGE = NO
+TRUSTED = 127.0.0.0/8;
+
+[LOAD]
+INTERFACES = eth0
+BASICLIMITING = YES
+MAXNETUPBPSTOTAL = 50000
+MAXNETDOWNBPSTOTAL = 50000
+MAXCPULOAD = 100
+
Modified: GNUnet/src/util/cron.c
===================================================================
--- GNUnet/src/util/cron.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/util/cron.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -78,12 +78,12 @@
int next;
/** data ptr (argument to the method) */
void * data;
-} DeltaEntry;
+} UTIL_cron_DeltaListEntry;
/**
* The delta-list of waiting tasks.
*/
-static DeltaEntry * deltaList_;
+static UTIL_cron_DeltaListEntry * deltaList_;
/**
* The current size of the DeltaList.
@@ -162,7 +162,7 @@
deltaListSize_ = INIT_CRON_JOBS;
deltaList_
- = MALLOC(sizeof(DeltaEntry) * deltaListSize_);
+ = MALLOC(sizeof(UTIL_cron_DeltaListEntry) * deltaListSize_);
for (i=0;i<deltaListSize_;i++)
deltaList_[i].next = i-1;
firstFree_ = deltaListSize_-1;
@@ -344,8 +344,8 @@
void advanceCronJob(CronJob method,
unsigned int deltaRepeat,
void * data) {
- DeltaEntry * job;
- DeltaEntry * last;
+ UTIL_cron_DeltaListEntry * job;
+ UTIL_cron_DeltaListEntry * last;
int jobId;
#if DEBUG_CRON
@@ -421,8 +421,8 @@
unsigned int delta,
unsigned int deltaRepeat,
void * data) {
- DeltaEntry * entry;
- DeltaEntry * pos;
+ UTIL_cron_DeltaListEntry * entry;
+ UTIL_cron_DeltaListEntry * pos;
int last;
int current;
@@ -499,7 +499,7 @@
*/
void printCronTab() {
int jobId;
- DeltaEntry * tab;
+ UTIL_cron_DeltaListEntry * tab;
cron_t now;
cronTime(&now);
@@ -529,7 +529,7 @@
* jobs!)
*/
static void runJob() {
- DeltaEntry * job;
+ UTIL_cron_DeltaListEntry * job;
int jobId;
CronJob method;
void * data;
@@ -654,8 +654,8 @@
int delCronJob(CronJob method,
unsigned int repeat,
void * data) {
- DeltaEntry * job;
- DeltaEntry * last;
+ UTIL_cron_DeltaListEntry * job;
+ UTIL_cron_DeltaListEntry * last;
int jobId;
#if DEBUG_CRON
Modified: GNUnet/src/util/daemon.c
===================================================================
--- GNUnet/src/util/daemon.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/util/daemon.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -32,14 +32,14 @@
/**
* Checks if gnunetd is running
*
- * Uses CS_PROTO_CLIENT_COUNT query to determine if gnunetd is
+ * Uses CS_PROTO_traffic_COUNT query to determine if gnunetd is
* running.
*
* @return OK if gnunetd is running, SYSERR if not
*/
int checkGNUnetDaemonRunning() {
GNUNET_TCP_SOCKET * sock;
- CS_HEADER csHdr;
+ CS_MESSAGE_HEADER csHdr;
int ret;
sock = getClientSocket();
@@ -49,9 +49,9 @@
}
csHdr.size
- = htons(sizeof(CS_HEADER));
+ = htons(sizeof(CS_MESSAGE_HEADER));
csHdr.type
- = htons(CS_PROTO_CLIENT_COUNT);
+ = htons(CS_PROTO_traffic_COUNT);
if (SYSERR == writeToSocket(sock,
&csHdr)) {
releaseClientSocket(sock);
@@ -245,14 +245,14 @@
*/
int stopGNUnetDaemon() {
GNUNET_TCP_SOCKET * sock;
- CS_HEADER csHdr;
+ CS_MESSAGE_HEADER csHdr;
int ret;
sock = getClientSocket();
if (sock == NULL)
return SYSERR;
csHdr.size
- = htons(sizeof(CS_HEADER));
+ = htons(sizeof(CS_MESSAGE_HEADER));
csHdr.type
= htons(CS_PROTO_SHUTDOWN_REQUEST);
if (SYSERR == writeToSocket(sock,
Modified: GNUnet/src/util/osconfig.c
===================================================================
--- GNUnet/src/util/osconfig.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/util/osconfig.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other
contributing authors)
+ (C) 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
Modified: GNUnet/src/util/tcp_return.c
===================================================================
--- GNUnet/src/util/tcp_return.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/util/tcp_return.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -42,17 +42,17 @@
*/
int readTCPResult(GNUNET_TCP_SOCKET * sock,
int * ret) {
- CS_RETURN_VALUE * rv;
+ CS_returnvalue_MESSAGE * rv;
rv = NULL;
if (SYSERR == readFromSocket(sock,
- (CS_HEADER **) &rv)) {
+ (CS_MESSAGE_HEADER **) &rv)) {
LOG(LOG_WARNING,
_("'%s' failed, other side closed connection.\n"),
__FUNCTION__);
return SYSERR;
}
- if ( (ntohs(rv->header.size) != sizeof(CS_RETURN_VALUE)) ||
+ if ( (ntohs(rv->header.size) != sizeof(CS_returnvalue_MESSAGE)) ||
(ntohs(rv->header.type) != CS_PROTO_RETURN_VALUE) ) {
LOG(LOG_WARNING,
_("'%s' failed, reply invalid!\n"),
@@ -75,10 +75,10 @@
*/
int sendTCPResult(GNUNET_TCP_SOCKET * sock,
int ret) {
- CS_RETURN_VALUE rv;
+ CS_returnvalue_MESSAGE rv;
rv.header.size
- = htons(sizeof(CS_RETURN_VALUE));
+ = htons(sizeof(CS_returnvalue_MESSAGE));
rv.header.type
= htons(CS_PROTO_RETURN_VALUE);
rv.return_value
Modified: GNUnet/src/util/tcpio.c
===================================================================
--- GNUnet/src/util/tcpio.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/util/tcpio.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -214,7 +214,7 @@
* @return OK if the write was sucessful, otherwise SYSERR.
*/
int writeToSocket(GNUNET_TCP_SOCKET * sock,
- const CS_HEADER * buffer) {
+ const CS_MESSAGE_HEADER * buffer) {
int res;
int size;
@@ -278,7 +278,7 @@
* otherwise SYSERR.
*/
int writeToSocketNonBlocking(GNUNET_TCP_SOCKET * sock,
- const CS_HEADER * buffer) {
+ const CS_MESSAGE_HEADER * buffer) {
size_t res;
size_t size;
@@ -361,7 +361,7 @@
* to re-establish the connection [temporary error]).
*/
int readFromSocket(GNUNET_TCP_SOCKET * sock,
- CS_HEADER ** buffer) {
+ CS_MESSAGE_HEADER ** buffer) {
int res;
unsigned int pos;
char * buf;
@@ -386,7 +386,7 @@
return SYSERR; /* other side closed socket or invalid header */
}
size = ntohs(size);
- if (size < sizeof(CS_HEADER)) {
+ if (size < sizeof(CS_MESSAGE_HEADER)) {
#if DEBUG_TCPIO
LOG_STRERROR(LOG_INFO, "recv");
#endif
@@ -418,7 +418,7 @@
size);
#endif
MUTEX_UNLOCK(&sock->readlock);
- *buffer = (CS_HEADER*) buf;
+ *buffer = (CS_MESSAGE_HEADER*) buf;
(*buffer)->size = htons(size);
return OK; /* success */
}
Modified: GNUnet/src/util/tcpiotest.c
===================================================================
--- GNUnet/src/util/tcpiotest.c 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet/src/util/tcpiotest.c 2005-07-17 23:21:45 UTC (rev 1576)
@@ -122,17 +122,17 @@
static int testTransmission(GNUNET_TCP_SOCKET * a,
GNUNET_TCP_SOCKET * b) {
- CS_HEADER * hdr;
- CS_HEADER * buf;
+ CS_MESSAGE_HEADER * hdr;
+ CS_MESSAGE_HEADER * buf;
int i;
int j;
hdr = MALLOC(1024);
- for (i=0;i<1024-sizeof(CS_HEADER);i+=7) {
+ for (i=0;i<1024-sizeof(CS_MESSAGE_HEADER);i+=7) {
fprintf(stderr, ".");
for (j=0;j<i;j++)
((char*)&hdr[1])[j] = (char)i+j;
- hdr->size = htons(i+sizeof(CS_HEADER));
+ hdr->size = htons(i+sizeof(CS_MESSAGE_HEADER));
hdr->type = 0;
if (OK != writeToSocket(a, hdr)) {
FREE(hdr);
@@ -143,7 +143,7 @@
FREE(hdr);
return 2;
}
- if (0 != memcmp(buf, hdr, i+sizeof(CS_HEADER))) {
+ if (0 != memcmp(buf, hdr, i+sizeof(CS_MESSAGE_HEADER))) {
FREE(buf);
FREE(hdr);
return 4;
@@ -156,15 +156,15 @@
static int testNonblocking(GNUNET_TCP_SOCKET * a,
GNUNET_TCP_SOCKET * b) {
- CS_HEADER * hdr;
- CS_HEADER * buf;
+ CS_MESSAGE_HEADER * hdr;
+ CS_MESSAGE_HEADER * buf;
int i;
int cnt;
hdr = MALLOC(1024);
- for (i=0;i<1024-sizeof(CS_HEADER);i+=11)
+ for (i=0;i<1024-sizeof(CS_MESSAGE_HEADER);i+=11)
((char*)&hdr[1])[i] = (char)i;
- hdr->size = htons(64+sizeof(CS_HEADER));
+ hdr->size = htons(64+sizeof(CS_MESSAGE_HEADER));
hdr->type = 0;
while (OK == writeToSocketNonBlocking(a,
hdr))
@@ -181,7 +181,7 @@
FREE(hdr);
return 16;
}
- if (0 != memcmp(buf, hdr, 64+sizeof(CS_HEADER))) {
+ if (0 != memcmp(buf, hdr, 64+sizeof(CS_MESSAGE_HEADER))) {
printf("Failure in message %u. Headers: %d ? %d\n",
i,
buf->type,
@@ -207,7 +207,7 @@
FREE(hdr);
return 128;
}
- if (0 != memcmp(buf, hdr, 64+sizeof(CS_HEADER))) {
+ if (0 != memcmp(buf, hdr, 64+sizeof(CS_MESSAGE_HEADER))) {
FREE(buf);
FREE(hdr);
return 256;
Modified: GNUnet-docs/WWW/download.php3
===================================================================
--- GNUnet-docs/WWW/download.php3 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet-docs/WWW/download.php3 2005-07-17 23:21:45 UTC (rev 1576)
@@ -87,10 +87,10 @@
ARRAY("0.7.0", "08-2005"));
W("A pre-release for 0.7.0 is available:");
echo "<ul>\n";
-LIV(extlink_("download/GNUnet-0.7.0pre4.tar.bz2", "GNUnet-0.7.0pre4.tar.bz2
(1263 kb)"));
-LIV(extlink_("download/GNUnet-0.7.0pre4.tar.gz" , "GNUnet-0.7.0pre4.tar.gz
(1836 kb)"));
-LIV(extlink_("download/gnunet-gtk-0.7.0pre4.tar.bz2",
"gnunet-gtk-0.7.0pre4.tar.bz2 (299 kb)"));
-LIV(extlink_("download/gnunet-gtk-0.7.0pre4.tar.gz" ,
"gnunet-gtk-0.7.0pre4.tar.gz (376 kb)"));
+LIV(extlink_("download/GNUnet-0.7.0pre5.tar.bz2", "GNUnet-0.7.0pre5.tar.bz2
(1263 kb)"));
+LIV(extlink_("download/GNUnet-0.7.0pre5.tar.gz" , "GNUnet-0.7.0pre5.tar.gz
(1836 kb)"));
+LIV(extlink_("download/gnunet-gtk-0.7.0pre5.tar.bz2",
"gnunet-gtk-0.7.0pre5.tar.bz2 (299 kb)"));
+LIV(extlink_("download/gnunet-gtk-0.7.0pre5.tar.gz" ,
"gnunet-gtk-0.7.0pre5.tar.gz (376 kb)"));
LIV(extlink_("download/win/Setup-0.7-pre4.exe" , "Setup-0.7-pre4.exe (4896
kb)"));
LIV(extlink_("download/win/Setup-0.7-pre4.exe.asc" , "Setup-0.7-pre4.exe.asc
(1 kb)"));
echo "</ul>\n";
Added: GNUnet-docs/WWW/news/news_20050718.inc
===================================================================
--- GNUnet-docs/WWW/news/news_20050718.inc 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/news/news_20050718.inc 2005-07-17 23:21:45 UTC (rev
1576)
@@ -0,0 +1,16 @@
+<?php
+W("Download %s here.",
+ extlink_("http://gnunet.org/download/GNUnet-0.7.0pre5.tar.bz2";,
+ "GNUnet 0.7.0pre5"));
+W("gnunet-gtk is now a separate download and can be found %s.",
+ extlink_("http://gnunet.org/download/gnunet-gtk-0.7.0pre5.tar.bz2";,
+ "here"));
+W("This release fixes various critical bugs found in the pre4 release.");
+W("In particular, it fixes a bug in the bandwidth management that has been in
the code from the very beginning, resulting in <tt>gnunetd</tt> using more
bandwidth than specified, in particular on high-bandwidth connections with low
user-defined limits.");
+W("It also fixes i18n problems in <tt>gnunet-gtk</tt>.");
+W("The frequency of session key exchanges was reduced to a sane level.");
+W("The new version also fixes various segmentation violations, a possible
stack overflow, some memory leaks and various other bugs.");
+W("<tt>gnunet-gtk</tt> was refactored and now also uses a plugin
architecture.");
+W("Please report any bugs you find to %s.",
+ extlink_("https://gnunet.org/mantis/";, "mantis"));
+?>
Modified: GNUnet-docs/WWW/protocol_cs.php3
===================================================================
--- GNUnet-docs/WWW/protocol_cs.php3 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet-docs/WWW/protocol_cs.php3 2005-07-17 23:21:45 UTC (rev 1576)
@@ -10,7 +10,7 @@
W("TCP is stream oriented, but GNUnet breaks the stream into records.");
W("The different messages between GNUnet and the clients all have the
following basic format:");
EP();
-LAYOUT("CS_HEADER",
+LAYOUT("CS_MESSAGE_HEADER",
F(ARRAY(N("message size", NBO_()) => 2,
N("request type", NBO_()) => 2,
N("(size - 4) bytes of data", "") => 0)));
Modified: GNUnet-docs/WWW/protocol_cs_afs.php3
===================================================================
--- GNUnet-docs/WWW/protocol_cs_afs.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/protocol_cs_afs.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -31,7 +31,7 @@
W("The server is supposed to stop searching after receiving a matching
<tt>QUERY_STOP</tt> message.");
W("The format of the message is:");
EP();
-LAYOUT("RequestSearch",
+LAYOUT("CS_fs_request_search_MESSAGE",
F(ARRAY(N("message size (88 or 152)", NBO_()) => 2,
V("request type", 8, NBO_()) => 2,
N("priority", NBO_()) => 4,
@@ -47,7 +47,7 @@
W("This message is send by the client to <tt>gnunetd</tt> to abort a search.");
W("The format of the message is:");
EP();
-LAYOUT("RequestSearch",
+LAYOUT("CS_fs_request_search_MESSAGE",
F(ARRAY(N("message size (88 or 152)", NBO_()) => 2,
V("request type", 9, NBO_()) => 2,
N("priority", NBO_()) => 4,
@@ -65,7 +65,7 @@
extlink_("#CS_QUERY","QUERY_START"));
W("The format of the message is:");
EP();
-LAYOUT("ReplyContent",
+LAYOUT("CS_fs_reply_content_MESSAGE",
F(ARRAY(N("message size (4+X)", NBO_()) => 2,
V("request type", 9, NBO_()) => 2,
N("data (ECRS encoded)", "") => 0)));
@@ -84,7 +84,7 @@
P();
W("The format of the message is:");
EP();
-LAYOUT("RequestInsert",
+LAYOUT("CS_fs_request_insert_MESSAGE",
F(ARRAY(N("message size (20+X)", NBO_()) => 2,
V("request type", 10, NBO_()) => 2,
N("priority", NBO_()) => 4,
@@ -107,7 +107,7 @@
intlink_("protocol_cs_core.php3","RETURN_VALUE"));
W("The format of the message is:");
EP();
-LAYOUT("RequestIndex",
+LAYOUT("CS_fs_request_index_MESSAGE",
F(ARRAY(N("message size (92+X)", NBO_()) => 2,
V("request type", 11, NBO_()) => 2,
N("priority", NBO_()) => 4,
@@ -123,7 +123,7 @@
W("This message is used by clients to request the deletion of specific content
by <tt>gnunetd</tt> from the local datastore.");
W("The format of the message is:");
EP();
-LAYOUT("RequestDelete",
+LAYOUT("CS_fs_request_delete_MESSAGE",
F(ARRAY(N("message size (4+X)", NBO_()) => 2,
V("request type", 12, NBO_()) => 2,
N("data (ECRS encoded)", "") => 0)));
@@ -136,7 +136,7 @@
W("For that, <tt>gnunetd</tt> needs to know the <tt>blocksize</tt> that was
used during the construction of the original index.");
W("The format of the message is:");
EP();
-LAYOUT("RequestUnindex",
+LAYOUT("CS_fs_request_unindex_MESSAGE",
F(ARRAY(N("message size (72)", NBO_()) => 2,
V("request type", 13, NBO_()) => 2,
N("blocksize", NBO_()) => 4,
@@ -166,7 +166,7 @@
intlink_("protocol_cs_core.php3","RETURN_VALUE"));
W("The format of the message is:");
EP();
-LAYOUT("CS_HEADER",
+LAYOUT("CS_MESSAGE_HEADER",
F(ARRAY(V("message size", 4, NBO_()) => 2,
V("request type", 15, NBO_()) => 2)));
@@ -189,7 +189,7 @@
W("The format of the message is:");
-LAYOUT("RequestInitIndex",
+LAYOUT("CS_fs_request_init_index_MESSAGE",
F(ARRAY(N("message size (72+X)", NBO_()) => 2,
V("request type", 16, NBO_()) => 2,
V("reserved", 0, NBO_())=>4,
Modified: GNUnet-docs/WWW/protocol_cs_core.php3
===================================================================
--- GNUnet-docs/WWW/protocol_cs_core.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/protocol_cs_core.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -11,17 +11,17 @@
W("The RETURN_VALUE message is also used as part of application-specific CS
protocols.");
EP();
echo "<ul>\n";
-LILI("#CS_RETURN_VALUE","RETURN_VALUE");
+LILI("#CS_returnvalue_MESSAGE","RETURN_VALUE");
LILI("#CS_SHUTDOWN_REQUEST","SHUTDOWN_REQUEST");
echo "</ul>\n";
-ANCHOR("CS_RETURN_VALUE");H4("RETURN_VALUE");
+ANCHOR("CS_returnvalue_MESSAGE");H4("RETURN_VALUE");
BP();
W("The RETURN_VALUE message is used to communicate simple (int) return values
from TCP requests.");
W("It is always send in response to another, specific request.");
W("The format of the RETURN_VALUE message is:");
EP();
-LAYOUT("CS_RETURN_VALUE",
+LAYOUT("CS_returnvalue_MESSAGE",
F(ARRAY(V("message size", 8, NBO_()) => 2,
V("request type", 0, NBO_()) => 2,
N("return value", NBO_()) => 4)));
@@ -32,7 +32,7 @@
W("With this message, the client can request gnunetd to shutdown.");
W("The format of the SHUTDOWN_REQUEST message is:");
EP();
-LAYOUT("CS_HEADER",
+LAYOUT("CS_MESSAGE_HEADER",
F(ARRAY(V("message size", 4, NBO_()) => 2,
V("request type", 1, NBO_()) => 2)));
BP();
Modified: GNUnet-docs/WWW/protocol_cs_getoption.php3
===================================================================
--- GNUnet-docs/WWW/protocol_cs_getoption.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/protocol_cs_getoption.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -10,8 +10,8 @@
ARRAY("GET_OPTION", "getoption"));
EP();
echo "<ul>\n";
-LILI("#CS_GET_OPTION_REQUEST","GET_OPTION_REQUEST");
-LILI("#CS_GET_OPTION_REPLY","GET_OPTION_REPLY");
+LILI("#CS_getoption_request_MESSAGE","GET_OPTION_REQUEST");
+LILI("#CS_getoption_reply_MESSAGE","GET_OPTION_REPLY");
echo "</ul>\n";
ANCHOR("GET_OPTION_REQUEST");H4("GET_OPTION_REQUEST");
@@ -19,7 +19,7 @@
W("With this message, the client can request the value of an option from the
gnunetd configuration.");
W("The format of the GET_OPTION_REQUEST message is:");
EP();
-LAYOUT("CS_GET_OPTION_REQUEST",
+LAYOUT("CS_getoption_request_MESSAGE",
F(ARRAY(V("message size", 68, NBO_()) => 2,
V("request type", 2, NBO_()) => 2,
N("section name", "") => 32,
@@ -33,7 +33,7 @@
W("With this message, the server notifies the client about the value of an
option.");
W("The format of the GET_OPTION_REPLY message is:");
EP();
-LAYOUT("CS_GET_OPTION_REPLY",
+LAYOUT("CS_getoption_reply_MESSAGE",
F(ARRAY(N("message size", NBO_()) => 2,
V("request type", 3, NBO_()) => 2,
N("value (size - 4 bytes), 0-terminated", "") => 0)));
Modified: GNUnet-docs/WWW/protocol_cs_stats.php3
===================================================================
--- GNUnet-docs/WWW/protocol_cs_stats.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/protocol_cs_stats.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -23,7 +23,7 @@
P();
W("The format of the message is:");
EP();
-LAYOUT("CS_HEADER",
+LAYOUT("CS_MESSAGE_HEADER",
F(ARRAY(V("message size", 4, NBO_()) => 2,
V("request type", 36, NBO_()) => 2)));
@@ -35,7 +35,7 @@
W("The format of the message is:");
EP();
-LAYOUT("STATS_CS_MESSAGE",
+LAYOUT("CS_stats_reply_MESSAGE",
F(ARRAY(N("message size", NBO_()) => 2,
V("request type", 37, NBO_()) => 2,
V("reserved", 0, NBO_()) => 4,
@@ -61,7 +61,7 @@
intlink_("protocol_cs_core.php3", "RETURN_VALUE"));
W("The format of the message is:");
EP();
-LAYOUT("STATS_CS_MESSAGE",
+LAYOUT("CS_stats_reply_MESSAGE",
F(ARRAY(V("message size", 8, NBO_()) => 2,
V("request type", 38, NBO_()) => 2,
N("type", NBO_()) => 2,
Modified: GNUnet-docs/WWW/protocol_cs_traffic.php3
===================================================================
--- GNUnet-docs/WWW/protocol_cs_traffic.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/protocol_cs_traffic.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -10,31 +10,31 @@
ARRAY("TRAFFIC", "traffic"));
EP();
echo "<ul>\n";
-LILI("#CS_TRAFFIC_REQUEST","TRAFFIC_REQUEST");
-LILI("#CS_TRAFFIC_INFO","TRAFFIC_INFO");
+LILI("#CS_traffic_request_MESSAGE","TRAFFIC_REQUEST");
+LILI("#CS_traffic_info_MESSAGE","TRAFFIC_INFO");
echo "</ul>\n";
-ANCHOR("CS_TRAFFIC_REQUEST");H4("TRAFFIC_REQUEST");
+ANCHOR("CS_traffic_request_MESSAGE");H4("TRAFFIC_REQUEST");
BP();
W("With this message, the client can request traffic statistics from
<tt>gnunetd</tt>.");
W("The time period specfied in the message specifies which traffic is
interesting for the request (in terms of not older than time period time
units).");
W("The server responds with a TRAFFIC_INFO message.");
W("The format of the message is:");
EP();
-LAYOUT("CS_TRAFFIC_REQUEST",
+LAYOUT("CS_traffic_request_MESSAGE",
F(ARRAY(V("message size", 8, NBO_()) => 2,
V("request type", 33, NBO_()) => 2,
N("time interval", NBO_()) => 4)));
-ANCHOR("CS_TRAFFIC_INFO");H4("TRAFFIC_INFO");
+ANCHOR("CS_traffic_info_MESSAGE");H4("TRAFFIC_INFO");
BP();
W("With this message, the server sends traffic information to the client.");
W("The format of the message is:");
EP();
-LAYOUT("CS_TRAFFIC_INFO",
+LAYOUT("CS_traffic_info_MESSAGE",
F(ARRAY(N("message size", NBO_()) => 2,
V("request type", 34, NBO_()) => 2,
N("count", NBO_()) => 4,
Modified: GNUnet-docs/WWW/protocol_p2p.php3
===================================================================
--- GNUnet-docs/WWW/protocol_p2p.php3 2005-07-17 23:19:45 UTC (rev 1575)
+++ GNUnet-docs/WWW/protocol_p2p.php3 2005-07-17 23:21:45 UTC (rev 1576)
@@ -25,7 +25,7 @@
W("Each of the messages in the plaintext packet has the following header:");
EP();
-LAYOUT("p2p_HEADER",
+LAYOUT("P2P_MESSAGE_HEADER",
F(ARRAY(N("message size", NBO_()) => 2,
N("request type", NBO_()) => 2,
N("(size - 4) bytes of data", "") => 0)));
Modified: GNUnet-docs/WWW/protocol_p2p_afs.php3
===================================================================
--- GNUnet-docs/WWW/protocol_p2p_afs.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/protocol_p2p_afs.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -57,7 +57,7 @@
P();
W("The GAP protocol defines the following messages:");
echo "<ul>\n";
-LILI("#QUERY","GAP_QUERY");
+LILI("#QUERY","P2P_gap_query_MESSAGE");
LILI("#RESULT","GAP_RESULT");
echo "</ul>\n";
EP();
@@ -73,7 +73,7 @@
extlink_("download/ecrs.ps","ECRS"));
EP();
-LAYOUT("GAP_QUERY",
+LAYOUT("P2P_gap_query_MESSAGE",
F(ARRAY(N("message size", NBO_()) => 2,
V("request type", 16, NBO_()) => 2,
N("ECRS block type", NBO_()) => 4,
@@ -107,7 +107,7 @@
ARRAY(extlink_("download/esed.ps","GNUnet encoding paper"),
extlink_("encoding.php3","encoding page")));
EP();
-LAYOUT("GAP_REPLY",
+LAYOUT("P2P_gap_reply_MESSAGE",
F(ARRAY(N("message size", NBO_()) => 2,
V("request type", 17, NBO_()) => 2,
N("primary key", NBO_()) => 64,
Modified: GNUnet-docs/WWW/protocol_p2p_core.php3
===================================================================
--- GNUnet-docs/WWW/protocol_p2p_core.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/protocol_p2p_core.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -67,7 +67,7 @@
W("The encryption, decryption and verification is done by the GNUnet core and
neither the application nor the transport code need to worry about it.");
W("The format of the header that is added by the GNUnet core to each message
is the following:");
EP();
-LAYOUT("P2P_Message",
+LAYOUT("P2P_PACKET_HEADER",
F(ARRAY(N("hash of the plaintext (SHA-512)", "") => 64,
N("sequence number, 0 for plaintext", 11, NBO_()) => 4,
N("timestamp (in seconds)", NBO_()) => 4,
@@ -116,7 +116,7 @@
EXTLINK_("#SKEY","SKEY"));
W("Once an encrypted channel was formed, nodes can exchange HELOs via that
channel.");
EP();
-LAYOUT("HELO_Message",
+LAYOUT("P2P_hello_MESSAGE",
F(ARRAY(N("message size (600 + X)", NBO_()) => 2,
V("request type", 0, NBO_()) => 2,
N("RSA signature (signing data starting from sender id to end of
HELO)","") => 256,
@@ -161,7 +161,7 @@
P();
W("The format of an SKEY message is the following:");
EP();
-LAYOUT("SKEY_Message",
+LAYOUT("P2P_setkey_MESSAGE",
F(ARRAY(N("message size (520 + X)", NBO_()) => 2,
V("request type", 1, NBO_()) => 2,
N("creation time (seconds)", NBO_()) => 4,
@@ -190,7 +190,7 @@
W("The identity stored in the PING is the identity of the receiver.");
W("If that identity does not match, the PING must be silently discarded.");
EP();
-LAYOUT("PINGPONG_Message",
+LAYOUT("P2P_pingpong_MESSAGE",
F(ARRAY(V("message size", 72, NBO_()) => 2,
V("request type", 2, NBO_()) => 2,
N("challenge", NBO_()) => 4,
@@ -203,7 +203,7 @@
W("If the node is not aware of a corresponding PING (or if the challenge is
wrong), the PONG is silently dropped.");
W("Otherwise the appropriate action corresponding to the PING is triggered.");
EP();
-LAYOUT("PINGPONG_Message",
+LAYOUT("P2P_pingpong_MESSAGE",
F(ARRAY(V("message size", 72, NBO_()) => 2,
V("request type", 3, NBO_()) => 2,
N("challenge", NBO_()) => 4,
@@ -215,7 +215,7 @@
W("When a HANGUP message is received, the node must stop using the current
sessionkey (assuming the receiver is the other node involved in the
corresponding session with the sender).");
W("If the receiving node desires further communication with the sender, a new
sessionkey must be exchanged.");
W("The format of the HANGUP message is:");
-LAYOUT("HANGUP_Message",
+LAYOUT("P2P_hangup_MESSAGE",
F(ARRAY(V("message size", 68, NBO_()) => 2,
V("request type", 4, NBO_()) => 2,
N("Identity of sender", "") => 64)));
@@ -231,7 +231,7 @@
W("The format for fragments is:");
EP();
-LAYOUT("FRAGMENT_Message",
+LAYOUT("P2P_fragmentation_MESSAGE",
F(ARRAY(N("message size (12 + X)", NBO_()) => 2,
V("request type", 5, NBO_()) => 2,
N("fragment id", NBO_()) => 4,
@@ -253,7 +253,7 @@
W("Noise should only be used in encrypted traffic.");
W("The format for noise is:");
EP();
-LAYOUT("p2p_HEADER",
+LAYOUT("P2P_MESSAGE_HEADER",
F(ARRAY(N("message size", NBO_()) => 2,
V("request type", 6, NBO_()) => 2,
N("(size - 4) random bytes", "") => 0)));
Modified: GNUnet-docs/WWW/protocol_p2p_rpc.php3
===================================================================
--- GNUnet-docs/WWW/protocol_p2p_rpc.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/protocol_p2p_rpc.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -49,7 +49,7 @@
W("The format of the REQ message is:");
EP();
-LAYOUT("RPC_Message",
+LAYOUT("P2P_rpc_MESSAGE",
F(ARRAY(N("size", NBO_()) => 2,
V("type", 42, NBO_()) => 2,
N("sequence number", NBO_()) => 4,
@@ -72,7 +72,7 @@
BP();
W("The format of the RES message is:");
EP();
-LAYOUT("RPC_Message",
+LAYOUT("P2P_rpc_MESSAGE",
F(ARRAY(N("size", NBO_()) => 2,
V("type", 43, NBO_()) => 2,
N("sequence number", NBO_()) => 4,
Modified: GNUnet-docs/WWW/protocol_transport_tcp.php3
===================================================================
--- GNUnet-docs/WWW/protocol_transport_tcp.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/protocol_transport_tcp.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -16,7 +16,7 @@
BP();
W("The individual messages exchanged over TCP then have the format:");
EP();
-LAYOUT("TCPMessagePack",
+LAYOUT("TCPP2P_PACKET",
F(ARRAY(N("size", NBO_()) => 2,
V("reserved", 0, NBO_()) => 2,
N("data", "") => 0)));
Modified: GNUnet-docs/WWW/test/protocol_cs_afs.php3
===================================================================
--- GNUnet-docs/WWW/test/protocol_cs_afs.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/test/protocol_cs_afs.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -87,7 +87,7 @@
W("The importance in this message tells the server how important it is to
store this content, so that the server can decide which content to discard if
it is running out of space.");
P();
W("If the insertion was successful, the server replies with a %s containing
<tt>OK</tt>, otherwise the server replies with <tt>SYSERR</tt>.",
- extlink_("#CS_RETURN_VALUE","RETURN_VALUE"));
+ extlink_("#CS_returnvalue_MESSAGE","RETURN_VALUE"));
P();
W("The format of the INSERT_CHK message is:");
EP();
@@ -106,7 +106,7 @@
W("The importance in this message tells the server how important it is to
store this content, so that the server can decide which content to discard if
it is running out of space.");
P();
W("If the insertion was successful, the server replies with a %s containing
<tt>OK</tt>, otherwise the server replies with <tt>SYSERR</tt>.",
- extlink_("#CS_RETURN_VALUE","RETURN_VALUE"));
+ extlink_("#CS_returnvalue_MESSAGE","RETURN_VALUE"));
P();
W("The format of the INSERT_3HASH message is:");
EP();
@@ -127,7 +127,7 @@
extlink_("doxygen/html/structContentIndex.html","ContentIndex struct"));
P();
W("If the indexing was successful, the server replies with a %s containing
<tt>OK</tt>, otherwise the server replies with <tt>SYSERR</tt>.",
- extlink_("#CS_RETURN_VALUE","RETURN_VALUE"));
+ extlink_("#CS_returnvalue_MESSAGE","RETURN_VALUE"));
W("The format of the INDEX_BLOCK message is:");
EP();
@@ -141,7 +141,7 @@
BP();
W("This message is used by the client to add a file to the list of shared
files.");
W("<tt>gnunetd</tt> responds to this request with %s which can be used in the
%s messages.",
- ARRAY(extlink_("#CS_RETURN_VALUE","an index into the list of files"),
+ ARRAY(extlink_("#CS_returnvalue_MESSAGE","an index into the list of files"),
extlink_("#CS_INDEX_BLOCK","CS_INDEX_BLOCK")));
W("The file is identified by the RIPE160MD hash of the contents.");
W("Note that the client is expected to either copy or linked the file to the
index directory with the appropriate messages.");
@@ -176,7 +176,7 @@
extlink_("#CS_INSERT_CHK","CS_INSERT_CHK"));
W("The AFS module then deletes the corresponding CHK block.");
W("A %s is send back to indicate success or failure.",
- extlink_("#CS_RETURN_VALUE","RETURN_VALUE"));
+ extlink_("#CS_returnvalue_MESSAGE","RETURN_VALUE"));
EP();
ANCHOR("CS_DELETE_3HASH");H4("DELETE_3HASH");
@@ -185,7 +185,7 @@
extlink_("#CS_INSERT_CHK","CS_INSERT_CHK"));
W("The AFS module then deletes the corresponding block.");
W("A %s is send back to indicate success or failure.",
- extlink_("#CS_RETURN_VALUE","RETURN_VALUE"));
+ extlink_("#CS_returnvalue_MESSAGE","RETURN_VALUE"));
W("CS_DELETE_3HASH is not currently used by the code since there is no good
way to establish the RBlocks that correspond to a given file when facing
user-supplied keywords and meta-data.");
EP();
@@ -195,7 +195,7 @@
extlink_("#CS_INDEX_BLOCK","CS_INDEX_BLOCK"));
W("The AFS module then removes the corresponding index entry from the
database.");
W("A %s is send back to indicate success or failure.",
- extlink_("#CS_RETURN_VALUE","RETURN_VALUE"));
+ extlink_("#CS_returnvalue_MESSAGE","RETURN_VALUE"));
EP();
ANCHOR("CS_UNINDEX_FILE");H4("UNINDEX_FILE");
@@ -204,7 +204,7 @@
extlink_("#CS_INDEX_FILE","CS_INDEX_FILE"));
W("The AFS module then removes the corresponding file from the file list.");
W("A %s is send back to indicate success or failure.",
- extlink_("#CS_RETURN_VALUE","RETURN_VALUE"));
+ extlink_("#CS_returnvalue_MESSAGE","RETURN_VALUE"));
EP();
ANCHOR("CS_UNINDEX_SUPER");H4("UNINDEX_SUPER");
@@ -213,7 +213,7 @@
extlink_("#CS_INDEX_FILE","CS_INDEX_FILE"));
W("The AFS module then deletes the corresponding hash from the bloomfilter for
super-hashes.");
W("A %s is send back to indicate success or failure.",
- extlink_("#CS_RETURN_VALUE","RETURN_VALUE"));
+ extlink_("#CS_returnvalue_MESSAGE","RETURN_VALUE"));
EP();
ANCHOR("CS_NSQUERY");H4("NSQUERY");
Modified: GNUnet-docs/WWW/test/protocol_cs_core.php3
===================================================================
--- GNUnet-docs/WWW/test/protocol_cs_core.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/test/protocol_cs_core.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -9,7 +9,7 @@
W("The only application independent, always available client-server (CS)
message that are currently defined are:");
EP();
echo "<ul><li>";
-extlink("#CS_RETURN_VALUE","RETURN_VALUE");
+extlink("#CS_returnvalue_MESSAGE","RETURN_VALUE");
echo "</li><li>";
extlink("#CS_GET_STATISTICS","GET_STATISTICS");
echo "</li><li>";
@@ -17,16 +17,16 @@
echo "</li><li>";
extlink("#CS_TRAFFIC_QUERY","TRAFFIC_QUERY");
echo "</li><li>";
-extlink("#CS_TRAFFIC_INFO","TRAFFIC_INFO");
+extlink("#CS_traffic_info_MESSAGE","TRAFFIC_INFO");
echo "</li><li>";
extlink("#CS_SHUTDOWN_REQUEST","SHUTDOWN_REQUEST");
echo "</li><li>";
-extlink("#CS_GET_OPTION_REQUEST","GET_OPTION_REQUEST");
+extlink("#CS_getoption_request_MESSAGE","GET_OPTION_REQUEST");
echo "</li><li>";
-extlink("#CS_GET_OPTION_REPLY","GET_OPTION_REPLY");
+extlink("#CS_getoption_reply_MESSAGE","GET_OPTION_REPLY");
echo "</li></ul>";
-ANCHOR("CS_RETURN_VALUE");H4("RETURN_VALUE");
+ANCHOR("CS_returnvalue_MESSAGE");H4("RETURN_VALUE");
BP();
W("The RETURN_VALUE message is used to communicate simple (int) return values
from TCP requests.");
W("It is always send in response to another, specific request.");
@@ -96,7 +96,7 @@
EP();
-ANCHOR("CS_TRAFFIC_INFO");H4("TRAFFIC_INFO");
+ANCHOR("CS_traffic_info_MESSAGE");H4("TRAFFIC_INFO");
BP();
W("With this message, the server sends traffic information to the client.");
W("The format of the TRAFFIC_INFO message is:");
Modified: GNUnet-docs/WWW/test/protocol_p2p_afs.php3
===================================================================
--- GNUnet-docs/WWW/test/protocol_p2p_afs.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/test/protocol_p2p_afs.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -57,7 +57,7 @@
P();
W("The GAP protocol defines the following messages:");
echo "<ul>";
-LI(intlink_("#QUERY","GAP_QUERY"));
+LI(intlink_("#QUERY","P2P_gap_query_MESSAGE"));
LI(intlink_("#RESULT","GAP_RESULT"));
echo "</ul>";
EP();
Modified: GNUnet-docs/WWW/test/protocol_transport_udp.php3
===================================================================
--- GNUnet-docs/WWW/test/protocol_transport_udp.php3 2005-07-17 23:19:45 UTC
(rev 1575)
+++ GNUnet-docs/WWW/test/protocol_transport_udp.php3 2005-07-17 23:21:45 UTC
(rev 1576)
@@ -8,7 +8,7 @@
H2("The UDP transport service");
BP();
W("The current UDP implementation encapsulates messages in this %s.",
- extlink_("doxygen/html/structMessagePack.html","format"));
+ extlink_("doxygen/html/structP2P_PACKET.html","format"));
EP();
echo "<table class=\"border\" border=\"0\" cellspacing=\"0\"
cellpadding=\"0\">\n";
Modified: GNUnet-docs/WWW/test/user_tbench.php3
===================================================================
--- GNUnet-docs/WWW/test/user_tbench.php3 2005-07-17 23:19:45 UTC (rev
1575)
+++ GNUnet-docs/WWW/test/user_tbench.php3 2005-07-17 23:21:45 UTC (rev
1576)
@@ -1521,7 +1521,7 @@
use special messages to switch between plaintext and encrypted messages.
<p>
The current UDP implementation encapsulates messages in this
-<A href="doxygen/html/structMessagePack.html">format</A>:
+<A href="doxygen/html/structP2P_PACKET.html">format</A>:
<table border=3>
<tr>
<th>
@@ -2378,7 +2378,7 @@
The GNUnet client-to-node procotol currently defines the following
messages:
<ul>
- <li><A href="#CS_RETURN_VALUE">CS_RETURN_VALUE</A></li>
+ <li><A href="#CS_returnvalue_MESSAGE">CS_RETURN_VALUE</A></li>
<li><A href="#CS_GET_STATISTICS">CS_GET_STATISTICS</A></li>
<li><A href="#CS_STATISTICS">CS_STATISTICS</A></li>
<li><A href="#CS_QUERY">CS_QUERY</A></li>
@@ -2436,13 +2436,13 @@
</table>
<p>
The only generic client-server (CS) message that are currently
-defined are <A href="#CS_RETURN_VALUE">RETURN_VALUE</A> and
+defined are <A href="#CS_returnvalue_MESSAGE">RETURN_VALUE</A> and
<A href="#CS_GET_STATISTICS">GET_STATISTICS</A> and
<A href="#CS__STATISTICS">STATISTICS</A>.
All other CS messages are specific to anonymous file-sharing (AFS).
<p>
-<A name="CS_RETURN_VALUE"></A><h4>CS_RETURN_VALUE</h4>
+<A name="CS_returnvalue_MESSAGE"></A><h4>CS_RETURN_VALUE</h4>
The RETURN_VALUE message is used to communicate simple (int)
return values from TCP requests.
The format of the RETURN_VALUE message is:
@@ -2742,7 +2742,7 @@
server can decide which content to discard if
it is running out of space.<br>
If the insertion was successful, the server replies with
-a <A href="#CS_RETURN_VALUE">RETURN_VALUE</A> containing
+a <A href="#CS_returnvalue_MESSAGE">RETURN_VALUE</A> containing
<tt>OK</tt>, otherwise the server replies with
<tt>SYSERR</tt>.<br>
The format of the INSERT_CHK message is:
@@ -2791,7 +2791,7 @@
server can decide which content to discard if
it is running out of space.<br>
If the insertion was successful, the server replies with
-a <A href="#CS_RETURN_VALUE">RETURN_VALUE</A> containing
+a <A href="#CS_returnvalue_MESSAGE">RETURN_VALUE</A> containing
<tt>OK</tt>, otherwise the server replies with
<tt>SYSERR</tt>.<br>
The format of the INSERT_3HASH message is:
@@ -2856,7 +2856,7 @@
offset in the file at which the block corresponding
to the query can be found.<br>
If the indexing was successful, the server replies with
-a <A href="#CS_RETURN_VALUE">RETURN_VALUE</A> containing
+a <A href="#CS_returnvalue_MESSAGE">RETURN_VALUE</A> containing
<tt>OK</tt>, otherwise the server replies with
<tt>SYSERR</tt>.
The format of the INDEX_BLOCK message is:
@@ -2897,7 +2897,7 @@
<A name="CS_INDEX_FILE"></A><h4>CS_INDEX_FILE</h4>
This message is used by the client to add a file to the
list of shared files. <tt>gnunetd</tt> responds to this
-request with <A href="#CS_RETURN_VALUE">an index into the list of files</A>
+request with <A href="#CS_returnvalue_MESSAGE">an index into the list of
files</A>
which can be used in the <A href="#CS_INDEX_BLOCK">CS_INDEX_BLOCK</A>
messages. Notice that in order for on-demand sharing to work, the
inserting client and the server must have the shared file
Modified: gnunet-gtk/ABOUT-NLS
===================================================================
--- gnunet-gtk/ABOUT-NLS 2005-07-17 23:19:45 UTC (rev 1575)
+++ gnunet-gtk/ABOUT-NLS 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,11 +1,10 @@
-1 Notes on the Free Translation Project
-***************************************
+Notes on the Free Translation Project
+*************************************
Free software is going international! The Free Translation Project is
a way to get maintainers of free software, translators, and users all
-together, so that free software will gradually become able to speak many
-languages. A few packages already provide translations for their
-messages.
+together, so that will gradually become able to speak many languages.
+A few packages already provide translations for their messages.
If you found this `ABOUT-NLS' file inside a distribution, you may
assume that the distributed package does use GNU `gettext' internally,
@@ -16,15 +15,15 @@
Installers will find here some useful hints. These notes also
explain how users should proceed for getting the programs to use the
available translations. They tell how people wanting to contribute and
-work on translations can contact the appropriate team.
+work at translations should contact the appropriate team.
When reporting bugs in the `intl/' directory or bugs which may be
related to internationalization, you should tell about the version of
`gettext' which is used. The information can be found in the
`intl/VERSION' file, in internationalized packages.
-1.1 Quick configuration advice
-==============================
+Quick configuration advice
+==========================
If you want to exploit the full power of internationalization, you
should configure it using
@@ -46,8 +45,8 @@
you have installed a recent copy of the GNU gettext package with the
included `libintl'.
-1.2 INSTALL Matters
-===================
+INSTALL Matters
+===============
Some packages are "localizable" when properly installed; the programs
they contain can be made to speak your own native language. Most such
@@ -56,27 +55,27 @@
By default, this package will be installed to allow translation of
messages. It will automatically detect whether the system already
-provides the GNU `gettext' functions. If not, the included GNU
-`gettext' library will be used. This library is wholly contained
-within this package, usually in the `intl/' subdirectory, so prior
-installation of the GNU `gettext' package is _not_ required.
-Installers may use special options at configuration time for changing
-the default behaviour. The commands:
+provides the GNU `gettext' functions. If not, the GNU `gettext' own
+library will be used. This library is wholly contained within this
+package, usually in the `intl/' subdirectory, so prior installation of
+the GNU `gettext' package is _not_ required. Installers may use
+special options at configuration time for changing the default
+behaviour. The commands:
./configure --with-included-gettext
./configure --disable-nls
-will, respectively, bypass any pre-existing `gettext' to use the
+will respectively bypass any pre-existing `gettext' to use the
internationalizing routines provided within this package, or else,
_totally_ disable translation of messages.
When you already have GNU `gettext' installed on your system and run
configure without an option for your new package, `configure' will
probably detect the previously built and installed `libintl.a' file and
-will decide to use this. This might not be desirable. You should use
-the more recent version of the GNU `gettext' library. I.e. if the file
-`intl/VERSION' shows that the library which comes with this package is
-more recent, you should use
+will decide to use this. This might be not what is desirable. You
+should use the more recent version of the GNU `gettext' library. I.e.
+if the file `intl/VERSION' shows that the library which comes with this
+package is more recent, you should use
./configure --with-included-gettext
@@ -87,7 +86,7 @@
emulation of `gettext' on top of `catgets' could not provide all the
extensions of the GNU `gettext' library.
- Internationalized packages usually have many `po/LL.po' files, where
+ Internationalized packages have usually many `po/LL.po' files, where
LL gives an ISO 639 two-letter code identifying the language. Unless
translations have been forbidden at `configure' time by using the
`--disable-nls' switch, all available translations are installed
@@ -96,8 +95,8 @@
`LINGUAS' should then contain a space separated list of two-letter
codes, stating which languages are allowed.
-1.3 Using This Package
-======================
+Using This Package
+==================
As a user, if your language has been installed for this package, you
only have to set the `LANG' environment variable to the appropriate
@@ -132,21 +131,14 @@
read translations in German than English for when Swedish is not
available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
- Special advice for Norwegian users: The language code for Norwegian
-bokma*l changed from `no' to `nb' recently (in 2003). During the
-transition period, while some message catalogs for this language are
-installed under `nb' and some older ones under `no', it's recommended
-for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
-older translations are used.
-
In the `LANGUAGE' environment variable, but not in the `LANG'
environment variable, `LL_CC' combinations can be abbreviated as `LL'
to denote the language's main dialect. For example, `de' is equivalent
to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
(Portuguese as spoken in Portugal) in this context.
-1.4 Translating Teams
-=====================
+Translating Teams
+=================
For the Free Translation Project to be a success, we need interested
people who like their own language and write it well, and who are also
@@ -175,780 +167,507 @@
the terminology in use. Proven linguistic skill are praised more than
programming skill, here.
-1.5 Available Packages
-======================
+Available Packages
+==================
Languages are not equally supported in all packages. The following
-matrix shows the current state of internationalization, as of April
-2005. The matrix shows, in regard of each package, for which languages
+matrix shows the current state of internationalization, as of November
+2003. The matrix shows, in regard of each package, for which languages
PO files have been submitted to translation coordination, with a
translation percentage of at least 50%.
- Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB
- +-------------------------------------------------+
- GNUnet | |
- a2ps | [] [] [] [] [] |
- aegis | () |
- ant-phone | () |
- anubis | [] |
- ap-utils | |
- aspell | [] [] [] [] |
- bash | [] [] |
- batchelor | [] |
- bfd | |
- bibshelf | [] |
- binutils | [] |
- bison | [] [] |
- bluez-pin | [] [] [] [] |
- clisp | [] [] |
- console-tools | [] [] |
- coreutils | [] [] [] [] |
- cpio | |
- cpplib | [] [] [] |
- darkstat | [] () [] |
- dialog | [] [] [] [] [] [] |
- diffutils | [] [] [] [] [] |
- doodle | [] |
- e2fsprogs | [] [] |
- enscript | [] [] [] [] |
- error | [] [] [] [] |
- fetchmail | [] () [] [] [] |
- fileutils | [] [] |
- findutils | [] [] [] |
- flex | [] [] [] |
- fslint | [] |
- gas | |
- gawk | [] [] [] |
- gbiff | [] |
- gcal | [] |
- gcc | [] |
- gettext-examples | [] [] [] [] |
- gettext-runtime | [] [] [] [] |
- gettext-tools | [] [] |
- gimp-print | [] [] [] [] |
- gip | |
- gliv | [] |
- glunarclock | |
- gmult | [] [] |
- gnubiff | () |
- gnucash | [] () () [] |
- gnucash-glossary | [] () |
- gpe-aerial | [] [] |
- gpe-beam | [] [] |
- gpe-calendar | [] [] |
- gpe-clock | [] [] |
- gpe-conf | [] [] |
- gpe-contacts | |
- gpe-edit | [] |
- gpe-go | [] |
- gpe-login | [] [] |
- gpe-ownerinfo | [] [] |
- gpe-sketchbook | [] [] |
- gpe-su | [] [] |
- gpe-taskmanager | [] [] |
- gpe-timesheet | [] |
- gpe-today | [] [] |
- gpe-todo | [] [] |
- gphoto2 | [] [] [] [] |
- gprof | [] [] |
- gpsdrive | () () |
- gramadoir | [] [] |
- grep | [] [] [] [] [] [] |
- gretl | |
- gsasl | [] |
- gss | |
- gst-plugins | [] [] [] [] [] [] |
- gstreamer | [] [] [] [] [] |
- gtick | [] () |
- gtkspell | [] [] [] |
- hello | [] [] [] [] |
- id-utils | [] [] |
- impost | |
- indent | [] [] |
- iso_3166 | |
- iso_3166_1 | [] [] [] [] [] |
- iso_3166_2 | |
- iso_3166_3 | [] |
- iso_4217 | |
- iso_639 | |
- jpilot | [] |
- jtag | |
- jwhois | |
- kbd | [] [] [] [] |
- latrine | () |
- ld | [] |
- libc | [] [] [] [] [] |
- libextractor | |
- libgpewidget | [] [] [] |
- libgsasl | |
- libiconv | [] [] [] [] [] |
- libidn | |
- lifelines | [] () |
- lilypond | [] |
- lingoteach | |
- lynx | [] [] [] [] |
- m4 | [] [] [] [] |
- mailutils | [] |
- make | [] [] |
- man-db | [] () [] [] |
- minicom | [] [] |
- mysecretdiary | [] [] |
- nano | [] () [] |
- nano_1_0 | [] () [] [] |
- opcodes | [] |
- parted | [] [] [] [] |
- psmisc | |
- ptx | [] [] [] |
- pwdutils | |
- python | |
- radius | [] |
- recode | [] [] [] [] [] |
- rpm | [] [] |
- screem | |
- scrollkeeper | [] [] [] [] [] [] [] [] |
- sed | [] [] |
- sh-utils | [] [] |
- shared-mime-info | [] [] |
- sharutils | [] [] [] [] [] |
- silky | |
- skencil | [] () |
- sketch | [] () |
- solfege | [] |
- soundtracker | [] [] |
- sp | [] |
- stardict | [] |
- tar | |
- texinfo | [] [] |
- textutils | [] [] [] |
- tin | () () |
- tp-robot | [] |
- tuxpaint | [] [] [] [] [] [] [] |
- unicode-han-tra... | |
- unicode-transla... | |
- util-linux | [] [] [] [] |
- vorbis-tools | [] [] [] [] |
- wastesedge | () |
- wdiff | [] [] [] [] |
- wget | [] [] [] [] [] [] |
- xchat | [] [] [] [] |
- xkeyboard-config | |
- xpad | |
- +-------------------------------------------------+
- af am ar az be bg bs ca cs cy da de el en en_GB
- 10 0 0 2 7 4 0 41 43 3 52 90 20 1 15
+ Ready PO files am az be bg ca cs da de el en en_GB eo es
+ +-------------------------------------------+
+ a2ps | [] [] [] [] |
+ aegis | () |
+ ant-phone | () |
+ anubis | |
+ ap-utils | |
+ bash | [] [] [] [] |
+ batchelor | |
+ bfd | [] [] |
+ binutils | [] [] |
+ bison | [] [] [] |
+ bluez-pin | [] [] |
+ clisp | [] [] [] |
+ clisp | |
+ coreutils | [] [] [] [] |
+ cpio | [] [] [] |
+ darkstat | [] () [] |
+ diffutils | [] [] [] [] [] [] [] |
+ e2fsprogs | [] [] |
+ enscript | [] [] [] [] |
+ error | [] [] [] [] [] |
+ fetchmail | [] () [] [] [] [] |
+ fileutils | [] [] [] |
+ findutils | [] [] [] [] [] [] [] |
+ flex | [] [] [] [] |
+ fslint | |
+ gas | [] |
+ gawk | [] [] [] [] |
+ gbiff | [] |
+ gcal | [] |
+ gcc | [] [] |
+ gettext | [] [] [] [] [] |
+ gettext-examples | [] [] [] |
+ gettext-runtime | [] [] [] [] [] |
+ gettext-tools | [] [] [] |
+ gimp-print | [] [] [] [] [] |
+ gliv | |
+ glunarclock | [] [] [] |
+ gnubiff | [] |
+ gnucash | [] () [] [] |
+ gnucash-glossary | [] () [] |
+ gnupg | [] () [] [] [] [] |
+ gpe-aerial | [] |
+ gpe-beam | [] [] |
+ gpe-calendar | [] [] |
+ gpe-clock | [] [] |
+ gpe-conf | [] [] |
+ gpe-contacts | [] [] |
+ gpe-edit | [] |
+ gpe-go | [] |
+ gpe-login | [] [] |
+ gpe-ownerinfo | [] [] |
+ gpe-sketchbook | [] [] |
+ gpe-su | [] [] |
+ gpe-taskmanager | [] [] |
+ gpe-timesheet | [] |
+ gpe-today | [] [] |
+ gpe-todo | [] [] |
+ gphoto2 | [] [] [] [] |
+ gprof | [] [] [] |
+ gpsdrive | () () () |
+ gramadoir | [] |
+ grep | [] [] [] [] [] [] |
+ gretl | [] |
+ gtick | () |
+ hello | [] [] [] [] [] [] |
+ id-utils | [] [] |
+ indent | [] [] [] [] |
+ jpilot | [] [] [] |
+ jtag | |
+ jwhois | [] |
+ kbd | [] [] [] [] [] |
+ latrine | () |
+ ld | [] [] |
+ libc | [] [] [] [] [] [] |
+ libgpewidget | [] [] |
+ libiconv | [] [] [] [] [] |
+ lifelines | [] () |
+ lilypond | [] |
+ lingoteach | |
+ lingoteach_lessons | () () |
+ lynx | [] [] [] [] |
+ m4 | [] [] [] [] |
+ mailutils | [] [] |
+ make | [] [] [] |
+ man-db | [] () [] [] () |
+ minicom | [] [] [] |
+ mysecretdiary | [] [] [] |
+ nano | [] () [] [] [] |
+ nano_1_0 | [] () [] [] [] |
+ opcodes | [] |
+ parted | [] [] [] [] [] |
+ ptx | [] [] [] [] [] |
+ python | |
+ radius | |
+ recode | [] [] [] [] [] [] [] |
+ screem | |
+ scrollkeeper | [] [] [] [] [] [] |
+ sed | [] [] [] [] [] |
+ sh-utils | [] [] [] |
+ shared-mime-info | |
+ sharutils | [] [] [] [] [] [] |
+ sketch | [] () [] |
+ soundtracker | [] [] [] |
+ sp | [] |
+ tar | [] [] [] [] |
+ texinfo | [] [] [] |
+ textutils | [] [] [] [] |
+ tin | () () |
+ tuxpaint | [] [] [] [] [] [] [] |
+ util-linux | [] [] [] [] [] |
+ vorbis-tools | [] [] [] [] |
+ wastesedge | () |
+ wdiff | [] [] [] [] |
+ wget | [] [] [] [] [] [] |
+ xchat | [] [] [] [] |
+ xfree86_xkb_xml | [] |
+ xpad | [] |
+ +-------------------------------------------+
+ am az be bg ca cs da de el en en_GB eo es
+ 0 1 8 3 37 37 54 73 15 1 5 12 62
+
+ et fa fi fr ga gl he hr hu id is it ja
+ +----------------------------------------+
+ a2ps | [] [] [] () |
+ aegis | |
+ ant-phone | |
+ anubis | [] |
+ ap-utils | [] |
+ bash | [] [] |
+ batchelor | [] |
+ bfd | [] |
+ binutils | [] [] |
+ bison | [] [] [] [] |
+ bluez-pin | [] [] [] [] [] |
+ clisp | [] |
+ clisp | |
+ coreutils | [] [] [] [] [] [] |
+ cpio | [] [] [] |
+ darkstat | () [] [] [] |
+ diffutils | [] [] [] [] [] [] [] |
+ e2fsprogs | |
+ enscript | [] [] |
+ error | [] [] [] [] |
+ fetchmail | [] |
+ fileutils | [] [] [] [] [] [] |
+ findutils | [] [] [] [] [] [] [] [] [] [] |
+ flex | [] [] |
+ fslint | |
+ gas | [] |
+ gawk | [] [] [] |
+ gbiff | |
+ gcal | [] |
+ gcc | [] |
+ gettext | [] [] |
+ gettext-examples | [] [] |
+ gettext-runtime | [] [] [] [] |
+ gettext-tools | [] [] |
+ gimp-print | [] [] |
+ gliv | () |
+ glunarclock | [] [] [] [] [] |
+ gnubiff | |
+ gnucash | () [] |
+ gnucash-glossary | [] |
+ gnupg | [] [] [] [] [] [] [] |
+ gpe-aerial | [] |
+ gpe-beam | [] |
+ gpe-calendar | [] [] [] |
+ gpe-clock | [] |
+ gpe-conf | [] |
+ gpe-contacts | [] [] |
+ gpe-edit | [] [] |
+ gpe-go | [] |
+ gpe-login | [] [] |
+ gpe-ownerinfo | [] [] [] |
+ gpe-sketchbook | [] |
+ gpe-su | [] |
+ gpe-taskmanager | [] |
+ gpe-timesheet | [] [] [] |
+ gpe-today | [] [] |
+ gpe-todo | [] [] |
+ gphoto2 | [] [] [] |
+ gprof | [] [] |
+ gpsdrive | () [] () () |
+ gramadoir | [] |
+ grep | [] [] [] [] [] [] [] [] [] [] [] |
+ gretl | [] |
+ gtick | [] [] |
+ hello | [] [] [] [] [] [] [] [] [] [] [] [] |
+ id-utils | [] [] [] [] |
+ indent | [] [] [] [] [] [] [] [] [] |
+ jpilot | [] () |
+ jtag | |
+ jwhois | [] [] [] [] |
+ kbd | [] |
+ latrine | |
+ ld | [] |
+ libc | [] [] [] [] [] |
+ libgpewidget | [] [] [] [] |
+ libiconv | [] [] [] [] [] [] [] [] [] |
+ lifelines | () |
+ lilypond | [] |
+ lingoteach | [] [] |
+ lingoteach_lessons | |
+ lynx | [] [] [] [] |
+ m4 | [] [] [] [] |
+ mailutils | |
+ make | [] [] [] [] [] |
+ man-db | () () |
+ minicom | [] [] [] [] |
+ mysecretdiary | [] [] |
+ nano | [] [] [] [] |
+ nano_1_0 | [] [] [] [] |
+ opcodes | [] |
+ parted | [] [] [] |
+ ptx | [] [] [] [] [] [] [] |
+ python | |
+ radius | |
+ recode | [] [] [] [] [] [] |
+ screem | |
+ scrollkeeper | [] |
+ sed | [] [] [] [] [] [] [] [] [] |
+ sh-utils | [] [] [] [] [] [] [] |
+ shared-mime-info | [] |
+ sharutils | [] [] [] [] [] |
+ sketch | [] |
+ soundtracker | [] [] [] [] |
+ sp | [] () |
+ tar | [] [] [] [] [] [] [] [] [] |
+ texinfo | [] [] [] [] |
+ textutils | [] [] [] [] [] |
+ tin | [] () |
+ tuxpaint | [] [] [] [] [] [] [] [] |
+ util-linux | [] [] [] [] () [] |
+ vorbis-tools | [] |
+ wastesedge | () |
+ wdiff | [] [] [] [] [] [] |
+ wget | [] [] [] [] [] [] [] |
+ xchat | [] [] [] |
+ xfree86_xkb_xml | |
+ xpad | [] |
+ +----------------------------------------+
+ et fa fi fr ga gl he hr hu id is it ja
+ 21 1 24 84 24 24 8 10 38 31 1 22 33
+
+ ko lg lt lv ms nb nl nn no pl pt pt_BR ro
+ +-------------------------------------------+
+ a2ps | () [] [] () () [] [] |
+ aegis | () () |
+ ant-phone | [] [] |
+ anubis | [] [] [] [] [] |
+ ap-utils | [] () [] |
+ bash | [] [] |
+ batchelor | [] |
+ bfd | [] |
+ binutils | |
+ bison | [] [] [] [] |
+ bluez-pin | [] [] [] |
+ clisp | [] |
+ clisp | |
+ coreutils | [] |
+ cpio | [] [] [] [] [] |
+ darkstat | [] [] [] [] |
+ diffutils | [] [] [] [] |
+ e2fsprogs | [] |
+ enscript | [] [] [] |
+ error | [] [] [] |
+ fetchmail | [] [] () |
+ fileutils | [] |
+ findutils | [] [] [] [] [] |
+ flex | [] [] [] [] |
+ fslint | [] [] |
+ gas | |
+ gawk | [] [] [] |
+ gbiff | [] [] |
+ gcal | |
+ gcc | |
+ gettext | [] [] [] |
+ gettext-examples | [] [] |
+ gettext-runtime | [] [] [] |
+ gettext-tools | [] [] [] |
+ gimp-print | [] |
+ gliv | [] [] [] |
+ glunarclock | [] [] [] |
+ gnubiff | |
+ gnucash | [] [] () |
+ gnucash-glossary | [] [] |
+ gnupg | [] |
+ gpe-aerial | [] [] [] |
+ gpe-beam | [] [] [] |
+ gpe-calendar | [] [] [] |
+ gpe-clock | [] [] [] |
+ gpe-conf | [] [] [] |
+ gpe-contacts | [] [] [] |
+ gpe-edit | [] [] [] |
+ gpe-go | [] [] |
+ gpe-login | [] [] [] |
+ gpe-ownerinfo | [] [] [] |
+ gpe-sketchbook | [] [] [] |
+ gpe-su | [] [] [] |
+ gpe-taskmanager | [] [] [] |
+ gpe-timesheet | [] [] [] |
+ gpe-today | [] [] [] |
+ gpe-todo | [] [] [] |
+ gphoto2 | [] |
+ gprof | [] [] |
+ gpsdrive | () () () [] |
+ gramadoir | [] |
+ grep | [] [] [] [] |
+ gretl | |
+ gtick | [] [] |
+ hello | [] [] [] [] [] [] [] [] [] [] |
+ id-utils | [] [] [] |
+ indent | [] [] [] |
+ jpilot | () () |
+ jtag | |
+ jwhois | [] [] [] [] |
+ kbd | [] [] [] |
+ latrine | [] |
+ ld | |
+ libc | [] [] [] [] [] |
+ libgpewidget | [] [] [] |
+ libiconv | [] [] [] [] |
+ lifelines | |
+ lilypond | |
+ lingoteach | |
+ lingoteach_lessons | |
+ lynx | [] [] |
+ m4 | [] [] [] [] |
+ mailutils | [] |
+ make | [] [] [] [] |
+ man-db | [] |
+ minicom | [] [] [] |
+ mysecretdiary | [] [] [] |
+ nano | [] [] [] [] |
+ nano_1_0 | [] [] [] [] [] |
+ opcodes | [] [] |
+ parted | [] [] [] [] |
+ ptx | [] [] [] [] [] [] [] |
+ python | |
+ radius | [] |
+ recode | [] [] [] |
+ screem | |
+ scrollkeeper | [] [] [] [] |
+ sed | [] [] [] |
+ sh-utils | [] |
+ shared-mime-info | [] |
+ sharutils | [] |
+ sketch | [] [] |
+ soundtracker | |
+ sp | |
+ tar | [] [] [] [] [] [] |
+ texinfo | [] [] [] |
+ textutils | [] [] |
+ tin | |
+ tuxpaint | [] [] [] [] [] [] [] [] [] |
+ util-linux | [] [] |
+ vorbis-tools | [] [] |
+ wastesedge | |
+ wdiff | [] [] [] [] |
+ wget | [] [] |
+ xchat | [] [] |
+ xfree86_xkb_xml | [] |
+ xpad | [] [] |
+ +-------------------------------------------+
+ ko lg lt lv ms nb nl nn no pl pt pt_BR ro
+ 11 0 1 2 12 10 60 4 4 38 23 34 74
+
+ ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
+ +-------------------------------------------+
+ a2ps | [] [] [] [] [] | 16
+ aegis | () | 0
+ ant-phone | | 2
+ anubis | [] [] [] | 9
+ ap-utils | () | 3
+ bash | [] | 9
+ batchelor | | 2
+ bfd | [] [] | 6
+ binutils | [] [] [] | 7
+ bison | [] [] [] | 14
+ bluez-pin | [] [] [] | 13
+ clisp | | 5
+ clisp | | 0
+ coreutils | [] [] [] [] [] | 16
+ cpio | [] [] [] | 14
+ darkstat | [] [] [] () () | 12
+ diffutils | [] [] [] [] | 22
+ e2fsprogs | [] [] | 5
+ enscript | [] [] [] | 12
+ error | [] [] [] | 15
+ fetchmail | [] [] [] | 11
+ fileutils | [] [] [] [] [] [] | 16
+ findutils | [] [] [] [] [] [] [] | 29
+ flex | [] [] [] | 13
+ fslint | | 2
+ gas | [] | 3
+ gawk | [] [] | 12
+ gbiff | | 3
+ gcal | [] [] | 4
+ gcc | [] | 4
+ gettext | [] [] [] [] [] [] | 16
+ gettext-examples | [] [] | 9
+ gettext-runtime | [] [] [] [] [] [] [] [] [] | 21
+ gettext-tools | [] [] [] [] [] [] | 14
+ gimp-print | [] [] | 10
+ gliv | | 3
+ glunarclock | [] [] [] [] | 15
+ gnubiff | | 1
+ gnucash | [] [] [] | 9
+ gnucash-glossary | [] [] [] | 8
+ gnupg | [] [] [] [] | 17
+ gpe-aerial | [] [] | 7
+ gpe-beam | [] [] | 8
+ gpe-calendar | [] [] [] [] [] | 13
+ gpe-clock | [] [] [] | 9
+ gpe-conf | [] [] [] | 9
+ gpe-contacts | [] [] [] [] | 11
+ gpe-edit | [] [] [] [] [] | 11
+ gpe-go | [] | 5
+ gpe-login | [] [] [] [] [] | 12
+ gpe-ownerinfo | [] [] [] [] | 12
+ gpe-sketchbook | [] [] [] | 9
+ gpe-su | [] [] [] | 9
+ gpe-taskmanager | [] [] [] | 9
+ gpe-timesheet | [] [] [] [] | 11
+ gpe-today | [] [] [] [] [] | 12
+ gpe-todo | [] [] [] [] [] | 12
+ gphoto2 | [] [] [] | 11
+ gprof | [] [] | 9
+ gpsdrive | [] [] | 4
+ gramadoir | | 3
+ grep | [] [] [] [] [] | 26
+ gretl | | 2
+ gtick | [] | 5
+ hello | [] [] [] [] [] | 33
+ id-utils | [] [] [] | 12
+ indent | [] [] [] [] [] | 21
+ jpilot | [] [] [] [] [] | 9
+ jtag | [] | 1
+ jwhois | () () [] [] | 11
+ kbd | [] [] | 11
+ latrine | | 1
+ ld | [] [] | 5
+ libc | [] [] [] [] | 20
+ libgpewidget | [] [] [] | 12
+ libiconv | [] [] [] [] [] [] [] [] [] | 27
+ lifelines | [] | 2
+ lilypond | [] | 3
+ lingoteach | | 2
+ lingoteach_lessons | () | 0
+ lynx | [] [] [] [] | 14
+ m4 | [] [] [] | 15
+ mailutils | [] | 4
+ make | [] [] [] [] | 16
+ man-db | [] | 5
+ minicom | [] | 11
+ mysecretdiary | [] [] | 10
+ nano | [] [] [] [] [] | 17
+ nano_1_0 | [] [] [] [] | 17
+ opcodes | [] [] | 6
+ parted | [] [] [] | 15
+ ptx | [] [] [] | 22
+ python | | 0
+ radius | [] | 2
+ recode | [] [] [] [] | 20
+ screem | [] [] | 2
+ scrollkeeper | [] [] [] [] | 15
+ sed | [] [] [] [] [] [] | 23
+ sh-utils | [] [] [] | 14
+ shared-mime-info | [] [] | 4
+ sharutils | [] [] [] [] [] | 17
+ sketch | [] | 6
+ soundtracker | [] [] | 9
+ sp | [] | 3
+ tar | [] [] [] [] [] | 24
+ texinfo | [] [] [] [] | 14
+ textutils | [] [] [] [] [] | 16
+ tin | | 1
+ tuxpaint | [] [] [] [] [] | 29
+ util-linux | [] [] [] | 15
+ vorbis-tools | [] | 8
+ wastesedge | | 0
+ wdiff | [] [] [] [] | 18
+ wget | [] [] [] [] [] [] [] [] | 23
+ xchat | [] [] [] [] [] | 14
+ xfree86_xkb_xml | [] [] [] [] | 6
+ xpad | | 4
+ +-------------------------------------------+
+ 51 teams ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
+ 117 domains 58 41 16 16 78 0 53 12 1 10 21 22 1230
- eo es et eu fa fi fr ga gl he hr hu id is it
- +-----------------------------------------------+
- GNUnet | |
- a2ps | [] [] [] () |
- aegis | |
- ant-phone | [] |
- anubis | [] |
- ap-utils | [] |
- aspell | [] [] |
- bash | [] [] [] [] |
- batchelor | [] [] |
- bfd | [] |
- bibshelf | [] [] [] |
- binutils | [] [] |
- bison | [] [] [] [] [] [] |
- bluez-pin | [] [] [] [] [] [] |
- clisp | [] [] |
- console-tools | |
- coreutils | [] [] [] [] [] |
- cpio | [] [] |
- cpplib | [] [] |
- darkstat | [] () [] [] [] |
- dialog | [] [] [] [] [] [] [] [] |
- diffutils | [] [] [] [] [] [] [] [] [] [] |
- doodle | [] [] |
- e2fsprogs | [] [] [] |
- enscript | [] [] |
- error | [] [] [] [] [] |
- fetchmail | [] |
- fileutils | [] [] [] [] [] [] |
- findutils | [] [] [] [] [] |
- flex | [] [] [] |
- fslint | [] |
- gas | [] [] |
- gawk | [] [] [] [] |
- gbiff | [] |
- gcal | [] [] |
- gcc | [] |
- gettext-examples | [] [] [] [] |
- gettext-runtime | [] [] [] [] [] [] |
- gettext-tools | [] [] [] |
- gimp-print | [] [] |
- gip | [] [] [] |
- gliv | () |
- glunarclock | [] [] [] |
- gmult | [] [] [] |
- gnubiff | () () |
- gnucash | [] () [] |
- gnucash-glossary | [] [] |
- gpe-aerial | [] [] |
- gpe-beam | [] [] |
- gpe-calendar | [] [] [] [] |
- gpe-clock | [] [] [] |
- gpe-conf | [] |
- gpe-contacts | [] |
- gpe-edit | [] [] |
- gpe-go | [] [] |
- gpe-login | [] [] [] |
- gpe-ownerinfo | [] [] [] [] [] |
- gpe-sketchbook | [] [] |
- gpe-su | [] [] [] |
- gpe-taskmanager | [] [] [] |
- gpe-timesheet | [] [] [] [] |
- gpe-today | [] [] [] [] |
- gpe-todo | [] [] [] |
- gphoto2 | [] [] [] [] [] |
- gprof | [] [] [] |
- gpsdrive | () () [] () |
- gramadoir | [] [] |
- grep | [] [] [] [] [] [] [] [] [] [] [] [] |
- gretl | [] [] [] |
- gsasl | [] [] [] |
- gss | [] |
- gst-plugins | [] [] [] |
- gstreamer | [] |
- gtick | [] [] [] [] [] |
- gtkspell | [] [] [] [] [] [] |
- hello | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
- id-utils | [] [] [] [] |
- impost | [] [] |
- indent | [] [] [] [] [] [] [] [] [] [] [] |
- iso_3166 | [] [] [] |
- iso_3166_1 | [] [] [] [] [] [] [] |
- iso_3166_2 | [] |
- iso_3166_3 | [] |
- iso_4217 | [] [] [] |
- iso_639 | [] [] [] [] |
- jpilot | [] [] |
- jtag | [] |
- jwhois | [] [] [] [] [] |
- kbd | [] [] |
- latrine | [] [] [] |
- ld | [] [] |
- libc | [] [] [] [] [] |
- libextractor | |
- libgpewidget | [] [] [] [] [] |
- libgsasl | [] [] |
- libiconv | [] [] [] [] [] [] [] [] [] [] [] |
- libidn | [] [] |
- lifelines | () |
- lilypond | [] |
- lingoteach | [] [] [] |
- lynx | [] [] [] |
- m4 | [] [] [] [] |
- mailutils | [] [] |
- make | [] [] [] [] [] [] [] |
- man-db | () |
- minicom | [] [] [] [] |
- mysecretdiary | [] [] [] |
- nano | [] [] () [] [] |
- nano_1_0 | [] [] [] [] [] |
- opcodes | [] [] |
- parted | [] [] [] [] |
- psmisc | [] [] |
- ptx | [] [] [] [] [] [] [] [] [] |
- pwdutils | |
- python | |
- radius | [] [] |
- recode | [] [] [] [] [] [] [] [] |
- rpm | [] |
- screem | |
- scrollkeeper | [] [] [] |
- sed | [] [] [] [] [] |
- sh-utils | [] [] [] [] [] [] [] |
- shared-mime-info | [] [] [] [] [] [] |
- sharutils | [] [] [] [] [] [] [] |
- silky | [] |
- skencil | [] [] |
- sketch | [] [] |
- solfege | [] |
- soundtracker | [] [] [] |
- sp | [] |
- stardict | [] |
- tar | [] [] [] [] [] |
- texinfo | [] [] [] |
- textutils | [] [] [] [] [] |
- tin | [] () |
- tp-robot | [] [] |
- tuxpaint | [] [] [] [] [] [] [] [] [] |
- unicode-han-tra... | |
- unicode-transla... | [] [] |
- util-linux | [] [] [] [] [] [] |
- vorbis-tools | [] [] |
- wastesedge | () |
- wdiff | [] [] [] [] [] [] [] [] |
- wget | [] [] [] [] [] [] [] [] [] [] |
- xchat | [] [] [] [] [] |
- xkeyboard-config | |
- xpad | [] [] [] |
- +-----------------------------------------------+
- eo es et eu fa fi fr ga gl he hr hu id is it
- 13 85 21 15 2 35 115 45 17 8 6 40 27 1 45
-
- ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
- +-----------------------------------------------+
- GNUnet | |
- a2ps | () [] [] () |
- aegis | () |
- ant-phone | [] |
- anubis | [] [] [] |
- ap-utils | |
- aspell | [] [] |
- bash | [] |
- batchelor | [] |
- bfd | |
- bibshelf | |
- binutils | |
- bison | [] [] [] |
- bluez-pin | [] |
- clisp | [] |
- console-tools | |
- coreutils | [] [] |
- cpio | |
- cpplib | |
- darkstat | [] [] |
- dialog | [] |
- diffutils | [] [] [] |
- doodle | |
- e2fsprogs | |
- enscript | [] |
- error | [] |
- fetchmail | [] [] |
- fileutils | [] [] |
- findutils | [] |
- flex | [] [] |
- fslint | [] |
- gas | |
- gawk | [] [] |
- gbiff | [] |
- gcal | |
- gcc | |
- gettext-examples | [] [] |
- gettext-runtime | [] [] [] |
- gettext-tools | [] [] |
- gimp-print | [] [] |
- gip | [] |
- gliv | [] |
- glunarclock | [] [] |
- gmult | [] |
- gnubiff | |
- gnucash | () () [] |
- gnucash-glossary | [] |
- gpe-aerial | [] |
- gpe-beam | [] |
- gpe-calendar | [] |
- gpe-clock | [] |
- gpe-conf | [] |
- gpe-contacts | |
- gpe-edit | [] |
- gpe-go | [] |
- gpe-login | [] |
- gpe-ownerinfo | [] |
- gpe-sketchbook | [] |
- gpe-su | [] |
- gpe-taskmanager | [] [] |
- gpe-timesheet | [] |
- gpe-today | [] |
- gpe-todo | [] |
- gphoto2 | [] [] |
- gprof | |
- gpsdrive | () () () |
- gramadoir | () |
- grep | [] [] [] |
- gretl | |
- gsasl | [] |
- gss | |
- gst-plugins | [] |
- gstreamer | [] |
- gtick | [] |
- gtkspell | [] [] |
- hello | [] [] [] [] [] [] [] [] |
- id-utils | [] |
- impost | |
- indent | [] [] |
- iso_3166 | [] |
- iso_3166_1 | [] [] |
- iso_3166_2 | [] |
- iso_3166_3 | [] |
- iso_4217 | [] [] [] |
- iso_639 | [] [] [] |
- jpilot | () () () |
- jtag | |
- jwhois | [] |
- kbd | [] |
- latrine | [] |
- ld | |
- libc | [] [] [] [] [] |
- libextractor | |
- libgpewidget | [] |
- libgsasl | [] |
- libiconv | [] |
- libidn | |
- lifelines | [] |
- lilypond | [] |
- lingoteach | [] |
- lynx | [] [] |
- m4 | [] [] |
- mailutils | |
- make | [] [] [] |
- man-db | () |
- minicom | [] |
- mysecretdiary | [] |
- nano | [] [] |
- nano_1_0 | [] [] [] |
- opcodes | [] |
- parted | [] [] |
- psmisc | [] [] |
- ptx | [] [] [] |
- pwdutils | |
- python | |
- radius | |
- recode | [] |
- rpm | [] [] |
- screem | [] |
- scrollkeeper | [] [] [] |
- sed | [] [] |
- sh-utils | [] [] |
- shared-mime-info | [] [] [] [] |
- sharutils | [] [] |
- silky | [] |
- skencil | |
- sketch | |
- solfege | [] [] |
- soundtracker | |
- sp | () |
- stardict | [] [] |
- tar | [] [] |
- texinfo | [] [] [] |
- textutils | [] [] [] |
- tin | |
- tp-robot | [] |
- tuxpaint | [] [] [] [] [] [] |
- unicode-han-tra... | |
- unicode-transla... | |
- util-linux | [] [] |
- vorbis-tools | [] |
- wastesedge | [] |
- wdiff | [] [] |
- wget | [] [] |
- xchat | [] [] [] [] |
- xkeyboard-config | [] |
- xpad | [] |
- +-----------------------------------------------+
- ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
- 33 11 1 1 1 2 2 3 11 0 15 96 7 5 0
-
- or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
- +-------------------------------------------------+
- GNUnet | |
- a2ps | () [] [] [] [] [] [] |
- aegis | () () |
- ant-phone | [] |
- anubis | [] [] [] |
- ap-utils | () |
- aspell | [] [] |
- bash | [] [] [] |
- batchelor | [] |
- bfd | |
- bibshelf | |
- binutils | [] [] |
- bison | [] [] [] [] [] |
- bluez-pin | [] [] [] [] [] [] [] [] |
- clisp | [] |
- console-tools | [] |
- coreutils | [] [] [] [] |
- cpio | [] [] |
- cpplib | |
- darkstat | [] [] [] [] [] [] |
- dialog | [] [] [] [] [] [] [] |
- diffutils | [] [] [] [] [] [] |
- doodle | [] |
- e2fsprogs | [] [] |
- enscript | [] [] [] [] |
- error | [] [] [] |
- fetchmail | [] () [] [] [] |
- fileutils | [] [] [] [] [] |
- findutils | [] [] [] [] [] [] |
- flex | [] [] [] [] [] |
- fslint | [] [] [] |
- gas | |
- gawk | [] [] [] [] |
- gbiff | [] |
- gcal | [] |
- gcc | |
- gettext-examples | [] [] [] [] [] [] |
- gettext-runtime | [] [] [] [] [] [] [] |
- gettext-tools | [] [] [] [] [] [] [] |
- gimp-print | [] [] |
- gip | [] [] [] |
- gliv | [] [] [] |
- glunarclock | [] [] [] [] [] [] |
- gmult | [] [] [] [] |
- gnubiff | () [] |
- gnucash | () [] [] [] [] |
- gnucash-glossary | [] [] [] |
- gpe-aerial | [] [] [] [] [] [] |
- gpe-beam | [] [] [] [] [] [] |
- gpe-calendar | [] [] [] [] [] [] [] |
- gpe-clock | [] [] [] [] [] [] [] |
- gpe-conf | [] [] [] [] [] [] |
- gpe-contacts | [] [] [] |
- gpe-edit | [] [] [] [] [] [] [] |
- gpe-go | [] [] [] [] [] |
- gpe-login | [] [] [] [] [] [] [] |
- gpe-ownerinfo | [] [] [] [] [] [] [] |
- gpe-sketchbook | [] [] [] [] [] [] [] |
- gpe-su | [] [] [] [] [] [] [] |
- gpe-taskmanager | [] [] [] [] [] [] [] |
- gpe-timesheet | [] [] [] [] [] [] [] |
- gpe-today | [] [] [] [] [] [] [] |
- gpe-todo | [] [] [] [] [] [] [] |
- gphoto2 | [] [] [] [] |
- gprof | [] [] [] |
- gpsdrive | [] |
- gramadoir | [] |
- grep | [] [] [] [] [] [] [] |
- gretl | [] |
- gsasl | [] [] [] [] [] |
- gss | [] [] [] |
- gst-plugins | [] [] [] [] |
- gstreamer | [] [] [] [] |
- gtick | [] [] [] |
- gtkspell | [] [] [] [] [] [] |
- hello | [] [] [] [] [] [] [] |
- id-utils | [] [] [] [] |
- impost | |
- indent | [] [] [] [] [] [] |
- iso_3166 | [] [] [] [] [] |
- iso_3166_1 | [] [] [] [] |
- iso_3166_2 | |
- iso_3166_3 | [] [] [] |
- iso_4217 | [] [] |
- iso_639 | [] [] [] |
- jpilot | |
- jtag | [] |
- jwhois | [] [] [] () () |
- kbd | [] [] [] |
- latrine | [] [] |
- ld | [] |
- libc | [] [] [] [] [] |
- libextractor | [] |
- libgpewidget | [] [] [] [] [] [] |
- libgsasl | [] [] [] |
- libiconv | [] [] [] [] [] [] [] [] [] [] |
- libidn | [] () |
- lifelines | [] [] |
- lilypond | [] |
- lingoteach | [] |
- lynx | [] [] [] |
- m4 | [] [] [] [] [] |
- mailutils | [] [] [] |
- make | [] [] [] [] |
- man-db | [] [] |
- minicom | [] [] [] [] |
- mysecretdiary | [] [] [] [] |
- nano | [] [] [] |
- nano_1_0 | [] [] [] [] |
- opcodes | [] [] |
- parted | [] [] [] [] |
- psmisc | [] [] |
- ptx | [] [] [] [] [] [] |
- pwdutils | [] |
- python | |
- radius | [] [] |
- recode | [] [] [] [] [] [] |
- rpm | [] [] [] [] |
- screem | |
- scrollkeeper | [] [] [] [] [] [] [] |
- sed | [] [] [] [] [] [] [] [] |
- sh-utils | [] [] [] |
- shared-mime-info | [] [] [] [] [] |
- sharutils | [] [] [] |
- silky | [] |
- skencil | [] [] [] |
- sketch | [] [] [] |
- solfege | |
- soundtracker | [] [] |
- sp | |
- stardict | [] [] |
- tar | [] [] [] [] |
- texinfo | [] [] [] [] |
- textutils | [] [] [] |
- tin | |
- tp-robot | [] |
- tuxpaint | [] [] [] [] [] [] [] [] |
- unicode-han-tra... | |
- unicode-transla... | |
- util-linux | [] [] [] |
- vorbis-tools | [] [] |
- wastesedge | |
- wdiff | [] [] [] [] [] [] |
- wget | [] [] [] [] [] [] [] [] [] |
- xchat | [] [] [] [] [] [] |
- xkeyboard-config | |
- xpad | |
- +-------------------------------------------------+
- or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
- 1 0 48 30 58 6 79 71 5 45 13 12 50 86 0
-
- tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
- +--------------------------------------------+
- GNUnet | | 0
- a2ps | [] [] [] | 19
- aegis | | 0
- ant-phone | [] | 4
- anubis | [] | 9
- ap-utils | () | 1
- aspell | [] [] [] | 13
- bash | | 10
- batchelor | [] [] | 7
- bfd | | 1
- bibshelf | [] | 5
- binutils | [] | 6
- bison | [] | 17
- bluez-pin | [] [] [] [] [] | 24
- clisp | | 7
- console-tools | [] | 4
- coreutils | [] | 16
- cpio | [] [] | 6
- cpplib | [] [] | 7
- darkstat | [] () () | 15
- dialog | [] [] [] | 25
- diffutils | [] [] [] [] | 28
- doodle | [] | 5
- e2fsprogs | [] | 8
- enscript | [] | 12
- error | [] [] [] | 16
- fetchmail | [] | 12
- fileutils | [] [] [] | 18
- findutils | [] [] | 17
- flex | [] [] | 15
- fslint | [] | 7
- gas | [] | 3
- gawk | [] | 14
- gbiff | | 4
- gcal | [] | 5
- gcc | [] | 3
- gettext-examples | [] [] [] [] | 20
- gettext-runtime | [] [] [] [] [] | 25
- gettext-tools | [] [] [] | 17
- gimp-print | [] | 11
- gip | [] | 8
- gliv | [] | 6
- glunarclock | [] [] | 13
- gmult | [] [] [] | 13
- gnubiff | [] | 3
- gnucash | () [] | 10
- gnucash-glossary | [] | 8
- gpe-aerial | [] [] | 13
- gpe-beam | [] [] | 13
- gpe-calendar | [] [] [] [] | 18
- gpe-clock | [] [] [] [] | 17
- gpe-conf | [] [] | 12
- gpe-contacts | [] [] | 6
- gpe-edit | [] [] [] [] | 15
- gpe-go | [] [] | 11
- gpe-login | [] [] [] [] [] | 18
- gpe-ownerinfo | [] [] [] [] | 19
- gpe-sketchbook | [] [] | 14
- gpe-su | [] [] [] | 16
- gpe-taskmanager | [] [] [] | 17
- gpe-timesheet | [] [] [] [] | 17
- gpe-today | [] [] [] [] [] | 19
- gpe-todo | [] [] [] | 16
- gphoto2 | [] [] | 17
- gprof | [] [] | 10
- gpsdrive | | 2
- gramadoir | [] | 6
- grep | [] [] [] [] | 32
- gretl | | 4
- gsasl | [] [] | 12
- gss | [] | 5
- gst-plugins | [] [] | 16
- gstreamer | [] [] [] | 14
- gtick | [] | 11
- gtkspell | [] [] [] | 20
- hello | [] [] [] [] | 37
- id-utils | [] [] | 13
- impost | [] | 3
- indent | [] [] [] | 24
- iso_3166 | [] [] [] | 12
- iso_3166_1 | [] [] | 20
- iso_3166_2 | | 2
- iso_3166_3 | [] [] | 8
- iso_4217 | [] [] | 10
- iso_639 | [] [] | 12
- jpilot | [] [] [] | 6
- jtag | | 2
- jwhois | [] [] [] | 12
- kbd | [] [] | 12
- latrine | [] [] | 8
- ld | [] | 5
- libc | [] [] | 22
- libextractor | | 1
- libgpewidget | [] [] | 17
- libgsasl | [] | 7
- libiconv | [] [] [] [] [] | 32
- libidn | [] [] | 5
- lifelines | | 4
- lilypond | [] | 5
- lingoteach | | 5
- lynx | [] [] | 14
- m4 | [] [] | 17
- mailutils | [] | 7
- make | [] [] | 18
- man-db | | 5
- minicom | | 11
- mysecretdiary | [] [] | 12
- nano | | 11
- nano_1_0 | [] [] | 17
- opcodes | [] | 7
- parted | [] [] [] | 17
- psmisc | [] | 7
- ptx | [] [] | 23
- pwdutils | | 1
- python | | 0
- radius | [] | 6
- recode | [] [] | 22
- rpm | [] [] | 11
- screem | | 1
- scrollkeeper | [] [] | 23
- sed | [] [] | 19
- sh-utils | [] | 15
- shared-mime-info | [] [] | 19
- sharutils | [] [] [] | 20
- silky | | 3
- skencil | | 6
- sketch | | 6
- solfege | | 4
- soundtracker | [] | 8
- sp | [] | 3
- stardict | [] [] [] [] | 10
- tar | [] [] | 13
- texinfo | [] [] | 14
- textutils | [] [] [] | 17
- tin | | 1
- tp-robot | [] [] | 7
- tuxpaint | [] [] [] [] | 34
- unicode-han-tra... | | 0
- unicode-transla... | | 2
- util-linux | [] [] | 17
- vorbis-tools | [] | 10
- wastesedge | | 1
- wdiff | [] [] | 22
- wget | [] [] [] [] | 31
- xchat | [] [] [] | 22
- xkeyboard-config | | 1
- xpad | [] | 5
- +--------------------------------------------+
- 72 teams tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
- 147 domains 0 0 1 78 29 0 71 16 0 41 20 0 1711
-
Some counters in the preceding matrix are higher than the number of
visible blocks let us expect. This is because a few extra PO files are
used for implementing regional variants of languages, or language
@@ -960,13 +679,13 @@
lag between the mere existence a PO file and its wide availability in a
distribution.
- If April 2005 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
-matrix with full percentage details can be found at
+ If November 2003 seems to be old, you may fetch a more recent copy
+of this `ABOUT-NLS' file on most GNU archive sites. The most
+up-to-date matrix with full percentage details can be found at
`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
-1.6 Using `gettext' in new packages
-===================================
+Using `gettext' in new packages
+===============================
If you are writing a freely available program and want to
internationalize it you are welcome to use GNU `gettext' in your
Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac 2005-07-17 23:19:45 UTC (rev 1575)
+++ gnunet-gtk/configure.ac 2005-07-17 23:21:45 UTC (rev 1576)
@@ -20,8 +20,8 @@
# Process this file with autoconf to produce a configure script.
#
AC_PREREQ(2.57)
-AC_INIT([gnunet-gtk],[0.7.0pre4],address@hidden)
-AM_INIT_AUTOMAKE([gnunet-gtk], [0.7.0pre4])
+AC_INIT([gnunet-gtk],[0.7.0pre5],address@hidden)
+AM_INIT_AUTOMAKE([gnunet-gtk], [0.7.0pre5])
AM_CONFIG_HEADER(config.h)
AH_TOP([#define _GNU_SOURCE 1])
Modified: gnunet-gtk/mkinstalldirs
===================================================================
--- gnunet-gtk/mkinstalldirs 2005-07-17 23:19:45 UTC (rev 1575)
+++ gnunet-gtk/mkinstalldirs 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,33 +1,21 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2005-02-02.21
-
-# Original author: Noah Friedman <address@hidden>
+# Author: Noah Friedman <address@hidden>
# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <address@hidden> or send patches to
-# <address@hidden>.
+# Public domain
errstatus=0
dirmode=""
usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <address@hidden>."
-
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
- echo "$usage"
- exit $?
+ echo "$usage" 1>&2
+ exit 0
;;
-m) # -m PERM arg
shift
@@ -35,10 +23,6 @@
dirmode=$1
shift
;;
- --version)
- echo "$0 $scriptversion"
- exit $?
- ;;
--) # stop option processing
shift
break
@@ -66,37 +50,17 @@
0) exit 0 ;;
esac
-# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error. This is a problem when calling mkinstalldirs
-# from a parallel make. We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ if mkdir -p -- . 2>/dev/null; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- test -d ./-p && rmdir ./-p
- test -d ./--version && rmdir ./--version
fi
;;
*)
- if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
- test ! -d ./--version; then
+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
- else
- # Clean up after NextStep and OpenStep mkdir.
- for d in ./-m ./-p ./--version "./$dirmode";
- do
- test -d $d && rmdir $d
- done
fi
;;
esac
@@ -120,17 +84,17 @@
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
- errstatus=$lasterr
+ errstatus=$lasterr
else
- if test ! -z "$dirmode"; then
+ if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
- lasterr=""
- chmod "$dirmode" "$pathcomp" || lasterr=$?
+ lasterr=""
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
fi
fi
@@ -143,8 +107,5 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
# End:
+# mkinstalldirs ends here
Modified: gnunet-gtk/po/Makefile.in
===================================================================
--- gnunet-gtk/po/Makefile.in 2005-07-17 23:19:45 UTC (rev 1575)
+++ gnunet-gtk/po/Makefile.in 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,5 +1,5 @@
# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <address@hidden>
+# Copyright (C) 1995-1997, 2000-2003 by Ulrich Drepper <address@hidden>
#
# This file can be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU General Public
@@ -8,11 +8,10 @@
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
#
-# Origin: gettext-0.14.4
+# Origin: gettext-0.13
PACKAGE = gnunet-gtk
VERSION = 0.7.0pre4
-PACKAGE_BUGREPORT = address@hidden
SHELL = /bin/sh
@@ -47,7 +46,7 @@
DUMMYPOFILES = @DUMMYPOFILES@
DISTFILES.common = Makefile.in.in remove-potcdate.sin \
$(DISTFILES.common.extra1) $(DISTFILES.common.extra2)
$(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \
$(POFILES) $(GMOFILES) \
$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
@@ -58,7 +57,7 @@
# Makevars gets inserted here. (Don't remove this line!)
.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
.po.mo:
@echo "$(MSGFMT) -c -o $@ $<"; \
@@ -80,12 +79,6 @@
all-yes: stamp-po
all-no:
-# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
-# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
-# we don't want to bother translators with empty POT files). We assume that
-# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-# In this case, stamp-po is a nop (i.e. a phony target).
-
# stamp-po is a timestamp denoting the last time at which the CATALOGS have
# been loosely updated. Its purpose is that when a developer or translator
# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
@@ -95,13 +88,10 @@
# $(POFILES) has been designed to not touch files that don't need to be
# changed.
stamp-po: $(srcdir)/$(DOMAIN).pot
- test ! -f $(srcdir)/$(DOMAIN).pot || \
- test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
- @test ! -f $(srcdir)/$(DOMAIN).pot || { \
- echo "touch stamp-po" && \
- echo timestamp > stamp-poT && \
- mv stamp-poT stamp-po; \
- }
+ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+ @echo "touch stamp-po"
+ @echo timestamp > stamp-poT
+ @mv stamp-poT stamp-po
# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
# otherwise packages like GCC can not be built if only parts of the source
@@ -110,16 +100,11 @@
# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
- if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' =
'@'PACKAGE_BUGREPORT'@'; then \
- msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
- else \
- msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
- fi; \
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
- --msgid-bugs-address="$$msgid_bugs_address"
+ --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
test ! -f $(DOMAIN).po || { \
if test -f $(srcdir)/$(DOMAIN).pot; then \
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot >
$(DOMAIN).1po && \
@@ -145,13 +130,9 @@
# Note that a PO file is not touched if it doesn't need to be changed.
$(POFILES): $(srcdir)/$(DOMAIN).pot
@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
- if test -f "$(srcdir)/$${lang}.po"; then \
- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
- else \
- $(MAKE) $${lang}.po-create; \
- fi
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
install: install-exec install-data
@@ -304,14 +285,11 @@
$(MAKE) update-po
@$(MAKE) dist2
# This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
+dist2: $(DISTFILES)
dists="$(DISTFILES)"; \
if test "$(PACKAGE)" = "gettext-tools"; then \
dists="$$dists Makevars.template"; \
fi; \
- if test -f $(srcdir)/$(DOMAIN).pot; then \
- dists="$$dists $(DOMAIN).pot stamp-po"; \
- fi; \
if test -f $(srcdir)/ChangeLog; then \
dists="$$dists ChangeLog"; \
fi; \
@@ -323,9 +301,9 @@
if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
for file in $$dists; do \
if test -f $$file; then \
- cp -p $$file $(distdir) || exit 1; \
+ cp -p $$file $(distdir); \
else \
- cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+ cp -p $(srcdir)/$$file $(distdir); \
fi; \
done
@@ -334,13 +312,6 @@
test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
$(MAKE) update-gmo
-# General rule for creating PO files.
-
-.nop.po-create:
- @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
- echo "File $$lang.po does not exist. If you are a translator, you can
create it through 'msginit'." 1>&2; \
- exit 1
-
# General rule for updating PO files.
.nop.po-update:
@@ -372,7 +343,7 @@
update-gmo: Makefile $(GMOFILES)
@:
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status
@POMAKEFILEDEPS@
+Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/address@hidden CONFIG_HEADERS= \
$(SHELL) ./config.status
Modified: gnunet-gtk/po/Makefile.in.in
===================================================================
--- gnunet-gtk/po/Makefile.in.in 2005-07-17 23:19:45 UTC (rev 1575)
+++ gnunet-gtk/po/Makefile.in.in 2005-07-17 23:21:45 UTC (rev 1576)
@@ -1,5 +1,5 @@
# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <address@hidden>
+# Copyright (C) 1995-1997, 2000-2003 by Ulrich Drepper <address@hidden>
#
# This file can be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU General Public
@@ -8,11 +8,10 @@
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
#
-# Origin: gettext-0.14.4
+# Origin: gettext-0.13
PACKAGE = @PACKAGE@
VERSION = @VERSION@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
SHELL = /bin/sh
@SET_MAKE@
@@ -47,7 +46,7 @@
DUMMYPOFILES = @DUMMYPOFILES@
DISTFILES.common = Makefile.in.in remove-potcdate.sin \
$(DISTFILES.common.extra1) $(DISTFILES.common.extra2)
$(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \
$(POFILES) $(GMOFILES) \
$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
@@ -58,7 +57,7 @@
# Makevars gets inserted here. (Don't remove this line!)
.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
.po.mo:
@echo "$(MSGFMT) -c -o $@ $<"; \
@@ -80,12 +79,6 @@
all-yes: stamp-po
all-no:
-# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
-# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
-# we don't want to bother translators with empty POT files). We assume that
-# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-# In this case, stamp-po is a nop (i.e. a phony target).
-
# stamp-po is a timestamp denoting the last time at which the CATALOGS have
# been loosely updated. Its purpose is that when a developer or translator
# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
@@ -95,13 +88,10 @@
# $(POFILES) has been designed to not touch files that don't need to be
# changed.
stamp-po: $(srcdir)/$(DOMAIN).pot
- test ! -f $(srcdir)/$(DOMAIN).pot || \
- test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
- @test ! -f $(srcdir)/$(DOMAIN).pot || { \
- echo "touch stamp-po" && \
- echo timestamp > stamp-poT && \
- mv stamp-poT stamp-po; \
- }
+ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+ @echo "touch stamp-po"
+ @echo timestamp > stamp-poT
+ @mv stamp-poT stamp-po
# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
# otherwise packages like GCC can not be built if only parts of the source
@@ -110,16 +100,11 @@
# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
- if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' =
'@'PACKAGE_BUGREPORT'@'; then \
- msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
- else \
- msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
- fi; \
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
- --msgid-bugs-address="$$msgid_bugs_address"
+ --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
test ! -f $(DOMAIN).po || { \
if test -f $(srcdir)/$(DOMAIN).pot; then \
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot >
$(DOMAIN).1po && \
@@ -145,13 +130,9 @@
# Note that a PO file is not touched if it doesn't need to be changed.
$(POFILES): $(srcdir)/$(DOMAIN).pot
@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
- if test -f "$(srcdir)/$${lang}.po"; then \
- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
- else \
- $(MAKE) $${lang}.po-create; \
- fi
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
install: install-exec install-data
@@ -304,14 +285,11 @@
$(MAKE) update-po
@$(MAKE) dist2
# This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
+dist2: $(DISTFILES)
dists="$(DISTFILES)"; \
if test "$(PACKAGE)" = "gettext-tools"; then \
dists="$$dists Makevars.template"; \
fi; \
- if test -f $(srcdir)/$(DOMAIN).pot; then \
- dists="$$dists $(DOMAIN).pot stamp-po"; \
- fi; \
if test -f $(srcdir)/ChangeLog; then \
dists="$$dists ChangeLog"; \
fi; \
@@ -323,9 +301,9 @@
if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
for file in $$dists; do \
if test -f $$file; then \
- cp -p $$file $(distdir) || exit 1; \
+ cp -p $$file $(distdir); \
else \
- cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+ cp -p $(srcdir)/$$file $(distdir); \
fi; \
done
@@ -334,13 +312,6 @@
test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
$(MAKE) update-gmo
-# General rule for creating PO files.
-
-.nop.po-create:
- @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
- echo "File $$lang.po does not exist. If you are a translator, you can
create it through 'msginit'." 1>&2; \
- exit 1
-
# General rule for updating PO files.
.nop.po-update:
@@ -372,7 +343,7 @@
update-gmo: Makefile $(GMOFILES)
@:
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status
@POMAKEFILEDEPS@
+Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/address@hidden CONFIG_HEADERS= \
$(SHELL) ./config.status
Modified: gnunet-gtk/po/Rules-quot
===================================================================
--- gnunet-gtk/po/Rules-quot 2005-07-17 23:19:45 UTC (rev 1575)
+++ gnunet-gtk/po/Rules-quot 2005-07-17 23:21:45 UTC (rev 1576)
@@ -4,11 +4,6 @@
.SUFFIXES: .insert-header .po-update-en
address@hidden:
- $(MAKE) address@hidden
address@hidden:
- $(MAKE) address@hidden
-
address@hidden: address@hidden
address@hidden: address@hidden
Modified: gnunet-gtk/po/de.po
===================================================================
--- gnunet-gtk/po/de.po 2005-07-17 23:19:45 UTC (rev 1575)
+++ gnunet-gtk/po/de.po 2005-07-17 23:21:45 UTC (rev 1576)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre0\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-09 19:49+0200\n"
+"POT-Creation-Date: 2005-07-18 01:16+0200\n"
"PO-Revision-Date: 2005-05-11 21:35+0200\n"
"Last-Translator: Nils Durner <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -21,16 +21,16 @@
msgid "gnunet-gtk, GNU's Peer-to-Peer Network"
msgstr ""
-#: gnunet-gtk.glade:68
+#: gnunet-gtk.glade:69
#, fuzzy
msgid "Show credits"
msgstr "_Daten anzeigen"
-#: gnunet-gtk.glade:87
+#: gnunet-gtk.glade:88
msgid "<span size=\"x-large\">Welcome to gnunet-gtk 0.7.0</span>"
msgstr ""
-#: gnunet-gtk.glade:119
+#: gnunet-gtk.glade:120
msgid ""
"\n"
" \n"
@@ -68,102 +68,102 @@
" The GNUnet Team"
msgstr ""
-#: gnunet-gtk.glade:200
+#: gnunet-gtk.glade:203
msgid "_Welcome"
msgstr "_Willkommen"
-#: gnunet-gtk.glade:275
+#: gnunet-gtk.glade:278
#, fuzzy
msgid "Try to start the GNUnet Daemon gnunetd on localhost"
msgstr ""
"Versuche, den GNUnet Daemonen gnunetd auf dem lokalen Rechner zu starten."
-#: gnunet-gtk.glade:319
+#: gnunet-gtk.glade:322
msgid "start gnunet_d"
msgstr "Start gnunet_d"
-#: gnunet-gtk.glade:355
+#: gnunet-gtk.glade:358
msgid "Stops the GNUnet daemon gnunetd"
msgstr "Stoppt den GNUnet daemon gnunetd"
-#: gnunet-gtk.glade:399
+#: gnunet-gtk.glade:402
msgid "sto_p gnunetd"
msgstr "Stoppt den gnunetd Daemonen"
-#: gnunet-gtk.glade:472
+#: gnunet-gtk.glade:475
msgid "<b>gnunetd control</b>"
msgstr "gnunetd Kontrolle"
-#: gnunet-gtk.glade:534
+#: gnunet-gtk.glade:537
msgid "<b>Available Applications</b>"
msgstr "Verf�gbare Anwendungen"
-#: gnunet-gtk.glade:600
+#: gnunet-gtk.glade:603
msgid "_General"
msgstr "All_gemeines"
-#: gnunet-gtk.glade:677
+#: gnunet-gtk.glade:682
msgid "<b>Search Overview</b>"
msgstr ""
-#: gnunet-gtk.glade:757
+#: gnunet-gtk.glade:762
msgid "Cancel the selected download"
msgstr "Den ausgew�hlten Download abbrechen"
-#: gnunet-gtk.glade:776
+#: gnunet-gtk.glade:781
msgid "Clear completed downloads from the download list"
msgstr ""
-#: gnunet-gtk.glade:804
+#: gnunet-gtk.glade:809
msgid "<b>Downloads</b>"
msgstr "Downloads"
-#: gnunet-gtk.glade:866
+#: gnunet-gtk.glade:871
#, fuzzy
msgid "<b>Uploads</b>"
msgstr "Upload abgewiesen!"
-#: gnunet-gtk.glade:925
+#: gnunet-gtk.glade:932
msgid "Stat_us"
msgstr "Stat_us"
-#: gnunet-gtk.glade:968 gnunet-gtk.glade:2895 gnunet-gtk.glade:4537
+#: gnunet-gtk.glade:975 gnunet-gtk.glade:2902 gnunet-gtk.glade:4544
msgid "_Keyword:"
msgstr "Schl_�sselwort:"
-#: gnunet-gtk.glade:1028
+#: gnunet-gtk.glade:1035
msgid ""
"Search GNUnet for content under the specified keyword (and, if applicable, "
"restrict the search to the given namespace)"
msgstr ""
-#: gnunet-gtk.glade:1073
+#: gnunet-gtk.glade:1080
msgid "Sea_rch"
msgstr "Suche"
-#: gnunet-gtk.glade:1109
+#: gnunet-gtk.glade:1116
msgid "in _namespace"
msgstr "im _Namensraum"
-#: gnunet-gtk.glade:1164 gnunet-gtk.glade:1486
+#: gnunet-gtk.glade:1171 gnunet-gtk.glade:1493
msgid "_Anonymity:"
msgstr "_Anonymit�t"
-#: gnunet-gtk.glade:1191
+#: gnunet-gtk.glade:1198
msgid ""
"Specify the anonymity level for the search, 0 for no anonymity. Higher "
"values provide more privacy but also less performance."
msgstr ""
-#: gnunet-gtk.glade:1309
+#: gnunet-gtk.glade:1316
msgid "_Download"
msgstr "_Download"
-#: gnunet-gtk.glade:1355
+#: gnunet-gtk.glade:1362
msgid "Method:"
msgstr "Methode:"
-#: gnunet-gtk.glade:1385
+#: gnunet-gtk.glade:1392
msgid ""
"Indexing will avoid copying the file into the GNUnet database. Instead, "
"GNUnet will try to add a symbolic link to the specified file. If that "
@@ -173,11 +173,11 @@
"efficient than insertion."
msgstr ""
-#: gnunet-gtk.glade:1387
+#: gnunet-gtk.glade:1394
msgid "inde_x"
msgstr "indi_zieren"
-#: gnunet-gtk.glade:1409
+#: gnunet-gtk.glade:1416
msgid ""
"Inserting a file means that an encrypted copy will be added to the GNUnet "
"database. Without the proper key (which is not stored in plaintext "
@@ -187,45 +187,45 @@
"(after compromising your machine)."
msgstr ""
-#: gnunet-gtk.glade:1411
+#: gnunet-gtk.glade:1418
msgid "i_nsert"
msgstr "ei_nf�gen"
-#: gnunet-gtk.glade:1433
+#: gnunet-gtk.glade:1440
msgid "Scope:"
msgstr "Umfang:"
-#: gnunet-gtk.glade:1463
+#: gnunet-gtk.glade:1470
msgid "only insert a single file"
msgstr "nur eine einzelne Datei"
-#: gnunet-gtk.glade:1465
+#: gnunet-gtk.glade:1472
msgid "file onl_y"
msgstr "nur Datei"
-#: gnunet-gtk.glade:1515
+#: gnunet-gtk.glade:1522
msgid "_Filename:"
msgstr "_Dateiname:"
-#: gnunet-gtk.glade:1544
+#: gnunet-gtk.glade:1551
msgid "Browse local computer for files (or directories) to upload."
msgstr ""
-#: gnunet-gtk.glade:1588
+#: gnunet-gtk.glade:1595
msgid "_Browse"
msgstr "Durchst�_bern"
-#: gnunet-gtk.glade:1662
+#: gnunet-gtk.glade:1669
#, fuzzy
msgid "Recursively insert an entire directory tree"
msgstr "Rekursiv einen gesamten Verzeichnisbaum einf�gen"
-#: gnunet-gtk.glade:1664
+#: gnunet-gtk.glade:1671
#, fuzzy
msgid "_recursive (for entire directories)"
msgstr "_rekursiv (f�r komplette Verzeichnisse)"
-#: gnunet-gtk.glade:1687
+#: gnunet-gtk.glade:1694
msgid ""
"What level of sender-anonymity is desired when sharing this particular "
"file? 0 allows direct connections (no anonymity). Higher levels require "
@@ -233,152 +233,152 @@
"privacy at the expense of efficiency."
msgstr ""
-#: gnunet-gtk.glade:1710
+#: gnunet-gtk.glade:1717
msgid ""
"Upload the specified file with the selected options (you will then be "
"prompted to enter meta-data and keywords)."
msgstr ""
-#: gnunet-gtk.glade:1754
+#: gnunet-gtk.glade:1761
msgid "Up_load"
msgstr "Hoch_laden"
-#: gnunet-gtk.glade:1831
+#: gnunet-gtk.glade:1838
msgid "U_pload"
msgstr "Hochladen"
-#: gnunet-gtk.glade:1872
+#: gnunet-gtk.glade:1879
msgid "c_reate"
msgstr "E_rzeugen"
-#: gnunet-gtk.glade:1893 gnunet-gtk.glade:1946
+#: gnunet-gtk.glade:1900 gnunet-gtk.glade:1953
msgid "_Namespace"
msgstr "_Namensraum"
-#: gnunet-gtk.glade:1902
+#: gnunet-gtk.glade:1909
msgid "_Directory"
msgstr "_Verzeichnis"
-#: gnunet-gtk.glade:1911 gnunet-gtk.glade:1956
+#: gnunet-gtk.glade:1918 gnunet-gtk.glade:1963
msgid "_Collection"
msgstr "Sammlung"
-#: gnunet-gtk.glade:1924
+#: gnunet-gtk.glade:1931
msgid "d_elete"
msgstr "L�sch_en"
-#: gnunet-gtk.glade:1945
+#: gnunet-gtk.glade:1952
msgid ""
"Will prevent future insertions into the namespace (will not delete content "
"in the namespace)"
msgstr ""
-#: gnunet-gtk.glade:1955
+#: gnunet-gtk.glade:1962
msgid "end collection (will not delete content already in the collection)"
msgstr ""
-#: gnunet-gtk.glade:2087
+#: gnunet-gtk.glade:2094
msgid "<b>Available Content</b>"
msgstr ""
-#: gnunet-gtk.glade:2146
+#: gnunet-gtk.glade:2153
msgid "Ad_vanced"
msgstr "Fortgeschrittene"
-#: gnunet-gtk.glade:2204
+#: gnunet-gtk.glade:2211
#, fuzzy
msgid "File s_haring"
msgstr "Datentausc_h"
-#: gnunet-gtk.glade:2316
+#: gnunet-gtk.glade:2323
msgid "_Statistics"
msgstr "_Statistiken"
-#: gnunet-gtk.glade:2450
+#: gnunet-gtk.glade:2457
msgid "/join #gnunet"
msgstr "/join #gnunet"
-#: gnunet-gtk.glade:2535
+#: gnunet-gtk.glade:2542
msgid "Cha_t"
msgstr "Cha_t"
-#: gnunet-gtk.glade:2588 gnunet-gtk.glade:2603 gnunet-gtk.glade:4980
+#: gnunet-gtk.glade:2595 gnunet-gtk.glade:2610 gnunet-gtk.glade:4987
msgid "Edit File Information"
msgstr "Dateiinformationen bearbeiten"
-#: gnunet-gtk.glade:2604
+#: gnunet-gtk.glade:2611
msgid "This dialog is used to edit information about shared files."
msgstr ""
-#: gnunet-gtk.glade:2621 gnunet-gtk.glade:5009 gnunet-gtk.glade:5589
+#: gnunet-gtk.glade:2628 gnunet-gtk.glade:5016 gnunet-gtk.glade:5596
msgid ""
"Confirm the displayed meta-data and keywords and proceed with the upload."
msgstr ""
-#: gnunet-gtk.glade:2630
+#: gnunet-gtk.glade:2637
msgid "metaDataDialogCancelButton"
msgstr ""
-#: gnunet-gtk.glade:2631
+#: gnunet-gtk.glade:2638
msgid "Abort the upload operation."
msgstr ""
-#: gnunet-gtk.glade:2640 gnunet-gtk.glade:5024 gnunet-gtk.glade:5604
+#: gnunet-gtk.glade:2647 gnunet-gtk.glade:5031 gnunet-gtk.glade:5611
#, fuzzy
msgid "Cancel the upload."
msgstr "# Client Trace-Anfragen empfangen"
-#: gnunet-gtk.glade:2663
+#: gnunet-gtk.glade:2670
msgid "Please provide meta-data and keywords for the content."
msgstr ""
-#: gnunet-gtk.glade:2694 gnunet-gtk.glade:4679 gnunet-gtk.glade:5294
-#: gnunet-gtk.glade:5826
+#: gnunet-gtk.glade:2701 gnunet-gtk.glade:4686 gnunet-gtk.glade:5301
+#: gnunet-gtk.glade:5833
msgid "_Type:"
msgstr ""
-#: gnunet-gtk.glade:2748 gnunet-gtk.glade:4718 gnunet-gtk.glade:5348
-#: gnunet-gtk.glade:5880
+#: gnunet-gtk.glade:2755 gnunet-gtk.glade:4725 gnunet-gtk.glade:5355
+#: gnunet-gtk.glade:5887
msgid "_Value:"
msgstr "_Wert:"
-#: gnunet-gtk.glade:2775 gnunet-gtk.glade:5375 gnunet-gtk.glade:5907
+#: gnunet-gtk.glade:2782 gnunet-gtk.glade:5382 gnunet-gtk.glade:5914
msgid "Enter metadata about the upload"
msgstr ""
-#: gnunet-gtk.glade:2785
+#: gnunet-gtk.glade:2792
msgid "Value Entry"
msgstr ""
-#: gnunet-gtk.glade:2786
+#: gnunet-gtk.glade:2793
msgid ""
"Enter the value for the meta-data of the specified type here.\n"
"Press ENTER to add the data."
msgstr ""
-#: gnunet-gtk.glade:2801 gnunet-gtk.glade:5396 gnunet-gtk.glade:5928
+#: gnunet-gtk.glade:2808 gnunet-gtk.glade:5403 gnunet-gtk.glade:5935
msgid ""
"Add the given description to the meta-data describing the uploaded file."
msgstr ""
-#: gnunet-gtk.glade:2842 gnunet-gtk.glade:2987 gnunet-gtk.glade:4626
-#: gnunet-gtk.glade:5437 gnunet-gtk.glade:5969
+#: gnunet-gtk.glade:2849 gnunet-gtk.glade:2994 gnunet-gtk.glade:4633
+#: gnunet-gtk.glade:5444 gnunet-gtk.glade:5976
msgid ""
"Select entries and use the context menu (right click) in order to delete "
"keywords."
msgstr ""
-#: gnunet-gtk.glade:2859 gnunet-gtk.glade:5454 gnunet-gtk.glade:5986
+#: gnunet-gtk.glade:2866 gnunet-gtk.glade:5461 gnunet-gtk.glade:5993
#, fuzzy
msgid "<b>Meta-data</b>"
msgstr "Upload abgewiesen!"
-#: gnunet-gtk.glade:2922 gnunet-gtk.glade:5105 gnunet-gtk.glade:5212
-#: gnunet-gtk.glade:5685
+#: gnunet-gtk.glade:2929 gnunet-gtk.glade:5112 gnunet-gtk.glade:5219
+#: gnunet-gtk.glade:5692
msgid "Enter keywords"
msgstr "Schl�sselw�rter eingeben"
-#: gnunet-gtk.glade:2943
+#: gnunet-gtk.glade:2950
#, fuzzy
msgid ""
"Add the specified keyword to the list of keywords under which the file or "
@@ -387,125 +387,125 @@
"Keine Bekanntmachung f�r diesen Namespace erstellen (zu verwenden, wenn ein "
"neues Pseudonym erstellt wird)"
-#: gnunet-gtk.glade:2972
+#: gnunet-gtk.glade:2979
msgid "Lists all of the keywords that will be used."
msgstr ""
-#: gnunet-gtk.glade:3004
+#: gnunet-gtk.glade:3011
#, fuzzy
msgid "<b>Keywords</b>"
msgstr "<b>Schl�sselw�rter</b>"
-#: gnunet-gtk.glade:3040 gnunet-gtk.glade:5490
+#: gnunet-gtk.glade:3047 gnunet-gtk.glade:5497
msgid "_Preview:"
msgstr "Vorschau:"
-#: gnunet-gtk.glade:3109
+#: gnunet-gtk.glade:3116
#, fuzzy
msgid "File Information"
msgstr "Dateiinformation"
-#: gnunet-gtk.glade:3194 src/plugins/fs/search.c:424
+#: gnunet-gtk.glade:3201 src/plugins/fs/search.c:427
msgid "Meta-data"
msgstr "Metadaten"
-#: gnunet-gtk.glade:3225
+#: gnunet-gtk.glade:3232
msgid "Search Results"
msgstr "Suchergebnisse"
-#: gnunet-gtk.glade:3272
+#: gnunet-gtk.glade:3279
msgid ""
"List of search results. Directories must first be downloaded before their "
"contents will be displayed."
msgstr ""
-#: gnunet-gtk.glade:3301
+#: gnunet-gtk.glade:3308
msgid "Anon_ymity:"
msgstr "Anonymit�t:"
-#: gnunet-gtk.glade:3328
+#: gnunet-gtk.glade:3335
msgid ""
"Specify the desired anonymity level for this download. A value of 0 means no "
"receiver anonymity (allows direct connection). Use higher values for "
"increased privacy at the expense of performance."
msgstr ""
-#: gnunet-gtk.glade:3359
+#: gnunet-gtk.glade:3366
#, fuzzy
msgid "Download selected files."
msgstr "Download abgebrochen."
-#: gnunet-gtk.glade:3404
+#: gnunet-gtk.glade:3411
msgid "Down_load"
msgstr "Down_load"
-#: gnunet-gtk.glade:3440
+#: gnunet-gtk.glade:3447
msgid "Close this search."
msgstr "Diese Suche schlie�en."
-#: gnunet-gtk.glade:3472
+#: gnunet-gtk.glade:3479
msgid "Namespace Contents"
msgstr "Inhaltsverzeichnis des Namensraums"
-#: gnunet-gtk.glade:3504
+#: gnunet-gtk.glade:3511
msgid ""
"List of the files and directories that have been added to this namespace so "
"far."
msgstr ""
-#: gnunet-gtk.glade:3532
+#: gnunet-gtk.glade:3539
msgid "Add additional files to this namespace."
msgstr ""
-#: gnunet-gtk.glade:3550
+#: gnunet-gtk.glade:3557
msgid "Publish an update to the selected updatable content."
msgstr ""
-#: gnunet-gtk.glade:3595
+#: gnunet-gtk.glade:3602
msgid "U_pdate"
msgstr "Aktualisieren"
-#: gnunet-gtk.glade:3639
+#: gnunet-gtk.glade:3646
msgid "Chat"
msgstr ""
-#: gnunet-gtk.glade:3677
+#: gnunet-gtk.glade:3684
msgid "The current conversation in this chat room."
msgstr ""
-#: gnunet-gtk.glade:3716
+#: gnunet-gtk.glade:3723
msgid "Hello!"
msgstr "Hallo!"
-#: gnunet-gtk.glade:3732
+#: gnunet-gtk.glade:3739
msgid "Sends the message to all participants in the current chat room."
msgstr ""
-#: gnunet-gtk.glade:3778
+#: gnunet-gtk.glade:3785
msgid "Sen_d"
msgstr "Sen_den"
-#: gnunet-gtk.glade:3838
+#: gnunet-gtk.glade:3845
msgid "List of the participants in the chat room."
msgstr ""
-#: gnunet-gtk.glade:3863
+#: gnunet-gtk.glade:3870
msgid "The gnunet-gtk about dialog"
msgstr ""
-#: gnunet-gtk.glade:3865
+#: gnunet-gtk.glade:3872
msgid "gnunet-gtk"
msgstr "gnunet-gtk"
-#: gnunet-gtk.glade:3866
+#: gnunet-gtk.glade:3873
msgid "(C) 2001-2005 Christian Grothoff (and other contributing authors)"
msgstr ""
-#: gnunet-gtk.glade:3867
+#: gnunet-gtk.glade:3874
msgid "https://gnunet.org/";
msgstr "https://gnunet.org/";
-#: gnunet-gtk.glade:3868
+#: gnunet-gtk.glade:3875
msgid ""
" GNU GENERAL PUBLIC LICENSE\n"
" Version 2, June 1991\n"
@@ -793,11 +793,11 @@
" END OF TERMS AND CONDITIONS\n"
msgstr ""
-#: gnunet-gtk.glade:4151
+#: gnunet-gtk.glade:4158
msgid "GNUnet Website"
msgstr ""
-#: gnunet-gtk.glade:4185
+#: gnunet-gtk.glade:4192
msgid ""
"Di Ma\n"
"Jens Palsberg <address@hidden>\n"
@@ -813,57 +813,57 @@
"Phan Vinh Thinh <address@hidden>\n"
msgstr ""
-#: gnunet-gtk.glade:4208
+#: gnunet-gtk.glade:4215
#, fuzzy
msgid "Select file to upload to GNUnet"
msgstr "# Client Trace-Anfragen empfangen"
-#: gnunet-gtk.glade:4236
+#: gnunet-gtk.glade:4243
#, fuzzy
msgid "Cancel selecting file to upload"
msgstr "# Client Trace-Anfragen empfangen"
-#: gnunet-gtk.glade:4250
+#: gnunet-gtk.glade:4257
msgid "Select this file (or directory) for the upload"
msgstr ""
-#: gnunet-gtk.glade:4275
+#: gnunet-gtk.glade:4282
#, fuzzy
msgid "Create Namespace"
msgstr "das Rating eines Namespaces setzen"
-#: gnunet-gtk.glade:4304
+#: gnunet-gtk.glade:4311
msgid ""
"Confirm the specified data. Creates the namespace and publishes the "
"advertisements."
msgstr ""
-#: gnunet-gtk.glade:4319
+#: gnunet-gtk.glade:4326
msgid "Cancel namespace creation."
msgstr ""
-#: gnunet-gtk.glade:4342
+#: gnunet-gtk.glade:4349
#, fuzzy
msgid "Please provide information about the namespace"
msgstr "Informationen �ber andere GNUnet Knoten ausgeben."
-#: gnunet-gtk.glade:4373
+#: gnunet-gtk.glade:4380
#, fuzzy
msgid "_Name:"
msgstr "_Datei"
-#: gnunet-gtk.glade:4399
+#: gnunet-gtk.glade:4406
msgid ""
"Each namespace is supposed to have a name. While GNUnet cannot guarantee "
"that these names are unique, users should try to select names that are "
"unlikely to conflict and that correspond to the contents of the namespace."
msgstr ""
-#: gnunet-gtk.glade:4419
+#: gnunet-gtk.glade:4426
msgid "_Root"
msgstr ""
-#: gnunet-gtk.glade:4446
+#: gnunet-gtk.glade:4453
msgid ""
"The namespace root is the file or directory in the namespace that will be "
"advertised to other users. Typically it contains a directory with the "
@@ -871,12 +871,12 @@
"the root."
msgstr ""
-#: gnunet-gtk.glade:4479
+#: gnunet-gtk.glade:4486
#, fuzzy
msgid "Anonymity (for namespace advertisement):"
msgstr "Namespace Eintrag '%s' erstellt\n"
-#: gnunet-gtk.glade:4564
+#: gnunet-gtk.glade:4571
#, fuzzy
msgid ""
"Enter a keyword under which advertisements for this namespace will be "
@@ -885,7 +885,7 @@
"Keine Bekanntmachung f�r diesen Namespace erstellen (zu verwenden, wenn ein "
"neues Pseudonym erstellt wird)"
-#: gnunet-gtk.glade:4585
+#: gnunet-gtk.glade:4592
#, fuzzy
msgid ""
"Add the given keyword to the list of keywords under which advertisements for "
@@ -894,63 +894,63 @@
"Keine Bekanntmachung f�r diesen Namespace erstellen (zu verwenden, wenn ein "
"neues Pseudonym erstellt wird)"
-#: gnunet-gtk.glade:4643 src/plugins/fs/extensions/musicinsert.c:225
+#: gnunet-gtk.glade:4650 src/plugins/fs/extensions/musicinsert.c:225
msgid "Keywords"
msgstr ""
-#: gnunet-gtk.glade:4745
+#: gnunet-gtk.glade:4752
msgid "Enter meta-data (descriptions) for this namespace"
msgstr ""
-#: gnunet-gtk.glade:4766
+#: gnunet-gtk.glade:4773
msgid "Add the given metadata entry to the metadata for this namespace."
msgstr ""
-#: gnunet-gtk.glade:4807
+#: gnunet-gtk.glade:4814
msgid ""
"Metadata describing the namespace (used in advertisements). Use the context "
"menu (right-click) to delete selected entries."
msgstr ""
-#: gnunet-gtk.glade:4824
+#: gnunet-gtk.glade:4831
msgid "Metadata"
msgstr ""
-#: gnunet-gtk.glade:4860
+#: gnunet-gtk.glade:4867
msgid "Close the selected search"
msgstr ""
-#: gnunet-gtk.glade:4861
+#: gnunet-gtk.glade:4868
#, fuzzy
msgid "_Close"
msgstr "Kollabieren"
-#: gnunet-gtk.glade:4897
+#: gnunet-gtk.glade:4904
#, fuzzy
msgid "Messages"
msgstr "Nachrichtengr��e"
-#: gnunet-gtk.glade:5047
+#: gnunet-gtk.glade:5054
msgid "Please provide meta-data and an identifier for the content."
msgstr ""
-#: gnunet-gtk.glade:5078 gnunet-gtk.glade:5658
+#: gnunet-gtk.glade:5085 gnunet-gtk.glade:5665
msgid "_Identifier:"
msgstr "_Identifizierer:"
-#: gnunet-gtk.glade:5126 gnunet-gtk.glade:5706
+#: gnunet-gtk.glade:5133 gnunet-gtk.glade:5713
msgid "Anonymit_y:"
msgstr "Anon_ymit�t:"
-#: gnunet-gtk.glade:5185
+#: gnunet-gtk.glade:5192
msgid "_Next Identifier:"
msgstr "_N�chster Identifizierer:"
-#: gnunet-gtk.glade:5233 gnunet-gtk.glade:5765
+#: gnunet-gtk.glade:5240 gnunet-gtk.glade:5772
msgid "_Update Interval:"
msgstr "Akt_ualisierungs Intervall:"
-#: gnunet-gtk.glade:5259 gnunet-gtk.glade:5791
+#: gnunet-gtk.glade:5266 gnunet-gtk.glade:5798
msgid ""
"--no update--\n"
"--sporadic update--\n"
@@ -961,54 +961,54 @@
"1 year\n"
msgstr ""
-#: gnunet-gtk.glade:5560
+#: gnunet-gtk.glade:5567
#, fuzzy
msgid "Edit Collection Information"
msgstr "Volle Ansicht"
-#: gnunet-gtk.glade:5627
+#: gnunet-gtk.glade:5634
msgid "Please provide meta-data and an identifier for the collection."
msgstr ""
-#: src/plugins/fs/search.c:76 src/plugins/fs/namespace.c:294
+#: src/plugins/fs/search.c:76 src/plugins/fs/namespace.c:296
msgid "unknown"
msgstr "unbekannt"
-#: src/plugins/fs/search.c:100 src/plugins/fs/namespace.c:198
-#: src/plugins/fs/namespace.c:278
+#: src/plugins/fs/search.c:100 src/plugins/fs/namespace.c:200
+#: src/plugins/fs/namespace.c:280
msgid "no name given"
msgstr ""
-#: src/plugins/fs/search.c:403 src/plugins/fs/download.c:474
+#: src/plugins/fs/search.c:406 src/plugins/fs/download.c:474
msgid "Name"
msgstr "Name"
-#: src/plugins/fs/search.c:410 src/plugins/fs/download.c:482
+#: src/plugins/fs/search.c:413 src/plugins/fs/download.c:482
msgid "Size"
msgstr "Gr��e"
-#: src/plugins/fs/search.c:417 src/plugins/fs/namespace.c:113
+#: src/plugins/fs/search.c:420 src/plugins/fs/namespace.c:115
msgid "Mime-type"
msgstr "Mimetyp"
-#: src/plugins/fs/search.c:431
+#: src/plugins/fs/search.c:434
msgid "Preview"
msgstr "Vorschau"
-#: src/plugins/fs/search.c:494 src/plugins/fs/search.c:637
+#: src/plugins/fs/search.c:497 src/plugins/fs/search.c:640
msgid "globally"
msgstr "global"
-#: src/plugins/fs/search.c:512
+#: src/plugins/fs/search.c:515
#, fuzzy, c-format
msgid "Failed to create namespace URI from '%s'.\n"
msgstr "Fehler beim Parsen der Ger�tedaten von '%s' bei %s:%d.\n"
-#: src/plugins/fs/search.c:769
+#: src/plugins/fs/search.c:772
msgid "Query"
msgstr "Anfrage"
-#: src/plugins/fs/search.c:776
+#: src/plugins/fs/search.c:779
msgid "Results"
msgstr "Ergebnisse"
@@ -1059,8 +1059,8 @@
"will store download under its GNUnet URI '%s' instead.\n"
msgstr ""
-#: src/plugins/fs/download.c:489 src/plugins/fs/upload.c:772
-#: src/plugins/fs/namespace.c:1007
+#: src/plugins/fs/download.c:489 src/plugins/fs/upload.c:490
+#: src/plugins/fs/namespace.c:856
msgid "URI"
msgstr "URI"
@@ -1121,96 +1121,102 @@
msgid "Choose files to insert..."
msgstr ""
-#: src/plugins/fs/upload.c:434 src/plugins/fs/collection.c:124
-#: src/plugins/fs/namespace.c:502 src/plugins/fs/namespace.c:883
-msgid "Category"
+#: src/plugins/fs/upload.c:432
+msgid "Choose the file or directory you want to publish."
msgstr ""
-#: src/plugins/fs/upload.c:441 src/plugins/fs/collection.c:131
-#: src/plugins/fs/namespace.c:509 src/plugins/fs/namespace.c:890
-msgid "Value"
+#: src/plugins/fs/upload.c:482 src/plugins/fs/namespace.c:94
+#: src/plugins/fs/namespace.c:842
+#, fuzzy
+msgid "Filename"
+msgstr "_Datei"
+
+#: src/plugins/fs/collection.c:81 src/plugins/fs/namespace.c:728
+msgid "--sporadic update--"
msgstr ""
-#: src/plugins/fs/upload.c:457 src/plugins/fs/namespace.c:523
-msgid "Keyword"
+#: src/plugins/fs/collection.c:84 src/plugins/fs/namespace.c:731
+msgid "--no update--"
msgstr ""
-#: src/plugins/fs/upload.c:714
-msgid "Choose the file or directory you want to publish."
+#: src/plugins/fs/collection.c:97 src/plugins/fs/namespace.c:744
+msgid "Failed to parse given time interval!"
msgstr ""
-#: src/plugins/fs/upload.c:764 src/plugins/fs/namespace.c:92
-#: src/plugins/fs/namespace.c:993
-#, fuzzy
-msgid "Filename"
-msgstr "_Datei"
-
-#: src/plugins/fs/collection.c:218
+#: src/plugins/fs/collection.c:132
#, fuzzy, c-format
msgid "Failed to start collection '%s' (consult logs)."
msgstr "Fehler beim Starten der Collection.\n"
-#: src/plugins/fs/collection.c:242
+#: src/plugins/fs/collection.c:156
#, fuzzy
msgid "Collection stopped.\n"
msgstr "Cron angehalten\n"
-#: src/plugins/fs/collection.c:245
+#: src/plugins/fs/collection.c:159
#, fuzzy
msgid "Failed to stop collection (consult logs).\n"
msgstr "Fehler beim Beenden der Collection (nicht aktiv?).\n"
-#: src/plugins/fs/namespace.c:99 src/plugins/fs/namespace.c:1000
+#: src/plugins/fs/namespace.c:101 src/plugins/fs/namespace.c:849
msgid "Filesize"
msgstr "Dateigr��e"
-#: src/plugins/fs/namespace.c:106 src/plugins/daemon/daemon.c:238
+#: src/plugins/fs/namespace.c:108 src/plugins/daemon/daemon.c:238
msgid "Description"
msgstr "Beschreibung"
-#: src/plugins/fs/namespace.c:120
+#: src/plugins/fs/namespace.c:122
msgid "Last ID"
msgstr ""
-#: src/plugins/fs/namespace.c:127
+#: src/plugins/fs/namespace.c:129
#, fuzzy
msgid "Next ID"
msgstr "Weiter"
-#: src/plugins/fs/namespace.c:136
+#: src/plugins/fs/namespace.c:138
msgid "Publication Frequency"
msgstr ""
-#: src/plugins/fs/namespace.c:143
+#: src/plugins/fs/namespace.c:145
msgid "Next Publication Date"
msgstr ""
-#: src/plugins/fs/namespace.c:641
+#: src/plugins/fs/namespace.c:467
#, c-format
msgid ""
"Failed to create namespace '%s'.Consult logs, most likely error is that a "
"namespace with that name already exists."
msgstr ""
-#: src/plugins/fs/namespace.c:680
+#: src/plugins/fs/namespace.c:506
msgid "No local namespaces available that could be deleted!"
msgstr ""
-#: src/plugins/fs/namespace.c:709
+#: src/plugins/fs/namespace.c:535
#, c-format
msgid "Should the namespace '%s' really be deleted?"
msgstr ""
-#: src/plugins/fs/namespace.c:802
+#: src/plugins/fs/namespace.c:627
#, fuzzy
msgid "Failed to insert content into namespace (consult logs).\n"
msgstr "Fehler beim Starten der Collection.\n"
-#: src/plugins/fs/namespace.c:843
+#: src/plugins/fs/namespace.c:669
msgid "You must select some available content for publication first!"
msgstr ""
-#: src/plugins/fs/namespace.c:966
+#: src/plugins/fs/namespace.c:709
+msgid "Category"
+msgstr ""
+
+#: src/plugins/fs/namespace.c:716
+msgid "Value"
+msgstr ""
+
+#: src/plugins/fs/namespace.c:815
msgid "Not implemented!"
msgstr ""
@@ -1240,84 +1246,50 @@
msgid "Application"
msgstr "_Optionen"
-#: src/plugins/stats/functions.c:117
-msgid "# of connected peers"
-msgstr "# an verbundenen Knoten"
-
-#: src/plugins/stats/functions.c:131
-#, c-format
-msgid "% of allowed cpu load"
-msgstr ""
-
-#: src/plugins/stats/functions.c:155
-#, fuzzy
-msgid "# bytes decrypted"
-msgstr "# Bytes des Typs %d empfangen"
-
-#: src/plugins/stats/functions.c:161
-msgid "# bytes of noise received"
-msgstr "# Bytes Rauschen empfangen"
-
-#: src/plugins/stats/functions.c:168 src/plugins/stats/functions.c:181
-#: src/plugins/stats/functions.c:261
-#, c-format
-msgid "# bytes received of type %d"
-msgstr "# Bytes des Typs %d empfangen"
-
-#: src/plugins/stats/functions.c:235
-#, fuzzy
-msgid "# bytes encrypted"
-msgstr "# Bytes des Typs %d empfangen"
-
-#: src/plugins/stats/functions.c:241
-#, fuzzy
-msgid "# bytes noise sent"
-msgstr "# Bytes Rauschen empfangen"
-
-#: src/plugins/stats/functions.c:248
-#, c-format
-msgid "# bytes transmitted of type %d"
-msgstr "# Bytes des Typs %d �bertragen"
-
-#: src/plugins/stats/functions.c:346
+#: src/plugins/stats/functions.c:336
msgid "Connectivity"
msgstr ""
-#: src/plugins/stats/functions.c:347
+#: src/plugins/stats/functions.c:337
msgid "# connected nodes (100% = connection table size)"
msgstr ""
-#: src/plugins/stats/functions.c:354
+#: src/plugins/stats/functions.c:344
#, fuzzy
msgid "CPU load"
msgstr "_�ffnen"
-#: src/plugins/stats/functions.c:355
+#: src/plugins/stats/functions.c:345
msgid "CPU load (in percent of allowed load)"
msgstr ""
-#: src/plugins/stats/functions.c:362
+#: src/plugins/stats/functions.c:352
msgid "Inbound Traffic"
msgstr ""
-#: src/plugins/stats/functions.c:363 src/plugins/stats/functions.c:371
+#: src/plugins/stats/functions.c:353 src/plugins/stats/functions.c:361
msgid "Noise (red), Content (green), Queries (yellow), other (blue)"
msgstr ""
-#: src/plugins/stats/functions.c:370
+#: src/plugins/stats/functions.c:360
msgid "Outbound Traffic"
msgstr ""
-#: src/common/helper.c:273
+#: src/common/helper.c:279
#, fuzzy, c-format
msgid "Failed to find handler for '%s'\n"
msgstr "Fehler beim Aktualisieren der Daten des Moduls '%s'\n"
-#: src/common/helper.c:299
+#: src/common/helper.c:305
#, fuzzy, c-format
msgid "Failed to load plugin '%s'\n"
msgstr "Fehler beim Aktualisieren der Daten des Moduls '%s'\n"
+#: src/common/helper.c:387
+#, fuzzy, c-format
+msgid "Failed to open '%s'.\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls '%s'\n"
+
#: src/core/main.c:43
#, fuzzy
msgid "GNUnet GTK user interface."
@@ -1327,7 +1299,31 @@
msgid "Use --help to get a list of options.\n"
msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
+#~ msgid "# of connected peers"
+#~ msgstr "# an verbundenen Knoten"
+
#, fuzzy
+#~ msgid "# bytes decrypted"
+#~ msgstr "# Bytes des Typs %d empfangen"
+
+#~ msgid "# bytes of noise received"
+#~ msgstr "# Bytes Rauschen empfangen"
+
+#~ msgid "# bytes received of type %d"
+#~ msgstr "# Bytes des Typs %d empfangen"
+
+#, fuzzy
+#~ msgid "# bytes encrypted"
+#~ msgstr "# Bytes des Typs %d empfangen"
+
+#, fuzzy
+#~ msgid "# bytes noise sent"
+#~ msgstr "# Bytes Rauschen empfangen"
+
+#~ msgid "# bytes transmitted of type %d"
+#~ msgstr "# Bytes des Typs %d �bertragen"
+
+#, fuzzy
#~ msgid "Close"
#~ msgstr "Kollabieren"
Modified: gnunet-gtk/po/gnunet-gtk.pot
===================================================================
--- gnunet-gtk/po/gnunet-gtk.pot 2005-07-17 23:19:45 UTC (rev 1575)
+++ gnunet-gtk/po/gnunet-gtk.pot 2005-07-17 23:21:45 UTC (rev 1576)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-09 19:49+0200\n"
+"POT-Creation-Date: 2005-07-18 01:16+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -20,15 +20,15 @@
msgid "gnunet-gtk, GNU's Peer-to-Peer Network"
msgstr ""
-#: gnunet-gtk.glade:68
+#: gnunet-gtk.glade:69
msgid "Show credits"
msgstr ""
-#: gnunet-gtk.glade:87
+#: gnunet-gtk.glade:88
msgid "<span size=\"x-large\">Welcome to gnunet-gtk 0.7.0</span>"
msgstr ""
-#: gnunet-gtk.glade:119
+#: gnunet-gtk.glade:120
msgid ""
"\n"
" \n"
@@ -66,99 +66,99 @@
" The GNUnet Team"
msgstr ""
-#: gnunet-gtk.glade:200
+#: gnunet-gtk.glade:203
msgid "_Welcome"
msgstr ""
-#: gnunet-gtk.glade:275
+#: gnunet-gtk.glade:278
msgid "Try to start the GNUnet Daemon gnunetd on localhost"
msgstr ""
-#: gnunet-gtk.glade:319
+#: gnunet-gtk.glade:322
msgid "start gnunet_d"
msgstr ""
-#: gnunet-gtk.glade:355
+#: gnunet-gtk.glade:358
msgid "Stops the GNUnet daemon gnunetd"
msgstr ""
-#: gnunet-gtk.glade:399
+#: gnunet-gtk.glade:402
msgid "sto_p gnunetd"
msgstr ""
-#: gnunet-gtk.glade:472
+#: gnunet-gtk.glade:475
msgid "<b>gnunetd control</b>"
msgstr ""
-#: gnunet-gtk.glade:534
+#: gnunet-gtk.glade:537
msgid "<b>Available Applications</b>"
msgstr ""
-#: gnunet-gtk.glade:600
+#: gnunet-gtk.glade:603
msgid "_General"
msgstr ""
-#: gnunet-gtk.glade:677
+#: gnunet-gtk.glade:682
msgid "<b>Search Overview</b>"
msgstr ""
-#: gnunet-gtk.glade:757
+#: gnunet-gtk.glade:762
msgid "Cancel the selected download"
msgstr ""
-#: gnunet-gtk.glade:776
+#: gnunet-gtk.glade:781
msgid "Clear completed downloads from the download list"
msgstr ""
-#: gnunet-gtk.glade:804
+#: gnunet-gtk.glade:809
msgid "<b>Downloads</b>"
msgstr ""
-#: gnunet-gtk.glade:866
+#: gnunet-gtk.glade:871
msgid "<b>Uploads</b>"
msgstr ""
-#: gnunet-gtk.glade:925
+#: gnunet-gtk.glade:932
msgid "Stat_us"
msgstr ""
-#: gnunet-gtk.glade:968 gnunet-gtk.glade:2895 gnunet-gtk.glade:4537
+#: gnunet-gtk.glade:975 gnunet-gtk.glade:2902 gnunet-gtk.glade:4544
msgid "_Keyword:"
msgstr ""
-#: gnunet-gtk.glade:1028
+#: gnunet-gtk.glade:1035
msgid ""
"Search GNUnet for content under the specified keyword (and, if applicable, "
"restrict the search to the given namespace)"
msgstr ""
-#: gnunet-gtk.glade:1073
+#: gnunet-gtk.glade:1080
msgid "Sea_rch"
msgstr ""
-#: gnunet-gtk.glade:1109
+#: gnunet-gtk.glade:1116
msgid "in _namespace"
msgstr ""
-#: gnunet-gtk.glade:1164 gnunet-gtk.glade:1486
+#: gnunet-gtk.glade:1171 gnunet-gtk.glade:1493
msgid "_Anonymity:"
msgstr ""
-#: gnunet-gtk.glade:1191
+#: gnunet-gtk.glade:1198
msgid ""
"Specify the anonymity level for the search, 0 for no anonymity. Higher "
"values provide more privacy but also less performance."
msgstr ""
-#: gnunet-gtk.glade:1309
+#: gnunet-gtk.glade:1316
msgid "_Download"
msgstr ""
-#: gnunet-gtk.glade:1355
+#: gnunet-gtk.glade:1362
msgid "Method:"
msgstr ""
-#: gnunet-gtk.glade:1385
+#: gnunet-gtk.glade:1392
msgid ""
"Indexing will avoid copying the file into the GNUnet database. Instead, "
"GNUnet will try to add a symbolic link to the specified file. If that "
@@ -168,11 +168,11 @@
"efficient than insertion."
msgstr ""
-#: gnunet-gtk.glade:1387
+#: gnunet-gtk.glade:1394
msgid "inde_x"
msgstr ""
-#: gnunet-gtk.glade:1409
+#: gnunet-gtk.glade:1416
msgid ""
"Inserting a file means that an encrypted copy will be added to the GNUnet "
"database. Without the proper key (which is not stored in plaintext "
@@ -182,43 +182,43 @@
"(after compromising your machine)."
msgstr ""
-#: gnunet-gtk.glade:1411
+#: gnunet-gtk.glade:1418
msgid "i_nsert"
msgstr ""
-#: gnunet-gtk.glade:1433
+#: gnunet-gtk.glade:1440
msgid "Scope:"
msgstr ""
-#: gnunet-gtk.glade:1463
+#: gnunet-gtk.glade:1470
msgid "only insert a single file"
msgstr ""
-#: gnunet-gtk.glade:1465
+#: gnunet-gtk.glade:1472
msgid "file onl_y"
msgstr ""
-#: gnunet-gtk.glade:1515
+#: gnunet-gtk.glade:1522
msgid "_Filename:"
msgstr ""
-#: gnunet-gtk.glade:1544
+#: gnunet-gtk.glade:1551
msgid "Browse local computer for files (or directories) to upload."
msgstr ""
-#: gnunet-gtk.glade:1588
+#: gnunet-gtk.glade:1595
msgid "_Browse"
msgstr ""
-#: gnunet-gtk.glade:1662
+#: gnunet-gtk.glade:1669
msgid "Recursively insert an entire directory tree"
msgstr ""
-#: gnunet-gtk.glade:1664
+#: gnunet-gtk.glade:1671
msgid "_recursive (for entire directories)"
msgstr ""
-#: gnunet-gtk.glade:1687
+#: gnunet-gtk.glade:1694
msgid ""
"What level of sender-anonymity is desired when sharing this particular "
"file? 0 allows direct connections (no anonymity). Higher levels require "
@@ -226,270 +226,270 @@
"privacy at the expense of efficiency."
msgstr ""
-#: gnunet-gtk.glade:1710
+#: gnunet-gtk.glade:1717
msgid ""
"Upload the specified file with the selected options (you will then be "
"prompted to enter meta-data and keywords)."
msgstr ""
-#: gnunet-gtk.glade:1754
+#: gnunet-gtk.glade:1761
msgid "Up_load"
msgstr ""
-#: gnunet-gtk.glade:1831
+#: gnunet-gtk.glade:1838
msgid "U_pload"
msgstr ""
-#: gnunet-gtk.glade:1872
+#: gnunet-gtk.glade:1879
msgid "c_reate"
msgstr ""
-#: gnunet-gtk.glade:1893 gnunet-gtk.glade:1946
+#: gnunet-gtk.glade:1900 gnunet-gtk.glade:1953
msgid "_Namespace"
msgstr ""
-#: gnunet-gtk.glade:1902
+#: gnunet-gtk.glade:1909
msgid "_Directory"
msgstr ""
-#: gnunet-gtk.glade:1911 gnunet-gtk.glade:1956
+#: gnunet-gtk.glade:1918 gnunet-gtk.glade:1963
msgid "_Collection"
msgstr ""
-#: gnunet-gtk.glade:1924
+#: gnunet-gtk.glade:1931
msgid "d_elete"
msgstr ""
-#: gnunet-gtk.glade:1945
+#: gnunet-gtk.glade:1952
msgid ""
"Will prevent future insertions into the namespace (will not delete content "
"in the namespace)"
msgstr ""
-#: gnunet-gtk.glade:1955
+#: gnunet-gtk.glade:1962
msgid "end collection (will not delete content already in the collection)"
msgstr ""
-#: gnunet-gtk.glade:2087
+#: gnunet-gtk.glade:2094
msgid "<b>Available Content</b>"
msgstr ""
-#: gnunet-gtk.glade:2146
+#: gnunet-gtk.glade:2153
msgid "Ad_vanced"
msgstr ""
-#: gnunet-gtk.glade:2204
+#: gnunet-gtk.glade:2211
msgid "File s_haring"
msgstr ""
-#: gnunet-gtk.glade:2316
+#: gnunet-gtk.glade:2323
msgid "_Statistics"
msgstr ""
-#: gnunet-gtk.glade:2450
+#: gnunet-gtk.glade:2457
msgid "/join #gnunet"
msgstr ""
-#: gnunet-gtk.glade:2535
+#: gnunet-gtk.glade:2542
msgid "Cha_t"
msgstr ""
-#: gnunet-gtk.glade:2588 gnunet-gtk.glade:2603 gnunet-gtk.glade:4980
+#: gnunet-gtk.glade:2595 gnunet-gtk.glade:2610 gnunet-gtk.glade:4987
msgid "Edit File Information"
msgstr ""
-#: gnunet-gtk.glade:2604
+#: gnunet-gtk.glade:2611
msgid "This dialog is used to edit information about shared files."
msgstr ""
-#: gnunet-gtk.glade:2621 gnunet-gtk.glade:5009 gnunet-gtk.glade:5589
+#: gnunet-gtk.glade:2628 gnunet-gtk.glade:5016 gnunet-gtk.glade:5596
msgid ""
"Confirm the displayed meta-data and keywords and proceed with the upload."
msgstr ""
-#: gnunet-gtk.glade:2630
+#: gnunet-gtk.glade:2637
msgid "metaDataDialogCancelButton"
msgstr ""
-#: gnunet-gtk.glade:2631
+#: gnunet-gtk.glade:2638
msgid "Abort the upload operation."
msgstr ""
-#: gnunet-gtk.glade:2640 gnunet-gtk.glade:5024 gnunet-gtk.glade:5604
+#: gnunet-gtk.glade:2647 gnunet-gtk.glade:5031 gnunet-gtk.glade:5611
msgid "Cancel the upload."
msgstr ""
-#: gnunet-gtk.glade:2663
+#: gnunet-gtk.glade:2670
msgid "Please provide meta-data and keywords for the content."
msgstr ""
-#: gnunet-gtk.glade:2694 gnunet-gtk.glade:4679 gnunet-gtk.glade:5294
-#: gnunet-gtk.glade:5826
+#: gnunet-gtk.glade:2701 gnunet-gtk.glade:4686 gnunet-gtk.glade:5301
+#: gnunet-gtk.glade:5833
msgid "_Type:"
msgstr ""
-#: gnunet-gtk.glade:2748 gnunet-gtk.glade:4718 gnunet-gtk.glade:5348
-#: gnunet-gtk.glade:5880
+#: gnunet-gtk.glade:2755 gnunet-gtk.glade:4725 gnunet-gtk.glade:5355
+#: gnunet-gtk.glade:5887
msgid "_Value:"
msgstr ""
-#: gnunet-gtk.glade:2775 gnunet-gtk.glade:5375 gnunet-gtk.glade:5907
+#: gnunet-gtk.glade:2782 gnunet-gtk.glade:5382 gnunet-gtk.glade:5914
msgid "Enter metadata about the upload"
msgstr ""
-#: gnunet-gtk.glade:2785
+#: gnunet-gtk.glade:2792
msgid "Value Entry"
msgstr ""
-#: gnunet-gtk.glade:2786
+#: gnunet-gtk.glade:2793
msgid ""
"Enter the value for the meta-data of the specified type here.\n"
"Press ENTER to add the data."
msgstr ""
-#: gnunet-gtk.glade:2801 gnunet-gtk.glade:5396 gnunet-gtk.glade:5928
+#: gnunet-gtk.glade:2808 gnunet-gtk.glade:5403 gnunet-gtk.glade:5935
msgid ""
"Add the given description to the meta-data describing the uploaded file."
msgstr ""
-#: gnunet-gtk.glade:2842 gnunet-gtk.glade:2987 gnunet-gtk.glade:4626
-#: gnunet-gtk.glade:5437 gnunet-gtk.glade:5969
+#: gnunet-gtk.glade:2849 gnunet-gtk.glade:2994 gnunet-gtk.glade:4633
+#: gnunet-gtk.glade:5444 gnunet-gtk.glade:5976
msgid ""
"Select entries and use the context menu (right click) in order to delete "
"keywords."
msgstr ""
-#: gnunet-gtk.glade:2859 gnunet-gtk.glade:5454 gnunet-gtk.glade:5986
+#: gnunet-gtk.glade:2866 gnunet-gtk.glade:5461 gnunet-gtk.glade:5993
msgid "<b>Meta-data</b>"
msgstr ""
-#: gnunet-gtk.glade:2922 gnunet-gtk.glade:5105 gnunet-gtk.glade:5212
-#: gnunet-gtk.glade:5685
+#: gnunet-gtk.glade:2929 gnunet-gtk.glade:5112 gnunet-gtk.glade:5219
+#: gnunet-gtk.glade:5692
msgid "Enter keywords"
msgstr ""
-#: gnunet-gtk.glade:2943
+#: gnunet-gtk.glade:2950
msgid ""
"Add the specified keyword to the list of keywords under which the file or "
"directory will be found."
msgstr ""
-#: gnunet-gtk.glade:2972
+#: gnunet-gtk.glade:2979
msgid "Lists all of the keywords that will be used."
msgstr ""
-#: gnunet-gtk.glade:3004
+#: gnunet-gtk.glade:3011
msgid "<b>Keywords</b>"
msgstr ""
-#: gnunet-gtk.glade:3040 gnunet-gtk.glade:5490
+#: gnunet-gtk.glade:3047 gnunet-gtk.glade:5497
msgid "_Preview:"
msgstr ""
-#: gnunet-gtk.glade:3109
+#: gnunet-gtk.glade:3116
msgid "File Information"
msgstr ""
-#: gnunet-gtk.glade:3194 src/plugins/fs/search.c:424
+#: gnunet-gtk.glade:3201 src/plugins/fs/search.c:427
msgid "Meta-data"
msgstr ""
-#: gnunet-gtk.glade:3225
+#: gnunet-gtk.glade:3232
msgid "Search Results"
msgstr ""
-#: gnunet-gtk.glade:3272
+#: gnunet-gtk.glade:3279
msgid ""
"List of search results. Directories must first be downloaded before their "
"contents will be displayed."
msgstr ""
-#: gnunet-gtk.glade:3301
+#: gnunet-gtk.glade:3308
msgid "Anon_ymity:"
msgstr ""
-#: gnunet-gtk.glade:3328
+#: gnunet-gtk.glade:3335
msgid ""
"Specify the desired anonymity level for this download. A value of 0 means no "
"receiver anonymity (allows direct connection). Use higher values for "
"increased privacy at the expense of performance."
msgstr ""
-#: gnunet-gtk.glade:3359
+#: gnunet-gtk.glade:3366
msgid "Download selected files."
msgstr ""
-#: gnunet-gtk.glade:3404
+#: gnunet-gtk.glade:3411
msgid "Down_load"
msgstr ""
-#: gnunet-gtk.glade:3440
+#: gnunet-gtk.glade:3447
msgid "Close this search."
msgstr ""
-#: gnunet-gtk.glade:3472
+#: gnunet-gtk.glade:3479
msgid "Namespace Contents"
msgstr ""
-#: gnunet-gtk.glade:3504
+#: gnunet-gtk.glade:3511
msgid ""
"List of the files and directories that have been added to this namespace so "
"far."
msgstr ""
-#: gnunet-gtk.glade:3532
+#: gnunet-gtk.glade:3539
msgid "Add additional files to this namespace."
msgstr ""
-#: gnunet-gtk.glade:3550
+#: gnunet-gtk.glade:3557
msgid "Publish an update to the selected updatable content."
msgstr ""
-#: gnunet-gtk.glade:3595
+#: gnunet-gtk.glade:3602
msgid "U_pdate"
msgstr ""
-#: gnunet-gtk.glade:3639
+#: gnunet-gtk.glade:3646
msgid "Chat"
msgstr ""
-#: gnunet-gtk.glade:3677
+#: gnunet-gtk.glade:3684
msgid "The current conversation in this chat room."
msgstr ""
-#: gnunet-gtk.glade:3716
+#: gnunet-gtk.glade:3723
msgid "Hello!"
msgstr ""
-#: gnunet-gtk.glade:3732
+#: gnunet-gtk.glade:3739
msgid "Sends the message to all participants in the current chat room."
msgstr ""
-#: gnunet-gtk.glade:3778
+#: gnunet-gtk.glade:3785
msgid "Sen_d"
msgstr ""
-#: gnunet-gtk.glade:3838
+#: gnunet-gtk.glade:3845
msgid "List of the participants in the chat room."
msgstr ""
-#: gnunet-gtk.glade:3863
+#: gnunet-gtk.glade:3870
msgid "The gnunet-gtk about dialog"
msgstr ""
-#: gnunet-gtk.glade:3865
+#: gnunet-gtk.glade:3872
msgid "gnunet-gtk"
msgstr ""
-#: gnunet-gtk.glade:3866
+#: gnunet-gtk.glade:3873
msgid "(C) 2001-2005 Christian Grothoff (and other contributing authors)"
msgstr ""
-#: gnunet-gtk.glade:3867
+#: gnunet-gtk.glade:3874
msgid "https://gnunet.org/";
msgstr ""
-#: gnunet-gtk.glade:3868
+#: gnunet-gtk.glade:3875
msgid ""
" GNU GENERAL PUBLIC LICENSE\n"
" Version 2, June 1991\n"
@@ -777,11 +777,11 @@
" END OF TERMS AND CONDITIONS\n"
msgstr ""
-#: gnunet-gtk.glade:4151
+#: gnunet-gtk.glade:4158
msgid "GNUnet Website"
msgstr ""
-#: gnunet-gtk.glade:4185
+#: gnunet-gtk.glade:4192
msgid ""
"Di Ma\n"
"Jens Palsberg <address@hidden>\n"
@@ -797,52 +797,52 @@
"Phan Vinh Thinh <address@hidden>\n"
msgstr ""
-#: gnunet-gtk.glade:4208
+#: gnunet-gtk.glade:4215
msgid "Select file to upload to GNUnet"
msgstr ""
-#: gnunet-gtk.glade:4236
+#: gnunet-gtk.glade:4243
msgid "Cancel selecting file to upload"
msgstr ""
-#: gnunet-gtk.glade:4250
+#: gnunet-gtk.glade:4257
msgid "Select this file (or directory) for the upload"
msgstr ""
-#: gnunet-gtk.glade:4275
+#: gnunet-gtk.glade:4282
msgid "Create Namespace"
msgstr ""
-#: gnunet-gtk.glade:4304
+#: gnunet-gtk.glade:4311
msgid ""
"Confirm the specified data. Creates the namespace and publishes the "
"advertisements."
msgstr ""
-#: gnunet-gtk.glade:4319
+#: gnunet-gtk.glade:4326
msgid "Cancel namespace creation."
msgstr ""
-#: gnunet-gtk.glade:4342
+#: gnunet-gtk.glade:4349
msgid "Please provide information about the namespace"
msgstr ""
-#: gnunet-gtk.glade:4373
+#: gnunet-gtk.glade:4380
msgid "_Name:"
msgstr ""
-#: gnunet-gtk.glade:4399
+#: gnunet-gtk.glade:4406
msgid ""
"Each namespace is supposed to have a name. While GNUnet cannot guarantee "
"that these names are unique, users should try to select names that are "
"unlikely to conflict and that correspond to the contents of the namespace."
msgstr ""
-#: gnunet-gtk.glade:4419
+#: gnunet-gtk.glade:4426
msgid "_Root"
msgstr ""
-#: gnunet-gtk.glade:4446
+#: gnunet-gtk.glade:4453
msgid ""
"The namespace root is the file or directory in the namespace that will be "
"advertised to other users. Typically it contains a directory with the "
@@ -850,77 +850,77 @@
"the root."
msgstr ""
-#: gnunet-gtk.glade:4479
+#: gnunet-gtk.glade:4486
msgid "Anonymity (for namespace advertisement):"
msgstr ""
-#: gnunet-gtk.glade:4564
+#: gnunet-gtk.glade:4571
msgid ""
"Enter a keyword under which advertisements for this namespace will be "
"published."
msgstr ""
-#: gnunet-gtk.glade:4585
+#: gnunet-gtk.glade:4592
msgid ""
"Add the given keyword to the list of keywords under which advertisements for "
"the namespace will be published."
msgstr ""
-#: gnunet-gtk.glade:4643 src/plugins/fs/extensions/musicinsert.c:225
+#: gnunet-gtk.glade:4650 src/plugins/fs/extensions/musicinsert.c:225
msgid "Keywords"
msgstr ""
-#: gnunet-gtk.glade:4745
+#: gnunet-gtk.glade:4752
msgid "Enter meta-data (descriptions) for this namespace"
msgstr ""
-#: gnunet-gtk.glade:4766
+#: gnunet-gtk.glade:4773
msgid "Add the given metadata entry to the metadata for this namespace."
msgstr ""
-#: gnunet-gtk.glade:4807
+#: gnunet-gtk.glade:4814
msgid ""
"Metadata describing the namespace (used in advertisements). Use the context "
"menu (right-click) to delete selected entries."
msgstr ""
-#: gnunet-gtk.glade:4824
+#: gnunet-gtk.glade:4831
msgid "Metadata"
msgstr ""
-#: gnunet-gtk.glade:4860
+#: gnunet-gtk.glade:4867
msgid "Close the selected search"
msgstr ""
-#: gnunet-gtk.glade:4861
+#: gnunet-gtk.glade:4868
msgid "_Close"
msgstr ""
-#: gnunet-gtk.glade:4897
+#: gnunet-gtk.glade:4904
msgid "Messages"
msgstr ""
-#: gnunet-gtk.glade:5047
+#: gnunet-gtk.glade:5054
msgid "Please provide meta-data and an identifier for the content."
msgstr ""
-#: gnunet-gtk.glade:5078 gnunet-gtk.glade:5658
+#: gnunet-gtk.glade:5085 gnunet-gtk.glade:5665
msgid "_Identifier:"
msgstr ""
-#: gnunet-gtk.glade:5126 gnunet-gtk.glade:5706
+#: gnunet-gtk.glade:5133 gnunet-gtk.glade:5713
msgid "Anonymit_y:"
msgstr ""
-#: gnunet-gtk.glade:5185
+#: gnunet-gtk.glade:5192
msgid "_Next Identifier:"
msgstr ""
-#: gnunet-gtk.glade:5233 gnunet-gtk.glade:5765
+#: gnunet-gtk.glade:5240 gnunet-gtk.glade:5772
msgid "_Update Interval:"
msgstr ""
-#: gnunet-gtk.glade:5259 gnunet-gtk.glade:5791
+#: gnunet-gtk.glade:5266 gnunet-gtk.glade:5798
msgid ""
"--no update--\n"
"--sporadic update--\n"
@@ -931,53 +931,53 @@
"1 year\n"
msgstr ""
-#: gnunet-gtk.glade:5560
+#: gnunet-gtk.glade:5567
msgid "Edit Collection Information"
msgstr ""
-#: gnunet-gtk.glade:5627
+#: gnunet-gtk.glade:5634
msgid "Please provide meta-data and an identifier for the collection."
msgstr ""
-#: src/plugins/fs/search.c:76 src/plugins/fs/namespace.c:294
+#: src/plugins/fs/search.c:76 src/plugins/fs/namespace.c:296
msgid "unknown"
msgstr ""
-#: src/plugins/fs/search.c:100 src/plugins/fs/namespace.c:198
-#: src/plugins/fs/namespace.c:278
+#: src/plugins/fs/search.c:100 src/plugins/fs/namespace.c:200
+#: src/plugins/fs/namespace.c:280
msgid "no name given"
msgstr ""
-#: src/plugins/fs/search.c:403 src/plugins/fs/download.c:474
+#: src/plugins/fs/search.c:406 src/plugins/fs/download.c:474
msgid "Name"
msgstr ""
-#: src/plugins/fs/search.c:410 src/plugins/fs/download.c:482
+#: src/plugins/fs/search.c:413 src/plugins/fs/download.c:482
msgid "Size"
msgstr ""
-#: src/plugins/fs/search.c:417 src/plugins/fs/namespace.c:113
+#: src/plugins/fs/search.c:420 src/plugins/fs/namespace.c:115
msgid "Mime-type"
msgstr ""
-#: src/plugins/fs/search.c:431
+#: src/plugins/fs/search.c:434
msgid "Preview"
msgstr ""
-#: src/plugins/fs/search.c:494 src/plugins/fs/search.c:637
+#: src/plugins/fs/search.c:497 src/plugins/fs/search.c:640
msgid "globally"
msgstr ""
-#: src/plugins/fs/search.c:512
+#: src/plugins/fs/search.c:515
#, c-format
msgid "Failed to create namespace URI from '%s'.\n"
msgstr ""
-#: src/plugins/fs/search.c:769
+#: src/plugins/fs/search.c:772
msgid "Query"
msgstr ""
-#: src/plugins/fs/search.c:776
+#: src/plugins/fs/search.c:779
msgid "Results"
msgstr ""
@@ -1026,8 +1026,8 @@
"will store download under its GNUnet URI '%s' instead.\n"
msgstr ""
-#: src/plugins/fs/download.c:489 src/plugins/fs/upload.c:772
-#: src/plugins/fs/namespace.c:1007
+#: src/plugins/fs/download.c:489 src/plugins/fs/upload.c:490
+#: src/plugins/fs/namespace.c:856
msgid "URI"
msgstr ""
@@ -1084,91 +1084,97 @@
msgid "Choose files to insert..."
msgstr ""
-#: src/plugins/fs/upload.c:434 src/plugins/fs/collection.c:124
-#: src/plugins/fs/namespace.c:502 src/plugins/fs/namespace.c:883
-msgid "Category"
+#: src/plugins/fs/upload.c:432
+msgid "Choose the file or directory you want to publish."
msgstr ""
-#: src/plugins/fs/upload.c:441 src/plugins/fs/collection.c:131
-#: src/plugins/fs/namespace.c:509 src/plugins/fs/namespace.c:890
-msgid "Value"
+#: src/plugins/fs/upload.c:482 src/plugins/fs/namespace.c:94
+#: src/plugins/fs/namespace.c:842
+msgid "Filename"
msgstr ""
-#: src/plugins/fs/upload.c:457 src/plugins/fs/namespace.c:523
-msgid "Keyword"
+#: src/plugins/fs/collection.c:81 src/plugins/fs/namespace.c:728
+msgid "--sporadic update--"
msgstr ""
-#: src/plugins/fs/upload.c:714
-msgid "Choose the file or directory you want to publish."
+#: src/plugins/fs/collection.c:84 src/plugins/fs/namespace.c:731
+msgid "--no update--"
msgstr ""
-#: src/plugins/fs/upload.c:764 src/plugins/fs/namespace.c:92
-#: src/plugins/fs/namespace.c:993
-msgid "Filename"
+#: src/plugins/fs/collection.c:97 src/plugins/fs/namespace.c:744
+msgid "Failed to parse given time interval!"
msgstr ""
-#: src/plugins/fs/collection.c:218
+#: src/plugins/fs/collection.c:132
#, c-format
msgid "Failed to start collection '%s' (consult logs)."
msgstr ""
-#: src/plugins/fs/collection.c:242
+#: src/plugins/fs/collection.c:156
msgid "Collection stopped.\n"
msgstr ""
-#: src/plugins/fs/collection.c:245
+#: src/plugins/fs/collection.c:159
msgid "Failed to stop collection (consult logs).\n"
msgstr ""
-#: src/plugins/fs/namespace.c:99 src/plugins/fs/namespace.c:1000
+#: src/plugins/fs/namespace.c:101 src/plugins/fs/namespace.c:849
msgid "Filesize"
msgstr ""
-#: src/plugins/fs/namespace.c:106 src/plugins/daemon/daemon.c:238
+#: src/plugins/fs/namespace.c:108 src/plugins/daemon/daemon.c:238
msgid "Description"
msgstr ""
-#: src/plugins/fs/namespace.c:120
+#: src/plugins/fs/namespace.c:122
msgid "Last ID"
msgstr ""
-#: src/plugins/fs/namespace.c:127
+#: src/plugins/fs/namespace.c:129
msgid "Next ID"
msgstr ""
-#: src/plugins/fs/namespace.c:136
+#: src/plugins/fs/namespace.c:138
msgid "Publication Frequency"
msgstr ""
-#: src/plugins/fs/namespace.c:143
+#: src/plugins/fs/namespace.c:145
msgid "Next Publication Date"
msgstr ""
-#: src/plugins/fs/namespace.c:641
+#: src/plugins/fs/namespace.c:467
#, c-format
msgid ""
"Failed to create namespace '%s'.Consult logs, most likely error is that a "
"namespace with that name already exists."
msgstr ""
-#: src/plugins/fs/namespace.c:680
+#: src/plugins/fs/namespace.c:506
msgid "No local namespaces available that could be deleted!"
msgstr ""
-#: src/plugins/fs/namespace.c:709
+#: src/plugins/fs/namespace.c:535
#, c-format
msgid "Should the namespace '%s' really be deleted?"
msgstr ""
-#: src/plugins/fs/namespace.c:802
+#: src/plugins/fs/namespace.c:627
msgid "Failed to insert content into namespace (consult logs).\n"
msgstr ""
-#: src/plugins/fs/namespace.c:843
+#: src/plugins/fs/namespace.c:669
msgid "You must select some available content for publication first!"
msgstr ""
-#: src/plugins/fs/namespace.c:966
+#: src/plugins/fs/namespace.c:709
+msgid "Category"
+msgstr ""
+
+#: src/plugins/fs/namespace.c:716
+msgid "Value"
+msgstr ""
+
+#: src/plugins/fs/namespace.c:815
msgid "Not implemented!"
msgstr ""
@@ -1196,80 +1202,49 @@
msgid "Application"
msgstr ""
-#: src/plugins/stats/functions.c:117
-msgid "# of connected peers"
-msgstr ""
-
-#: src/plugins/stats/functions.c:131
-#, c-format
-msgid "% of allowed cpu load"
-msgstr ""
-
-#: src/plugins/stats/functions.c:155
-msgid "# bytes decrypted"
-msgstr ""
-
-#: src/plugins/stats/functions.c:161
-msgid "# bytes of noise received"
-msgstr ""
-
-#: src/plugins/stats/functions.c:168 src/plugins/stats/functions.c:181
-#: src/plugins/stats/functions.c:261
-#, c-format
-msgid "# bytes received of type %d"
-msgstr ""
-
-#: src/plugins/stats/functions.c:235
-msgid "# bytes encrypted"
-msgstr ""
-
-#: src/plugins/stats/functions.c:241
-msgid "# bytes noise sent"
-msgstr ""
-
-#: src/plugins/stats/functions.c:248
-#, c-format
-msgid "# bytes transmitted of type %d"
-msgstr ""
-
-#: src/plugins/stats/functions.c:346
+#: src/plugins/stats/functions.c:336
msgid "Connectivity"
msgstr ""
-#: src/plugins/stats/functions.c:347
+#: src/plugins/stats/functions.c:337
msgid "# connected nodes (100% = connection table size)"
msgstr ""
-#: src/plugins/stats/functions.c:354
+#: src/plugins/stats/functions.c:344
msgid "CPU load"
msgstr ""
-#: src/plugins/stats/functions.c:355
+#: src/plugins/stats/functions.c:345
msgid "CPU load (in percent of allowed load)"
msgstr ""
-#: src/plugins/stats/functions.c:362
+#: src/plugins/stats/functions.c:352
msgid "Inbound Traffic"
msgstr ""
-#: src/plugins/stats/functions.c:363 src/plugins/stats/functions.c:371
+#: src/plugins/stats/functions.c:353 src/plugins/stats/functions.c:361
msgid "Noise (red), Content (green), Queries (yellow), other (blue)"
msgstr ""
-#: src/plugins/stats/functions.c:370
+#: src/plugins/stats/functions.c:360
msgid "Outbound Traffic"
msgstr ""
-#: src/common/helper.c:273
+#: src/common/helper.c:279
#, c-format
msgid "Failed to find handler for '%s'\n"
msgstr ""
-#: src/common/helper.c:299
+#: src/common/helper.c:305
#, c-format
msgid "Failed to load plugin '%s'\n"
msgstr ""
+#: src/common/helper.c:387
+#, c-format
+msgid "Failed to open '%s'.\n"
+msgstr ""
+
#: src/core/main.c:43
msgid "GNUnet GTK user interface."
msgstr ""
Modified: gnunet-gtk/po/rw.po
===================================================================
--- gnunet-gtk/po/rw.po 2005-07-17 23:19:45 UTC (rev 1575)
+++ gnunet-gtk/po/rw.po 2005-07-17 23:21:45 UTC (rev 1576)
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre0\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-09 19:49+0200\n"
+"POT-Creation-Date: 2005-07-18 01:16+0200\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"
@@ -28,15 +28,15 @@
msgid "gnunet-gtk, GNU's Peer-to-Peer Network"
msgstr ""
-#: gnunet-gtk.glade:68
+#: gnunet-gtk.glade:69
msgid "Show credits"
msgstr ""
-#: gnunet-gtk.glade:87
+#: gnunet-gtk.glade:88
msgid "<span size=\"x-large\">Welcome to gnunet-gtk 0.7.0</span>"
msgstr ""
-#: gnunet-gtk.glade:119
+#: gnunet-gtk.glade:120
msgid ""
"\n"
" \n"
@@ -74,106 +74,106 @@
" The GNUnet Team"
msgstr ""
-#: gnunet-gtk.glade:200
+#: gnunet-gtk.glade:203
msgid "_Welcome"
msgstr ""
-#: gnunet-gtk.glade:275
+#: gnunet-gtk.glade:278
msgid "Try to start the GNUnet Daemon gnunetd on localhost"
msgstr ""
-#: gnunet-gtk.glade:319
+#: gnunet-gtk.glade:322
#, fuzzy
msgid "start gnunet_d"
msgstr "i"
-#: gnunet-gtk.glade:355
+#: gnunet-gtk.glade:358
#, fuzzy
msgid "Stops the GNUnet daemon gnunetd"
msgstr "i"
-#: gnunet-gtk.glade:399
+#: gnunet-gtk.glade:402
msgid "sto_p gnunetd"
msgstr ""
-#: gnunet-gtk.glade:472
+#: gnunet-gtk.glade:475
msgid "<b>gnunetd control</b>"
msgstr ""
-#: gnunet-gtk.glade:534
+#: gnunet-gtk.glade:537
msgid "<b>Available Applications</b>"
msgstr ""
-#: gnunet-gtk.glade:600
+#: gnunet-gtk.glade:603
msgid "_General"
msgstr ""
-#: gnunet-gtk.glade:677
+#: gnunet-gtk.glade:682
msgid "<b>Search Overview</b>"
msgstr ""
-#: gnunet-gtk.glade:757
+#: gnunet-gtk.glade:762
msgid "Cancel the selected download"
msgstr ""
-#: gnunet-gtk.glade:776
+#: gnunet-gtk.glade:781
msgid "Clear completed downloads from the download list"
msgstr ""
-#: gnunet-gtk.glade:804
+#: gnunet-gtk.glade:809
#, fuzzy
msgid "<b>Downloads</b>"
msgstr "Iyimura"
-#: gnunet-gtk.glade:866
+#: gnunet-gtk.glade:871
#, fuzzy
msgid "<b>Uploads</b>"
msgstr "Ibirimo"
-#: gnunet-gtk.glade:925
+#: gnunet-gtk.glade:932
msgid "Stat_us"
msgstr ""
-#: gnunet-gtk.glade:968 gnunet-gtk.glade:2895 gnunet-gtk.glade:4537
+#: gnunet-gtk.glade:975 gnunet-gtk.glade:2902 gnunet-gtk.glade:4544
#, fuzzy
msgid "_Keyword:"
msgstr "Ijambo banze:"
-#: gnunet-gtk.glade:1028
+#: gnunet-gtk.glade:1035
msgid ""
"Search GNUnet for content under the specified keyword (and, if applicable, "
"restrict the search to the given namespace)"
msgstr ""
-#: gnunet-gtk.glade:1073
+#: gnunet-gtk.glade:1080
#, fuzzy
msgid "Sea_rch"
msgstr "Gushaka"
-#: gnunet-gtk.glade:1109
+#: gnunet-gtk.glade:1116
msgid "in _namespace"
msgstr ""
-#: gnunet-gtk.glade:1164 gnunet-gtk.glade:1486
+#: gnunet-gtk.glade:1171 gnunet-gtk.glade:1493
msgid "_Anonymity:"
msgstr ""
-#: gnunet-gtk.glade:1191
+#: gnunet-gtk.glade:1198
msgid ""
"Specify the anonymity level for the search, 0 for no anonymity. Higher "
"values provide more privacy but also less performance."
msgstr ""
-#: gnunet-gtk.glade:1309
+#: gnunet-gtk.glade:1316
#, fuzzy
msgid "_Download"
msgstr "Iyimura"
-#: gnunet-gtk.glade:1355
+#: gnunet-gtk.glade:1362
msgid "Method:"
msgstr ""
-#: gnunet-gtk.glade:1385
+#: gnunet-gtk.glade:1392
msgid ""
"Indexing will avoid copying the file into the GNUnet database. Instead, "
"GNUnet will try to add a symbolic link to the specified file. If that "
@@ -183,11 +183,11 @@
"efficient than insertion."
msgstr ""
-#: gnunet-gtk.glade:1387
+#: gnunet-gtk.glade:1394
msgid "inde_x"
msgstr ""
-#: gnunet-gtk.glade:1409
+#: gnunet-gtk.glade:1416
msgid ""
"Inserting a file means that an encrypted copy will be added to the GNUnet "
"database. Without the proper key (which is not stored in plaintext "
@@ -198,48 +198,48 @@
msgstr ""
# sw/source\ui\docvw\docvw.src:STR_REDLINE_INSERT.text
-#: gnunet-gtk.glade:1411
+#: gnunet-gtk.glade:1418
#, fuzzy
msgid "i_nsert"
msgstr "Byinjijwemo"
-#: gnunet-gtk.glade:1433
+#: gnunet-gtk.glade:1440
msgid "Scope:"
msgstr ""
-#: gnunet-gtk.glade:1463
+#: gnunet-gtk.glade:1470
#, fuzzy
msgid "only insert a single file"
msgstr "Kugenzura... i Idosiye"
-#: gnunet-gtk.glade:1465
+#: gnunet-gtk.glade:1472
msgid "file onl_y"
msgstr ""
-#: gnunet-gtk.glade:1515
+#: gnunet-gtk.glade:1522
#, fuzzy
msgid "_Filename:"
msgstr "Izina ry'idosiye"
-#: gnunet-gtk.glade:1544
+#: gnunet-gtk.glade:1551
#, fuzzy
msgid "Browse local computer for files (or directories) to upload."
msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
-#: gnunet-gtk.glade:1588
+#: gnunet-gtk.glade:1595
msgid "_Browse"
msgstr ""
-#: gnunet-gtk.glade:1662
+#: gnunet-gtk.glade:1669
#, fuzzy
msgid "Recursively insert an entire directory tree"
msgstr "Gusiba Byose Kongeramo Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
-#: gnunet-gtk.glade:1664
+#: gnunet-gtk.glade:1671
msgid "_recursive (for entire directories)"
msgstr ""
-#: gnunet-gtk.glade:1687
+#: gnunet-gtk.glade:1694
msgid ""
"What level of sender-anonymity is desired when sharing this particular "
"file? 0 allows direct connections (no anonymity). Higher levels require "
@@ -247,286 +247,286 @@
"privacy at the expense of efficiency."
msgstr ""
-#: gnunet-gtk.glade:1710
+#: gnunet-gtk.glade:1717
msgid ""
"Upload the specified file with the selected options (you will then be "
"prompted to enter meta-data and keywords)."
msgstr ""
-#: gnunet-gtk.glade:1754
+#: gnunet-gtk.glade:1761
#, fuzzy
msgid "Up_load"
msgstr "Ibirimo"
-#: gnunet-gtk.glade:1831
+#: gnunet-gtk.glade:1838
#, fuzzy
msgid "U_pload"
msgstr "Ibirimo"
-#: gnunet-gtk.glade:1872
+#: gnunet-gtk.glade:1879
msgid "c_reate"
msgstr ""
-#: gnunet-gtk.glade:1893 gnunet-gtk.glade:1946
+#: gnunet-gtk.glade:1900 gnunet-gtk.glade:1953
msgid "_Namespace"
msgstr ""
-#: gnunet-gtk.glade:1902
+#: gnunet-gtk.glade:1909
#, fuzzy
msgid "_Directory"
msgstr "Ububiko"
-#: gnunet-gtk.glade:1911 gnunet-gtk.glade:1956
+#: gnunet-gtk.glade:1918 gnunet-gtk.glade:1963
#, fuzzy
msgid "_Collection"
msgstr "Kyahagariswe"
-#: gnunet-gtk.glade:1924
+#: gnunet-gtk.glade:1931
#, fuzzy
msgid "d_elete"
msgstr "Cyasibwe"
-#: gnunet-gtk.glade:1945
+#: gnunet-gtk.glade:1952
msgid ""
"Will prevent future insertions into the namespace (will not delete content "
"in the namespace)"
msgstr ""
-#: gnunet-gtk.glade:1955
+#: gnunet-gtk.glade:1962
msgid "end collection (will not delete content already in the collection)"
msgstr ""
-#: gnunet-gtk.glade:2087
+#: gnunet-gtk.glade:2094
msgid "<b>Available Content</b>"
msgstr ""
-#: gnunet-gtk.glade:2146
+#: gnunet-gtk.glade:2153
msgid "Ad_vanced"
msgstr ""
-#: gnunet-gtk.glade:2204
+#: gnunet-gtk.glade:2211
msgid "File s_haring"
msgstr ""
-#: gnunet-gtk.glade:2316
+#: gnunet-gtk.glade:2323
#, fuzzy
msgid "_Statistics"
msgstr "Sitatisitiki"
-#: gnunet-gtk.glade:2450
+#: gnunet-gtk.glade:2457
msgid "/join #gnunet"
msgstr ""
-#: gnunet-gtk.glade:2535
+#: gnunet-gtk.glade:2542
msgid "Cha_t"
msgstr ""
-#: gnunet-gtk.glade:2588 gnunet-gtk.glade:2603 gnunet-gtk.glade:4980
+#: gnunet-gtk.glade:2595 gnunet-gtk.glade:2610 gnunet-gtk.glade:4987
msgid "Edit File Information"
msgstr ""
-#: gnunet-gtk.glade:2604
+#: gnunet-gtk.glade:2611
msgid "This dialog is used to edit information about shared files."
msgstr ""
-#: gnunet-gtk.glade:2621 gnunet-gtk.glade:5009 gnunet-gtk.glade:5589
+#: gnunet-gtk.glade:2628 gnunet-gtk.glade:5016 gnunet-gtk.glade:5596
msgid ""
"Confirm the displayed meta-data and keywords and proceed with the upload."
msgstr ""
-#: gnunet-gtk.glade:2630
+#: gnunet-gtk.glade:2637
msgid "metaDataDialogCancelButton"
msgstr ""
-#: gnunet-gtk.glade:2631
+#: gnunet-gtk.glade:2638
msgid "Abort the upload operation."
msgstr ""
-#: gnunet-gtk.glade:2640 gnunet-gtk.glade:5024 gnunet-gtk.glade:5604
+#: gnunet-gtk.glade:2647 gnunet-gtk.glade:5031 gnunet-gtk.glade:5611
msgid "Cancel the upload."
msgstr ""
-#: gnunet-gtk.glade:2663
+#: gnunet-gtk.glade:2670
msgid "Please provide meta-data and keywords for the content."
msgstr ""
-#: gnunet-gtk.glade:2694 gnunet-gtk.glade:4679 gnunet-gtk.glade:5294
-#: gnunet-gtk.glade:5826
+#: gnunet-gtk.glade:2701 gnunet-gtk.glade:4686 gnunet-gtk.glade:5301
+#: gnunet-gtk.glade:5833
msgid "_Type:"
msgstr ""
-#: gnunet-gtk.glade:2748 gnunet-gtk.glade:4718 gnunet-gtk.glade:5348
-#: gnunet-gtk.glade:5880
+#: gnunet-gtk.glade:2755 gnunet-gtk.glade:4725 gnunet-gtk.glade:5355
+#: gnunet-gtk.glade:5887
#, fuzzy
msgid "_Value:"
msgstr "Agaciro"
-#: gnunet-gtk.glade:2775 gnunet-gtk.glade:5375 gnunet-gtk.glade:5907
+#: gnunet-gtk.glade:2782 gnunet-gtk.glade:5382 gnunet-gtk.glade:5914
msgid "Enter metadata about the upload"
msgstr ""
-#: gnunet-gtk.glade:2785
+#: gnunet-gtk.glade:2792
#, fuzzy
msgid "Value Entry"
msgstr "Agaciro"
-#: gnunet-gtk.glade:2786
+#: gnunet-gtk.glade:2793
msgid ""
"Enter the value for the meta-data of the specified type here.\n"
"Press ENTER to add the data."
msgstr ""
-#: gnunet-gtk.glade:2801 gnunet-gtk.glade:5396 gnunet-gtk.glade:5928
+#: gnunet-gtk.glade:2808 gnunet-gtk.glade:5403 gnunet-gtk.glade:5935
msgid ""
"Add the given description to the meta-data describing the uploaded file."
msgstr ""
-#: gnunet-gtk.glade:2842 gnunet-gtk.glade:2987 gnunet-gtk.glade:4626
-#: gnunet-gtk.glade:5437 gnunet-gtk.glade:5969
+#: gnunet-gtk.glade:2849 gnunet-gtk.glade:2994 gnunet-gtk.glade:4633
+#: gnunet-gtk.glade:5444 gnunet-gtk.glade:5976
msgid ""
"Select entries and use the context menu (right click) in order to delete "
"keywords."
msgstr ""
-#: gnunet-gtk.glade:2859 gnunet-gtk.glade:5454 gnunet-gtk.glade:5986
+#: gnunet-gtk.glade:2866 gnunet-gtk.glade:5461 gnunet-gtk.glade:5993
msgid "<b>Meta-data</b>"
msgstr ""
-#: gnunet-gtk.glade:2922 gnunet-gtk.glade:5105 gnunet-gtk.glade:5212
-#: gnunet-gtk.glade:5685
+#: gnunet-gtk.glade:2929 gnunet-gtk.glade:5112 gnunet-gtk.glade:5219
+#: gnunet-gtk.glade:5692
#, fuzzy
msgid "Enter keywords"
msgstr "Ijambo- banze"
-#: gnunet-gtk.glade:2943
+#: gnunet-gtk.glade:2950
msgid ""
"Add the specified keyword to the list of keywords under which the file or "
"directory will be found."
msgstr ""
-#: gnunet-gtk.glade:2972
+#: gnunet-gtk.glade:2979
msgid "Lists all of the keywords that will be used."
msgstr ""
-#: gnunet-gtk.glade:3004
+#: gnunet-gtk.glade:3011
#, fuzzy
msgid "<b>Keywords</b>"
msgstr "Ijambo banze:"
-#: gnunet-gtk.glade:3040 gnunet-gtk.glade:5490
+#: gnunet-gtk.glade:3047 gnunet-gtk.glade:5497
msgid "_Preview:"
msgstr ""
-#: gnunet-gtk.glade:3109
+#: gnunet-gtk.glade:3116
msgid "File Information"
msgstr ""
-#: gnunet-gtk.glade:3194 src/plugins/fs/search.c:424
+#: gnunet-gtk.glade:3201 src/plugins/fs/search.c:427
msgid "Meta-data"
msgstr ""
-#: gnunet-gtk.glade:3225
+#: gnunet-gtk.glade:3232
#, fuzzy
msgid "Search Results"
msgstr "Gushaka"
-#: gnunet-gtk.glade:3272
+#: gnunet-gtk.glade:3279
msgid ""
"List of search results. Directories must first be downloaded before their "
"contents will be displayed."
msgstr ""
-#: gnunet-gtk.glade:3301
+#: gnunet-gtk.glade:3308
msgid "Anon_ymity:"
msgstr ""
-#: gnunet-gtk.glade:3328
+#: gnunet-gtk.glade:3335
msgid ""
"Specify the desired anonymity level for this download. A value of 0 means no "
"receiver anonymity (allows direct connection). Use higher values for "
"increased privacy at the expense of performance."
msgstr ""
-#: gnunet-gtk.glade:3359
+#: gnunet-gtk.glade:3366
#, fuzzy
msgid "Download selected files."
msgstr "/Byahiswemo"
-#: gnunet-gtk.glade:3404
+#: gnunet-gtk.glade:3411
#, fuzzy
msgid "Down_load"
msgstr "Iyimura"
-#: gnunet-gtk.glade:3440
+#: gnunet-gtk.glade:3447
msgid "Close this search."
msgstr ""
-#: gnunet-gtk.glade:3472
+#: gnunet-gtk.glade:3479
#, fuzzy
msgid "Namespace Contents"
msgstr "Ikiranga"
-#: gnunet-gtk.glade:3504
+#: gnunet-gtk.glade:3511
msgid ""
"List of the files and directories that have been added to this namespace so "
"far."
msgstr ""
-#: gnunet-gtk.glade:3532
+#: gnunet-gtk.glade:3539
msgid "Add additional files to this namespace."
msgstr ""
-#: gnunet-gtk.glade:3550
+#: gnunet-gtk.glade:3557
msgid "Publish an update to the selected updatable content."
msgstr ""
-#: gnunet-gtk.glade:3595
+#: gnunet-gtk.glade:3602
msgid "U_pdate"
msgstr ""
-#: gnunet-gtk.glade:3639
+#: gnunet-gtk.glade:3646
msgid "Chat"
msgstr ""
-#: gnunet-gtk.glade:3677
+#: gnunet-gtk.glade:3684
msgid "The current conversation in this chat room."
msgstr ""
# sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: gnunet-gtk.glade:3716
+#: gnunet-gtk.glade:3723
#, fuzzy
msgid "Hello!"
msgstr "/Kugoboka"
-#: gnunet-gtk.glade:3732
+#: gnunet-gtk.glade:3739
msgid "Sends the message to all participants in the current chat room."
msgstr ""
-#: gnunet-gtk.glade:3778
+#: gnunet-gtk.glade:3785
msgid "Sen_d"
msgstr ""
-#: gnunet-gtk.glade:3838
+#: gnunet-gtk.glade:3845
msgid "List of the participants in the chat room."
msgstr ""
-#: gnunet-gtk.glade:3863
+#: gnunet-gtk.glade:3870
msgid "The gnunet-gtk about dialog"
msgstr ""
-#: gnunet-gtk.glade:3865
+#: gnunet-gtk.glade:3872
msgid "gnunet-gtk"
msgstr ""
-#: gnunet-gtk.glade:3866
+#: gnunet-gtk.glade:3873
msgid "(C) 2001-2005 Christian Grothoff (and other contributing authors)"
msgstr ""
-#: gnunet-gtk.glade:3867
+#: gnunet-gtk.glade:3874
msgid "https://gnunet.org/";
msgstr ""
-#: gnunet-gtk.glade:3868
+#: gnunet-gtk.glade:3875
msgid ""
" GNU GENERAL PUBLIC LICENSE\n"
" Version 2, June 1991\n"
@@ -814,11 +814,11 @@
" END OF TERMS AND CONDITIONS\n"
msgstr ""
-#: gnunet-gtk.glade:4151
+#: gnunet-gtk.glade:4158
msgid "GNUnet Website"
msgstr ""
-#: gnunet-gtk.glade:4185
+#: gnunet-gtk.glade:4192
msgid ""
"Di Ma\n"
"Jens Palsberg <address@hidden>\n"
@@ -834,48 +834,48 @@
"Phan Vinh Thinh <address@hidden>\n"
msgstr ""
-#: gnunet-gtk.glade:4208
+#: gnunet-gtk.glade:4215
#, fuzzy
msgid "Select file to upload to GNUnet"
msgstr "#Umukiriya IDOSIYE"
-#: gnunet-gtk.glade:4236
+#: gnunet-gtk.glade:4243
#, fuzzy
msgid "Cancel selecting file to upload"
msgstr "#Umukiriya IDOSIYE"
-#: gnunet-gtk.glade:4250
+#: gnunet-gtk.glade:4257
#, fuzzy
msgid "Select this file (or directory) for the upload"
msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
-#: gnunet-gtk.glade:4275
+#: gnunet-gtk.glade:4282
#, fuzzy
msgid "Create Namespace"
msgstr "Ikiranga"
-#: gnunet-gtk.glade:4304
+#: gnunet-gtk.glade:4311
msgid ""
"Confirm the specified data. Creates the namespace and publishes the "
"advertisements."
msgstr ""
-#: gnunet-gtk.glade:4319
+#: gnunet-gtk.glade:4326
#, fuzzy
msgid "Cancel namespace creation."
msgstr "OYA bushyinguro"
-#: gnunet-gtk.glade:4342
+#: gnunet-gtk.glade:4349
#, fuzzy
msgid "Please provide information about the namespace"
msgstr "OYA Gushaka Meta Ibisobanuro Ibyerekeye Imyanyazina"
-#: gnunet-gtk.glade:4373
+#: gnunet-gtk.glade:4380
#, fuzzy
msgid "_Name:"
msgstr "Izina ry'idosiye"
-#: gnunet-gtk.glade:4399
+#: gnunet-gtk.glade:4406
msgid ""
"Each namespace is supposed to have a name. While GNUnet cannot guarantee "
"that these names are unique, users should try to select names that are "
@@ -883,12 +883,12 @@
msgstr ""
# 5214
-#: gnunet-gtk.glade:4419
+#: gnunet-gtk.glade:4426
#, fuzzy
msgid "_Root"
msgstr "Imizi"
-#: gnunet-gtk.glade:4446
+#: gnunet-gtk.glade:4453
msgid ""
"The namespace root is the file or directory in the namespace that will be "
"advertised to other users. Typically it contains a directory with the "
@@ -896,82 +896,82 @@
"the root."
msgstr ""
-#: gnunet-gtk.glade:4479
+#: gnunet-gtk.glade:4486
msgid "Anonymity (for namespace advertisement):"
msgstr ""
-#: gnunet-gtk.glade:4564
+#: gnunet-gtk.glade:4571
#, fuzzy
msgid ""
"Enter a keyword under which advertisements for this namespace will be "
"published."
msgstr "OYA kugirango iyi Gukoresha Ryari: a Gishya"
-#: gnunet-gtk.glade:4585
+#: gnunet-gtk.glade:4592
#, fuzzy
msgid ""
"Add the given keyword to the list of keywords under which advertisements for "
"the namespace will be published."
msgstr "OYA kugirango iyi Gukoresha Ryari: a Gishya"
-#: gnunet-gtk.glade:4643 src/plugins/fs/extensions/musicinsert.c:225
+#: gnunet-gtk.glade:4650 src/plugins/fs/extensions/musicinsert.c:225
#, fuzzy
msgid "Keywords"
msgstr "Ijambo banze:"
-#: gnunet-gtk.glade:4745
+#: gnunet-gtk.glade:4752
msgid "Enter meta-data (descriptions) for this namespace"
msgstr ""
-#: gnunet-gtk.glade:4766
+#: gnunet-gtk.glade:4773
msgid "Add the given metadata entry to the metadata for this namespace."
msgstr ""
-#: gnunet-gtk.glade:4807
+#: gnunet-gtk.glade:4814
msgid ""
"Metadata describing the namespace (used in advertisements). Use the context "
"menu (right-click) to delete selected entries."
msgstr ""
-#: gnunet-gtk.glade:4824
+#: gnunet-gtk.glade:4831
msgid "Metadata"
msgstr ""
-#: gnunet-gtk.glade:4860
+#: gnunet-gtk.glade:4867
msgid "Close the selected search"
msgstr ""
-#: gnunet-gtk.glade:4861
+#: gnunet-gtk.glade:4868
#, fuzzy
msgid "_Close"
msgstr "Gufunga"
-#: gnunet-gtk.glade:4897
+#: gnunet-gtk.glade:4904
msgid "Messages"
msgstr "ubutumwa"
-#: gnunet-gtk.glade:5047
+#: gnunet-gtk.glade:5054
msgid "Please provide meta-data and an identifier for the content."
msgstr ""
-#: gnunet-gtk.glade:5078 gnunet-gtk.glade:5658
+#: gnunet-gtk.glade:5085 gnunet-gtk.glade:5665
msgid "_Identifier:"
msgstr ""
-#: gnunet-gtk.glade:5126 gnunet-gtk.glade:5706
+#: gnunet-gtk.glade:5133 gnunet-gtk.glade:5713
msgid "Anonymit_y:"
msgstr ""
-#: gnunet-gtk.glade:5185
+#: gnunet-gtk.glade:5192
#, fuzzy
msgid "_Next Identifier:"
msgstr "Urufunguzo Ikiranga"
-#: gnunet-gtk.glade:5233 gnunet-gtk.glade:5765
+#: gnunet-gtk.glade:5240 gnunet-gtk.glade:5772
msgid "_Update Interval:"
msgstr ""
-#: gnunet-gtk.glade:5259 gnunet-gtk.glade:5791
+#: gnunet-gtk.glade:5266 gnunet-gtk.glade:5798
msgid ""
"--no update--\n"
"--sporadic update--\n"
@@ -982,55 +982,55 @@
"1 year\n"
msgstr ""
-#: gnunet-gtk.glade:5560
+#: gnunet-gtk.glade:5567
msgid "Edit Collection Information"
msgstr ""
-#: gnunet-gtk.glade:5627
+#: gnunet-gtk.glade:5634
msgid "Please provide meta-data and an identifier for the collection."
msgstr ""
-#: src/plugins/fs/search.c:76 src/plugins/fs/namespace.c:294
+#: src/plugins/fs/search.c:76 src/plugins/fs/namespace.c:296
msgid "unknown"
msgstr "itazwi"
-#: src/plugins/fs/search.c:100 src/plugins/fs/namespace.c:198
-#: src/plugins/fs/namespace.c:278
+#: src/plugins/fs/search.c:100 src/plugins/fs/namespace.c:200
+#: src/plugins/fs/namespace.c:280
msgid "no name given"
msgstr ""
-#: src/plugins/fs/search.c:403 src/plugins/fs/download.c:474
+#: src/plugins/fs/search.c:406 src/plugins/fs/download.c:474
msgid "Name"
msgstr ""
-#: src/plugins/fs/search.c:410 src/plugins/fs/download.c:482
+#: src/plugins/fs/search.c:413 src/plugins/fs/download.c:482
msgid "Size"
msgstr "Ingano"
# framework/source\classes\fltdlg.src:DLG_FILTER_SELECT.FT_DLG_MIMETYPE.text
-#: src/plugins/fs/search.c:417 src/plugins/fs/namespace.c:113
+#: src/plugins/fs/search.c:420 src/plugins/fs/namespace.c:115
#, fuzzy
msgid "Mime-type"
msgstr "Ubwoko bwa MIME:"
-#: src/plugins/fs/search.c:431
+#: src/plugins/fs/search.c:434
msgid "Preview"
msgstr ""
-#: src/plugins/fs/search.c:494 src/plugins/fs/search.c:637
+#: src/plugins/fs/search.c:497 src/plugins/fs/search.c:640
msgid "globally"
msgstr ""
-#: src/plugins/fs/search.c:512
+#: src/plugins/fs/search.c:515
#, fuzzy, c-format
msgid "Failed to create namespace URI from '%s'.\n"
msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
-#: src/plugins/fs/search.c:769
+#: src/plugins/fs/search.c:772
msgid "Query"
msgstr ""
-#: src/plugins/fs/search.c:776
+#: src/plugins/fs/search.c:779
msgid "Results"
msgstr ""
@@ -1081,8 +1081,8 @@
"will store download under its GNUnet URI '%s' instead.\n"
msgstr ""
-#: src/plugins/fs/download.c:489 src/plugins/fs/upload.c:772
-#: src/plugins/fs/namespace.c:1007
+#: src/plugins/fs/download.c:489 src/plugins/fs/upload.c:490
+#: src/plugins/fs/namespace.c:856
msgid "URI"
msgstr ""
@@ -1146,83 +1146,82 @@
msgid "Choose files to insert..."
msgstr "IDOSIYE Kuri Byinjijwemo"
-#: src/plugins/fs/upload.c:434 src/plugins/fs/collection.c:124
-#: src/plugins/fs/namespace.c:502 src/plugins/fs/namespace.c:883
-msgid "Category"
+#: src/plugins/fs/upload.c:432
+msgid "Choose the file or directory you want to publish."
msgstr ""
-#: src/plugins/fs/upload.c:441 src/plugins/fs/collection.c:131
-#: src/plugins/fs/namespace.c:509 src/plugins/fs/namespace.c:890
-msgid "Value"
-msgstr "Agaciro"
+#: src/plugins/fs/upload.c:482 src/plugins/fs/namespace.c:94
+#: src/plugins/fs/namespace.c:842
+msgid "Filename"
+msgstr "Izina ry'idosiye"
-#: src/plugins/fs/upload.c:457 src/plugins/fs/namespace.c:523
+#: src/plugins/fs/collection.c:81 src/plugins/fs/namespace.c:728
#, fuzzy
-msgid "Keyword"
-msgstr "Ijambo banze:"
+msgid "--sporadic update--"
+msgstr "--Oya Kuvugurura"
-#: src/plugins/fs/upload.c:714
-msgid "Choose the file or directory you want to publish."
+#: src/plugins/fs/collection.c:84 src/plugins/fs/namespace.c:731
+#, fuzzy
+msgid "--no update--"
+msgstr "--Oya Kuvugurura"
+
+#: src/plugins/fs/collection.c:97 src/plugins/fs/namespace.c:744
+msgid "Failed to parse given time interval!"
msgstr ""
-#: src/plugins/fs/upload.c:764 src/plugins/fs/namespace.c:92
-#: src/plugins/fs/namespace.c:993
-msgid "Filename"
-msgstr "Izina ry'idosiye"
-
-#: src/plugins/fs/collection.c:218
+#: src/plugins/fs/collection.c:132
#, fuzzy, c-format
msgid "Failed to start collection '%s' (consult logs)."
msgstr "Kuri Kwihuza Kuri"
-#: src/plugins/fs/collection.c:242
+#: src/plugins/fs/collection.c:156
#, fuzzy
msgid "Collection stopped.\n"
msgstr "Kyahagariswe"
-#: src/plugins/fs/collection.c:245
+#: src/plugins/fs/collection.c:159
#, fuzzy
msgid "Failed to stop collection (consult logs).\n"
msgstr "Kuri Kwihuza Kuri"
-#: src/plugins/fs/namespace.c:99 src/plugins/fs/namespace.c:1000
+#: src/plugins/fs/namespace.c:101 src/plugins/fs/namespace.c:849
#, fuzzy
msgid "Filesize"
msgstr "/Idosiye"
-#: src/plugins/fs/namespace.c:106 src/plugins/daemon/daemon.c:238
+#: src/plugins/fs/namespace.c:108 src/plugins/daemon/daemon.c:238
#, fuzzy
msgid "Description"
msgstr "Igaragaza Imiterere:"
-#: src/plugins/fs/namespace.c:120
+#: src/plugins/fs/namespace.c:122
msgid "Last ID"
msgstr ""
-#: src/plugins/fs/namespace.c:127
+#: src/plugins/fs/namespace.c:129
msgid "Next ID"
msgstr ""
-#: src/plugins/fs/namespace.c:136
+#: src/plugins/fs/namespace.c:138
msgid "Publication Frequency"
msgstr ""
-#: src/plugins/fs/namespace.c:143
+#: src/plugins/fs/namespace.c:145
msgid "Next Publication Date"
msgstr ""
-#: src/plugins/fs/namespace.c:641
+#: src/plugins/fs/namespace.c:467
#, c-format
msgid ""
"Failed to create namespace '%s'.Consult logs, most likely error is that a "
"namespace with that name already exists."
msgstr ""
-#: src/plugins/fs/namespace.c:680
+#: src/plugins/fs/namespace.c:506
msgid "No local namespaces available that could be deleted!"
msgstr ""
-#: src/plugins/fs/namespace.c:709
+#: src/plugins/fs/namespace.c:535
#, fuzzy, c-format
msgid "Should the namespace '%s' really be deleted?"
msgstr ""
@@ -1235,16 +1234,24 @@
"X- Generator: KBabel 1. 0\n"
"."
-#: src/plugins/fs/namespace.c:802
+#: src/plugins/fs/namespace.c:627
#, fuzzy
msgid "Failed to insert content into namespace (consult logs).\n"
msgstr "Kuri Kongeramo"
-#: src/plugins/fs/namespace.c:843
+#: src/plugins/fs/namespace.c:669
msgid "You must select some available content for publication first!"
msgstr ""
-#: src/plugins/fs/namespace.c:966
+#: src/plugins/fs/namespace.c:709
+msgid "Category"
+msgstr ""
+
+#: src/plugins/fs/namespace.c:716
+msgid "Value"
+msgstr "Agaciro"
+
+#: src/plugins/fs/namespace.c:815
msgid "Not implemented!"
msgstr ""
@@ -1275,89 +1282,53 @@
msgid "Application"
msgstr "Ikimenyetso"
-#: src/plugins/stats/functions.c:117
-#, fuzzy
-msgid "# of connected peers"
-msgstr "#Bya"
-
-#: src/plugins/stats/functions.c:131
-#, fuzzy, c-format
-msgid "% of allowed cpu load"
-msgstr "%Bya CPU Ibirimo"
-
-#: src/plugins/stats/functions.c:155
-#, fuzzy
-msgid "# bytes decrypted"
-msgstr "#Bayite"
-
-#: src/plugins/stats/functions.c:161
-#, fuzzy
-msgid "# bytes of noise received"
-msgstr "#Bayite Bya BYAKIRIWE"
-
-#: src/plugins/stats/functions.c:168 src/plugins/stats/functions.c:181
-#: src/plugins/stats/functions.c:261
-#, fuzzy, c-format
-msgid "# bytes received of type %d"
-msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-
-#: src/plugins/stats/functions.c:235
-#, fuzzy
-msgid "# bytes encrypted"
-msgstr "#Bayite"
-
-#: src/plugins/stats/functions.c:241
-#, fuzzy
-msgid "# bytes noise sent"
-msgstr "#Bayite Yoherejwe:"
-
-#: src/plugins/stats/functions.c:248
-#, fuzzy, c-format
-msgid "# bytes transmitted of type %d"
-msgstr "#Bayite Bya Ubwoko"
-
-#: src/plugins/stats/functions.c:346
+#: src/plugins/stats/functions.c:336
msgid "Connectivity"
msgstr ""
-#: src/plugins/stats/functions.c:347
+#: src/plugins/stats/functions.c:337
#, fuzzy
msgid "# connected nodes (100% = connection table size)"
msgstr "#100 Ukwihuza imbonerahamwe# Ingano"
-#: src/plugins/stats/functions.c:354
+#: src/plugins/stats/functions.c:344
#, fuzzy
msgid "CPU load"
msgstr "Ibirimo"
-#: src/plugins/stats/functions.c:355
+#: src/plugins/stats/functions.c:345
#, fuzzy
msgid "CPU load (in percent of allowed load)"
msgstr "Ibirimo in Ku ijana Bya Ibirimo"
-#: src/plugins/stats/functions.c:362
+#: src/plugins/stats/functions.c:352
msgid "Inbound Traffic"
msgstr ""
-#: src/plugins/stats/functions.c:363 src/plugins/stats/functions.c:371
+#: src/plugins/stats/functions.c:353 src/plugins/stats/functions.c:361
#, fuzzy
msgid "Noise (red), Content (green), Queries (yellow), other (blue)"
msgstr "Umutuku Icyatsi Umuhondo Ikindi Ubururu"
-#: src/plugins/stats/functions.c:370
+#: src/plugins/stats/functions.c:360
msgid "Outbound Traffic"
msgstr ""
-#: src/common/helper.c:273
+#: src/common/helper.c:279
#, fuzzy, c-format
msgid "Failed to find handler for '%s'\n"
msgstr "Kuri Kuvugurura Ibyatanzwe kugirango Modire"
-#: src/common/helper.c:299
+#: src/common/helper.c:305
#, fuzzy, c-format
msgid "Failed to load plugin '%s'\n"
msgstr "Kuri Ibikubiyemo"
+#: src/common/helper.c:387
+#, fuzzy, c-format
+msgid "Failed to open '%s'.\n"
+msgstr "Kuri Ibikubiyemo"
+
#: src/core/main.c:43
#, fuzzy
msgid "GNUnet GTK user interface."
@@ -1369,6 +1340,42 @@
msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
#, fuzzy
+#~ msgid "Keyword"
+#~ msgstr "Ijambo banze:"
+
+#, fuzzy
+#~ msgid "# of connected peers"
+#~ msgstr "#Bya"
+
+#, fuzzy
+#~ msgid "% of allowed cpu load"
+#~ msgstr "%Bya CPU Ibirimo"
+
+#, fuzzy
+#~ msgid "# bytes decrypted"
+#~ msgstr "#Bayite"
+
+#, fuzzy
+#~ msgid "# bytes of noise received"
+#~ msgstr "#Bayite Bya BYAKIRIWE"
+
+#, fuzzy
+#~ msgid "# bytes received of type %d"
+#~ msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+
+#, fuzzy
+#~ msgid "# bytes encrypted"
+#~ msgstr "#Bayite"
+
+#, fuzzy
+#~ msgid "# bytes noise sent"
+#~ msgstr "#Bayite Yoherejwe:"
+
+#, fuzzy
+#~ msgid "# bytes transmitted of type %d"
+#~ msgstr "#Bayite Bya Ubwoko"
+
+#, fuzzy
#~ msgid "Unavailable.\n"
#~ msgstr "Bihari"
@@ -4293,10 +4300,6 @@
#~ msgstr "kugirango i Komeza>> Kuvugurura Kuri iyi Ibikubiyemo"
#, fuzzy
-#~ msgid "--no update--"
-#~ msgstr "--Oya Kuvugurura"
-
-#, fuzzy
#~ msgid "Updateable SBlocks for pseudonym"
#~ msgstr "kugirango"
Modified: gnunet-gtk/po/vi.po
===================================================================
--- gnunet-gtk/po/vi.po 2005-07-17 23:19:45 UTC (rev 1575)
+++ gnunet-gtk/po/vi.po 2005-07-17 23:21:45 UTC (rev 1576)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gnunet-gtk 0.7.0pre4\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-09 19:49+0200\n"
+"POT-Creation-Date: 2005-07-18 01:16+0200\n"
"PO-Revision-Date: 2005-07-05 22:33+0400\n"
"Last-Translator: Phan Vinh Thinh <address@hidden>\n"
"Language-Team: Vietnamese <address@hidden>\n"
@@ -19,15 +19,15 @@
msgid "gnunet-gtk, GNU's Peer-to-Peer Network"
msgstr "gnunet-gtk, Mạng Peer-to-Peer của GNU"
-#: gnunet-gtk.glade:68
+#: gnunet-gtk.glade:69
msgid "Show credits"
msgstr "Hiển thị Lời cám ơn"
-#: gnunet-gtk.glade:87
+#: gnunet-gtk.glade:88
msgid "<span size=\"x-large\">Welcome to gnunet-gtk 0.7.0</span>"
msgstr "<span size=\"x-large\">Chào mừng tới gnunet-gtk 0.7.0</span>"
-#: gnunet-gtk.glade:119
+#: gnunet-gtk.glade:120
msgid ""
"\n"
" \n"
@@ -99,67 +99,67 @@
"\n"
" Nhóm phát triển GNUnet"
-#: gnunet-gtk.glade:200
+#: gnunet-gtk.glade:203
msgid "_Welcome"
msgstr "_Chào mừng"
-#: gnunet-gtk.glade:275
+#: gnunet-gtk.glade:278
msgid "Try to start the GNUnet Daemon gnunetd on localhost"
msgstr "Hãy thử chạy Daemon GNUnet gnunetd trên máy nội bộ localhost"
-#: gnunet-gtk.glade:319
+#: gnunet-gtk.glade:322
msgid "start gnunet_d"
msgstr "chạy gnunet_d"
-#: gnunet-gtk.glade:355
+#: gnunet-gtk.glade:358
msgid "Stops the GNUnet daemon gnunetd"
msgstr "Dừng daemon của GNUnet gnunetd"
-#: gnunet-gtk.glade:399
+#: gnunet-gtk.glade:402
msgid "sto_p gnunetd"
msgstr "dừn_g gnunetd"
-#: gnunet-gtk.glade:472
+#: gnunet-gtk.glade:475
msgid "<b>gnunetd control</b>"
msgstr "<b>điều khiển gnunetd</b>"
-#: gnunet-gtk.glade:534
+#: gnunet-gtk.glade:537
msgid "<b>Available Applications</b>"
msgstr "<b>Các ứng dụng có</b>"
-#: gnunet-gtk.glade:600
+#: gnunet-gtk.glade:603
msgid "_General"
msgstr "_Chung"
-#: gnunet-gtk.glade:677
+#: gnunet-gtk.glade:682
msgid "<b>Search Overview</b>"
msgstr "<b>Xem tổng quát Tìm kiếm</b>"
-#: gnunet-gtk.glade:757
+#: gnunet-gtk.glade:762
msgid "Cancel the selected download"
msgstr "Dừng các tải đã chọn"
-#: gnunet-gtk.glade:776
+#: gnunet-gtk.glade:781
msgid "Clear completed downloads from the download list"
msgstr "Xóa các công việc tải đã hoàn thảnh khỏi danh sách"
-#: gnunet-gtk.glade:804
+#: gnunet-gtk.glade:809
msgid "<b>Downloads</b>"
msgstr "<b>Tải xuống</b>"
-#: gnunet-gtk.glade:866
+#: gnunet-gtk.glade:871
msgid "<b>Uploads</b>"
msgstr "<b>Tải lên</b>"
-#: gnunet-gtk.glade:925
+#: gnunet-gtk.glade:932
msgid "Stat_us"
msgstr "Trạng thá_i"
-#: gnunet-gtk.glade:968 gnunet-gtk.glade:2895 gnunet-gtk.glade:4537
+#: gnunet-gtk.glade:975 gnunet-gtk.glade:2902 gnunet-gtk.glade:4544
msgid "_Keyword:"
msgstr "_Từ khóa:"
-#: gnunet-gtk.glade:1028
+#: gnunet-gtk.glade:1035
msgid ""
"Search GNUnet for content under the specified keyword (and, if applicable, "
"restrict the search to the given namespace)"
@@ -167,19 +167,19 @@
"Tìm kiếm nội dung theo từ khóa chỉ ra trong GNUnet (và, nếu có thể, giới hạn "
"tìm kiếm trong không gian tên đưa ra)"
-#: gnunet-gtk.glade:1073
+#: gnunet-gtk.glade:1080
msgid "Sea_rch"
msgstr "Tìm _kiếm"
-#: gnunet-gtk.glade:1109
+#: gnunet-gtk.glade:1116
msgid "in _namespace"
msgstr "trong không _gian tên"
-#: gnunet-gtk.glade:1164 gnunet-gtk.glade:1486
+#: gnunet-gtk.glade:1171 gnunet-gtk.glade:1493
msgid "_Anonymity:"
msgstr "_Giấu tên:"
-#: gnunet-gtk.glade:1191
+#: gnunet-gtk.glade:1198
msgid ""
"Specify the anonymity level for the search, 0 for no anonymity. Higher "
"values provide more privacy but also less performance."
@@ -187,15 +187,15 @@
"Chỉ ra mức độ giấu tên cho tìm kiếm, 0 để không giấu tên. Các giá trị cao "
"hơn tăng tính bảo mật nhưng làm giảm hiệu suất."
-#: gnunet-gtk.glade:1309
+#: gnunet-gtk.glade:1316
msgid "_Download"
msgstr "_Tải xuống"
-#: gnunet-gtk.glade:1355
+#: gnunet-gtk.glade:1362
msgid "Method:"
msgstr "Phương pháp:"
-#: gnunet-gtk.glade:1385
+#: gnunet-gtk.glade:1392
msgid ""
"Indexing will avoid copying the file into the GNUnet database. Instead, "
"GNUnet will try to add a symbolic link to the specified file. If that "
@@ -205,11 +205,11 @@
"efficient than insertion."
msgstr ""
-#: gnunet-gtk.glade:1387
+#: gnunet-gtk.glade:1394
msgid "inde_x"
msgstr "chỉ mụ_c"
-#: gnunet-gtk.glade:1409
+#: gnunet-gtk.glade:1416
msgid ""
"Inserting a file means that an encrypted copy will be added to the GNUnet "
"database. Without the proper key (which is not stored in plaintext "
@@ -219,43 +219,43 @@
"(after compromising your machine)."
msgstr ""
-#: gnunet-gtk.glade:1411
+#: gnunet-gtk.glade:1418
msgid "i_nsert"
msgstr "chè_n"
-#: gnunet-gtk.glade:1433
+#: gnunet-gtk.glade:1440
msgid "Scope:"
msgstr "Khu vực:"
-#: gnunet-gtk.glade:1463
+#: gnunet-gtk.glade:1470
msgid "only insert a single file"
msgstr "chỉ chèn một tập tin đơn"
-#: gnunet-gtk.glade:1465
+#: gnunet-gtk.glade:1472
msgid "file onl_y"
msgstr "chỉ tập ti_n"
-#: gnunet-gtk.glade:1515
+#: gnunet-gtk.glade:1522
msgid "_Filename:"
msgstr "_Tên tập tin:"
-#: gnunet-gtk.glade:1544
+#: gnunet-gtk.glade:1551
msgid "Browse local computer for files (or directories) to upload."
msgstr "Duyệt tìm tập tin (hoặc thư mục) trên máy nội bộ để tải lên."
-#: gnunet-gtk.glade:1588
+#: gnunet-gtk.glade:1595
msgid "_Browse"
msgstr "_Duyệt"
-#: gnunet-gtk.glade:1662
+#: gnunet-gtk.glade:1669
msgid "Recursively insert an entire directory tree"
msgstr "Chèn đệ quy toàn bộ một cây thư mục"
-#: gnunet-gtk.glade:1664
+#: gnunet-gtk.glade:1671
msgid "_recursive (for entire directories)"
msgstr "đệ _quy (cho toàn bộ thư mục)"
-#: gnunet-gtk.glade:1687
+#: gnunet-gtk.glade:1694
msgid ""
"What level of sender-anonymity is desired when sharing this particular "
"file? 0 allows direct connections (no anonymity). Higher levels require "
@@ -263,7 +263,7 @@
"privacy at the expense of efficiency."
msgstr ""
-#: gnunet-gtk.glade:1710
+#: gnunet-gtk.glade:1717
msgid ""
"Upload the specified file with the selected options (you will then be "
"prompted to enter meta-data and keywords)."
@@ -271,38 +271,38 @@
"Tải lên tập tin chỉ ra với các tùy chọn đã chọn (sẽ hỏi người dùng nhập dữ "
"liệu mêta và từ khóa)."
-#: gnunet-gtk.glade:1754
+#: gnunet-gtk.glade:1761
#, fuzzy
msgid "Up_load"
msgstr "Tải _lên"
-#: gnunet-gtk.glade:1831
+#: gnunet-gtk.glade:1838
#, fuzzy
msgid "U_pload"
msgstr "Tải _lên"
-#: gnunet-gtk.glade:1872
+#: gnunet-gtk.glade:1879
msgid "c_reate"
msgstr "_tạo"
-#: gnunet-gtk.glade:1893 gnunet-gtk.glade:1946
+#: gnunet-gtk.glade:1900 gnunet-gtk.glade:1953
msgid "_Namespace"
msgstr "_Không gian tên"
-#: gnunet-gtk.glade:1902
+#: gnunet-gtk.glade:1909
msgid "_Directory"
msgstr "_Thư mục"
-#: gnunet-gtk.glade:1911 gnunet-gtk.glade:1956
+#: gnunet-gtk.glade:1918 gnunet-gtk.glade:1963
#, fuzzy
msgid "_Collection"
msgstr "_Thu thập"
-#: gnunet-gtk.glade:1924
+#: gnunet-gtk.glade:1931
msgid "d_elete"
msgstr "_xóa"
-#: gnunet-gtk.glade:1945
+#: gnunet-gtk.glade:1952
msgid ""
"Will prevent future insertions into the namespace (will not delete content "
"in the namespace)"
@@ -310,84 +310,84 @@
"Sẽ không cho phép chèn thêm vào không gian tên (sẽ không xóa nội dung trong "
"không gian tên)"
-#: gnunet-gtk.glade:1955
+#: gnunet-gtk.glade:1962
msgid "end collection (will not delete content already in the collection)"
msgstr "dừng thu thập (sẽ không xóa nội dung đã có trong bộ sưu tập)"
-#: gnunet-gtk.glade:2087
+#: gnunet-gtk.glade:2094
msgid "<b>Available Content</b>"
msgstr "<b>Nội dung có</b>"
-#: gnunet-gtk.glade:2146
+#: gnunet-gtk.glade:2153
msgid "Ad_vanced"
msgstr "_Nâng cao"
-#: gnunet-gtk.glade:2204
+#: gnunet-gtk.glade:2211
msgid "File s_haring"
msgstr "_Chia sẻ tập tin"
-#: gnunet-gtk.glade:2316
+#: gnunet-gtk.glade:2323
msgid "_Statistics"
msgstr "_Thống kê"
-#: gnunet-gtk.glade:2450
+#: gnunet-gtk.glade:2457
msgid "/join #gnunet"
msgstr "/nhập vào #gnunet"
-#: gnunet-gtk.glade:2535
+#: gnunet-gtk.glade:2542
msgid "Cha_t"
msgstr "_Nói chuyện"
-#: gnunet-gtk.glade:2588 gnunet-gtk.glade:2603 gnunet-gtk.glade:4980
+#: gnunet-gtk.glade:2595 gnunet-gtk.glade:2610 gnunet-gtk.glade:4987
msgid "Edit File Information"
msgstr "Sửa thông tin tập tin"
-#: gnunet-gtk.glade:2604
+#: gnunet-gtk.glade:2611
msgid "This dialog is used to edit information about shared files."
msgstr "Hộp thoại này dùng để sửa thông tin về các tập tin chia sẻ."
-#: gnunet-gtk.glade:2621 gnunet-gtk.glade:5009 gnunet-gtk.glade:5589
+#: gnunet-gtk.glade:2628 gnunet-gtk.glade:5016 gnunet-gtk.glade:5596
msgid ""
"Confirm the displayed meta-data and keywords and proceed with the upload."
msgstr ""
"Xác nhận các dữ liệu mêta và từ khóa đã hiển thị và đã thực hiện với tải lên."
-#: gnunet-gtk.glade:2630
+#: gnunet-gtk.glade:2637
msgid "metaDataDialogCancelButton"
msgstr ""
-#: gnunet-gtk.glade:2631
+#: gnunet-gtk.glade:2638
msgid "Abort the upload operation."
msgstr "Thoát khỏi thao tác tải lên."
-#: gnunet-gtk.glade:2640 gnunet-gtk.glade:5024 gnunet-gtk.glade:5604
+#: gnunet-gtk.glade:2647 gnunet-gtk.glade:5031 gnunet-gtk.glade:5611
msgid "Cancel the upload."
msgstr "Dừng tải lên."
-#: gnunet-gtk.glade:2663
+#: gnunet-gtk.glade:2670
msgid "Please provide meta-data and keywords for the content."
msgstr "Xin hãy cung cấp dữ liệu mêta và từ khóa cho nội dung."
-#: gnunet-gtk.glade:2694 gnunet-gtk.glade:4679 gnunet-gtk.glade:5294
-#: gnunet-gtk.glade:5826
+#: gnunet-gtk.glade:2701 gnunet-gtk.glade:4686 gnunet-gtk.glade:5301
+#: gnunet-gtk.glade:5833
#, fuzzy
msgid "_Type:"
msgstr "_Dạng:"
-#: gnunet-gtk.glade:2748 gnunet-gtk.glade:4718 gnunet-gtk.glade:5348
-#: gnunet-gtk.glade:5880
+#: gnunet-gtk.glade:2755 gnunet-gtk.glade:4725 gnunet-gtk.glade:5355
+#: gnunet-gtk.glade:5887
msgid "_Value:"
msgstr "_Giá trị:"
-#: gnunet-gtk.glade:2775 gnunet-gtk.glade:5375 gnunet-gtk.glade:5907
+#: gnunet-gtk.glade:2782 gnunet-gtk.glade:5382 gnunet-gtk.glade:5914
msgid "Enter metadata about the upload"
msgstr "Nhập dữ liệu mêta về tải lên"
-#: gnunet-gtk.glade:2785
+#: gnunet-gtk.glade:2792
msgid "Value Entry"
msgstr "Giá trị của Mục"
-#: gnunet-gtk.glade:2786
+#: gnunet-gtk.glade:2793
msgid ""
"Enter the value for the meta-data of the specified type here.\n"
"Press ENTER to add the data."
@@ -395,60 +395,60 @@
"Xin hãy nhập giá trị cho dữ liệu mêta của dạng chi ra ở đây.\n"
"Nhấn ENTER để thêm dữ liệu."
-#: gnunet-gtk.glade:2801 gnunet-gtk.glade:5396 gnunet-gtk.glade:5928
+#: gnunet-gtk.glade:2808 gnunet-gtk.glade:5403 gnunet-gtk.glade:5935
msgid ""
"Add the given description to the meta-data describing the uploaded file."
msgstr "Thêm mô tả đã chọn vào dữ liệu mêta mô tả tập tin đã tải lên."
-#: gnunet-gtk.glade:2842 gnunet-gtk.glade:2987 gnunet-gtk.glade:4626
-#: gnunet-gtk.glade:5437 gnunet-gtk.glade:5969
+#: gnunet-gtk.glade:2849 gnunet-gtk.glade:2994 gnunet-gtk.glade:4633
+#: gnunet-gtk.glade:5444 gnunet-gtk.glade:5976
msgid ""
"Select entries and use the context menu (right click) in order to delete "
"keywords."
msgstr ""
"Chọn các mục và dùng trình đơn mở ra khi nhấn chuột phải để xóa từ khóa."
-#: gnunet-gtk.glade:2859 gnunet-gtk.glade:5454 gnunet-gtk.glade:5986
+#: gnunet-gtk.glade:2866 gnunet-gtk.glade:5461 gnunet-gtk.glade:5993
msgid "<b>Meta-data</b>"
msgstr "<b>Dữ liệu Mêta</b>"
-#: gnunet-gtk.glade:2922 gnunet-gtk.glade:5105 gnunet-gtk.glade:5212
-#: gnunet-gtk.glade:5685
+#: gnunet-gtk.glade:2929 gnunet-gtk.glade:5112 gnunet-gtk.glade:5219
+#: gnunet-gtk.glade:5692
msgid "Enter keywords"
msgstr "Nhập từ khóa"
-#: gnunet-gtk.glade:2943
+#: gnunet-gtk.glade:2950
msgid ""
"Add the specified keyword to the list of keywords under which the file or "
"directory will be found."
msgstr ""
"Thêm từ khóa chỉ ra tới danh sách từ khóa để tìm các thư mục hay tập tin."
-#: gnunet-gtk.glade:2972
+#: gnunet-gtk.glade:2979
msgid "Lists all of the keywords that will be used."
msgstr "Liệt kê tất cả các từ khóa sẽ dùng."
-#: gnunet-gtk.glade:3004
+#: gnunet-gtk.glade:3011
msgid "<b>Keywords</b>"
msgstr "<b>Từ khóa</b>"
-#: gnunet-gtk.glade:3040 gnunet-gtk.glade:5490
+#: gnunet-gtk.glade:3047 gnunet-gtk.glade:5497
msgid "_Preview:"
msgstr "_Xem trước:"
-#: gnunet-gtk.glade:3109
+#: gnunet-gtk.glade:3116
msgid "File Information"
msgstr "Thông tin Tập tin"
-#: gnunet-gtk.glade:3194 src/plugins/fs/search.c:424
+#: gnunet-gtk.glade:3201 src/plugins/fs/search.c:427
msgid "Meta-data"
msgstr "Dữ liệu Mêta"
-#: gnunet-gtk.glade:3225
+#: gnunet-gtk.glade:3232
msgid "Search Results"
msgstr "Kết quả Tìm kiếm"
-#: gnunet-gtk.glade:3272
+#: gnunet-gtk.glade:3279
msgid ""
"List of search results. Directories must first be downloaded before their "
"contents will be displayed."
@@ -456,11 +456,11 @@
"Danh sách kết quả tìm kiếm. Thư mục phải được tải xuống trước khi hiển thị "
"nội dung của chúng."
-#: gnunet-gtk.glade:3301
+#: gnunet-gtk.glade:3308
msgid "Anon_ymity:"
msgstr "_Giấu tên:"
-#: gnunet-gtk.glade:3328
+#: gnunet-gtk.glade:3335
msgid ""
"Specify the desired anonymity level for this download. A value of 0 means no "
"receiver anonymity (allows direct connection). Use higher values for "
@@ -470,82 +470,82 @@
"cho phép giấu tên (cho phép kết nối thẳng). Dùng giá trị cao hơn để tăng "
"mức độ bí mật cho người nhận nhưng ảnh hưởng đến hiệu suất."
-#: gnunet-gtk.glade:3359
+#: gnunet-gtk.glade:3366
#, fuzzy
msgid "Download selected files."
msgstr "Tải các tập tin đã chọn."
-#: gnunet-gtk.glade:3404
+#: gnunet-gtk.glade:3411
msgid "Down_load"
msgstr "Tải _xuống"
-#: gnunet-gtk.glade:3440
+#: gnunet-gtk.glade:3447
msgid "Close this search."
msgstr "Đóng tìm kiếm này."
-#: gnunet-gtk.glade:3472
+#: gnunet-gtk.glade:3479
msgid "Namespace Contents"
msgstr "Nội dung Không gian tên"
-#: gnunet-gtk.glade:3504
+#: gnunet-gtk.glade:3511
msgid ""
"List of the files and directories that have been added to this namespace so "
"far."
msgstr "Danh sách các tập tin và thư mục sẽ thêm vào không gian tên này."
-#: gnunet-gtk.glade:3532
+#: gnunet-gtk.glade:3539
msgid "Add additional files to this namespace."
msgstr "Thêm các tập tin bổ sung vào không gian tên này."
-#: gnunet-gtk.glade:3550
+#: gnunet-gtk.glade:3557
msgid "Publish an update to the selected updatable content."
msgstr "Đưa ra chia sẻ một cập nhật tới nội dung có thể cập nhật đã chọn."
-#: gnunet-gtk.glade:3595
+#: gnunet-gtk.glade:3602
msgid "U_pdate"
msgstr "_Cập nhật"
-#: gnunet-gtk.glade:3639
+#: gnunet-gtk.glade:3646
msgid "Chat"
msgstr "Nói chuyện"
-#: gnunet-gtk.glade:3677
+#: gnunet-gtk.glade:3684
msgid "The current conversation in this chat room."
msgstr "Hội thoại hiện thời trong phòng chát này."
-#: gnunet-gtk.glade:3716
+#: gnunet-gtk.glade:3723
msgid "Hello!"
msgstr "Chào!"
-#: gnunet-gtk.glade:3732
+#: gnunet-gtk.glade:3739
msgid "Sends the message to all participants in the current chat room."
msgstr "Gửi tin tới tất cả những người có trong phòng chát hiện thời."
-#: gnunet-gtk.glade:3778
+#: gnunet-gtk.glade:3785
msgid "Sen_d"
msgstr "_Gửi"
-#: gnunet-gtk.glade:3838
+#: gnunet-gtk.glade:3845
msgid "List of the participants in the chat room."
msgstr "Danh sách những người có trong phòng chát."
-#: gnunet-gtk.glade:3863
+#: gnunet-gtk.glade:3870
msgid "The gnunet-gtk about dialog"
msgstr "Hộp thoại giới thiệu gnunet-gtk"
-#: gnunet-gtk.glade:3865
+#: gnunet-gtk.glade:3872
msgid "gnunet-gtk"
msgstr "gnunet-gtk"
-#: gnunet-gtk.glade:3866
+#: gnunet-gtk.glade:3873
msgid "(C) 2001-2005 Christian Grothoff (and other contributing authors)"
msgstr "(C) 2001-2005 Christian Grothoff (và các nhà cộng tác khác)"
-#: gnunet-gtk.glade:3867
+#: gnunet-gtk.glade:3874
msgid "https://gnunet.org/";
msgstr "https://gnunet.org/";
-#: gnunet-gtk.glade:3868
+#: gnunet-gtk.glade:3875
msgid ""
" GNU GENERAL PUBLIC LICENSE\n"
" Version 2, June 1991\n"
@@ -833,11 +833,11 @@
" END OF TERMS AND CONDITIONS\n"
msgstr ""
-#: gnunet-gtk.glade:4151
+#: gnunet-gtk.glade:4158
msgid "GNUnet Website"
msgstr "Trang web của GNUnet"
-#: gnunet-gtk.glade:4185
+#: gnunet-gtk.glade:4192
msgid ""
"Di Ma\n"
"Jens Palsberg <address@hidden>\n"
@@ -865,23 +865,23 @@
"Steven Michael Murphy <address@hidden>\n"
"Phan Vinh Thinh <address@hidden>\n"
-#: gnunet-gtk.glade:4208
+#: gnunet-gtk.glade:4215
msgid "Select file to upload to GNUnet"
msgstr "Chọn tập tin để tải lên GNUnet"
-#: gnunet-gtk.glade:4236
+#: gnunet-gtk.glade:4243
msgid "Cancel selecting file to upload"
msgstr "Dừng chọn tập tin để tải lên"
-#: gnunet-gtk.glade:4250
+#: gnunet-gtk.glade:4257
msgid "Select this file (or directory) for the upload"
msgstr "Chọn tập tin (hoặc thư mục) này để tải lên"
-#: gnunet-gtk.glade:4275
+#: gnunet-gtk.glade:4282
msgid "Create Namespace"
msgstr "Tạo Không gian tên"
-#: gnunet-gtk.glade:4304
+#: gnunet-gtk.glade:4311
msgid ""
"Confirm the specified data. Creates the namespace and publishes the "
"advertisements."
@@ -889,19 +889,19 @@
"Xác nhận dữ liệu chỉ ra. Tạo không gian tên và đưa ra lời giới thiệu quảng "
"cáo."
-#: gnunet-gtk.glade:4319
+#: gnunet-gtk.glade:4326
msgid "Cancel namespace creation."
msgstr "Dừng tạo không gian tên."
-#: gnunet-gtk.glade:4342
+#: gnunet-gtk.glade:4349
msgid "Please provide information about the namespace"
msgstr "Xin hãy cung cấp thông tin về không gian tên"
-#: gnunet-gtk.glade:4373
+#: gnunet-gtk.glade:4380
msgid "_Name:"
msgstr "_Tên:"
-#: gnunet-gtk.glade:4399
+#: gnunet-gtk.glade:4406
msgid ""
"Each namespace is supposed to have a name. While GNUnet cannot guarantee "
"that these names are unique, users should try to select names that are "
@@ -911,11 +911,11 @@
"trùng nhau, người dùng cần chọn những tên ít gây xung đột và tương ứng với "
"nội dung của không gian tên."
-#: gnunet-gtk.glade:4419
+#: gnunet-gtk.glade:4426
msgid "_Root"
msgstr ""
-#: gnunet-gtk.glade:4446
+#: gnunet-gtk.glade:4453
msgid ""
"The namespace root is the file or directory in the namespace that will be "
"advertised to other users. Typically it contains a directory with the "
@@ -923,18 +923,18 @@
"the root."
msgstr ""
-#: gnunet-gtk.glade:4479
+#: gnunet-gtk.glade:4486
msgid "Anonymity (for namespace advertisement):"
msgstr "Giấu tên (cho quảng cáo không gian tên):"
-#: gnunet-gtk.glade:4564
+#: gnunet-gtk.glade:4571
msgid ""
"Enter a keyword under which advertisements for this namespace will be "
"published."
msgstr ""
"Nhập một từ khóa để quảng cáo cho không gian tên này khi đưa ra chia sẻ."
-#: gnunet-gtk.glade:4585
+#: gnunet-gtk.glade:4592
msgid ""
"Add the given keyword to the list of keywords under which advertisements for "
"the namespace will be published."
@@ -942,19 +942,19 @@
"Thêm từ khóa đã chọn vào danh sách từ khóa để quảng cáo cho không gian tên "
"này khi đưa ra chia sẻ."
-#: gnunet-gtk.glade:4643 src/plugins/fs/extensions/musicinsert.c:225
+#: gnunet-gtk.glade:4650 src/plugins/fs/extensions/musicinsert.c:225
msgid "Keywords"
msgstr "Từ khóa"
-#: gnunet-gtk.glade:4745
+#: gnunet-gtk.glade:4752
msgid "Enter meta-data (descriptions) for this namespace"
msgstr "Nhập dữ liệu mêta (mô tả) cho không gian tên này"
-#: gnunet-gtk.glade:4766
+#: gnunet-gtk.glade:4773
msgid "Add the given metadata entry to the metadata for this namespace."
msgstr "Thêm mục dữ liệu mêta đưa ra tới dữ liệu mêta cho không gian tên này."
-#: gnunet-gtk.glade:4807
+#: gnunet-gtk.glade:4814
msgid ""
"Metadata describing the namespace (used in advertisements). Use the context "
"menu (right-click) to delete selected entries."
@@ -962,45 +962,45 @@
"Dữ liệu mêta mô tả không gian tên (dùng trong lời giới thiệu quảng cáo). "
"Hãy dùng trình đơn mở ra khi nhấn chuột phải dể chọn các mục."
-#: gnunet-gtk.glade:4824
+#: gnunet-gtk.glade:4831
msgid "Metadata"
msgstr "Dữ liệu mêta"
-#: gnunet-gtk.glade:4860
+#: gnunet-gtk.glade:4867
msgid "Close the selected search"
msgstr "Đóng tìm kiếm đã chọn"
-#: gnunet-gtk.glade:4861
+#: gnunet-gtk.glade:4868
msgid "_Close"
msgstr "Đón_g"
-#: gnunet-gtk.glade:4897
+#: gnunet-gtk.glade:4904
msgid "Messages"
msgstr "Tin nhắn"
-#: gnunet-gtk.glade:5047
+#: gnunet-gtk.glade:5054
#, fuzzy
msgid "Please provide meta-data and an identifier for the content."
msgstr "Xin hãy cung cấp dữ liệu mêta và từ khóa cho nội dung."
-#: gnunet-gtk.glade:5078 gnunet-gtk.glade:5658
+#: gnunet-gtk.glade:5085 gnunet-gtk.glade:5665
msgid "_Identifier:"
msgstr ""
-#: gnunet-gtk.glade:5126 gnunet-gtk.glade:5706
+#: gnunet-gtk.glade:5133 gnunet-gtk.glade:5713
#, fuzzy
msgid "Anonymit_y:"
msgstr "_Giấu tên:"
-#: gnunet-gtk.glade:5185
+#: gnunet-gtk.glade:5192
msgid "_Next Identifier:"
msgstr ""
-#: gnunet-gtk.glade:5233 gnunet-gtk.glade:5765
+#: gnunet-gtk.glade:5240 gnunet-gtk.glade:5772
msgid "_Update Interval:"
msgstr ""
-#: gnunet-gtk.glade:5259 gnunet-gtk.glade:5791
+#: gnunet-gtk.glade:5266 gnunet-gtk.glade:5798
msgid ""
"--no update--\n"
"--sporadic update--\n"
@@ -1011,55 +1011,55 @@
"1 year\n"
msgstr ""
-#: gnunet-gtk.glade:5560
+#: gnunet-gtk.glade:5567
#, fuzzy
msgid "Edit Collection Information"
msgstr "Sửa thông tin tập tin"
-#: gnunet-gtk.glade:5627
+#: gnunet-gtk.glade:5634
#, fuzzy
msgid "Please provide meta-data and an identifier for the collection."
msgstr "Xin hãy cung cấp dữ liệu mêta và từ khóa cho nội dung."
-#: src/plugins/fs/search.c:76 src/plugins/fs/namespace.c:294
+#: src/plugins/fs/search.c:76 src/plugins/fs/namespace.c:296
msgid "unknown"
msgstr "không rõ"
-#: src/plugins/fs/search.c:100 src/plugins/fs/namespace.c:198
-#: src/plugins/fs/namespace.c:278
+#: src/plugins/fs/search.c:100 src/plugins/fs/namespace.c:200
+#: src/plugins/fs/namespace.c:280
msgid "no name given"
msgstr "chưa đưa ra tên"
-#: src/plugins/fs/search.c:403 src/plugins/fs/download.c:474
+#: src/plugins/fs/search.c:406 src/plugins/fs/download.c:474
msgid "Name"
msgstr "Tên"
-#: src/plugins/fs/search.c:410 src/plugins/fs/download.c:482
+#: src/plugins/fs/search.c:413 src/plugins/fs/download.c:482
msgid "Size"
msgstr "Kích thước"
-#: src/plugins/fs/search.c:417 src/plugins/fs/namespace.c:113
+#: src/plugins/fs/search.c:420 src/plugins/fs/namespace.c:115
msgid "Mime-type"
msgstr "Dạng mime"
-#: src/plugins/fs/search.c:431
+#: src/plugins/fs/search.c:434
msgid "Preview"
msgstr "Xem trước"
-#: src/plugins/fs/search.c:494 src/plugins/fs/search.c:637
+#: src/plugins/fs/search.c:497 src/plugins/fs/search.c:640
msgid "globally"
msgstr "toàn cầu"
-#: src/plugins/fs/search.c:512
+#: src/plugins/fs/search.c:515
#, c-format
msgid "Failed to create namespace URI from '%s'.\n"
msgstr "Thất bại khi tạo URI không gian tên từ '%s'.\n"
-#: src/plugins/fs/search.c:769
+#: src/plugins/fs/search.c:772
msgid "Query"
msgstr "Hỏi"
-#: src/plugins/fs/search.c:776
+#: src/plugins/fs/search.c:779
msgid "Results"
msgstr "Kết quả"
@@ -1111,8 +1111,8 @@
"Tập tin '%s' tồn tại trong '%s',\n"
"sẽ chứa các tải xuống dưới URI GNUnet của nó '%s' để thay thế.\n"
-#: src/plugins/fs/download.c:489 src/plugins/fs/upload.c:772
-#: src/plugins/fs/namespace.c:1007
+#: src/plugins/fs/download.c:489 src/plugins/fs/upload.c:490
+#: src/plugins/fs/namespace.c:856
msgid "URI"
msgstr "URI"
@@ -1172,93 +1172,99 @@
msgid "Choose files to insert..."
msgstr ""
-#: src/plugins/fs/upload.c:434 src/plugins/fs/collection.c:124
-#: src/plugins/fs/namespace.c:502 src/plugins/fs/namespace.c:883
-msgid "Category"
-msgstr "Hạng mục"
-
-#: src/plugins/fs/upload.c:441 src/plugins/fs/collection.c:131
-#: src/plugins/fs/namespace.c:509 src/plugins/fs/namespace.c:890
-msgid "Value"
-msgstr "Giá trị"
-
-#: src/plugins/fs/upload.c:457 src/plugins/fs/namespace.c:523
-msgid "Keyword"
-msgstr "Từ khóa"
-
-#: src/plugins/fs/upload.c:714
+#: src/plugins/fs/upload.c:432
msgid "Choose the file or directory you want to publish."
msgstr "Chọn tập tin hoặc thư mục muốn đưa ra chia sẻ."
-#: src/plugins/fs/upload.c:764 src/plugins/fs/namespace.c:92
-#: src/plugins/fs/namespace.c:993
+#: src/plugins/fs/upload.c:482 src/plugins/fs/namespace.c:94
+#: src/plugins/fs/namespace.c:842
msgid "Filename"
msgstr "Tên tập tin"
-#: src/plugins/fs/collection.c:218
+#: src/plugins/fs/collection.c:81 src/plugins/fs/namespace.c:728
+msgid "--sporadic update--"
+msgstr ""
+
+#: src/plugins/fs/collection.c:84 src/plugins/fs/namespace.c:731
+msgid "--no update--"
+msgstr ""
+
+#: src/plugins/fs/collection.c:97 src/plugins/fs/namespace.c:744
+msgid "Failed to parse given time interval!"
+msgstr ""
+
+#: src/plugins/fs/collection.c:132
#, c-format
msgid "Failed to start collection '%s' (consult logs)."
msgstr ""
-#: src/plugins/fs/collection.c:242
+#: src/plugins/fs/collection.c:156
#, fuzzy
msgid "Collection stopped.\n"
msgstr "_Thu thập"
-#: src/plugins/fs/collection.c:245
+#: src/plugins/fs/collection.c:159
msgid "Failed to stop collection (consult logs).\n"
msgstr ""
-#: src/plugins/fs/namespace.c:99 src/plugins/fs/namespace.c:1000
+#: src/plugins/fs/namespace.c:101 src/plugins/fs/namespace.c:849
#, fuzzy
msgid "Filesize"
msgstr "Tên tập tin"
-#: src/plugins/fs/namespace.c:106 src/plugins/daemon/daemon.c:238
+#: src/plugins/fs/namespace.c:108 src/plugins/daemon/daemon.c:238
msgid "Description"
msgstr ""
-#: src/plugins/fs/namespace.c:120
+#: src/plugins/fs/namespace.c:122
msgid "Last ID"
msgstr ""
-#: src/plugins/fs/namespace.c:127
+#: src/plugins/fs/namespace.c:129
msgid "Next ID"
msgstr ""
-#: src/plugins/fs/namespace.c:136
+#: src/plugins/fs/namespace.c:138
msgid "Publication Frequency"
msgstr ""
-#: src/plugins/fs/namespace.c:143
+#: src/plugins/fs/namespace.c:145
msgid "Next Publication Date"
msgstr ""
-#: src/plugins/fs/namespace.c:641
+#: src/plugins/fs/namespace.c:467
#, c-format
msgid ""
"Failed to create namespace '%s'.Consult logs, most likely error is that a "
"namespace with that name already exists."
msgstr ""
-#: src/plugins/fs/namespace.c:680
+#: src/plugins/fs/namespace.c:506
msgid "No local namespaces available that could be deleted!"
msgstr ""
-#: src/plugins/fs/namespace.c:709
+#: src/plugins/fs/namespace.c:535
#, c-format
msgid "Should the namespace '%s' really be deleted?"
msgstr ""
-#: src/plugins/fs/namespace.c:802
+#: src/plugins/fs/namespace.c:627
msgid "Failed to insert content into namespace (consult logs).\n"
msgstr ""
-#: src/plugins/fs/namespace.c:843
+#: src/plugins/fs/namespace.c:669
msgid "You must select some available content for publication first!"
msgstr ""
-#: src/plugins/fs/namespace.c:966
+#: src/plugins/fs/namespace.c:709
+msgid "Category"
+msgstr "Hạng mục"
+
+#: src/plugins/fs/namespace.c:716
+msgid "Value"
+msgstr "Giá trị"
+
+#: src/plugins/fs/namespace.c:815
msgid "Not implemented!"
msgstr ""
@@ -1288,81 +1294,50 @@
msgid "Application"
msgstr "Thông báo"
-#: src/plugins/stats/functions.c:117
-msgid "# of connected peers"
-msgstr ""
-
-#: src/plugins/stats/functions.c:131
-#, c-format
-msgid "% of allowed cpu load"
-msgstr ""
-
-#: src/plugins/stats/functions.c:155
-msgid "# bytes decrypted"
-msgstr ""
-
-#: src/plugins/stats/functions.c:161
-msgid "# bytes of noise received"
-msgstr ""
-
-#: src/plugins/stats/functions.c:168 src/plugins/stats/functions.c:181
-#: src/plugins/stats/functions.c:261
-#, c-format
-msgid "# bytes received of type %d"
-msgstr ""
-
-#: src/plugins/stats/functions.c:235
-msgid "# bytes encrypted"
-msgstr ""
-
-#: src/plugins/stats/functions.c:241
-msgid "# bytes noise sent"
-msgstr ""
-
-#: src/plugins/stats/functions.c:248
-#, c-format
-msgid "# bytes transmitted of type %d"
-msgstr ""
-
-#: src/plugins/stats/functions.c:346
+#: src/plugins/stats/functions.c:336
msgid "Connectivity"
msgstr ""
-#: src/plugins/stats/functions.c:347
+#: src/plugins/stats/functions.c:337
msgid "# connected nodes (100% = connection table size)"
msgstr ""
-#: src/plugins/stats/functions.c:354
+#: src/plugins/stats/functions.c:344
#, fuzzy
msgid "CPU load"
msgstr "Tải _lên"
-#: src/plugins/stats/functions.c:355
+#: src/plugins/stats/functions.c:345
msgid "CPU load (in percent of allowed load)"
msgstr ""
-#: src/plugins/stats/functions.c:362
+#: src/plugins/stats/functions.c:352
msgid "Inbound Traffic"
msgstr ""
-#: src/plugins/stats/functions.c:363 src/plugins/stats/functions.c:371
+#: src/plugins/stats/functions.c:353 src/plugins/stats/functions.c:361
msgid "Noise (red), Content (green), Queries (yellow), other (blue)"
msgstr ""
-#: src/plugins/stats/functions.c:370
+#: src/plugins/stats/functions.c:360
msgid "Outbound Traffic"
msgstr ""
-#: src/common/helper.c:273
+#: src/common/helper.c:279
#, c-format
msgid "Failed to find handler for '%s'\n"
msgstr ""
-#: src/common/helper.c:299
+#: src/common/helper.c:305
#, c-format
msgid "Failed to load plugin '%s'\n"
msgstr ""
+#: src/common/helper.c:387
+#, fuzzy, c-format
+msgid "Failed to open '%s'.\n"
+msgstr "Thất bại khi tạo URI không gian tên từ '%s'.\n"
+
#: src/core/main.c:43
msgid "GNUnet GTK user interface."
msgstr "Giao diện người dùng GTK của GNUnet."
@@ -1371,6 +1346,9 @@
msgid "Use --help to get a list of options.\n"
msgstr "Dùng --help để xem danh sách các tùy chọn.\n"
+#~ msgid "Keyword"
+#~ msgstr "Từ khóa"
+
#~ msgid "Unavailable.\n"
#~ msgstr "Không thể.\n"
Modified: gnunet-gtk/src/core/Makefile.am
===================================================================
--- gnunet-gtk/src/core/Makefile.am 2005-07-17 23:19:45 UTC (rev 1575)
+++ gnunet-gtk/src/core/Makefile.am 2005-07-17 23:21:45 UTC (rev 1576)
@@ -7,7 +7,7 @@
bin_PROGRAMS = gnunet-gtk
gnunet_gtk_SOURCES = \
- main.c main.h
+ main.c
gnunet_gtk_LDADD = \
@GTK_LIBS@ \
Modified: gnunet-gtk/src/plugins/stats/functions.c
===================================================================
--- gnunet-gtk/src/plugins/stats/functions.c 2005-07-17 23:19:45 UTC (rev
1575)
+++ gnunet-gtk/src/plugins/stats/functions.c 2005-07-17 23:21:45 UTC (rev
1576)
@@ -161,7 +161,7 @@
SNPRINTF(buffer,
512,
"# bytes received of type %d",
- GAP_p2p_PROTO_RESULT);
+ P2P_PROTO_gap_RESULT);
if (OK != getStatValue(&content,
&lcontent,
NULL,
@@ -173,7 +173,7 @@
SNPRINTF(buffer,
512,
"# bytes received of type %d",
- GAP_p2p_PROTO_QUERY);
+ P2P_PROTO_gap_QUERY);
if (OK != getStatValue(&queries,
&lqueries,
NULL,
@@ -237,7 +237,7 @@
SNPRINTF(buffer,
512,
"# bytes transmitted of type %d",
- GAP_p2p_PROTO_RESULT);
+ P2P_PROTO_gap_RESULT);
if (OK != getStatValue(&content,
&lcontent,
NULL,
@@ -249,7 +249,7 @@
SNPRINTF(buffer,
512,
"# bytes received of type %d",
- GAP_p2p_PROTO_QUERY);
+ P2P_PROTO_gap_QUERY);
if (OK == getStatValue(&queries,
&lqueries,
NULL,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r1576 - Extractor GNUnet GNUnet/bin GNUnet/m4 GNUnet/po GNUnet/src/applications/advertising GNUnet/src/applications/bootstrap_http GNUnet/src/applications/chat GNUnet/src/applications/dht/module GNUnet/src/applications/dht/tools GNUnet/src/applications/fragmentation GNUnet/src/applications/fs/ecrs GNUnet/src/applications/fs/fsui GNUnet/src/applications/fs/lib GNUnet/src/applications/fs/module GNUnet/src/applications/gap GNUnet/src/applications/gap/peer1 GNUnet/src/applications/gap/peer2 GNUnet/src/applications/getoption GNUnet/src/applications/identity GNUnet/src/applications/pingpong GNUnet/src/applications/rpc GNUnet/src/applications/session GNUnet/src/applications/stats GNUnet/src/applications/tbench GNUnet/src/applications/template GNUnet/src/applications/testbed GNUnet/src/applications/tracekit GNUnet/src/applications/traffic GNUnet/src/applications/transport GNUnet/src/conf GNUnet/src/include GNUnet/src/server GNUnet/src/transports GNUnet/src/util GNUnet-docs/WWW GNUnet-docs/WWW/news GNUnet-docs/WWW/test gnunet-gtk gnunet-gtk/po gnunet-gtk/src/core gnunet-gtk/src/plugins/stats,
grothoff <=