LRN's big logging rewrite (#1805):

* GNUNET_BOTTOM_LOGLEVEL and GNUNET_TOP_LOGLEVEL set global levels
Use bottom level to force logging to be more verbose than configured
Use top level to force logging to be less verbose than configured
Obviously, bottom <= top

* GNUNET_LOG sets per-component levels
GNUNET_LOG looks like this:
name[/bottom[/top]]/...
name starts with a non-digit character, must not include '/'
bottom and top must consist only of digits, or be empty
a description is only used if it matches the component exactly
as a special exception (for now) the name '*' matches any component
per-component loglevels override global loglevels
global levels override whatever is given via arguments or in config
Examples:
test_client/8/8/
run test_client with DEBUG level (usually leads to a timeout, by the way)

*/2/2/core/8/8/transport/4/4
run everything with WARNING, core - with DEBUG, transport - with INFO

*//1/peerinfo/4/
run everything with top loglevel ERROR, global/configured bottom loglevel,
and peerinfo - with bottom loglevel INFO and global/configured top loglevel

statistics/
does nothing

* Added GNUNET_ERROR_TYPE_UNSPECIFIED enum value, to hold -1.
  Its corresponding string is NULL.
* Changed the logger calls as Grothoff suggested - to use static int to hold
  the result of runtime evaluation of logability.
  Logging can be unconditionally disabled in advance by defining
  GNUNET_LOG_CALL_STATUS to 0, and enabled in advance by defining it to 1.
* Added GNUNET_CULL_LOGGING, which, if defined, completely culls out all
  logging calls at compile time.
* Log definition parsing is only done once, results are cached.
* Changed definition format, now it looks like this:
  [component|*|];[file|*|];[function|*|];[from_line[-to_line]];level/[component...]
  All field separators are mandatory (but some fields could be empty or be '*').
  Line definition must be either empty or "number" or "number-number"
  Level definition must not be empty, and is a string representation
  of the level (i.e. DEBUG, WARNING, INFO, etc).
  Definition entry must end with a slash, whether or not there's another
  entry after it.
  File name is matched to the end of __FILE__, which allows file name
  to match not only the base name, but also directories leading to it.
* Removed default WARNING loglevel from program and service utility code.
  Now they default to NULL (UNSPECIFIED) level, which can be overriden by
  GNUNET_LOG definition, if no level is specified via config or commandline.
  Log levels from config or commandline are overriden by GNUNET_FORCE_LOG.
  If GNUNET_*LOG are undefined, and no levels came from config or commandline,
  logger internally defaults to WARNING level.

Add --enable-logging configure option

1 files changed, 179 insertions, 168 deletions

diff --git a/po/de.po b/po/de.po
index 1770979cb..4afe6a768 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2011-09-13 14:44+0200\n"
+"POT-Creation-Date: 2011-09-19 13:28+0200\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <durner@gnunet.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -77,61 +77,65 @@ msgstr ""
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1096 src/nat/nat.c:1113
+#: src/nat/nat.c:1096
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/nat/nat.c:1167 src/nat/nat.c:1177
+#: src/nat/nat.c:1158 src/nat/nat.c:1168
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1309
+#: src/nat/nat.c:1300
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1312
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:290
+#: src/nat/gnunet-nat-server.c:289
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:329
+#: src/nat/gnunet-nat-server.c:328
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_test.c:348
+#: src/nat/nat_test.c:349
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat_test.c:418
+#: src/nat/nat_test.c:419
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1275 src/vpn/gnunet-daemon-exit.c:1455
-#: src/template/gnunet-template.c:68 src/core/test_core_api_send_to_self.c:217
+#: src/vpn/gnunet-daemon-vpn.c:1279 src/template/gnunet-template.c:68
+#: src/core/test_core_api_send_to_self.c:217
 #, fuzzy
 msgid "help text"
 msgstr "Hilfetext für -t"
 
+#: src/vpn/gnunet-daemon-exit.c:1493
+msgid "Daemon to run to provide an IP exit node for the VPN"
+msgstr ""
+
 #: src/datacache/datacache.c:108 src/datacache/datacache.c:236
-#: src/datastore/gnunet-service-datastore.c:821
+#: src/datastore/gnunet-service-datastore.c:824
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# bytes in der Datenbank"
 
 #: src/datacache/datacache.c:134 src/datacache/datacache.c:142
-#: src/datastore/gnunet-service-datastore.c:1292
-#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/gnunet-service-datastore.c:1295
+#: src/datastore/gnunet-service-datastore.c:1486
 #: src/datastore/test_plugin_datastore.c:192
 #: src/datastore/test_plugin_datastore.c:315
 #: src/datastore/perf_plugin_datastore.c:309
@@ -168,13 +172,13 @@ msgstr ""
 #: src/datacache/plugin_datacache_sqlite.c:122
 #: src/datacache/plugin_datacache_sqlite.c:191
 #: src/datacache/plugin_datacache_sqlite.c:232
-#: src/datacache/plugin_datacache_sqlite.c:296
-#: src/datacache/plugin_datacache_sqlite.c:305
-#: src/datacache/plugin_datacache_sqlite.c:318
-#: src/datacache/plugin_datacache_sqlite.c:325
-#: src/datacache/plugin_datacache_sqlite.c:338
-#: src/datacache/plugin_datacache_sqlite.c:346
-#: src/datacache/plugin_datacache_sqlite.c:354
+#: src/datacache/plugin_datacache_sqlite.c:295
+#: src/datacache/plugin_datacache_sqlite.c:304
+#: src/datacache/plugin_datacache_sqlite.c:315
+#: src/datacache/plugin_datacache_sqlite.c:322
+#: src/datacache/plugin_datacache_sqlite.c:332
+#: src/datacache/plugin_datacache_sqlite.c:340
+#: src/datacache/plugin_datacache_sqlite.c:348
 #: src/datacache/plugin_datacache_mysql.c:103
 #: src/datacache/plugin_datacache_mysql.c:110
 #: src/datacache/plugin_datacache_mysql.c:517
@@ -194,12 +198,12 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:419
+#: src/datacache/plugin_datacache_sqlite.c:413
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:454
-#: src/datastore/plugin_datastore_sqlite.c:405
+#: src/datacache/plugin_datacache_sqlite.c:446
+#: src/datastore/plugin_datastore_sqlite.c:420
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -241,7 +245,7 @@ msgstr ""
 #: src/testing/test_testing_topology_blacklist.c:448
 #: src/testing/testing_peergroup.c:876
 #: src/testing/test_testing_large_topology.c:1022
-#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3907
+#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3897
 #: src/dv/test_transport_api_dv.c:1132
 #, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
@@ -321,23 +325,23 @@ msgstr ""
 msgid "Finished copying all blacklist files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3581 src/testing/testing_group.c:3720
+#: src/testing/testing_group.c:3580 src/testing/testing_group.c:3717
 #: src/testing/testing_group.c:4925 src/testing/testing_group.c:5066
 msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3591 src/testing/testing_group.c:4935
+#: src/testing/testing_group.c:3590 src/testing/testing_group.c:4935
 #: src/testing/testing_group.c:5076
 #, c-format
 msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3603
+#: src/testing/testing_group.c:3602
 #, fuzzy, c-format
 msgid "Offering Hello of peer %s to peer %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/testing/testing_group.c:3730
+#: src/testing/testing_group.c:3728
 #, c-format
 msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
@@ -513,150 +517,150 @@ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6298 src/testing/testing.c:1272
+#: src/testing/testing_group.c:6298 src/testing/testing.c:1273
 #, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr ""
 
-#: src/testing/testing.c:208
+#: src/testing/testing.c:209
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:222 src/testing/testing.c:822
+#: src/testing/testing.c:223 src/testing/testing.c:823
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "`%s' ist zu keinem Knoten verbunden.\n"
 
-#: src/testing/testing.c:245
+#: src/testing/testing.c:246
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:246
+#: src/testing/testing.c:247
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/testing/testing.c:302
+#: src/testing/testing.c:303
 #, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr ""
 
-#: src/testing/testing.c:309
+#: src/testing/testing.c:310
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/testing/testing.c:310 src/testing/testing.c:508
+#: src/testing/testing.c:311 src/testing/testing.c:509
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/testing/testing.c:372
+#: src/testing/testing.c:373
 #, fuzzy, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
 
-#: src/testing/testing.c:376
+#: src/testing/testing.c:377
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/testing/testing.c:386
+#: src/testing/testing.c:387
 #, fuzzy
 msgid "`Failed to get hostkey!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/testing/testing.c:420
+#: src/testing/testing.c:421
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:500
+#: src/testing/testing.c:501
 #, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr ""
 
-#: src/testing/testing.c:507
+#: src/testing/testing.c:508
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:531 src/testing/testing.c:630
+#: src/testing/testing.c:532 src/testing/testing.c:631
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:532 src/testing/testing.c:631
-#: src/testing/testing.c:651
+#: src/testing/testing.c:533 src/testing/testing.c:632
+#: src/testing/testing.c:652
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:571 src/testing/testing.c:2072
-#: src/testing/testing.c:2091
+#: src/testing/testing.c:572 src/testing/testing.c:2074
+#: src/testing/testing.c:2093
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/testing/testing.c:600
+#: src/testing/testing.c:601
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:650
+#: src/testing/testing.c:651
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:673 src/testing/testing.c:707
+#: src/testing/testing.c:674 src/testing/testing.c:708
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:688 src/testing/testing.c:737
+#: src/testing/testing.c:689 src/testing/testing.c:738
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:810
+#: src/testing/testing.c:811
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:988
+#: src/testing/testing.c:989
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testing/testing.c:1360 src/testing/testing.c:1443
-#: src/testing/testing.c:1581
+#: src/testing/testing.c:1361 src/testing/testing.c:1444
+#: src/testing/testing.c:1582
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/testing/testing.c:1533
+#: src/testing/testing.c:1534
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testing/testing.c:1668
+#: src/testing/testing.c:1669
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1676
+#: src/testing/testing.c:1677
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/testing/testing.c:1707
+#: src/testing/testing.c:1708
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/testing/testing.c:1710
+#: src/testing/testing.c:1711
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/testing/testing.c:1881
+#: src/testing/testing.c:1883
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/testing/testing.c:2036
+#: src/testing/testing.c:2038
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -850,7 +854,7 @@ msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:556
-#: src/transport/gnunet-service-transport.c:458
+#: src/transport/gnunet-service-transport.c:462
 #: src/peerinfo-tool/gnunet-peerinfo.c:208 src/core/gnunet-service-core.c:4607
 #, fuzzy, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
@@ -1075,8 +1079,8 @@ msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/topology/gnunet-daemon-topology.c:676
 #: src/topology/gnunet-daemon-topology.c:778
-#: src/transport/gnunet-service-transport_neighbours.c:432
-#: src/transport/gnunet-service-transport_neighbours.c:627
+#: src/transport/gnunet-service-transport_neighbours.c:465
+#: src/transport/gnunet-service-transport_neighbours.c:662
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
@@ -1337,24 +1341,29 @@ msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/util/connection.c:852 src/util/connection.c:1023
+#: src/util/connection.c:852 src/util/connection.c:1028
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:1013
+#: src/util/connection.c:863
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' (%p)\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/util/connection.c:1018
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:1529
+#: src/util/connection.c:1534
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1565
+#: src/util/connection.c:1570
 #, fuzzy, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -1468,7 +1477,7 @@ msgid ""
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/network.c:1193
+#: src/util/network.c:1194
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -1760,7 +1769,7 @@ msgstr ""
 "Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/getopt_helpers.c:254 src/util/getopt_helpers.c:282
+#: src/util/getopt_helpers.c:253 src/util/getopt_helpers.c:281
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
@@ -2161,7 +2170,7 @@ msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
 
 #: src/fs/gnunet-download.c:263 src/fs/gnunet-unindex.c:169
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:585
-#: src/mesh/test_mesh_small.c:674 src/dht/gnunet-dht-get-peer.c:190
+#: src/mesh/test_mesh_small.c:676 src/dht/gnunet-dht-get-peer.c:190
 #: src/dht/gnunet-dht-put.c:176 src/dht/gnunet-dht-get.c:204
 #: src/nse/gnunet-nse-profiler.c:655
 msgid "be verbose (print progress information)"
@@ -2633,81 +2642,81 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-service-fs_cp.c:693
+#: src/fs/gnunet-service-fs_cp.c:694
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:728
+#: src/fs/gnunet-service-fs_cp.c:729
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:734
+#: src/fs/gnunet-service-fs_cp.c:735
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:763 src/fs/gnunet-service-fs_cp.c:879
-#: src/fs/gnunet-service-fs_cp.c:1289 src/fs/gnunet-service-fs_cp.c:1326
+#: src/fs/gnunet-service-fs_cp.c:764 src/fs/gnunet-service-fs_cp.c:880
+#: src/fs/gnunet-service-fs_cp.c:1290 src/fs/gnunet-service-fs_cp.c:1327
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:836
+#: src/fs/gnunet-service-fs_cp.c:837
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:899
+#: src/fs/gnunet-service-fs_cp.c:900
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:913
+#: src/fs/gnunet-service-fs_cp.c:914
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:951
+#: src/fs/gnunet-service-fs_cp.c:952
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1018
+#: src/fs/gnunet-service-fs_cp.c:1019
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1042
+#: src/fs/gnunet-service-fs_cp.c:1043
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1052
+#: src/fs/gnunet-service-fs_cp.c:1053
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1131
+#: src/fs/gnunet-service-fs_cp.c:1132
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1165
+#: src/fs/gnunet-service-fs_cp.c:1166
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1189
+#: src/fs/gnunet-service-fs_cp.c:1190
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1255
+#: src/fs/gnunet-service-fs_cp.c:1256
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1283
+#: src/fs/gnunet-service-fs_cp.c:1284
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1324
+#: src/fs/gnunet-service-fs_cp.c:1325
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -3034,20 +3043,20 @@ msgstr "Teste Transport(e) %s\n"
 msgid "Failed to load block plugin `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/mesh/test_mesh_small.c:687
+#: src/mesh/test_mesh_small.c:689
 msgid "Test mesh in a small network."
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:859
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:864
+#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
 msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:892
+#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
@@ -3102,34 +3111,34 @@ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:665
+#: src/arm/gnunet-service-arm.c:666
 msgid "Stopping all services\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:717
+#: src/arm/gnunet-service-arm.c:723
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:790
+#: src/arm/gnunet-service-arm.c:796
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:795
+#: src/arm/gnunet-service-arm.c:801
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:800
+#: src/arm/gnunet-service-arm.c:806
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:807
+#: src/arm/gnunet-service-arm.c:813
 #, fuzzy, c-format
 msgid "Service `%s' stopped\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-service-arm.c:821
+#: src/arm/gnunet-service-arm.c:827
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
 msgstr ""
@@ -3439,7 +3448,7 @@ msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 #: src/transport/test_plugin_transport_udp.c:185
 #: src/transport/test_plugin_transport_https.c:1271
 #: src/transport/test_plugin_transport.c:202
-#: src/transport/gnunet-service-transport.c:435
+#: src/transport/gnunet-service-transport.c:439
 #: src/transport/test_plugin_transport_http.c:1232
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
@@ -3447,7 +3456,7 @@ msgstr ""
 #: src/transport/test_plugin_transport_udp.c:195
 #: src/transport/test_plugin_transport_https.c:1335
 #: src/transport/test_plugin_transport.c:212
-#: src/transport/gnunet-service-transport.c:444
+#: src/transport/gnunet-service-transport.c:448
 #: src/transport/test_plugin_transport_http.c:1255
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
@@ -3462,19 +3471,19 @@ msgstr "Teste Transport(e) %s\n"
 msgid "Failed to load transport plugin for udp\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/plugin_transport_wlan.c:1422
-#: src/transport/plugin_transport_wlan.c:1617
-#: src/transport/plugin_transport_wlan.c:1736
+#: src/transport/plugin_transport_wlan.c:1436
+#: src/transport/plugin_transport_wlan.c:1631
+#: src/transport/plugin_transport_wlan.c:1750
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1854
+#: src/transport/plugin_transport_wlan.c:1868
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2710
+#: src/transport/plugin_transport_wlan.c:2728
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
@@ -3513,35 +3522,35 @@ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 msgid "# SET QUOTA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:776
+#: src/transport/gnunet-service-transport_neighbours.c:811
 #, fuzzy
 msgid "# messages not sent (no such peer or not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:796
+#: src/transport/gnunet-service-transport_neighbours.c:831
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:864
+#: src/transport/gnunet-service-transport_neighbours.c:899
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:882
+#: src/transport/gnunet-service-transport_neighbours.c:917
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:907
+#: src/transport/gnunet-service-transport_neighbours.c:942
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:937
+#: src/transport/gnunet-service-transport_neighbours.c:972
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:949
+#: src/transport/gnunet-service-transport_neighbours.c:984
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
@@ -3664,7 +3673,7 @@ msgid "Phase 3: sending messages\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
 #: src/transport/test_plugin_transport_https.c:1284
-#: src/transport/plugin_transport_http.c:3321
+#: src/transport/plugin_transport_http.c:3323
 #: src/transport/test_plugin_transport_http.c:1245
 #, c-format
 msgid "Require valid port number for transport plugin `%s' in configuration!\n"
@@ -3700,6 +3709,11 @@ msgid ""
 "\n"
 msgstr ""
 
+#: src/transport/test_transport_api.c:120
+#, fuzzy
+msgid "Fail! Could not connect peers\n"
+msgstr "`%s': Verbindung konnte nicht hergestellt werden.\n"
+
 #: src/transport/gnunet-transport-list-connections.c:91
 #: src/peerinfo-tool/gnunet-peerinfo.c:200
 #: src/core/gnunet-core-list-connections.c:166
@@ -3765,36 +3779,36 @@ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 msgid "# HTTP outbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3349
-#: src/transport/plugin_transport_http.c:3378
+#: src/transport/plugin_transport_http.c:3351
+#: src/transport/plugin_transport_http.c:3380
 #, fuzzy
 msgid "Misconfigured address to bind to in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/transport/plugin_transport_http.c:3404
+#: src/transport/plugin_transport_http.c:3406
 #, fuzzy, c-format
 msgid "Required configuration options missing in section `%s'\n"
 msgstr ""
 "Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in der "
 "Sektion `%s' angegeben werden.\n"
 
-#: src/transport/plugin_transport_http.c:3442
+#: src/transport/plugin_transport_http.c:3444
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3458
+#: src/transport/plugin_transport_http.c:3460
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3610
+#: src/transport/plugin_transport_http.c:3612
 #, c-format
 msgid ""
 "HTTP Server with %s could not be started on port %u! %s plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3626
+#: src/transport/plugin_transport_http.c:3628
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -3899,58 +3913,58 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:520
+#: src/transport/gnunet-service-transport_validation.c:518
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:606
+#: src/transport/gnunet-service-transport_validation.c:604
 #: src/core/gnunet-service-core.c:4187
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:628
+#: src/transport/gnunet-service-transport_validation.c:626
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:685
+#: src/transport/gnunet-service-transport_validation.c:683
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:694
+#: src/transport/gnunet-service-transport_validation.c:692
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:758
+#: src/transport/gnunet-service-transport_validation.c:756
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:792
+#: src/transport/gnunet-service-transport_validation.c:790
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_validation.c:864
+#: src/transport/gnunet-service-transport_validation.c:862
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:923
+#: src/transport/gnunet-service-transport_validation.c:921
 #: src/core/gnunet-service-core.c:4210
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_validation.c:945
+#: src/transport/gnunet-service-transport_validation.c:943
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:961
+#: src/transport/gnunet-service-transport_validation.c:959
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
@@ -4020,17 +4034,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1279
+#: src/transport/plugin_transport_udp.c:1280
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1329
+#: src/transport/plugin_transport_udp.c:1330
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_udp.c:1455
+#: src/transport/plugin_transport_udp.c:1456
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
@@ -4401,23 +4415,23 @@ msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:662
+#: src/datastore/plugin_datastore_sqlite.c:677
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1115
+#: src/datastore/plugin_datastore_sqlite.c:1130
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1134
+#: src/datastore/plugin_datastore_sqlite.c:1149
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1173
+#: src/datastore/plugin_datastore_sqlite.c:1188
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -4470,8 +4484,8 @@ msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:681
 #: src/datastore/gnunet-service-datastore.c:735
-#: src/datastore/gnunet-service-datastore.c:953
-#: src/datastore/gnunet-service-datastore.c:1438
+#: src/datastore/gnunet-service-datastore.c:956
+#: src/datastore/gnunet-service-datastore.c:1441
 msgid "# reserved"
 msgstr ""
 
@@ -4479,80 +4493,80 @@ msgstr ""
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:835
+#: src/datastore/gnunet-service-datastore.c:838
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1001
+#: src/datastore/gnunet-service-datastore.c:1004
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1015
+#: src/datastore/gnunet-service-datastore.c:1018
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1043
+#: src/datastore/gnunet-service-datastore.c:1046
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1077
+#: src/datastore/gnunet-service-datastore.c:1080
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1112
+#: src/datastore/gnunet-service-datastore.c:1115
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1139
+#: src/datastore/gnunet-service-datastore.c:1142
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1149
+#: src/datastore/gnunet-service-datastore.c:1152
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1183
+#: src/datastore/gnunet-service-datastore.c:1186
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1227
+#: src/datastore/gnunet-service-datastore.c:1230
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1300
+#: src/datastore/gnunet-service-datastore.c:1303
 #: src/datastore/test_plugin_datastore.c:322
 #: src/datastore/perf_plugin_datastore.c:420
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1309
+#: src/datastore/gnunet-service-datastore.c:1312
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1488
+#: src/datastore/gnunet-service-datastore.c:1491
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1490
+#: src/datastore/gnunet-service-datastore.c:1493
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1500
+#: src/datastore/gnunet-service-datastore.c:1503
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1513
+#: src/datastore/gnunet-service-datastore.c:1516
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
@@ -4710,22 +4724,22 @@ msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"
 msgid "Failed to connect to the dv service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nse/gnunet-service-nse.c:864
+#: src/nse/gnunet-service-nse.c:866
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1286 src/nse/gnunet-service-nse.c:1305
-#: src/nse/gnunet-service-nse.c:1326
+#: src/nse/gnunet-service-nse.c:1288 src/nse/gnunet-service-nse.c:1307
+#: src/nse/gnunet-service-nse.c:1328
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1293
+#: src/nse/gnunet-service-nse.c:1295
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/nse/gnunet-service-nse.c:1314
+#: src/nse/gnunet-service-nse.c:1316
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -6554,9 +6568,6 @@ msgstr "Konfigurationsdatei FILENAME verwenden"
 #~ msgid "`%s': Could not create hello.\n"
 #~ msgstr "`%s': Hello konnte nicht erzeugt werden.\n"
 
-#~ msgid "`%s': Could not connect.\n"
-#~ msgstr "`%s': Verbindung konnte nicht hergestellt werden.\n"
-
 #~ msgid "`%s': Could not send.\n"
 #~ msgstr "`%s': Kann nicht senden.\n"