[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8298 - in GNUnet: . contrib po src/applications/chat/lib s
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r8298 - in GNUnet: . contrib po src/applications/chat/lib src/include src/libs/mysql src/util/network |
|
Date: |
Fri, 27 Feb 2009 23:01:49 -0700 |
Author: grothoff
Date: 2009-02-27 23:01:49 -0700 (Fri, 27 Feb 2009)
New Revision: 8298
Modified:
GNUnet/ChangeLog
GNUnet/configure.ac
GNUnet/contrib/doxygen
GNUnet/po/GNUnet.pot
GNUnet/po/de.po
GNUnet/po/es.po
GNUnet/po/sv.po
GNUnet/po/vi.po
GNUnet/src/applications/chat/lib/Makefile.am
GNUnet/src/include/Makefile.am
GNUnet/src/include/gnunet_util_common.h
GNUnet/src/include/gnunet_util_core.h
GNUnet/src/include/gnunet_util_network.h
GNUnet/src/libs/mysql/lmysql.c
GNUnet/src/util/network/io.c
Log:
bump
Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog 2009-02-28 05:16:03 UTC (rev 8297)
+++ GNUnet/ChangeLog 2009-02-28 06:01:49 UTC (rev 8298)
@@ -1,3 +1,6 @@
+Fri Feb 27 22:05:50 MST 2009
+ Releasing 0.8.0c.
+
Sun Feb 1 19:51:40 MST 2009
Fixed Mantis #1429 (struct padding could cause sizeof
to be different on AMD64, using gcc-ism "packed" to
Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2009-02-28 05:16:03 UTC (rev 8297)
+++ GNUnet/configure.ac 2009-02-28 06:01:49 UTC (rev 8298)
@@ -21,8 +21,8 @@
#
#
AC_PREREQ(2.61)
-AC_INIT([GNUnet], [0.8.0b],address@hidden)
-AM_INIT_AUTOMAKE([GNUnet], [0.8.0b])
+AC_INIT([GNUnet], [0.8.0c],address@hidden)
+AM_INIT_AUTOMAKE([GNUnet], [0.8.0c])
AC_CONFIG_HEADERS([config.h])
AH_TOP([#define _GNU_SOURCE 1])
Modified: GNUnet/contrib/doxygen
===================================================================
--- GNUnet/contrib/doxygen 2009-02-28 05:16:03 UTC (rev 8297)
+++ GNUnet/contrib/doxygen 2009-02-28 06:01:49 UTC (rev 8298)
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = GNUnet
-PROJECT_NUMBER = 0.8.0a
+PROJECT_NUMBER = 0.8.0c
OUTPUT_DIRECTORY = /home/gnunet/WWW/doxygen
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot 2009-02-28 05:16:03 UTC (rev 8297)
+++ GNUnet/po/GNUnet.pot 2009-02-28 06:01:49 UTC (rev 8298)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2009-01-08 10:55-0700\n"
+"POT-Creation-Date: 2009-02-27 22:04-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -749,7 +749,7 @@
msgid "Error connecting to %s:%u. Is the daemon running?\n"
msgstr ""
-#: src/util/network_client/tcpio.c:398
+#: src/util/network_client/tcpio.c:398 src/util/network/io.c:164
#, c-format
msgid "Cannot connect to %s:%u: %s\n"
msgstr ""
@@ -975,21 +975,38 @@
msgid "RSA signature verification failed at %s:%d: %s\n"
msgstr ""
-#: src/util/os/user.c:108 src/util/os/user.c:125
+#: src/util/os/user.c:167 src/util/os/user.c:482 src/util/os/user.c:499
#, c-format
msgid "`%s' returned with error code %u"
msgstr ""
-#: src/util/os/user.c:155 src/util/os/user.c:200
+#: src/util/os/user.c:298 src/util/os/user.c:345
+msgid "Error while parsing dscl output.\n"
+msgstr ""
+
+#: src/util/os/user.c:320
#, c-format
+msgid "Couldn't find a group (`%s') for the new user and none was specified.\n"
+msgstr ""
+
+#: src/util/os/user.c:375
+msgid "Failed to find a free system id for the new group.\n"
+msgstr ""
+
+#: src/util/os/user.c:392
+msgid "Failed to find a free system id for the new user.\n"
+msgstr ""
+
+#: src/util/os/user.c:529 src/util/os/user.c:574
+#, c-format
msgid "Cannot obtain information about user `%s': %s\n"
msgstr ""
-#: src/util/os/user.c:156
+#: src/util/os/user.c:530
msgid "No such user"
msgstr ""
-#: src/util/os/user.c:171
+#: src/util/os/user.c:545
#, c-format
msgid "Cannot change user/group to `%s': %s\n"
msgstr ""
@@ -1037,7 +1054,8 @@
msgid "Setting open descriptor limit not supported.\n"
msgstr ""
-#: src/util/os/osconfig.c:463 src/util/os/osconfig.c:492
+#: src/util/os/osconfig.c:453 src/util/os/osconfig.c:631
+#: src/util/os/osconfig.c:660
#, c-format
msgid "Command `%s' failed with error code %u\n"
msgstr ""
@@ -1240,7 +1258,7 @@
msgid "Running benchmark...\n"
msgstr ""
-#: src/applications/tbench/tbench.c:422
+#: src/applications/tbench/tbench.c:438
msgid "allows profiling of direct peer-to-peer connections"
msgstr ""
@@ -1399,7 +1417,7 @@
msgstr ""
#: src/applications/sqstore_sqlite/sqlite.c:1474
-#: src/applications/sqstore_mysql/mysql.c:1078
+#: src/applications/sqstore_mysql/mysql.c:1081
msgid "# bytes in datastore"
msgstr ""
@@ -1407,8 +1425,8 @@
msgid "# bytes allocated by SQLite"
msgstr ""
-#: src/applications/sqstore_mysql/mysql.c:1085
-#: src/applications/sqstore_mysql/mysql.c:1160
+#: src/applications/sqstore_mysql/mysql.c:1088
+#: src/applications/sqstore_mysql/mysql.c:1163
msgid ""
"Failed to load MySQL database module. Check that MySQL is running and "
"configured properly!\n"
@@ -1571,37 +1589,37 @@
msgid "`%s' registering handler %d\n"
msgstr ""
-#: src/applications/topology_default/topology.c:466
+#: src/applications/topology_default/topology.c:475
#, c-format
msgid "Could not read friends list `%s'\n"
msgstr ""
-#: src/applications/topology_default/topology.c:485
+#: src/applications/topology_default/topology.c:499
#, c-format
msgid "Failed to read friends list from `%s'\n"
msgstr ""
-#: src/applications/topology_default/topology.c:505
+#: src/applications/topology_default/topology.c:519
msgid "Syntax error in topology specification, skipping bytes.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:523
+#: src/applications/topology_default/topology.c:538
#, c-format
msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:535
+#: src/applications/topology_default/topology.c:551
msgid ""
"Fewer friends specified than required by minimum friend count. Will only "
"connect to friends.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:543
+#: src/applications/topology_default/topology.c:559
msgid ""
"More friendly connections required than target total number of connections.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:726
+#: src/applications/topology_default/topology.c:743
msgid "maintains GNUnet default mesh topology"
msgstr ""
@@ -1875,7 +1893,7 @@
msgstr ""
#: src/applications/dht/tools/dht_multipeer_test.c:80
-#: src/applications/dht/tools/dht_twopeer_test.c:47
+#: src/applications/dht/tools/dht_api.c:332
#: src/applications/dht/module/table.c:783
msgid "# dht connections"
msgstr ""
@@ -2165,7 +2183,7 @@
#: src/applications/fs/tools/gnunet-pseudonym.c:70
#: src/applications/fs/tools/gnunet-auto-share.c:199
#: src/applications/fs/tools/gnunet-insert.c:246
-#: src/applications/fs/tools/gnunet-search.c:125
+#: src/applications/fs/tools/gnunet-search.c:126
#: src/applications/fs/tools/gnunet-download.c:77
msgid "set the desired LEVEL of sender-anonymity"
msgstr ""
@@ -2537,7 +2555,7 @@
#: src/applications/fs/tools/gnunet-insert.c:297
msgid ""
-"only simulte the process but do not do any actual publishing (useful to "
+"only simulate the process but do not do any actual publishing (useful to "
"compute URIs)"
msgstr ""
@@ -2583,15 +2601,15 @@
msgid "Option `%s' makes no sense without option `%s'.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-search.c:128
+#: src/applications/fs/tools/gnunet-search.c:129
msgid "Search GNUnet for files."
msgstr ""
-#: src/applications/fs/tools/gnunet-search.c:132
+#: src/applications/fs/tools/gnunet-search.c:133
msgid "write encountered (decrypted) search results to FILENAME"
msgstr ""
-#: src/applications/fs/tools/gnunet-search.c:169
+#: src/applications/fs/tools/gnunet-search.c:170
#, c-format
msgid "Error converting arguments to URI!\n"
msgstr ""
@@ -2777,12 +2795,12 @@
msgid "Number of double-quotes not balanced!\n"
msgstr ""
-#: src/applications/fs/ecrs/helper.c:398
+#: src/applications/fs/ecrs/helper.c:405
#, c-format
msgid "Renaming of file `%s' to `%s' failed: %s\n"
msgstr ""
-#: src/applications/fs/ecrs/helper.c:408
+#: src/applications/fs/ecrs/helper.c:415
#, c-format
msgid "Could not rename file `%s' to `%s': file exists\n"
msgstr ""
@@ -2802,19 +2820,19 @@
msgid "LOC URI not allowed for search.\n"
msgstr ""
-#: src/applications/fs/ecrs/namespace.c:365
+#: src/applications/fs/ecrs/namespace.c:370
#, c-format
msgid "File `%s' does not contain a pseudonym.\n"
msgstr ""
-#: src/applications/fs/ecrs/namespace.c:376
+#: src/applications/fs/ecrs/namespace.c:381
#, c-format
msgid "Format of pseudonym `%s' is invalid.\n"
msgstr ""
-#: src/applications/fs/ecrs/namespace.c:535
-#: src/applications/fs/ecrs/namespace.c:547
-#: src/applications/fs/ecrs/namespace.c:559
+#: src/applications/fs/ecrs/namespace.c:540
+#: src/applications/fs/ecrs/namespace.c:552
+#: src/applications/fs/ecrs/namespace.c:564
#, c-format
msgid "Format of file `%s' is invalid, trying to remove.\n"
msgstr ""
@@ -2998,41 +3016,52 @@
msgid "scp command is : %s \n"
msgstr ""
-#: src/applications/testing/remote.c:491
+#: src/applications/testing/remote.c:80 src/applications/testing/remote.c:92
#, c-format
+msgid "ssh command is : %s \n"
+msgstr ""
+
+#: src/applications/testing/remote.c:554
+#, c-format
msgid "Friend list of %s:%d\n"
msgstr ""
-#: src/applications/testing/remote.c:513
+#: src/applications/testing/remote.c:576
#, c-format
msgid "scp command for friend file copy is : %s \n"
msgstr ""
-#: src/applications/testing/remote.c:535
+#: src/applications/testing/remote.c:598
#, c-format
msgid "connecting peer %s:%d to peer %s:%d\n"
msgstr ""
-#: src/applications/testing/remotetest.c:38
+#: src/applications/testing/remotetest.c:39
msgid "Set up multiple gnunetd daemons across multiple hosts."
msgstr ""
-#: src/applications/testing/remotetest.c:43
+#: src/applications/testing/remotetest.c:44
msgid "set number of daemons to start"
msgstr ""
+#: src/applications/testing/remotetest.c:49
+msgid ""
+"set output file for a dot input file which represents the graph of the "
+"connected nodes"
+msgstr ""
+
#: src/applications/testing/testing.c:268
-#: src/applications/testing/remotetopologies.c:367
+#: src/applications/testing/remotetopologies.c:437
#, c-format
msgid "Waiting for peers to connect"
msgstr ""
-#: src/applications/testing/remotetopologies.c:213
+#: src/applications/testing/remotetopologies.c:281
#, c-format
msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
msgstr ""
-#: src/applications/testing/remotetopologies.c:491
+#: src/applications/testing/remotetopologies.c:572
#, c-format
msgid "Failed to establish connection with peers.\n"
msgstr ""
@@ -3050,9 +3079,9 @@
#: src/applications/bootstrap_http/http.c:365
#: src/applications/bootstrap_http/http.c:375
#: src/applications/bootstrap_http/http.c:385 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:541 src/transports/http.c:1085
-#: src/transports/http.c:1209 src/transports/http.c:1377
-#: src/transports/http.c:1777 src/transports/http.c:1827
+#: src/transports/upnp/upnp.c:541 src/transports/http.c:1086
+#: src/transports/http.c:1210 src/transports/http.c:1378
+#: src/transports/http.c:1778 src/transports/http.c:1828
#, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr ""
@@ -3080,12 +3109,12 @@
msgid "# HELLOs downloaded via http"
msgstr ""
-#: src/applications/getoption/getoption.c:78
+#: src/applications/getoption/getoption.c:79
#, c-format
msgid "`%s' registering client handler %d\n"
msgstr ""
-#: src/applications/getoption/getoption.c:88
+#: src/applications/getoption/getoption.c:89
msgid "allows clients to determine gnunetd's configuration"
msgstr ""
@@ -3098,7 +3127,7 @@
msgid "Template description."
msgstr ""
-#: src/applications/stats/clientapi.c:331
+#: src/applications/stats/clientapi.c:346
msgid "Uptime (seconds)"
msgstr ""
@@ -3525,7 +3554,7 @@
msgid "Failed to update data for module `%s'\n"
msgstr ""
-#: src/server/gnunet-update.c:225 src/server/gnunetd.c:124
+#: src/server/gnunet-update.c:225 src/server/gnunetd.c:126
msgid "Core initialization failed.\n"
msgstr ""
@@ -3546,39 +3575,43 @@
"Failed to determine filename used to store GNUnet version information!\n"
msgstr ""
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:87
#, c-format
msgid "`%s' startup complete.\n"
msgstr ""
-#: src/server/gnunetd.c:89
+#: src/server/gnunetd.c:91
#, c-format
msgid "`%s' is shutting down.\n"
msgstr ""
-#: src/server/gnunetd.c:179
+#: src/server/gnunetd.c:181
+msgid "do not daemonize (run gnunetd as a foreground process)"
+msgstr ""
+
+#: src/server/gnunetd.c:184
msgid ""
"run in debug mode; gnunetd will not daemonize and error messages will be "
"written to stderr instead of a logfile"
msgstr ""
-#: src/server/gnunetd.c:183
+#: src/server/gnunetd.c:188
msgid "Starts the gnunetd daemon."
msgstr ""
-#: src/server/gnunetd.c:186
+#: src/server/gnunetd.c:191
msgid "disable padding with random data (experimental)"
msgstr ""
-#: src/server/gnunetd.c:190
+#: src/server/gnunetd.c:195
msgid "print all log messages to the console (only works together with -d)"
msgstr ""
-#: src/server/gnunetd.c:194
+#: src/server/gnunetd.c:199
msgid "specify username as which gnunetd should run"
msgstr ""
-#: src/server/gnunetd.c:275
+#: src/server/gnunetd.c:280
#, c-format
msgid "Configuration or GNUnet version changed. You need to run `%s'!\n"
msgstr ""
@@ -3946,70 +3979,70 @@
msgid "upnp: NAT Returned IP: %s\n"
msgstr ""
-#: src/transports/http.c:2019 src/transports/tcp.c:811
+#: src/transports/http.c:2020 src/transports/tcp.c:811
#, c-format
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"%s\" to \"NO\"\n"
msgstr ""
-#: src/transports/http.c:2028
+#: src/transports/http.c:2029
msgid "# bytes received via HTTP"
msgstr ""
-#: src/transports/http.c:2029
+#: src/transports/http.c:2030
msgid "# bytes sent via HTTP"
msgstr ""
-#: src/transports/http.c:2031
+#: src/transports/http.c:2032
msgid "# bytes dropped by HTTP (outgoing)"
msgstr ""
-#: src/transports/http.c:2032
+#: src/transports/http.c:2033
msgid "# HTTP GET issued"
msgstr ""
-#: src/transports/http.c:2034
+#: src/transports/http.c:2035
msgid "# HTTP GET received"
msgstr ""
-#: src/transports/http.c:2035
+#: src/transports/http.c:2036
msgid "# HTTP PUT issued"
msgstr ""
-#: src/transports/http.c:2037
+#: src/transports/http.c:2038
msgid "# HTTP PUT received"
msgstr ""
-#: src/transports/http.c:2039
+#: src/transports/http.c:2040
msgid "# HTTP select calls"
msgstr ""
-#: src/transports/http.c:2041
+#: src/transports/http.c:2042
msgid "# HTTP send calls"
msgstr ""
-#: src/transports/http.c:2044
+#: src/transports/http.c:2045
msgid "# HTTP curl send callbacks"
msgstr ""
-#: src/transports/http.c:2046
+#: src/transports/http.c:2047
msgid "# HTTP curl receive callbacks"
msgstr ""
-#: src/transports/http.c:2048
+#: src/transports/http.c:2049
msgid "# HTTP mhd access callbacks"
msgstr ""
-#: src/transports/http.c:2050
+#: src/transports/http.c:2051
msgid "# HTTP mhd read callbacks"
msgstr ""
-#: src/transports/http.c:2052
+#: src/transports/http.c:2053
msgid "# HTTP mhd close callbacks"
msgstr ""
-#: src/transports/http.c:2054
+#: src/transports/http.c:2055
msgid "# HTTP connect calls"
msgstr ""
Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po 2009-02-28 05:16:03 UTC (rev 8297)
+++ GNUnet/po/de.po 2009-02-28 06:01:49 UTC (rev 8298)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2009-01-08 10:55-0700\n"
+"POT-Creation-Date: 2009-02-27 22:04-0700\n"
"PO-Revision-Date: 2006-03-17 21:37+0100\n"
"Last-Translator: Nils Durner <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -873,7 +873,7 @@
msgid "Error connecting to %s:%u. Is the daemon running?\n"
msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-#: src/util/network_client/tcpio.c:398
+#: src/util/network_client/tcpio.c:398 src/util/network/io.c:164
#, fuzzy, c-format
msgid "Cannot connect to %s:%u: %s\n"
msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
@@ -1115,21 +1115,38 @@
msgid "RSA signature verification failed at %s:%d: %s\n"
msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
-#: src/util/os/user.c:108 src/util/os/user.c:125
+#: src/util/os/user.c:167 src/util/os/user.c:482 src/util/os/user.c:499
#, fuzzy, c-format
msgid "`%s' returned with error code %u"
msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-#: src/util/os/user.c:155 src/util/os/user.c:200
+#: src/util/os/user.c:298 src/util/os/user.c:345
+msgid "Error while parsing dscl output.\n"
+msgstr ""
+
+#: src/util/os/user.c:320
+#, c-format
+msgid "Couldn't find a group (`%s') for the new user and none was specified.\n"
+msgstr ""
+
+#: src/util/os/user.c:375
+msgid "Failed to find a free system id for the new group.\n"
+msgstr ""
+
+#: src/util/os/user.c:392
+msgid "Failed to find a free system id for the new user.\n"
+msgstr ""
+
+#: src/util/os/user.c:529 src/util/os/user.c:574
#, fuzzy, c-format
msgid "Cannot obtain information about user `%s': %s\n"
msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
-#: src/util/os/user.c:156
+#: src/util/os/user.c:530
msgid "No such user"
msgstr ""
-#: src/util/os/user.c:171
+#: src/util/os/user.c:545
#, c-format
msgid "Cannot change user/group to `%s': %s\n"
msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
@@ -1180,7 +1197,8 @@
msgid "Setting open descriptor limit not supported.\n"
msgstr ""
-#: src/util/os/osconfig.c:463 src/util/os/osconfig.c:492
+#: src/util/os/osconfig.c:453 src/util/os/osconfig.c:631
+#: src/util/os/osconfig.c:660
#, fuzzy, c-format
msgid "Command `%s' failed with error code %u\n"
msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1392,7 +1410,7 @@
msgid "Running benchmark...\n"
msgstr "Benchmark läuft...\n"
-#: src/applications/tbench/tbench.c:422
+#: src/applications/tbench/tbench.c:438
msgid "allows profiling of direct peer-to-peer connections"
msgstr "Ermöglicht das Untersuchen direkter Peer-to-Peer Verbindungen"
@@ -1554,7 +1572,7 @@
msgstr "sqlite Datenspeicher"
#: src/applications/sqstore_sqlite/sqlite.c:1474
-#: src/applications/sqstore_mysql/mysql.c:1078
+#: src/applications/sqstore_mysql/mysql.c:1081
msgid "# bytes in datastore"
msgstr "# bytes in der Datenbank"
@@ -1563,8 +1581,8 @@
msgid "# bytes allocated by SQLite"
msgstr "# bytes erlaubt in der Datenbank"
-#: src/applications/sqstore_mysql/mysql.c:1085
-#: src/applications/sqstore_mysql/mysql.c:1160
+#: src/applications/sqstore_mysql/mysql.c:1088
+#: src/applications/sqstore_mysql/mysql.c:1163
msgid ""
"Failed to load MySQL database module. Check that MySQL is running and "
"configured properly!\n"
@@ -1750,37 +1768,37 @@
msgid "`%s' registering handler %d\n"
msgstr "`%s' registriert Handler %d\n"
-#: src/applications/topology_default/topology.c:466
+#: src/applications/topology_default/topology.c:475
#, fuzzy, c-format
msgid "Could not read friends list `%s'\n"
msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-#: src/applications/topology_default/topology.c:485
+#: src/applications/topology_default/topology.c:499
#, c-format
msgid "Failed to read friends list from `%s'\n"
msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-#: src/applications/topology_default/topology.c:505
+#: src/applications/topology_default/topology.c:519
msgid "Syntax error in topology specification, skipping bytes.\n"
msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
-#: src/applications/topology_default/topology.c:523
+#: src/applications/topology_default/topology.c:538
#, c-format
msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
-#: src/applications/topology_default/topology.c:535
+#: src/applications/topology_default/topology.c:551
msgid ""
"Fewer friends specified than required by minimum friend count. Will only "
"connect to friends.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:543
+#: src/applications/topology_default/topology.c:559
msgid ""
"More friendly connections required than target total number of connections.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:726
+#: src/applications/topology_default/topology.c:743
msgid "maintains GNUnet default mesh topology"
msgstr ""
@@ -2063,7 +2081,7 @@
msgstr "Ich bin Peer `%s'.\n"
#: src/applications/dht/tools/dht_multipeer_test.c:80
-#: src/applications/dht/tools/dht_twopeer_test.c:47
+#: src/applications/dht/tools/dht_api.c:332
#: src/applications/dht/module/table.c:783
msgid "# dht connections"
msgstr ""
@@ -2379,7 +2397,7 @@
#: src/applications/fs/tools/gnunet-pseudonym.c:70
#: src/applications/fs/tools/gnunet-auto-share.c:199
#: src/applications/fs/tools/gnunet-insert.c:246
-#: src/applications/fs/tools/gnunet-search.c:125
+#: src/applications/fs/tools/gnunet-search.c:126
#: src/applications/fs/tools/gnunet-download.c:77
msgid "set the desired LEVEL of sender-anonymity"
msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
@@ -2808,7 +2826,7 @@
#: src/applications/fs/tools/gnunet-insert.c:297
msgid ""
-"only simulte the process but do not do any actual publishing (useful to "
+"only simulate the process but do not do any actual publishing (useful to "
"compute URIs)"
msgstr ""
@@ -2856,15 +2874,15 @@
msgid "Option `%s' makes no sense without option `%s'.\n"
msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
-#: src/applications/fs/tools/gnunet-search.c:128
+#: src/applications/fs/tools/gnunet-search.c:129
msgid "Search GNUnet for files."
msgstr "Das GNUnet nach Dateien durchsuchen."
-#: src/applications/fs/tools/gnunet-search.c:132
+#: src/applications/fs/tools/gnunet-search.c:133
msgid "write encountered (decrypted) search results to FILENAME"
msgstr "Begegnete (entschlüsselte) Suchergebnisse in FILENAME schreiben"
-#: src/applications/fs/tools/gnunet-search.c:169
+#: src/applications/fs/tools/gnunet-search.c:170
#, c-format
msgid "Error converting arguments to URI!\n"
msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
@@ -3059,12 +3077,12 @@
msgid "Number of double-quotes not balanced!\n"
msgstr ""
-#: src/applications/fs/ecrs/helper.c:398
+#: src/applications/fs/ecrs/helper.c:405
#, c-format
msgid "Renaming of file `%s' to `%s' failed: %s\n"
msgstr "Umbenennen der Datei `%s' zu `%s' fehlgeschlagen: %s\n"
-#: src/applications/fs/ecrs/helper.c:408
+#: src/applications/fs/ecrs/helper.c:415
#, c-format
msgid "Could not rename file `%s' to `%s': file exists\n"
msgstr ""
@@ -3085,19 +3103,19 @@
msgid "LOC URI not allowed for search.\n"
msgstr "LOC URI ist nicht erlaubt für Suchen.\n"
-#: src/applications/fs/ecrs/namespace.c:365
+#: src/applications/fs/ecrs/namespace.c:370
#, c-format
msgid "File `%s' does not contain a pseudonym.\n"
msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
-#: src/applications/fs/ecrs/namespace.c:376
+#: src/applications/fs/ecrs/namespace.c:381
#, c-format
msgid "Format of pseudonym `%s' is invalid.\n"
msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
-#: src/applications/fs/ecrs/namespace.c:535
-#: src/applications/fs/ecrs/namespace.c:547
-#: src/applications/fs/ecrs/namespace.c:559
+#: src/applications/fs/ecrs/namespace.c:540
+#: src/applications/fs/ecrs/namespace.c:552
+#: src/applications/fs/ecrs/namespace.c:564
#, fuzzy, c-format
msgid "Format of file `%s' is invalid, trying to remove.\n"
msgstr "Format der Datei `%s' ist ungültig.\n"
@@ -3307,44 +3325,55 @@
msgid "scp command is : %s \n"
msgstr ""
-#: src/applications/testing/remote.c:491
+#: src/applications/testing/remote.c:80 src/applications/testing/remote.c:92
+#, c-format
+msgid "ssh command is : %s \n"
+msgstr ""
+
+#: src/applications/testing/remote.c:554
#, fuzzy, c-format
msgid "Friend list of %s:%d\n"
msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/applications/testing/remote.c:513
+#: src/applications/testing/remote.c:576
#, c-format
msgid "scp command for friend file copy is : %s \n"
msgstr ""
-#: src/applications/testing/remote.c:535
+#: src/applications/testing/remote.c:598
#, fuzzy, c-format
msgid "connecting peer %s:%d to peer %s:%d\n"
msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-#: src/applications/testing/remotetest.c:38
+#: src/applications/testing/remotetest.c:39
msgid "Set up multiple gnunetd daemons across multiple hosts."
msgstr ""
-#: src/applications/testing/remotetest.c:43
+#: src/applications/testing/remotetest.c:44
#, fuzzy
msgid "set number of daemons to start"
msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
+#: src/applications/testing/remotetest.c:49
+msgid ""
+"set output file for a dot input file which represents the graph of the "
+"connected nodes"
+msgstr ""
+
#: src/applications/testing/testing.c:268
-#: src/applications/testing/remotetopologies.c:367
+#: src/applications/testing/remotetopologies.c:437
#, fuzzy, c-format
msgid "Waiting for peers to connect"
msgstr ""
"Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
"verbleiben)...\n"
-#: src/applications/testing/remotetopologies.c:213
+#: src/applications/testing/remotetopologies.c:281
#, c-format
msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
msgstr ""
-#: src/applications/testing/remotetopologies.c:491
+#: src/applications/testing/remotetopologies.c:572
#, fuzzy, c-format
msgid "Failed to establish connection with peers.\n"
msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
@@ -3362,9 +3391,9 @@
#: src/applications/bootstrap_http/http.c:365
#: src/applications/bootstrap_http/http.c:375
#: src/applications/bootstrap_http/http.c:385 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:541 src/transports/http.c:1085
-#: src/transports/http.c:1209 src/transports/http.c:1377
-#: src/transports/http.c:1777 src/transports/http.c:1827
+#: src/transports/upnp/upnp.c:541 src/transports/http.c:1086
+#: src/transports/http.c:1210 src/transports/http.c:1378
+#: src/transports/http.c:1778 src/transports/http.c:1828
#, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
@@ -3393,12 +3422,12 @@
msgid "# HELLOs downloaded via http"
msgstr "# Hellos per HTTP heruntergeladen"
-#: src/applications/getoption/getoption.c:78
+#: src/applications/getoption/getoption.c:79
#, c-format
msgid "`%s' registering client handler %d\n"
msgstr "`%s' registriert Client-Handler %d\n"
-#: src/applications/getoption/getoption.c:88
+#: src/applications/getoption/getoption.c:89
msgid "allows clients to determine gnunetd's configuration"
msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
@@ -3411,7 +3440,7 @@
msgid "Template description."
msgstr ""
-#: src/applications/stats/clientapi.c:331
+#: src/applications/stats/clientapi.c:346
msgid "Uptime (seconds)"
msgstr "Laufzeit (Sekunden)"
@@ -3841,7 +3870,7 @@
msgid "Failed to update data for module `%s'\n"
msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-#: src/server/gnunet-update.c:225 src/server/gnunetd.c:124
+#: src/server/gnunet-update.c:225 src/server/gnunetd.c:126
#, fuzzy
msgid "Core initialization failed.\n"
msgstr " Verbindung fehlgeschlagen\n"
@@ -3865,17 +3894,21 @@
"Failed to determine filename used to store GNUnet version information!\n"
msgstr ""
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:87
#, c-format
msgid "`%s' startup complete.\n"
msgstr "`%s' Startvorgang abgeschlossen.\n"
-#: src/server/gnunetd.c:89
+#: src/server/gnunetd.c:91
#, c-format
msgid "`%s' is shutting down.\n"
msgstr "`%s' fährt herunter.\n"
-#: src/server/gnunetd.c:179
+#: src/server/gnunetd.c:181
+msgid "do not daemonize (run gnunetd as a foreground process)"
+msgstr ""
+
+#: src/server/gnunetd.c:184
msgid ""
"run in debug mode; gnunetd will not daemonize and error messages will be "
"written to stderr instead of a logfile"
@@ -3884,24 +3917,24 @@
"Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die "
"Standardfehlerausgabe (stderr) geschrieben."
-#: src/server/gnunetd.c:183
+#: src/server/gnunetd.c:188
msgid "Starts the gnunetd daemon."
msgstr "Startet den gnunetd Daemonen."
-#: src/server/gnunetd.c:186
+#: src/server/gnunetd.c:191
msgid "disable padding with random data (experimental)"
msgstr ""
-#: src/server/gnunetd.c:190
+#: src/server/gnunetd.c:195
msgid "print all log messages to the console (only works together with -d)"
msgstr ""
-#: src/server/gnunetd.c:194
+#: src/server/gnunetd.c:199
#, fuzzy
msgid "specify username as which gnunetd should run"
msgstr "Gibt an, auf welchem Host gnunetd läuft"
-#: src/server/gnunetd.c:275
+#: src/server/gnunetd.c:280
#, c-format
msgid "Configuration or GNUnet version changed. You need to run `%s'!\n"
msgstr ""
@@ -4297,72 +4330,72 @@
msgid "upnp: NAT Returned IP: %s\n"
msgstr ""
-#: src/transports/http.c:2019 src/transports/tcp.c:811
+#: src/transports/http.c:2020 src/transports/tcp.c:811
#, c-format
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"%s\" to \"NO\"\n"
msgstr ""
-#: src/transports/http.c:2028
+#: src/transports/http.c:2029
msgid "# bytes received via HTTP"
msgstr "# Bytes empfangen über HTTP"
-#: src/transports/http.c:2029
+#: src/transports/http.c:2030
msgid "# bytes sent via HTTP"
msgstr "# Bytes gesendet über HTTP"
-#: src/transports/http.c:2031
+#: src/transports/http.c:2032
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "# Bytes verworfen von HTTP"
-#: src/transports/http.c:2032
+#: src/transports/http.c:2033
msgid "# HTTP GET issued"
msgstr ""
-#: src/transports/http.c:2034
+#: src/transports/http.c:2035
#, fuzzy
msgid "# HTTP GET received"
msgstr "# Bytes empfangen über TCP"
-#: src/transports/http.c:2035
+#: src/transports/http.c:2036
msgid "# HTTP PUT issued"
msgstr ""
-#: src/transports/http.c:2037
+#: src/transports/http.c:2038
#, fuzzy
msgid "# HTTP PUT received"
msgstr "# Bytes empfangen über TCP"
-#: src/transports/http.c:2039
+#: src/transports/http.c:2040
msgid "# HTTP select calls"
msgstr ""
-#: src/transports/http.c:2041
+#: src/transports/http.c:2042
msgid "# HTTP send calls"
msgstr ""
-#: src/transports/http.c:2044
+#: src/transports/http.c:2045
msgid "# HTTP curl send callbacks"
msgstr ""
-#: src/transports/http.c:2046
+#: src/transports/http.c:2047
msgid "# HTTP curl receive callbacks"
msgstr ""
-#: src/transports/http.c:2048
+#: src/transports/http.c:2049
msgid "# HTTP mhd access callbacks"
msgstr ""
-#: src/transports/http.c:2050
+#: src/transports/http.c:2051
msgid "# HTTP mhd read callbacks"
msgstr ""
-#: src/transports/http.c:2052
+#: src/transports/http.c:2053
msgid "# HTTP mhd close callbacks"
msgstr ""
-#: src/transports/http.c:2054
+#: src/transports/http.c:2055
#, fuzzy
msgid "# HTTP connect calls"
msgstr "# verbundener Knoten"
Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po 2009-02-28 05:16:03 UTC (rev 8297)
+++ GNUnet/po/es.po 2009-02-28 06:01:49 UTC (rev 8298)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0e\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2009-01-08 10:55-0700\n"
+"POT-Creation-Date: 2009-02-27 22:04-0700\n"
"PO-Revision-Date: 2006-06-29 12:05+0200\n"
"Last-Translator: Miguel Angel Arruga <address@hidden>\n"
"Language-Team: Spanish\n"
@@ -868,7 +868,7 @@
msgid "Error connecting to %s:%u. Is the daemon running?\n"
msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
-#: src/util/network_client/tcpio.c:398
+#: src/util/network_client/tcpio.c:398 src/util/network/io.c:164
#, fuzzy, c-format
msgid "Cannot connect to %s:%u: %s\n"
msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
@@ -1100,21 +1100,38 @@
msgid "RSA signature verification failed at %s:%d: %s\n"
msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
-#: src/util/os/user.c:108 src/util/os/user.c:125
+#: src/util/os/user.c:167 src/util/os/user.c:482 src/util/os/user.c:499
#, fuzzy, c-format
msgid "`%s' returned with error code %u"
msgstr "'%s' falló con el código de error %s: %s"
-#: src/util/os/user.c:155 src/util/os/user.c:200
+#: src/util/os/user.c:298 src/util/os/user.c:345
+msgid "Error while parsing dscl output.\n"
+msgstr ""
+
+#: src/util/os/user.c:320
+#, c-format
+msgid "Couldn't find a group (`%s') for the new user and none was specified.\n"
+msgstr ""
+
+#: src/util/os/user.c:375
+msgid "Failed to find a free system id for the new group.\n"
+msgstr ""
+
+#: src/util/os/user.c:392
+msgid "Failed to find a free system id for the new user.\n"
+msgstr ""
+
+#: src/util/os/user.c:529 src/util/os/user.c:574
#, fuzzy, c-format
msgid "Cannot obtain information about user `%s': %s\n"
msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
-#: src/util/os/user.c:156
+#: src/util/os/user.c:530
msgid "No such user"
msgstr ""
-#: src/util/os/user.c:171
+#: src/util/os/user.c:545
#, c-format
msgid "Cannot change user/group to `%s': %s\n"
msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
@@ -1162,7 +1179,8 @@
msgid "Setting open descriptor limit not supported.\n"
msgstr ""
-#: src/util/os/osconfig.c:463 src/util/os/osconfig.c:492
+#: src/util/os/osconfig.c:453 src/util/os/osconfig.c:631
+#: src/util/os/osconfig.c:660
#, fuzzy, c-format
msgid "Command `%s' failed with error code %u\n"
msgstr "'%s' falló con el código de error %s: %s"
@@ -1372,7 +1390,7 @@
msgid "Running benchmark...\n"
msgstr ""
-#: src/applications/tbench/tbench.c:422
+#: src/applications/tbench/tbench.c:438
msgid "allows profiling of direct peer-to-peer connections"
msgstr ""
@@ -1534,7 +1552,7 @@
msgstr "base de datos sqlite"
#: src/applications/sqstore_sqlite/sqlite.c:1474
-#: src/applications/sqstore_mysql/mysql.c:1078
+#: src/applications/sqstore_mysql/mysql.c:1081
msgid "# bytes in datastore"
msgstr "# bytes en la base de datos"
@@ -1543,8 +1561,8 @@
msgid "# bytes allocated by SQLite"
msgstr "# bytes en la base de datos"
-#: src/applications/sqstore_mysql/mysql.c:1085
-#: src/applications/sqstore_mysql/mysql.c:1160
+#: src/applications/sqstore_mysql/mysql.c:1088
+#: src/applications/sqstore_mysql/mysql.c:1163
msgid ""
"Failed to load MySQL database module. Check that MySQL is running and "
"configured properly!\n"
@@ -1722,37 +1740,37 @@
msgid "`%s' registering handler %d\n"
msgstr "'%s' registrando manejador %d\n"
-#: src/applications/topology_default/topology.c:466
+#: src/applications/topology_default/topology.c:475
#, fuzzy, c-format
msgid "Could not read friends list `%s'\n"
msgstr "Imposible inicializar la aplicación '%s'\n"
-#: src/applications/topology_default/topology.c:485
+#: src/applications/topology_default/topology.c:499
#, c-format
msgid "Failed to read friends list from `%s'\n"
msgstr ""
-#: src/applications/topology_default/topology.c:505
+#: src/applications/topology_default/topology.c:519
msgid "Syntax error in topology specification, skipping bytes.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:523
+#: src/applications/topology_default/topology.c:538
#, c-format
msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:535
+#: src/applications/topology_default/topology.c:551
msgid ""
"Fewer friends specified than required by minimum friend count. Will only "
"connect to friends.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:543
+#: src/applications/topology_default/topology.c:559
msgid ""
"More friendly connections required than target total number of connections.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:726
+#: src/applications/topology_default/topology.c:743
msgid "maintains GNUnet default mesh topology"
msgstr ""
@@ -2034,7 +2052,7 @@
msgstr "Yo soy el par '%s'.\n"
#: src/applications/dht/tools/dht_multipeer_test.c:80
-#: src/applications/dht/tools/dht_twopeer_test.c:47
+#: src/applications/dht/tools/dht_api.c:332
#: src/applications/dht/module/table.c:783
msgid "# dht connections"
msgstr ""
@@ -2342,7 +2360,7 @@
#: src/applications/fs/tools/gnunet-pseudonym.c:70
#: src/applications/fs/tools/gnunet-auto-share.c:199
#: src/applications/fs/tools/gnunet-insert.c:246
-#: src/applications/fs/tools/gnunet-search.c:125
+#: src/applications/fs/tools/gnunet-search.c:126
#: src/applications/fs/tools/gnunet-download.c:77
msgid "set the desired LEVEL of sender-anonymity"
msgstr "seleccione el NIVEL deseado de anonimato al enviar"
@@ -2756,7 +2774,7 @@
#: src/applications/fs/tools/gnunet-insert.c:297
msgid ""
-"only simulte the process but do not do any actual publishing (useful to "
+"only simulate the process but do not do any actual publishing (useful to "
"compute URIs)"
msgstr ""
@@ -2804,15 +2822,15 @@
msgid "Option `%s' makes no sense without option `%s'.\n"
msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
-#: src/applications/fs/tools/gnunet-search.c:128
+#: src/applications/fs/tools/gnunet-search.c:129
msgid "Search GNUnet for files."
msgstr "Buscar GNUnet en busca de ficheros."
-#: src/applications/fs/tools/gnunet-search.c:132
+#: src/applications/fs/tools/gnunet-search.c:133
msgid "write encountered (decrypted) search results to FILENAME"
msgstr "escribe los resultados encontrados (desencriptados) a FILENAME"
-#: src/applications/fs/tools/gnunet-search.c:169
+#: src/applications/fs/tools/gnunet-search.c:170
#, c-format
msgid "Error converting arguments to URI!\n"
msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
@@ -3012,12 +3030,12 @@
msgid "Number of double-quotes not balanced!\n"
msgstr ""
-#: src/applications/fs/ecrs/helper.c:398
+#: src/applications/fs/ecrs/helper.c:405
#, c-format
msgid "Renaming of file `%s' to `%s' failed: %s\n"
msgstr "Al renombrar el fichero '%s' a '%s' se produjo un fallo: %s\n"
-#: src/applications/fs/ecrs/helper.c:408
+#: src/applications/fs/ecrs/helper.c:415
#, c-format
msgid "Could not rename file `%s' to `%s': file exists\n"
msgstr "Imposible renombrar el fichero '%s' a '%s': el fichero ya existe\n"
@@ -3039,19 +3057,19 @@
msgid "LOC URI not allowed for search.\n"
msgstr "LOC URI no autorizado para buscar.\n"
-#: src/applications/fs/ecrs/namespace.c:365
+#: src/applications/fs/ecrs/namespace.c:370
#, c-format
msgid "File `%s' does not contain a pseudonym.\n"
msgstr "El fichero '%s' no contiene un pseudónimo.\n"
-#: src/applications/fs/ecrs/namespace.c:376
+#: src/applications/fs/ecrs/namespace.c:381
#, c-format
msgid "Format of pseudonym `%s' is invalid.\n"
msgstr "Formato del pseudónimo '%s' no es válido.\n"
-#: src/applications/fs/ecrs/namespace.c:535
-#: src/applications/fs/ecrs/namespace.c:547
-#: src/applications/fs/ecrs/namespace.c:559
+#: src/applications/fs/ecrs/namespace.c:540
+#: src/applications/fs/ecrs/namespace.c:552
+#: src/applications/fs/ecrs/namespace.c:564
#, fuzzy, c-format
msgid "Format of file `%s' is invalid, trying to remove.\n"
msgstr "El formato del fichero '%s' no es válido.\n"
@@ -3252,42 +3270,53 @@
msgid "scp command is : %s \n"
msgstr ""
-#: src/applications/testing/remote.c:491
+#: src/applications/testing/remote.c:80 src/applications/testing/remote.c:92
+#, c-format
+msgid "ssh command is : %s \n"
+msgstr ""
+
+#: src/applications/testing/remote.c:554
#, fuzzy, c-format
msgid "Friend list of %s:%d\n"
msgstr "Fallo al conectar a gnunetd.\n"
-#: src/applications/testing/remote.c:513
+#: src/applications/testing/remote.c:576
#, c-format
msgid "scp command for friend file copy is : %s \n"
msgstr ""
-#: src/applications/testing/remote.c:535
+#: src/applications/testing/remote.c:598
#, fuzzy, c-format
msgid "connecting peer %s:%d to peer %s:%d\n"
msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
-#: src/applications/testing/remotetest.c:38
+#: src/applications/testing/remotetest.c:39
msgid "Set up multiple gnunetd daemons across multiple hosts."
msgstr ""
-#: src/applications/testing/remotetest.c:43
+#: src/applications/testing/remotetest.c:44
#, fuzzy
msgid "set number of daemons to start"
msgstr "número de mensajes a usar por iteración"
+#: src/applications/testing/remotetest.c:49
+msgid ""
+"set output file for a dot input file which represents the graph of the "
+"connected nodes"
+msgstr ""
+
#: src/applications/testing/testing.c:268
-#: src/applications/testing/remotetopologies.c:367
+#: src/applications/testing/remotetopologies.c:437
#, fuzzy, c-format
msgid "Waiting for peers to connect"
msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
-#: src/applications/testing/remotetopologies.c:213
+#: src/applications/testing/remotetopologies.c:281
#, c-format
msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
msgstr ""
-#: src/applications/testing/remotetopologies.c:491
+#: src/applications/testing/remotetopologies.c:572
#, fuzzy, c-format
msgid "Failed to establish connection with peers.\n"
msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
@@ -3305,9 +3334,9 @@
#: src/applications/bootstrap_http/http.c:365
#: src/applications/bootstrap_http/http.c:375
#: src/applications/bootstrap_http/http.c:385 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:541 src/transports/http.c:1085
-#: src/transports/http.c:1209 src/transports/http.c:1377
-#: src/transports/http.c:1777 src/transports/http.c:1827
+#: src/transports/upnp/upnp.c:541 src/transports/http.c:1086
+#: src/transports/http.c:1210 src/transports/http.c:1378
+#: src/transports/http.c:1778 src/transports/http.c:1828
#, fuzzy, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr "'%s' falló en %s: %d con error: '%s'.\n"
@@ -3336,12 +3365,12 @@
msgid "# HELLOs downloaded via http"
msgstr "# saludos descargados vía HTTP"
-#: src/applications/getoption/getoption.c:78
+#: src/applications/getoption/getoption.c:79
#, c-format
msgid "`%s' registering client handler %d\n"
msgstr "'%s' registrando un manejador de clientes %d\n"
-#: src/applications/getoption/getoption.c:88
+#: src/applications/getoption/getoption.c:89
msgid "allows clients to determine gnunetd's configuration"
msgstr "permite a los clientes determinar la configuración de gnunetd"
@@ -3354,7 +3383,7 @@
msgid "Template description."
msgstr ""
-#: src/applications/stats/clientapi.c:331
+#: src/applications/stats/clientapi.c:346
msgid "Uptime (seconds)"
msgstr ""
@@ -3782,7 +3811,7 @@
msgid "Failed to update data for module `%s'\n"
msgstr "Falló al actualizar los datos del módulo '%s'\n"
-#: src/server/gnunet-update.c:225 src/server/gnunetd.c:124
+#: src/server/gnunet-update.c:225 src/server/gnunetd.c:126
#, fuzzy
msgid "Core initialization failed.\n"
msgstr "Conexión fallida\n"
@@ -3804,17 +3833,21 @@
"Failed to determine filename used to store GNUnet version information!\n"
msgstr ""
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:87
#, c-format
msgid "`%s' startup complete.\n"
msgstr "'%s' comienzo completo.\n"
-#: src/server/gnunetd.c:89
+#: src/server/gnunetd.c:91
#, c-format
msgid "`%s' is shutting down.\n"
msgstr "'%s' se esta cerrando.\n"
-#: src/server/gnunetd.c:179
+#: src/server/gnunetd.c:181
+msgid "do not daemonize (run gnunetd as a foreground process)"
+msgstr ""
+
+#: src/server/gnunetd.c:184
msgid ""
"run in debug mode; gnunetd will not daemonize and error messages will be "
"written to stderr instead of a logfile"
@@ -3822,24 +3855,24 @@
"se ejecuta en modo de depuración; gnunetd no sera un demonio y los mensajes "
"de error serán escritos a través de stderr en vez de en un fichero de log"
-#: src/server/gnunetd.c:183
+#: src/server/gnunetd.c:188
msgid "Starts the gnunetd daemon."
msgstr "Arranca el demonio de gnunetd."
-#: src/server/gnunetd.c:186
+#: src/server/gnunetd.c:191
msgid "disable padding with random data (experimental)"
msgstr ""
-#: src/server/gnunetd.c:190
+#: src/server/gnunetd.c:195
msgid "print all log messages to the console (only works together with -d)"
msgstr ""
-#: src/server/gnunetd.c:194
+#: src/server/gnunetd.c:199
#, fuzzy
msgid "specify username as which gnunetd should run"
msgstr "especifica el host en el que gnunetd esta ejecutandose"
-#: src/server/gnunetd.c:275
+#: src/server/gnunetd.c:280
#, c-format
msgid "Configuration or GNUnet version changed. You need to run `%s'!\n"
msgstr ""
@@ -4221,73 +4254,73 @@
msgid "upnp: NAT Returned IP: %s\n"
msgstr ""
-#: src/transports/http.c:2019 src/transports/tcp.c:811
+#: src/transports/http.c:2020 src/transports/tcp.c:811
#, c-format
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"%s\" to \"NO\"\n"
msgstr ""
-#: src/transports/http.c:2028
+#: src/transports/http.c:2029
msgid "# bytes received via HTTP"
msgstr "# bytes recibidos vía HTTP"
-#: src/transports/http.c:2029
+#: src/transports/http.c:2030
msgid "# bytes sent via HTTP"
msgstr "# bytes mandados vía HTTP"
-#: src/transports/http.c:2031
+#: src/transports/http.c:2032
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "#bytes omitidos vía HTTP (salientes)"
-#: src/transports/http.c:2032
+#: src/transports/http.c:2033
msgid "# HTTP GET issued"
msgstr ""
-#: src/transports/http.c:2034
+#: src/transports/http.c:2035
#, fuzzy
msgid "# HTTP GET received"
msgstr "# bytes recibidos por TCP"
-#: src/transports/http.c:2035
+#: src/transports/http.c:2036
msgid "# HTTP PUT issued"
msgstr ""
-#: src/transports/http.c:2037
+#: src/transports/http.c:2038
#, fuzzy
msgid "# HTTP PUT received"
msgstr "# bytes recibidos por TCP"
-#: src/transports/http.c:2039
+#: src/transports/http.c:2040
msgid "# HTTP select calls"
msgstr ""
-#: src/transports/http.c:2041
+#: src/transports/http.c:2042
msgid "# HTTP send calls"
msgstr ""
-#: src/transports/http.c:2044
+#: src/transports/http.c:2045
msgid "# HTTP curl send callbacks"
msgstr ""
-#: src/transports/http.c:2046
+#: src/transports/http.c:2047
#, fuzzy
msgid "# HTTP curl receive callbacks"
msgstr "# bytes recibidos por TCP"
-#: src/transports/http.c:2048
+#: src/transports/http.c:2049
msgid "# HTTP mhd access callbacks"
msgstr ""
-#: src/transports/http.c:2050
+#: src/transports/http.c:2051
msgid "# HTTP mhd read callbacks"
msgstr ""
-#: src/transports/http.c:2052
+#: src/transports/http.c:2053
msgid "# HTTP mhd close callbacks"
msgstr ""
-#: src/transports/http.c:2054
+#: src/transports/http.c:2055
#, fuzzy
msgid "# HTTP connect calls"
msgstr "# de pares conectados"
Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po 2009-02-28 05:16:03 UTC (rev 8297)
+++ GNUnet/po/sv.po 2009-02-28 06:01:49 UTC (rev 8298)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2009-01-08 10:55-0700\n"
+"POT-Creation-Date: 2009-02-27 22:04-0700\n"
"PO-Revision-Date: 2006-01-21 17:16+0100\n"
"Last-Translator: Daniel Nylander <address@hidden>\n"
"Language-Team: Swedish <address@hidden>\n"
@@ -791,7 +791,7 @@
msgid "Error connecting to %s:%u. Is the daemon running?\n"
msgstr ""
-#: src/util/network_client/tcpio.c:398
+#: src/util/network_client/tcpio.c:398 src/util/network/io.c:164
#, fuzzy, c-format
msgid "Cannot connect to %s:%u: %s\n"
msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
@@ -1022,21 +1022,38 @@
msgid "RSA signature verification failed at %s:%d: %s\n"
msgstr ""
-#: src/util/os/user.c:108 src/util/os/user.c:125
+#: src/util/os/user.c:167 src/util/os/user.c:482 src/util/os/user.c:499
#, fuzzy, c-format
msgid "`%s' returned with error code %u"
msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-#: src/util/os/user.c:155 src/util/os/user.c:200
+#: src/util/os/user.c:298 src/util/os/user.c:345
+msgid "Error while parsing dscl output.\n"
+msgstr ""
+
+#: src/util/os/user.c:320
+#, c-format
+msgid "Couldn't find a group (`%s') for the new user and none was specified.\n"
+msgstr ""
+
+#: src/util/os/user.c:375
+msgid "Failed to find a free system id for the new group.\n"
+msgstr ""
+
+#: src/util/os/user.c:392
+msgid "Failed to find a free system id for the new user.\n"
+msgstr ""
+
+#: src/util/os/user.c:529 src/util/os/user.c:574
#, fuzzy, c-format
msgid "Cannot obtain information about user `%s': %s\n"
msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
-#: src/util/os/user.c:156
+#: src/util/os/user.c:530
msgid "No such user"
msgstr ""
-#: src/util/os/user.c:171
+#: src/util/os/user.c:545
#, c-format
msgid "Cannot change user/group to `%s': %s\n"
msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
@@ -1086,7 +1103,8 @@
msgid "Setting open descriptor limit not supported.\n"
msgstr ""
-#: src/util/os/osconfig.c:463 src/util/os/osconfig.c:492
+#: src/util/os/osconfig.c:453 src/util/os/osconfig.c:631
+#: src/util/os/osconfig.c:660
#, fuzzy, c-format
msgid "Command `%s' failed with error code %u\n"
msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -1291,7 +1309,7 @@
msgid "Running benchmark...\n"
msgstr ""
-#: src/applications/tbench/tbench.c:422
+#: src/applications/tbench/tbench.c:438
msgid "allows profiling of direct peer-to-peer connections"
msgstr ""
@@ -1450,7 +1468,7 @@
msgstr ""
#: src/applications/sqstore_sqlite/sqlite.c:1474
-#: src/applications/sqstore_mysql/mysql.c:1078
+#: src/applications/sqstore_mysql/mysql.c:1081
msgid "# bytes in datastore"
msgstr ""
@@ -1458,8 +1476,8 @@
msgid "# bytes allocated by SQLite"
msgstr ""
-#: src/applications/sqstore_mysql/mysql.c:1085
-#: src/applications/sqstore_mysql/mysql.c:1160
+#: src/applications/sqstore_mysql/mysql.c:1088
+#: src/applications/sqstore_mysql/mysql.c:1163
msgid ""
"Failed to load MySQL database module. Check that MySQL is running and "
"configured properly!\n"
@@ -1624,37 +1642,37 @@
msgid "`%s' registering handler %d\n"
msgstr "\"%s\" registrerar handtag %d\n"
-#: src/applications/topology_default/topology.c:466
+#: src/applications/topology_default/topology.c:475
#, fuzzy, c-format
msgid "Could not read friends list `%s'\n"
msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/applications/topology_default/topology.c:485
+#: src/applications/topology_default/topology.c:499
#, c-format
msgid "Failed to read friends list from `%s'\n"
msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/applications/topology_default/topology.c:505
+#: src/applications/topology_default/topology.c:519
msgid "Syntax error in topology specification, skipping bytes.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:523
+#: src/applications/topology_default/topology.c:538
#, c-format
msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:535
+#: src/applications/topology_default/topology.c:551
msgid ""
"Fewer friends specified than required by minimum friend count. Will only "
"connect to friends.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:543
+#: src/applications/topology_default/topology.c:559
msgid ""
"More friendly connections required than target total number of connections.\n"
msgstr ""
-#: src/applications/topology_default/topology.c:726
+#: src/applications/topology_default/topology.c:743
msgid "maintains GNUnet default mesh topology"
msgstr ""
@@ -1935,7 +1953,7 @@
msgstr "Jag är ändpunkt \"%s\".\n"
#: src/applications/dht/tools/dht_multipeer_test.c:80
-#: src/applications/dht/tools/dht_twopeer_test.c:47
+#: src/applications/dht/tools/dht_api.c:332
#: src/applications/dht/module/table.c:783
#, fuzzy
msgid "# dht connections"
@@ -2234,7 +2252,7 @@
#: src/applications/fs/tools/gnunet-pseudonym.c:70
#: src/applications/fs/tools/gnunet-auto-share.c:199
#: src/applications/fs/tools/gnunet-insert.c:246
-#: src/applications/fs/tools/gnunet-search.c:125
+#: src/applications/fs/tools/gnunet-search.c:126
#: src/applications/fs/tools/gnunet-download.c:77
msgid "set the desired LEVEL of sender-anonymity"
msgstr ""
@@ -2621,7 +2639,7 @@
#: src/applications/fs/tools/gnunet-insert.c:297
msgid ""
-"only simulte the process but do not do any actual publishing (useful to "
+"only simulate the process but do not do any actual publishing (useful to "
"compute URIs)"
msgstr ""
@@ -2667,15 +2685,15 @@
msgid "Option `%s' makes no sense without option `%s'.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-search.c:128
+#: src/applications/fs/tools/gnunet-search.c:129
msgid "Search GNUnet for files."
msgstr "Sök GNUnet efter filer."
-#: src/applications/fs/tools/gnunet-search.c:132
+#: src/applications/fs/tools/gnunet-search.c:133
msgid "write encountered (decrypted) search results to FILENAME"
msgstr ""
-#: src/applications/fs/tools/gnunet-search.c:169
+#: src/applications/fs/tools/gnunet-search.c:170
#, c-format
msgid "Error converting arguments to URI!\n"
msgstr ""
@@ -2872,12 +2890,12 @@
msgid "Number of double-quotes not balanced!\n"
msgstr ""
-#: src/applications/fs/ecrs/helper.c:398
+#: src/applications/fs/ecrs/helper.c:405
#, c-format
msgid "Renaming of file `%s' to `%s' failed: %s\n"
msgstr "Namnbyte på fil \"%s\" till \"%s\" misslyckades: %s\n"
-#: src/applications/fs/ecrs/helper.c:408
+#: src/applications/fs/ecrs/helper.c:415
#, c-format
msgid "Could not rename file `%s' to `%s': file exists\n"
msgstr "Kunde inte byta namn på fil \"%s\" till \"%s\": filen existerar\n"
@@ -2897,19 +2915,19 @@
msgid "LOC URI not allowed for search.\n"
msgstr "LOC URI tillåts inte för sökning.\n"
-#: src/applications/fs/ecrs/namespace.c:365
+#: src/applications/fs/ecrs/namespace.c:370
#, c-format
msgid "File `%s' does not contain a pseudonym.\n"
msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
-#: src/applications/fs/ecrs/namespace.c:376
+#: src/applications/fs/ecrs/namespace.c:381
#, c-format
msgid "Format of pseudonym `%s' is invalid.\n"
msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
-#: src/applications/fs/ecrs/namespace.c:535
-#: src/applications/fs/ecrs/namespace.c:547
-#: src/applications/fs/ecrs/namespace.c:559
+#: src/applications/fs/ecrs/namespace.c:540
+#: src/applications/fs/ecrs/namespace.c:552
+#: src/applications/fs/ecrs/namespace.c:564
#, fuzzy, c-format
msgid "Format of file `%s' is invalid, trying to remove.\n"
msgstr "Formatet på filen \"%s\" är ogiltig.\n"
@@ -3096,42 +3114,53 @@
msgid "scp command is : %s \n"
msgstr ""
-#: src/applications/testing/remote.c:491
+#: src/applications/testing/remote.c:80 src/applications/testing/remote.c:92
+#, c-format
+msgid "ssh command is : %s \n"
+msgstr ""
+
+#: src/applications/testing/remote.c:554
#, fuzzy, c-format
msgid "Friend list of %s:%d\n"
msgstr "Fel vid %s:%d.\n"
-#: src/applications/testing/remote.c:513
+#: src/applications/testing/remote.c:576
#, c-format
msgid "scp command for friend file copy is : %s \n"
msgstr ""
-#: src/applications/testing/remote.c:535
+#: src/applications/testing/remote.c:598
#, c-format
msgid "connecting peer %s:%d to peer %s:%d\n"
msgstr ""
-#: src/applications/testing/remotetest.c:38
+#: src/applications/testing/remotetest.c:39
msgid "Set up multiple gnunetd daemons across multiple hosts."
msgstr ""
-#: src/applications/testing/remotetest.c:43
+#: src/applications/testing/remotetest.c:44
#, fuzzy
msgid "set number of daemons to start"
msgstr "antal meddelanden att använda per iteration"
+#: src/applications/testing/remotetest.c:49
+msgid ""
+"set output file for a dot input file which represents the graph of the "
+"connected nodes"
+msgstr ""
+
#: src/applications/testing/testing.c:268
-#: src/applications/testing/remotetopologies.c:367
+#: src/applications/testing/remotetopologies.c:437
#, fuzzy, c-format
msgid "Waiting for peers to connect"
msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
-#: src/applications/testing/remotetopologies.c:213
+#: src/applications/testing/remotetopologies.c:281
#, c-format
msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
msgstr ""
-#: src/applications/testing/remotetopologies.c:491
+#: src/applications/testing/remotetopologies.c:572
#, fuzzy, c-format
msgid "Failed to establish connection with peers.\n"
msgstr "Misslyckades att starta samling.\n"
@@ -3149,9 +3178,9 @@
#: src/applications/bootstrap_http/http.c:365
#: src/applications/bootstrap_http/http.c:375
#: src/applications/bootstrap_http/http.c:385 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:541 src/transports/http.c:1085
-#: src/transports/http.c:1209 src/transports/http.c:1377
-#: src/transports/http.c:1777 src/transports/http.c:1827
+#: src/transports/upnp/upnp.c:541 src/transports/http.c:1086
+#: src/transports/http.c:1210 src/transports/http.c:1378
+#: src/transports/http.c:1778 src/transports/http.c:1828
#, fuzzy, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -3179,12 +3208,12 @@
msgid "# HELLOs downloaded via http"
msgstr ""
-#: src/applications/getoption/getoption.c:78
+#: src/applications/getoption/getoption.c:79
#, c-format
msgid "`%s' registering client handler %d\n"
msgstr "\"%s\" registrerar klienthandtag %d\n"
-#: src/applications/getoption/getoption.c:88
+#: src/applications/getoption/getoption.c:89
msgid "allows clients to determine gnunetd's configuration"
msgstr "tillåter klienter att fastställa gnunetds konfiguration"
@@ -3197,7 +3226,7 @@
msgid "Template description."
msgstr ""
-#: src/applications/stats/clientapi.c:331
+#: src/applications/stats/clientapi.c:346
msgid "Uptime (seconds)"
msgstr "Upptid (sekunder)"
@@ -3625,7 +3654,7 @@
msgid "Failed to update data for module `%s'\n"
msgstr ""
-#: src/server/gnunet-update.c:225 src/server/gnunetd.c:124
+#: src/server/gnunet-update.c:225 src/server/gnunetd.c:126
#, fuzzy
msgid "Core initialization failed.\n"
msgstr " Anslutning misslyckades\n"
@@ -3647,40 +3676,44 @@
"Failed to determine filename used to store GNUnet version information!\n"
msgstr ""
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:87
#, c-format
msgid "`%s' startup complete.\n"
msgstr "\"%s\" uppstart klar.\n"
-#: src/server/gnunetd.c:89
+#: src/server/gnunetd.c:91
#, c-format
msgid "`%s' is shutting down.\n"
msgstr ""
-#: src/server/gnunetd.c:179
+#: src/server/gnunetd.c:181
+msgid "do not daemonize (run gnunetd as a foreground process)"
+msgstr ""
+
+#: src/server/gnunetd.c:184
msgid ""
"run in debug mode; gnunetd will not daemonize and error messages will be "
"written to stderr instead of a logfile"
msgstr ""
-#: src/server/gnunetd.c:183
+#: src/server/gnunetd.c:188
msgid "Starts the gnunetd daemon."
msgstr "Startar gnunetd-demonen."
-#: src/server/gnunetd.c:186
+#: src/server/gnunetd.c:191
msgid "disable padding with random data (experimental)"
msgstr ""
-#: src/server/gnunetd.c:190
+#: src/server/gnunetd.c:195
msgid "print all log messages to the console (only works together with -d)"
msgstr ""
-#: src/server/gnunetd.c:194
+#: src/server/gnunetd.c:199
#, fuzzy
msgid "specify username as which gnunetd should run"
msgstr "ange värd på vilken gnunetd körs"
-#: src/server/gnunetd.c:275
+#: src/server/gnunetd.c:280
#, c-format
msgid "Configuration or GNUnet version changed. You need to run `%s'!\n"
msgstr ""
@@ -4062,70 +4095,70 @@
msgid "upnp: NAT Returned IP: %s\n"
msgstr ""
-#: src/transports/http.c:2019 src/transports/tcp.c:811
+#: src/transports/http.c:2020 src/transports/tcp.c:811
#, c-format
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
"option \"UPNP\" in section \"%s\" to \"NO\"\n"
msgstr ""
-#: src/transports/http.c:2028
+#: src/transports/http.c:2029
msgid "# bytes received via HTTP"
msgstr "# byte mottagna via HTTP"
-#: src/transports/http.c:2029
+#: src/transports/http.c:2030
msgid "# bytes sent via HTTP"
msgstr "# byte skickade via HTTP"
-#: src/transports/http.c:2031
+#: src/transports/http.c:2032
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "# byte kastade via HTTP (utgående)"
-#: src/transports/http.c:2032
+#: src/transports/http.c:2033
msgid "# HTTP GET issued"
msgstr ""
-#: src/transports/http.c:2034
+#: src/transports/http.c:2035
msgid "# HTTP GET received"
msgstr ""
-#: src/transports/http.c:2035
+#: src/transports/http.c:2036
msgid "# HTTP PUT issued"
msgstr ""
-#: src/transports/http.c:2037
+#: src/transports/http.c:2038
msgid "# HTTP PUT received"
msgstr ""
-#: src/transports/http.c:2039
+#: src/transports/http.c:2040
msgid "# HTTP select calls"
msgstr ""
-#: src/transports/http.c:2041
+#: src/transports/http.c:2042
msgid "# HTTP send calls"
msgstr ""
-#: src/transports/http.c:2044
+#: src/transports/http.c:2045
msgid "# HTTP curl send callbacks"
msgstr ""
-#: src/transports/http.c:2046
+#: src/transports/http.c:2047
msgid "# HTTP curl receive callbacks"
msgstr ""
-#: src/transports/http.c:2048
+#: src/transports/http.c:2049
msgid "# HTTP mhd access callbacks"
msgstr ""
-#: src/transports/http.c:2050
+#: src/transports/http.c:2051
msgid "# HTTP mhd read callbacks"
msgstr ""
-#: src/transports/http.c:2052
+#: src/transports/http.c:2053
msgid "# HTTP mhd close callbacks"
msgstr ""
-#: src/transports/http.c:2054
+#: src/transports/http.c:2055
#, fuzzy
msgid "# HTTP connect calls"
msgstr "# av anslutna parter"
Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po 2009-02-28 05:16:03 UTC (rev 8297)
+++ GNUnet/po/vi.po 2009-02-28 06:01:49 UTC (rev 8298)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnunet 0.8.0a\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2009-01-08 10:55-0700\n"
+"POT-Creation-Date: 2009-02-27 22:04-0700\n"
"PO-Revision-Date: 2008-09-10 22:05+0930\n"
"Last-Translator: Clytie Siddall <address@hidden>\n"
"Language-Team: Vietnamese <address@hidden>\n"
@@ -831,7 +831,7 @@
msgid "Error connecting to %s:%u. Is the daemon running?\n"
msgstr "Gặp lỗi khi kết nối tới %s:%u. Trình nền đang chạy không?\n"
-#: src/util/network_client/tcpio.c:398
+#: src/util/network_client/tcpio.c:398 src/util/network/io.c:164
#, c-format
msgid "Cannot connect to %s:%u: %s\n"
msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -1069,21 +1069,38 @@
msgid "RSA signature verification failed at %s:%d: %s\n"
msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
-#: src/util/os/user.c:108 src/util/os/user.c:125
+#: src/util/os/user.c:167 src/util/os/user.c:482 src/util/os/user.c:499
#, c-format
msgid "`%s' returned with error code %u"
msgstr "« %s » trả lại với mã lỗi %u"
-#: src/util/os/user.c:155 src/util/os/user.c:200
+#: src/util/os/user.c:298 src/util/os/user.c:345
+msgid "Error while parsing dscl output.\n"
+msgstr ""
+
+#: src/util/os/user.c:320
#, c-format
+msgid "Couldn't find a group (`%s') for the new user and none was specified.\n"
+msgstr ""
+
+#: src/util/os/user.c:375
+msgid "Failed to find a free system id for the new group.\n"
+msgstr ""
+
+#: src/util/os/user.c:392
+msgid "Failed to find a free system id for the new user.\n"
+msgstr ""
+
+#: src/util/os/user.c:529 src/util/os/user.c:574
+#, c-format
msgid "Cannot obtain information about user `%s': %s\n"
msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
-#: src/util/os/user.c:156
+#: src/util/os/user.c:530
msgid "No such user"
msgstr "Không có người dùng như vậy"
-#: src/util/os/user.c:171
+#: src/util/os/user.c:545
#, c-format
msgid "Cannot change user/group to `%s': %s\n"
msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
@@ -1132,7 +1149,8 @@
msgid "Setting open descriptor limit not supported.\n"
msgstr "Không hỗ trợ chức năng đặt giới hạn bộ mô tả còn mở.\n"
-#: src/util/os/osconfig.c:463 src/util/os/osconfig.c:492
+#: src/util/os/osconfig.c:453 src/util/os/osconfig.c:631
+#: src/util/os/osconfig.c:660
#, c-format
msgid "Command `%s' failed with error code %u\n"
msgstr "Câu lệnh « %s » đã thất bại với mã lỗi %u\n"
@@ -1340,7 +1358,7 @@
msgid "Running benchmark...\n"
msgstr "Đang chạy tiến trình kiểm chuẩn...\n"
-#: src/applications/tbench/tbench.c:422
+#: src/applications/tbench/tbench.c:438
msgid "allows profiling of direct peer-to-peer connections"
msgstr "cho phép đo hiệu năng sử dụng của kết nối đồng đẳng trực tiếp"
@@ -1501,7 +1519,7 @@
msgstr "kho dữ liệu sqlite"
#: src/applications/sqstore_sqlite/sqlite.c:1474
-#: src/applications/sqstore_mysql/mysql.c:1078
+#: src/applications/sqstore_mysql/mysql.c:1081
msgid "# bytes in datastore"
msgstr "# các byte trong kho dữ liệu"
@@ -1510,8 +1528,8 @@
msgid "# bytes allocated by SQLite"
msgstr "# các byte được phép trong kho dữ liệu"
-#: src/applications/sqstore_mysql/mysql.c:1085
-#: src/applications/sqstore_mysql/mysql.c:1160
+#: src/applications/sqstore_mysql/mysql.c:1088
+#: src/applications/sqstore_mysql/mysql.c:1163
msgid ""
"Failed to load MySQL database module. Check that MySQL is running and "
"configured properly!\n"
@@ -1685,39 +1703,39 @@
msgid "`%s' registering handler %d\n"
msgstr "« %s » đang đăng ký trình điều khiển %d\n"
-#: src/applications/topology_default/topology.c:466
+#: src/applications/topology_default/topology.c:475
#, c-format
msgid "Could not read friends list `%s'\n"
msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-#: src/applications/topology_default/topology.c:485
+#: src/applications/topology_default/topology.c:499
#, c-format
msgid "Failed to read friends list from `%s'\n"
msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-#: src/applications/topology_default/topology.c:505
+#: src/applications/topology_default/topology.c:519
msgid "Syntax error in topology specification, skipping bytes.\n"
msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
-#: src/applications/topology_default/topology.c:523
+#: src/applications/topology_default/topology.c:538
#, c-format
msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
msgstr ""
"Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
-#: src/applications/topology_default/topology.c:535
+#: src/applications/topology_default/topology.c:551
msgid ""
"Fewer friends specified than required by minimum friend count. Will only "
"connect to friends.\n"
msgstr ""
"Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
-#: src/applications/topology_default/topology.c:543
+#: src/applications/topology_default/topology.c:559
msgid ""
"More friendly connections required than target total number of connections.\n"
msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
-#: src/applications/topology_default/topology.c:726
+#: src/applications/topology_default/topology.c:743
msgid "maintains GNUnet default mesh topology"
msgstr "bảo quản định hình mắc lưới mặc định của GNUnet"
@@ -2005,7 +2023,7 @@
msgstr "Tôi là đồng đẳng « %s ».\n"
#: src/applications/dht/tools/dht_multipeer_test.c:80
-#: src/applications/dht/tools/dht_twopeer_test.c:47
+#: src/applications/dht/tools/dht_api.c:332
#: src/applications/dht/module/table.c:783
msgid "# dht connections"
msgstr "# các kết nối dht"
@@ -2308,7 +2326,7 @@
#: src/applications/fs/tools/gnunet-pseudonym.c:70
#: src/applications/fs/tools/gnunet-auto-share.c:199
#: src/applications/fs/tools/gnunet-insert.c:246
-#: src/applications/fs/tools/gnunet-search.c:125
+#: src/applications/fs/tools/gnunet-search.c:126
#: src/applications/fs/tools/gnunet-download.c:77
msgid "set the desired LEVEL of sender-anonymity"
msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
@@ -2714,8 +2732,9 @@
"công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
#: src/applications/fs/tools/gnunet-insert.c:297
+#, fuzzy
msgid ""
-"only simulte the process but do not do any actual publishing (useful to "
+"only simulate the process but do not do any actual publishing (useful to "
"compute URIs)"
msgstr ""
"chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
@@ -2765,15 +2784,15 @@
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"
-#: src/applications/fs/tools/gnunet-search.c:128
+#: src/applications/fs/tools/gnunet-search.c:129
msgid "Search GNUnet for files."
msgstr "Tìm tập tin trong GNUnet."
-#: src/applications/fs/tools/gnunet-search.c:132
+#: src/applications/fs/tools/gnunet-search.c:133
msgid "write encountered (decrypted) search results to FILENAME"
msgstr "ghi kết quả tìm kiếm tìm thấy (đã giải mã) vào tập tin TÊN_TẬP_TIN"
-#: src/applications/fs/tools/gnunet-search.c:169
+#: src/applications/fs/tools/gnunet-search.c:170
#, c-format
msgid "Error converting arguments to URI!\n"
msgstr "Gặp lỗi khi chuyển đổi các đối số sang URI.\n"
@@ -2968,12 +2987,12 @@
msgid "Number of double-quotes not balanced!\n"
msgstr "Có dấu nháy kép thừa hay thiếu.\n"
-#: src/applications/fs/ecrs/helper.c:398
+#: src/applications/fs/ecrs/helper.c:405
#, c-format
msgid "Renaming of file `%s' to `%s' failed: %s\n"
msgstr "Lỗi thay đổi tên của tập tin « %s » thành « %s »: %s\n"
-#: src/applications/fs/ecrs/helper.c:408
+#: src/applications/fs/ecrs/helper.c:415
#, c-format
msgid "Could not rename file `%s' to `%s': file exists\n"
msgstr "Không thể thay đổi tên tập tin « %s » thành « %s »: tập tin đã có\n"
@@ -2995,19 +3014,19 @@
msgid "LOC URI not allowed for search.\n"
msgstr "Không cho phép địa chỉ URI LOC khi tìm kiếm.\n"
-#: src/applications/fs/ecrs/namespace.c:365
+#: src/applications/fs/ecrs/namespace.c:370
#, c-format
msgid "File `%s' does not contain a pseudonym.\n"
msgstr "Tập tin « %s » không chứa biệt hiệu.\n"
-#: src/applications/fs/ecrs/namespace.c:376
+#: src/applications/fs/ecrs/namespace.c:381
#, c-format
msgid "Format of pseudonym `%s' is invalid.\n"
msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
-#: src/applications/fs/ecrs/namespace.c:535
-#: src/applications/fs/ecrs/namespace.c:547
-#: src/applications/fs/ecrs/namespace.c:559
+#: src/applications/fs/ecrs/namespace.c:540
+#: src/applications/fs/ecrs/namespace.c:552
+#: src/applications/fs/ecrs/namespace.c:564
#, c-format
msgid "Format of file `%s' is invalid, trying to remove.\n"
msgstr "Định dạng của tập tin « %s » là không hợp lệ nên thử gỡ bỏ.\n"
@@ -3201,43 +3220,54 @@
msgid "scp command is : %s \n"
msgstr "Câu lệnh scp là: %s\n"
-#: src/applications/testing/remote.c:491
+#: src/applications/testing/remote.c:80 src/applications/testing/remote.c:92
+#, fuzzy, c-format
+msgid "ssh command is : %s \n"
+msgstr "Câu lệnh scp là: %s\n"
+
+#: src/applications/testing/remote.c:554
#, c-format
msgid "Friend list of %s:%d\n"
msgstr "Danh sách bạn bè của %s:%d\n"
-#: src/applications/testing/remote.c:513
+#: src/applications/testing/remote.c:576
#, c-format
msgid "scp command for friend file copy is : %s \n"
msgstr "Câu lệnh scp cho bản sao tập tin bạn bè là: %s\n"
-#: src/applications/testing/remote.c:535
+#: src/applications/testing/remote.c:598
#, c-format
msgid "connecting peer %s:%d to peer %s:%d\n"
msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
-#: src/applications/testing/remotetest.c:38
+#: src/applications/testing/remotetest.c:39
msgid "Set up multiple gnunetd daemons across multiple hosts."
msgstr "Thiết lập nhiều trình nền gnunetd qua nhiều máy khác nhau."
-#: src/applications/testing/remotetest.c:43
+#: src/applications/testing/remotetest.c:44
msgid "set number of daemons to start"
msgstr "đặt số trình nền cần khởi chạy"
+#: src/applications/testing/remotetest.c:49
+msgid ""
+"set output file for a dot input file which represents the graph of the "
+"connected nodes"
+msgstr ""
+
#: src/applications/testing/testing.c:268
-#: src/applications/testing/remotetopologies.c:367
+#: src/applications/testing/remotetopologies.c:437
#, c-format
msgid "Waiting for peers to connect"
msgstr "Đang đợi các đồng đẳng kết nối"
-#: src/applications/testing/remotetopologies.c:213
+#: src/applications/testing/remotetopologies.c:281
#, c-format
msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
msgstr ""
"Đang kết nối các điểm nút theo địa hình học hình xuyến hai chiều: %u hàng, %"
"u cột\n"
-#: src/applications/testing/remotetopologies.c:491
+#: src/applications/testing/remotetopologies.c:572
#, c-format
msgid "Failed to establish connection with peers.\n"
msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
@@ -3255,9 +3285,9 @@
#: src/applications/bootstrap_http/http.c:365
#: src/applications/bootstrap_http/http.c:375
#: src/applications/bootstrap_http/http.c:385 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:541 src/transports/http.c:1085
-#: src/transports/http.c:1209 src/transports/http.c:1377
-#: src/transports/http.c:1777 src/transports/http.c:1827
+#: src/transports/upnp/upnp.c:541 src/transports/http.c:1086
+#: src/transports/http.c:1210 src/transports/http.c:1378
+#: src/transports/http.c:1778 src/transports/http.c:1828
#, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr "%s bị lỗi tại %s:%d: « %s »\n"
@@ -3286,12 +3316,12 @@
msgid "# HELLOs downloaded via http"
msgstr "# các HELLO tải xuống qua HTTP"
-#: src/applications/getoption/getoption.c:78
+#: src/applications/getoption/getoption.c:79
#, c-format
msgid "`%s' registering client handler %d\n"
msgstr "« %s » đang đăng ký trình điều khiển máy khách %d\n"
-#: src/applications/getoption/getoption.c:88
+#: src/applications/getoption/getoption.c:89
msgid "allows clients to determine gnunetd's configuration"
msgstr "cho phép máy khách quyết định cấu hình của trình nền gnunetd."
@@ -3304,7 +3334,7 @@
msgid "Template description."
msgstr "Mô tả mẫu."
-#: src/applications/stats/clientapi.c:331
+#: src/applications/stats/clientapi.c:346
msgid "Uptime (seconds)"
msgstr "Thời gian chạy (giây)"
@@ -3737,7 +3767,7 @@
msgid "Failed to update data for module `%s'\n"
msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-#: src/server/gnunet-update.c:225 src/server/gnunetd.c:124
+#: src/server/gnunet-update.c:225 src/server/gnunetd.c:126
msgid "Core initialization failed.\n"
msgstr "Lỗi sơ khởi lõi.\n"
@@ -3759,17 +3789,21 @@
msgstr ""
"Lỗi quyết định tên tập tin được dùng để chứa thông tin về phiên bản GNUnet.\n"
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:87
#, c-format
msgid "`%s' startup complete.\n"
msgstr "Hoàn thành khởi chạy « %s ».\n"
-#: src/server/gnunetd.c:89
+#: src/server/gnunetd.c:91
#, c-format
msgid "`%s' is shutting down.\n"
msgstr "« %s » đang tắt.\n"
-#: src/server/gnunetd.c:179
+#: src/server/gnunetd.c:181
+msgid "do not daemonize (run gnunetd as a foreground process)"
+msgstr ""
+
+#: src/server/gnunetd.c:184
msgid ""
"run in debug mode; gnunetd will not daemonize and error messages will be "
"written to stderr instead of a logfile"
@@ -3777,25 +3811,25 @@
"chạy trong chế độ tìm sửa lỗi; gnunetd sẽ không trở thành trình nền và sẽ "
"ghi thông báo lỗi ra đầu lỗi tiêu chuẩn thay vì vào một tập tin ghi sự kiện."
-#: src/server/gnunetd.c:183
+#: src/server/gnunetd.c:188
msgid "Starts the gnunetd daemon."
msgstr "Khởi chạy trình nền gnunetd."
-#: src/server/gnunetd.c:186
+#: src/server/gnunetd.c:191
msgid "disable padding with random data (experimental)"
msgstr "tắt đệm lót với dữ liệu ngẫu nhiên (vẫn thực nghiệm !)"
-#: src/server/gnunetd.c:190
+#: src/server/gnunetd.c:195
msgid "print all log messages to the console (only works together with -d)"
msgstr ""
"in mọi thông điệp ghi sự kiện ra bàn giao tiếp (chỉ hoạt động tổ hợp với « -d
"
"»)"
-#: src/server/gnunetd.c:194
+#: src/server/gnunetd.c:199
msgid "specify username as which gnunetd should run"
msgstr "chỉ ra tên người dùng dưới đó cần chạy gnunetd"
-#: src/server/gnunetd.c:275
+#: src/server/gnunetd.c:280
#, c-format
msgid "Configuration or GNUnet version changed. You need to run `%s'!\n"
msgstr ""
@@ -4181,7 +4215,7 @@
msgid "upnp: NAT Returned IP: %s\n"
msgstr "upnp: địa chỉ IP được NAT trả về: %s\n"
-#: src/transports/http.c:2019 src/transports/tcp.c:811
+#: src/transports/http.c:2020 src/transports/tcp.c:811
#, c-format
msgid ""
"The UPnP service could not be loaded. To disable UPnP, set the configuration "
@@ -4190,63 +4224,63 @@
"Dịch vụ UPnP không thể nạp được. Để tắt UPnP, đặt tùy chọn cấu hình « UPNP » "
"trong phần « %s » thành « NO » (không).\n"
-#: src/transports/http.c:2028
+#: src/transports/http.c:2029
msgid "# bytes received via HTTP"
msgstr "# các byte đã nhận qua HTTP"
-#: src/transports/http.c:2029
+#: src/transports/http.c:2030
msgid "# bytes sent via HTTP"
msgstr "# các byte đã gửi qua HTTP"
-#: src/transports/http.c:2031
+#: src/transports/http.c:2032
msgid "# bytes dropped by HTTP (outgoing)"
msgstr "# các byte loại bỏ bởi HTTP (đi ra)"
-#: src/transports/http.c:2032
+#: src/transports/http.c:2033
msgid "# HTTP GET issued"
msgstr "# Tín hiệu HTTP GET được gửi"
-#: src/transports/http.c:2034
+#: src/transports/http.c:2035
msgid "# HTTP GET received"
msgstr "# Tín hiệu HTTP GET được nhận"
-#: src/transports/http.c:2035
+#: src/transports/http.c:2036
msgid "# HTTP PUT issued"
msgstr "# Tín hiệu HTTP PUT được gửi"
-#: src/transports/http.c:2037
+#: src/transports/http.c:2038
msgid "# HTTP PUT received"
msgstr "# Tín hiệu HTTP PUT được nhận"
-#: src/transports/http.c:2039
+#: src/transports/http.c:2040
msgid "# HTTP select calls"
msgstr "# các cuộc gọi HTTP select (lựa chọn)"
-#: src/transports/http.c:2041
+#: src/transports/http.c:2042
msgid "# HTTP send calls"
msgstr "# các cuộc gọi HTTP send (gửi)"
-#: src/transports/http.c:2044
+#: src/transports/http.c:2045
msgid "# HTTP curl send callbacks"
msgstr "# các cuộc gọi ngược HTTP curl send (hàm curl gửi)"
-#: src/transports/http.c:2046
+#: src/transports/http.c:2047
msgid "# HTTP curl receive callbacks"
msgstr "# các cuộc gọi ngược HTTP curl receive (hàm curl nhận)"
-#: src/transports/http.c:2048
+#: src/transports/http.c:2049
msgid "# HTTP mhd access callbacks"
msgstr "# các cuộc gọi ngược HTTP mhd access (hàm mhd truy cập)"
-#: src/transports/http.c:2050
+#: src/transports/http.c:2051
msgid "# HTTP mhd read callbacks"
msgstr "# các cuộc gọi ngược HTTP mhd read (hàm mhd đọc)"
-#: src/transports/http.c:2052
+#: src/transports/http.c:2053
msgid "# HTTP mhd close callbacks"
msgstr "# các cuộc gọi ngược HTTP mhd close (hàm mhd đóng)"
-#: src/transports/http.c:2054
+#: src/transports/http.c:2055
msgid "# HTTP connect calls"
msgstr "# các cuộc gọi HTTP connect (kết nối)"
Modified: GNUnet/src/applications/chat/lib/Makefile.am
===================================================================
--- GNUnet/src/applications/chat/lib/Makefile.am 2009-02-28 05:16:03 UTC
(rev 8297)
+++ GNUnet/src/applications/chat/lib/Makefile.am 2009-02-28 06:01:49 UTC
(rev 8298)
@@ -23,6 +23,8 @@
TESTS = $(check_PROGRAMS)
+EXTRA_DIST = check.conf
+
loopback_test_SOURCES = \
loopback_test.c
loopback_test_LDADD = \
Modified: GNUnet/src/include/Makefile.am
===================================================================
--- GNUnet/src/include/Makefile.am 2009-02-28 05:16:03 UTC (rev 8297)
+++ GNUnet/src/include/Makefile.am 2009-02-28 06:01:49 UTC (rev 8298)
@@ -33,6 +33,7 @@
gnunet_identity_lib.h \
gnunet_identity_service.h \
gnunet_kvstore_service.h \
+ gnunet_mysql.h \
gnunet_namespace_lib.h \
gnunet_pingpong_service.h \
gnunet_protocols.h \
Modified: GNUnet/src/include/gnunet_util_common.h
===================================================================
--- GNUnet/src/include/gnunet_util_common.h 2009-02-28 05:16:03 UTC (rev
8297)
+++ GNUnet/src/include/gnunet_util_common.h 2009-02-28 06:01:49 UTC (rev
8298)
@@ -42,7 +42,7 @@
/**
* gcc-ism to get packed structs.
*/
-#define GNUNET_PACKED __attribute__((packed))
+#define GNUNET_PACKED __attribute__((packed))
/**
Modified: GNUnet/src/include/gnunet_util_core.h
===================================================================
--- GNUnet/src/include/gnunet_util_core.h 2009-02-28 05:16:03 UTC (rev
8297)
+++ GNUnet/src/include/gnunet_util_core.h 2009-02-28 06:01:49 UTC (rev
8298)
@@ -1,4 +1,4 @@
-/*
+ /*
This file is part of GNUnet.
(C) 2007 Christian Grothoff (and other contributing authors)
Modified: GNUnet/src/include/gnunet_util_network.h
===================================================================
--- GNUnet/src/include/gnunet_util_network.h 2009-02-28 05:16:03 UTC (rev
8297)
+++ GNUnet/src/include/gnunet_util_network.h 2009-02-28 06:01:49 UTC (rev
8298)
@@ -309,6 +309,16 @@
*mon, int osSocket);
/**
+ * Create a socket handle by boxing an OS socket.
+ * The OS socket should henceforth be no longer used
+ * directly. GNUNET_socket_destroy will close it.
+ */
+struct GNUNET_SocketHandle *
+GNUNET_socket_create_connect_to_host (struct GNUNET_LoadMonitor *mon,
+ const char *hostname,
+ unsigned short port);
+
+/**
* Close the socket (does NOT destroy it)
*/
void GNUNET_socket_close (struct GNUNET_SocketHandle *s);
Modified: GNUnet/src/libs/mysql/lmysql.c
===================================================================
--- GNUnet/src/libs/mysql/lmysql.c 2009-02-28 05:16:03 UTC (rev 8297)
+++ GNUnet/src/libs/mysql/lmysql.c 2009-02-28 06:01:49 UTC (rev 8298)
@@ -641,6 +641,7 @@
mysql_thread_init ();
if (GNUNET_OK != prepare_statement (s))
{
+ GNUNET_GE_BREAK (NULL, 0);
GNUNET_mutex_unlock (lock);
mysql_thread_end ();
return GNUNET_SYSERR;
@@ -648,6 +649,7 @@
va_start (ap, processor_cls);
if (GNUNET_OK != init_params (s, ap))
{
+ GNUNET_GE_BREAK (NULL, 0);
va_end (ap);
mysql_thread_end ();
GNUNET_mutex_unlock (lock);
@@ -679,7 +681,7 @@
{
ret = mysql_stmt_fetch (s->statement);
if (ret == MYSQL_NO_DATA)
- break;
+ break;
if (ret != 0)
{
GNUNET_GE_LOG (s->db->ectx,
Modified: GNUnet/src/util/network/io.c
===================================================================
--- GNUnet/src/util/network/io.c 2009-02-28 05:16:03 UTC (rev 8297)
+++ GNUnet/src/util/network/io.c 2009-02-28 06:01:49 UTC (rev 8298)
@@ -73,6 +73,165 @@
return ret;
}
+struct GNUNET_SocketHandle *
+GNUNET_socket_create_connect_to_host (struct GNUNET_LoadMonitor *mon,
+ const char *host,
+ unsigned short port)
+{
+ static int addr_families[] = {
+#ifdef AF_UNSPEC
+ AF_UNSPEC,
+#endif
+#ifdef AF_INET6
+ AF_INET6,
+#endif
+ AF_INET,
+ -1
+ };
+ struct sockaddr *soaddr;
+ socklen_t socklen;
+ int af_index;
+ int soerr;
+ socklen_t soerrlen;
+ int tries;
+ struct timeval timeout;
+ GNUNET_CronTime select_start;
+ int osock;
+ int iret;
+ struct GNUNET_SocketHandle *ret;
+ fd_set wset;
+
+ af_index = 0;
+ /* we immediately advance if there is a DNS lookup error
+ * (which would likely persist) or a socket API error
+ * (which would equally likely persist). We retry a
+ * few times with a small delay if we may just be having
+ * a connection issue.
+ */
+#define TRIES_PER_AF 2
+#ifdef WINDOWS
+#define DELAY_PER_RETRY (5000 * GNUNET_CRON_MILLISECONDS)
+#else
+#define DELAY_PER_RETRY (50 * GNUNET_CRON_MILLISECONDS)
+#endif
+#define ADVANCE() do { af_index++; tries = TRIES_PER_AF; } while(0)
+#define RETRY() do { tries--; if (tries == 0) { ADVANCE(); } else {
GNUNET_thread_sleep(DELAY_PER_RETRY); } } while (0)
+ tries = TRIES_PER_AF;
+ /* loop over all possible address families */
+ while (1)
+ {
+ if (addr_families[af_index] == -1)
+ return NULL; // FIXME: return never-ready socket instead!
+ soaddr = NULL;
+ socklen = 0;
+ if (GNUNET_SYSERR ==
+ GNUNET_get_ip_from_hostname (NULL, host,
+ addr_families[af_index], &soaddr,
+ &socklen))
+ {
+ ADVANCE ();
+ continue;
+ }
+ if (soaddr->sa_family == AF_INET)
+ {
+ ((struct sockaddr_in *) soaddr)->sin_port = htons (port);
+ osock = SOCKET (PF_INET, SOCK_STREAM, 0);
+ }
+ else
+ {
+#ifdef PF_INET6
+ ((struct sockaddr_in6 *) soaddr)->sin6_port = htons (port);
+ osock = SOCKET (PF_INET6, SOCK_STREAM, 0);
+#else
+ osock = -1;
+ errno = EAFNOSUPPORT;
+#endif
+ }
+ if (osock == -1)
+ {
+ GNUNET_free (soaddr);
+ ADVANCE ();
+ continue;
+ }
+ ret = GNUNET_socket_create(NULL, mon, osock);
+ GNUNET_socket_set_blocking (ret, GNUNET_NO);
+ iret = CONNECT (osock, soaddr, socklen);
+ GNUNET_free (soaddr);
+ if ((ret != 0) && (errno != EINPROGRESS) && (errno != EWOULDBLOCK))
+ {
+ GNUNET_GE_LOG (NULL,
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Cannot connect to %s:%u: %s\n"),
+ host, port, STRERROR (errno));
+ GNUNET_socket_destroy (ret);
+ ret = NULL;
+ if (errno == ECONNREFUSED)
+ RETRY (); /* service may just be restarting */
+ else
+ ADVANCE ();
+ continue;
+ }
+ /* we call select() first with a timeout of WAIT_SECONDS to
+ avoid blocking on a later write indefinitely;
+ Important if a local firewall decides to just drop
+ the TCP handshake... */
+ FD_ZERO (&wset);
+ FD_SET (osock, &wset);
+ timeout.tv_sec = 0;
+ timeout.tv_usec = DELAY_PER_RETRY * TRIES_PER_AF * 1000;
+ errno = 0;
+ select_start = GNUNET_get_time ();
+ iret = SELECT (osock + 1, NULL, &wset, NULL, &timeout);
+ if (iret == -1)
+ {
+ if (errno != EINTR)
+ GNUNET_GE_LOG_STRERROR (NULL,
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "select");
+ GNUNET_socket_destroy (ret);
+ ret = NULL;
+ if ((GNUNET_get_time () - select_start >
+ TRIES_PER_AF * DELAY_PER_RETRY) || (errno != EINTR))
+ ADVANCE (); /* spend enough time trying here */
+ else
+ RETRY ();
+ continue;
+ }
+ if (! FD_ISSET (osock, &wset))
+ {
+ GNUNET_socket_destroy (ret);
+ ret = NULL;
+ if (GNUNET_get_time () - select_start >
+ TRIES_PER_AF * DELAY_PER_RETRY)
+ ADVANCE (); /* spend enough time trying here */
+ else
+ RETRY ();
+ continue;
+ }
+ soerr = 0;
+ soerrlen = sizeof (soerr);
+ iret = GETSOCKOPT (osock, SOL_SOCKET, SO_ERROR, &soerr, &soerrlen);
+ if (iret != 0)
+ GNUNET_GE_LOG_STRERROR (NULL,
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "getsockopt");
+ if ((soerr != 0) || (iret != 0 && (errno == ENOTSOCK || errno == EBADF)))
+ {
+ GNUNET_socket_destroy (ret);
+ ret = NULL;
+ if (GNUNET_get_time () - select_start >
+ TRIES_PER_AF * DELAY_PER_RETRY)
+ ADVANCE (); /* spend enough time trying here */
+ else
+ RETRY ();
+ continue;
+ }
+ /* yayh! connected! */
+ break;
+ }
+ return ret;
+}
+
void
GNUNET_socket_close (struct GNUNET_SocketHandle *s)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8298 - in GNUnet: . contrib po src/applications/chat/lib src/include src/libs/mysql src/util/network,
gnunet <=