From 186199e3b42e2d9ead8072b605b06b9e76619084 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 3 Apr 2019 20:39:57 +0200 Subject: resume transmission on idle queues upon incoming message (TNG) --- po/de.po | 123 ++------- po/es.po | 148 ++++------ po/fr.po | 110 ++------ po/it.po | 91 +------ po/sv.po | 110 ++------ po/vi.po | 110 ++------ po/zh_CN.po | 114 ++------ src/transport/gnunet-service-tng.c | 537 +++++++++++++++++++------------------ 8 files changed, 424 insertions(+), 919 deletions(-) diff --git a/po/de.po b/po/de.po index 926a30f75..679e7b0db 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-04-03 14:36+0200\n" +"POT-Creation-Date: 2019-04-03 16:13+0200\n" "PO-Revision-Date: 2015-03-08 16:16+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" @@ -226,7 +226,6 @@ msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" #: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 #, c-format msgid "" @@ -237,9 +236,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3835 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 #: src/util/service.c:1162 @@ -248,7 +244,6 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 #: src/util/service.c:1201 #, c-format @@ -256,7 +251,6 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 #: src/util/service.c:1206 #, c-format @@ -264,7 +258,6 @@ msgid "Using `%s' instead\n" msgstr "" #: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 #, c-format msgid "" @@ -273,7 +266,6 @@ msgid "" msgstr "" #: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -282,7 +274,6 @@ msgstr "" #: src/arm/gnunet-service-arm.c:556 #: src/transport/plugin_transport_http_server.c:2688 #: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 #, c-format msgid "Failed to resolve `%s': %s\n" @@ -291,7 +282,6 @@ msgstr "»%s« konnte nicht aufgelöst werden: %s\n" #: src/arm/gnunet-service-arm.c:575 #: src/transport/plugin_transport_http_server.c:2706 #: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 #, fuzzy, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -7487,8 +7477,6 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:3530 #: src/transport/plugin_transport_tcp.c:3901 #: src/transport/plugin_transport_tcp.c:3908 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7558,7 +7546,6 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:2905 #: src/transport/plugin_transport_udp.c:3627 -#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7663,8 +7650,6 @@ msgstr "# Bytes verworfen von SMTP (ausgehend)" #: src/transport/plugin_transport_tcp.c:1557 #: src/transport/plugin_transport_tcp.c:2883 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" @@ -7673,9 +7658,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1964 #: src/transport/plugin_transport_tcp.c:3147 #: src/transport/plugin_transport_tcp.c:4024 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 msgid "# TCP sessions active" msgstr "# aktive TCP-Sitzungen" @@ -7685,87 +7667,66 @@ msgstr "# aktive TCP-Sitzungen" #: src/transport/plugin_transport_tcp.c:2143 #: src/transport/plugin_transport_tcp.c:2243 #: src/transport/plugin_transport_tcp.c:2268 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 msgid "# bytes currently in TCP buffers" msgstr "# Bytes derzeit in TCP-Puffern" #: src/transport/plugin_transport_tcp.c:1785 -#: src/transport/plugin_transport_xt.c:1781 msgid "# bytes discarded by TCP (disconnect)" msgstr "# Bytes verworfen von TCP (unterbrochen)" #: src/transport/plugin_transport_tcp.c:2073 -#: src/transport/plugin_transport_xt.c:2069 msgid "# bytes discarded by TCP (timeout)" msgstr "# Bytes verworfen von TCP (Zeitüberschreitung)" #: src/transport/plugin_transport_tcp.c:2147 -#: src/transport/plugin_transport_xt.c:2143 msgid "# bytes transmitted via TCP" msgstr "# Bytes über TCP übertragen" #: src/transport/plugin_transport_tcp.c:2545 -#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2721 -#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3213 -#: src/transport/plugin_transport_xt.c:3209 #, fuzzy msgid "# TCP WELCOME messages received" msgstr "# verschlüsselter PONG Nachrichten empfangen" #: src/transport/plugin_transport_tcp.c:3419 -#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "# Bytes empfangen über TCP" #: src/transport/plugin_transport_tcp.c:3470 #: src/transport/plugin_transport_tcp.c:3528 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr " Verbindung fehlgeschlagen\n" #: src/transport/plugin_transport_tcp.c:3474 -#: src/transport/plugin_transport_xt.c:3470 #, fuzzy msgid "# TCP server connect events" msgstr "# verbundener Knoten" #: src/transport/plugin_transport_tcp.c:3480 -#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3482 -#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3532 -#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3851 -#: src/transport/plugin_transport_xt.c:3849 msgid "Failed to start service.\n" msgstr "Fehler beim Starten des Dienstes.\n" @@ -7818,7 +7779,6 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" #: src/transport/plugin_transport_udp.c:3721 -#: src/transport/plugin_transport_xu.c:2143 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" @@ -7828,19 +7788,15 @@ msgstr "UDP-Sockets können nicht geöffnet werden\n" #: src/transport/plugin_transport_udp.c:3883 #: src/transport/plugin_transport_udp.c:3897 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3929 -#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "»%s« ist keine gültige IP-Adresse.\n" #: src/transport/plugin_transport_udp.c:3956 -#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "»%s« ist keine gültige IP-Adresse.\n" @@ -7926,55 +7882,6 @@ msgstr "" msgid "# sessions allocated" msgstr "# Sitzungsschlüssel akzeptiert" -#: src/transport/plugin_transport_xt.c:4010 -#, fuzzy, c-format -msgid "XT transport listening on port %llu\n" -msgstr "TCP-Transportdienst wartet auf Port %llu\n" - -#: src/transport/plugin_transport_xt.c:4014 -#, fuzzy -msgid "XT transport not listening on any port (client only)\n" -msgstr "TCP-Transportdienst wartet auf Port %llu\n" - -#: src/transport/plugin_transport_xt.c:4018 -#, fuzzy, c-format -msgid "XT transport advertises itself as being on port %llu\n" -msgstr "TCP-Transportdienst wartet auf Port %llu\n" - -#: src/transport/plugin_transport_xt.c:4022 -#, fuzzy -msgid "# XT sessions active" -msgstr "# aktive TCP-Sitzungen" - -#: src/transport/plugin_transport_xu.c:1237 -#, c-format -msgid "" -"XU could not transmit message to `%s': Network seems down, please check your " -"network configuration\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:1251 -msgid "" -"XU could not transmit IPv6 message! Please check your network configuration " -"and disable IPv6 if your connection does not have a global IPv6 address\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 -#, fuzzy, c-format -msgid "Failed to bind XU socket to %s: %s\n" -msgstr "UDP-Sockets können nicht geöffnet werden\n" - -#: src/transport/plugin_transport_xu.c:2234 -#, fuzzy -msgid "Failed to open XU sockets\n" -msgstr "UDP-Sockets können nicht geöffnet werden\n" - -#: src/transport/plugin_transport_xu.c:2398 -#, fuzzy -msgid "Failed to create XU network sockets\n" -msgstr "UDP-Sockets können nicht geöffnet werden\n" - #: src/transport/tcp_connection_legacy.c:452 #, c-format msgid "Access denied to `%s'\n" @@ -9174,6 +9081,34 @@ msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n" msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n" +#, fuzzy +#~ msgid "XT transport listening on port %llu\n" +#~ msgstr "TCP-Transportdienst wartet auf Port %llu\n" + +#, fuzzy +#~ msgid "XT transport not listening on any port (client only)\n" +#~ msgstr "TCP-Transportdienst wartet auf Port %llu\n" + +#, fuzzy +#~ msgid "XT transport advertises itself as being on port %llu\n" +#~ msgstr "TCP-Transportdienst wartet auf Port %llu\n" + +#, fuzzy +#~ msgid "# XT sessions active" +#~ msgstr "# aktive TCP-Sitzungen" + +#, fuzzy +#~ msgid "Failed to bind XU socket to %s: %s\n" +#~ msgstr "UDP-Sockets können nicht geöffnet werden\n" + +#, fuzzy +#~ msgid "Failed to open XU sockets\n" +#~ msgstr "UDP-Sockets können nicht geöffnet werden\n" + +#, fuzzy +#~ msgid "Failed to create XU network sockets\n" +#~ msgstr "UDP-Sockets können nicht geöffnet werden\n" + #, fuzzy #~ msgid "Print information about DV state" #~ msgstr "Informationen über andere GNUnet Knoten ausgeben." diff --git a/po/es.po b/po/es.po index 220e7958e..5d48bb5e7 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.9.5a\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-04-03 14:36+0200\n" +"POT-Creation-Date: 2019-04-03 16:13+0200\n" "PO-Revision-Date: 2013-02-23 17:50+0100\n" "Last-Translator: Miguel Ángel Arruga Vivas \n" "Language-Team: Spanish \n" @@ -234,7 +234,6 @@ msgstr "" "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)" #: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 #, c-format msgid "" @@ -247,9 +246,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3835 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 #: src/util/service.c:1162 @@ -260,7 +256,6 @@ msgstr "" "configuración!\n" #: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 #: src/util/service.c:1201 #, c-format @@ -269,7 +264,6 @@ msgstr "" "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n" #: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 #: src/util/service.c:1206 #, c-format @@ -277,7 +271,6 @@ msgid "Using `%s' instead\n" msgstr "Usando «%s» en su defecto\n" #: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 #, c-format msgid "" @@ -288,7 +281,6 @@ msgstr "" "«%s», no se pudo crear un «socket» UNIX: %s\n" #: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -299,7 +291,6 @@ msgstr "" #: src/arm/gnunet-service-arm.c:556 #: src/transport/plugin_transport_http_server.c:2688 #: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 #, c-format msgid "Failed to resolve `%s': %s\n" @@ -308,7 +299,6 @@ msgstr "Se produjo un fallo al resolver «%s»: %s\n" #: src/arm/gnunet-service-arm.c:575 #: src/transport/plugin_transport_http_server.c:2706 #: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 #, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -7767,8 +7757,6 @@ msgstr "tamaño del mensaje" #: src/transport/plugin_transport_http_server.c:3530 #: src/transport/plugin_transport_tcp.c:3901 #: src/transport/plugin_transport_tcp.c:3908 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7848,7 +7836,6 @@ msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n" #: src/transport/plugin_transport_http_server.c:2905 #: src/transport/plugin_transport_udp.c:3627 -#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n" @@ -7956,8 +7943,6 @@ msgstr "# bytes omitidos por SMTP (salientes)" #: src/transport/plugin_transport_tcp.c:1557 #: src/transport/plugin_transport_tcp.c:2883 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "Longitud de dirección inesperada: %u bytes\n" @@ -7966,9 +7951,6 @@ msgstr "Longitud de dirección inesperada: %u bytes\n" #: src/transport/plugin_transport_tcp.c:1964 #: src/transport/plugin_transport_tcp.c:3147 #: src/transport/plugin_transport_tcp.c:4024 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 msgid "# TCP sessions active" msgstr "# Sesiones TCP activas" @@ -7978,86 +7960,65 @@ msgstr "# Sesiones TCP activas" #: src/transport/plugin_transport_tcp.c:2143 #: src/transport/plugin_transport_tcp.c:2243 #: src/transport/plugin_transport_tcp.c:2268 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 msgid "# bytes currently in TCP buffers" msgstr "# bytes actualmente en los buffer TCP" #: src/transport/plugin_transport_tcp.c:1785 -#: src/transport/plugin_transport_xt.c:1781 msgid "# bytes discarded by TCP (disconnect)" msgstr "# bytes descartados por TCP (desconectado)" #: src/transport/plugin_transport_tcp.c:2073 -#: src/transport/plugin_transport_xt.c:2069 msgid "# bytes discarded by TCP (timeout)" msgstr "# bytes omitidos por TCP (expirados)" #: src/transport/plugin_transport_tcp.c:2147 -#: src/transport/plugin_transport_xt.c:2143 msgid "# bytes transmitted via TCP" msgstr "# bytes recibidos vía TCP" #: src/transport/plugin_transport_tcp.c:2545 -#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2721 -#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "# peticiones de desconexión del servicio de transporte por TCP" #: src/transport/plugin_transport_tcp.c:3213 -#: src/transport/plugin_transport_xt.c:3209 msgid "# TCP WELCOME messages received" msgstr "# Mensajes «WELCOME» TCP recibidos" #: src/transport/plugin_transport_tcp.c:3419 -#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "# bytes recibidos vía TCP" #: src/transport/plugin_transport_tcp.c:3470 #: src/transport/plugin_transport_tcp.c:3528 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr "# conexiones «stream» activas" #: src/transport/plugin_transport_tcp.c:3474 -#: src/transport/plugin_transport_xt.c:3470 #, fuzzy msgid "# TCP server connect events" msgstr "# Pares conectados" #: src/transport/plugin_transport_tcp.c:3480 -#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3482 -#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3532 -#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "# eventos de desconexión TCP a nivel de red" #: src/transport/plugin_transport_tcp.c:3851 -#: src/transport/plugin_transport_xt.c:3849 msgid "Failed to start service.\n" msgstr "Se produjo un fallo al iniciar el servicio.\n" @@ -8118,7 +8079,6 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" #: src/transport/plugin_transport_udp.c:3721 -#: src/transport/plugin_transport_xu.c:2143 #, fuzzy msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n" @@ -8129,19 +8089,15 @@ msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" #: src/transport/plugin_transport_udp.c:3883 #: src/transport/plugin_transport_udp.c:3897 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3929 -#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "«%s» no es una dirección IP válida.\n" #: src/transport/plugin_transport_udp.c:3956 -#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "«%s» no es una dirección IP válida.\n" @@ -8231,61 +8187,6 @@ msgstr "" msgid "# sessions allocated" msgstr "# sesiones WLAN alojadas" -#: src/transport/plugin_transport_xt.c:4010 -#, fuzzy, c-format -msgid "XT transport listening on port %llu\n" -msgstr "Transporte TCP escuchando en el puerto %llu\n" - -#: src/transport/plugin_transport_xt.c:4014 -#, fuzzy -msgid "XT transport not listening on any port (client only)\n" -msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n" - -#: src/transport/plugin_transport_xt.c:4018 -#, fuzzy, c-format -msgid "XT transport advertises itself as being on port %llu\n" -msgstr "El transporte TCP anuncia que está en el puerto %llu\n" - -#: src/transport/plugin_transport_xt.c:4022 -#, fuzzy -msgid "# XT sessions active" -msgstr "# Sesiones TCP activas" - -#: src/transport/plugin_transport_xu.c:1237 -#, fuzzy, c-format -msgid "" -"XU could not transmit message to `%s': Network seems down, please check your " -"network configuration\n" -msgstr "" -"UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, " -"compruebe su configuración de red\n" - -#: src/transport/plugin_transport_xu.c:1251 -#, fuzzy -msgid "" -"XU could not transmit IPv6 message! Please check your network configuration " -"and disable IPv6 if your connection does not have a global IPv6 address\n" -msgstr "" -"UDP no pudo transmitir el mensaje a «%s». Por favor, compruebe su " -"configuración de red y deshabilite IPv6 si su conexión carece de una " -"dirección IPv6 global\n" - -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 -#, fuzzy, c-format -msgid "Failed to bind XU socket to %s: %s\n" -msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" - -#: src/transport/plugin_transport_xu.c:2234 -#, fuzzy -msgid "Failed to open XU sockets\n" -msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" - -#: src/transport/plugin_transport_xu.c:2398 -#, fuzzy -msgid "Failed to create XU network sockets\n" -msgstr "Se produjo un fallo al crear una nueva firma" - #: src/transport/tcp_connection_legacy.c:452 #, c-format msgid "Access denied to `%s'\n" @@ -9524,6 +9425,53 @@ msgstr "Violación externa del protocolo detectada en %s:%d.\n" msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n" +#, fuzzy +#~ msgid "XT transport listening on port %llu\n" +#~ msgstr "Transporte TCP escuchando en el puerto %llu\n" + +#, fuzzy +#~ msgid "XT transport not listening on any port (client only)\n" +#~ msgstr "" +#~ "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n" + +#, fuzzy +#~ msgid "XT transport advertises itself as being on port %llu\n" +#~ msgstr "El transporte TCP anuncia que está en el puerto %llu\n" + +#, fuzzy +#~ msgid "# XT sessions active" +#~ msgstr "# Sesiones TCP activas" + +#, fuzzy +#~ msgid "" +#~ "XU could not transmit message to `%s': Network seems down, please check " +#~ "your network configuration\n" +#~ msgstr "" +#~ "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, " +#~ "compruebe su configuración de red\n" + +#, fuzzy +#~ msgid "" +#~ "XU could not transmit IPv6 message! Please check your network " +#~ "configuration and disable IPv6 if your connection does not have a global " +#~ "IPv6 address\n" +#~ msgstr "" +#~ "UDP no pudo transmitir el mensaje a «%s». Por favor, compruebe su " +#~ "configuración de red y deshabilite IPv6 si su conexión carece de una " +#~ "dirección IPv6 global\n" + +#, fuzzy +#~ msgid "Failed to bind XU socket to %s: %s\n" +#~ msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" + +#, fuzzy +#~ msgid "Failed to open XU sockets\n" +#~ msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" + +#, fuzzy +#~ msgid "Failed to create XU network sockets\n" +#~ msgstr "Se produjo un fallo al crear una nueva firma" + #, fuzzy #~ msgid "Print information about DV state" #~ msgstr "Imprime información acerca del estado del ATS" diff --git a/po/fr.po b/po/fr.po index 09e8993ac..6f0ab8c4b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-04-03 14:36+0200\n" +"POT-Creation-Date: 2019-04-03 16:13+0200\n" "PO-Revision-Date: 2015-12-24 01:20+0100\n" "Last-Translator: Stéphane Aulery \n" "Language-Team: French \n" @@ -221,7 +221,6 @@ msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" #: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 #, c-format msgid "" @@ -232,9 +231,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3835 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 #: src/util/service.c:1162 @@ -243,7 +239,6 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 #: src/util/service.c:1201 #, c-format @@ -251,7 +246,6 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 #: src/util/service.c:1206 #, c-format @@ -259,7 +253,6 @@ msgid "Using `%s' instead\n" msgstr "" #: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 #, c-format msgid "" @@ -268,7 +261,6 @@ msgid "" msgstr "" #: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -277,7 +269,6 @@ msgstr "" #: src/arm/gnunet-service-arm.c:556 #: src/transport/plugin_transport_http_server.c:2688 #: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 #, c-format msgid "Failed to resolve `%s': %s\n" @@ -286,7 +277,6 @@ msgstr "Résolution de « %s » échouée : %s\n" #: src/arm/gnunet-service-arm.c:575 #: src/transport/plugin_transport_http_server.c:2706 #: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 #, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -7195,8 +7185,6 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:3530 #: src/transport/plugin_transport_tcp.c:3901 #: src/transport/plugin_transport_tcp.c:3908 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7266,7 +7254,6 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:2905 #: src/transport/plugin_transport_udp.c:3627 -#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7366,8 +7353,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1557 #: src/transport/plugin_transport_tcp.c:2883 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" @@ -7376,9 +7361,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1964 #: src/transport/plugin_transport_tcp.c:3147 #: src/transport/plugin_transport_tcp.c:4024 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 msgid "# TCP sessions active" msgstr "# Session TCP active" @@ -7388,85 +7370,64 @@ msgstr "# Session TCP active" #: src/transport/plugin_transport_tcp.c:2143 #: src/transport/plugin_transport_tcp.c:2243 #: src/transport/plugin_transport_tcp.c:2268 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 msgid "# bytes currently in TCP buffers" msgstr "" #: src/transport/plugin_transport_tcp.c:1785 -#: src/transport/plugin_transport_xt.c:1781 msgid "# bytes discarded by TCP (disconnect)" msgstr "" #: src/transport/plugin_transport_tcp.c:2073 -#: src/transport/plugin_transport_xt.c:2069 msgid "# bytes discarded by TCP (timeout)" msgstr "" #: src/transport/plugin_transport_tcp.c:2147 -#: src/transport/plugin_transport_xt.c:2143 msgid "# bytes transmitted via TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:2545 -#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2721 -#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3213 -#: src/transport/plugin_transport_xt.c:3209 msgid "# TCP WELCOME messages received" msgstr "" #: src/transport/plugin_transport_tcp.c:3419 -#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3470 #: src/transport/plugin_transport_tcp.c:3528 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr "# Session TCP active" #: src/transport/plugin_transport_tcp.c:3474 -#: src/transport/plugin_transport_xt.c:3470 msgid "# TCP server connect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3480 -#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3482 -#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3532 -#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3851 -#: src/transport/plugin_transport_xt.c:3849 msgid "Failed to start service.\n" msgstr "" @@ -7518,7 +7479,6 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Résolution de « %s » échouée : %s\n" #: src/transport/plugin_transport_udp.c:3721 -#: src/transport/plugin_transport_xu.c:2143 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" @@ -7528,19 +7488,15 @@ msgstr "" #: src/transport/plugin_transport_udp.c:3883 #: src/transport/plugin_transport_udp.c:3897 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3929 -#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "adresse invalide" #: src/transport/plugin_transport_udp.c:3956 -#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "adresse invalide" @@ -7616,54 +7572,6 @@ msgstr "" msgid "# sessions allocated" msgstr "# Session TCP active" -#: src/transport/plugin_transport_xt.c:4010 -#, c-format -msgid "XT transport listening on port %llu\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4014 -msgid "XT transport not listening on any port (client only)\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4018 -#, c-format -msgid "XT transport advertises itself as being on port %llu\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4022 -#, fuzzy -msgid "# XT sessions active" -msgstr "# Session TCP active" - -#: src/transport/plugin_transport_xu.c:1237 -#, c-format -msgid "" -"XU could not transmit message to `%s': Network seems down, please check your " -"network configuration\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:1251 -msgid "" -"XU could not transmit IPv6 message! Please check your network configuration " -"and disable IPv6 if your connection does not have a global IPv6 address\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 -#, fuzzy, c-format -msgid "Failed to bind XU socket to %s: %s\n" -msgstr "Résolution de « %s » échouée : %s\n" - -#: src/transport/plugin_transport_xu.c:2234 -#, fuzzy -msgid "Failed to open XU sockets\n" -msgstr "Résolution de « %s » échouée : %s\n" - -#: src/transport/plugin_transport_xu.c:2398 -#, fuzzy -msgid "Failed to create XU network sockets\n" -msgstr "Résolution de « %s » échouée : %s\n" - #: src/transport/tcp_connection_legacy.c:452 #, c-format msgid "Access denied to `%s'\n" @@ -8833,6 +8741,22 @@ msgstr "" msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "" +#, fuzzy +#~ msgid "# XT sessions active" +#~ msgstr "# Session TCP active" + +#, fuzzy +#~ msgid "Failed to bind XU socket to %s: %s\n" +#~ msgstr "Résolution de « %s » échouée : %s\n" + +#, fuzzy +#~ msgid "Failed to open XU sockets\n" +#~ msgstr "Résolution de « %s » échouée : %s\n" + +#, fuzzy +#~ msgid "Failed to create XU network sockets\n" +#~ msgstr "Résolution de « %s » échouée : %s\n" + #, fuzzy #~ msgid "Dropping invalid fragment\n" #~ msgstr "Argument invalide « %s »\n" diff --git a/po/it.po b/po/it.po index bb7e031c3..1607f5bdd 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-04-03 14:36+0200\n" +"POT-Creation-Date: 2019-04-03 16:13+0200\n" "PO-Revision-Date: 2018-08-29 13:48+0200\n" "Last-Translator: Sebastiano Pistore \n" "Language-Team: Italian \n" @@ -217,7 +217,6 @@ msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" #: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 #, c-format msgid "" @@ -228,9 +227,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3835 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 #: src/util/service.c:1162 @@ -239,7 +235,6 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 #: src/util/service.c:1201 #, c-format @@ -247,7 +242,6 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 #: src/util/service.c:1206 #, c-format @@ -255,7 +249,6 @@ msgid "Using `%s' instead\n" msgstr "" #: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 #, c-format msgid "" @@ -264,7 +257,6 @@ msgid "" msgstr "" #: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -273,7 +265,6 @@ msgstr "" #: src/arm/gnunet-service-arm.c:556 #: src/transport/plugin_transport_http_server.c:2688 #: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 #, c-format msgid "Failed to resolve `%s': %s\n" @@ -282,7 +273,6 @@ msgstr "" #: src/arm/gnunet-service-arm.c:575 #: src/transport/plugin_transport_http_server.c:2706 #: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 #, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -7190,8 +7180,6 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:3530 #: src/transport/plugin_transport_tcp.c:3901 #: src/transport/plugin_transport_tcp.c:3908 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7261,7 +7249,6 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:2905 #: src/transport/plugin_transport_udp.c:3627 -#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7361,8 +7348,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1557 #: src/transport/plugin_transport_tcp.c:2883 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" @@ -7371,9 +7356,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1964 #: src/transport/plugin_transport_tcp.c:3147 #: src/transport/plugin_transport_tcp.c:4024 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 msgid "# TCP sessions active" msgstr "" @@ -7383,85 +7365,64 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:2143 #: src/transport/plugin_transport_tcp.c:2243 #: src/transport/plugin_transport_tcp.c:2268 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 msgid "# bytes currently in TCP buffers" msgstr "" #: src/transport/plugin_transport_tcp.c:1785 -#: src/transport/plugin_transport_xt.c:1781 msgid "# bytes discarded by TCP (disconnect)" msgstr "" #: src/transport/plugin_transport_tcp.c:2073 -#: src/transport/plugin_transport_xt.c:2069 msgid "# bytes discarded by TCP (timeout)" msgstr "" #: src/transport/plugin_transport_tcp.c:2147 -#: src/transport/plugin_transport_xt.c:2143 msgid "# bytes transmitted via TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:2545 -#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2721 -#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3213 -#: src/transport/plugin_transport_xt.c:3209 msgid "# TCP WELCOME messages received" msgstr "" #: src/transport/plugin_transport_tcp.c:3419 -#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3470 #: src/transport/plugin_transport_tcp.c:3528 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr "# connessioni attive" #: src/transport/plugin_transport_tcp.c:3474 -#: src/transport/plugin_transport_xt.c:3470 msgid "# TCP server connect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3480 -#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3482 -#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3532 -#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3851 -#: src/transport/plugin_transport_xt.c:3849 msgid "Failed to start service.\n" msgstr "" @@ -7513,7 +7474,6 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "" #: src/transport/plugin_transport_udp.c:3721 -#: src/transport/plugin_transport_xu.c:2143 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" @@ -7523,19 +7483,15 @@ msgstr "" #: src/transport/plugin_transport_udp.c:3883 #: src/transport/plugin_transport_udp.c:3897 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3929 -#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "`%s' non è un indirizzo IP valido.\n" #: src/transport/plugin_transport_udp.c:3956 -#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "`%s' non è un indirizzo IP valido.\n" @@ -7613,51 +7569,6 @@ msgstr "" msgid "# sessions allocated" msgstr "" -#: src/transport/plugin_transport_xt.c:4010 -#, c-format -msgid "XT transport listening on port %llu\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4014 -msgid "XT transport not listening on any port (client only)\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4018 -#, c-format -msgid "XT transport advertises itself as being on port %llu\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4022 -msgid "# XT sessions active" -msgstr "" - -#: src/transport/plugin_transport_xu.c:1237 -#, c-format -msgid "" -"XU could not transmit message to `%s': Network seems down, please check your " -"network configuration\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:1251 -msgid "" -"XU could not transmit IPv6 message! Please check your network configuration " -"and disable IPv6 if your connection does not have a global IPv6 address\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 -#, c-format -msgid "Failed to bind XU socket to %s: %s\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:2234 -msgid "Failed to open XU sockets\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:2398 -msgid "Failed to create XU network sockets\n" -msgstr "" - #: src/transport/tcp_connection_legacy.c:452 #, c-format msgid "Access denied to `%s'\n" diff --git a/po/sv.po b/po/sv.po index da73db878..f23447ca6 100644 --- a/po/sv.po +++ b/po/sv.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: 2019-04-03 14:36+0200\n" +"POT-Creation-Date: 2019-04-03 16:13+0200\n" "PO-Revision-Date: 2006-01-21 17:16+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -227,7 +227,6 @@ msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" #: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 #, c-format msgid "" @@ -238,9 +237,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3835 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 #: src/util/service.c:1162 @@ -249,7 +245,6 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 #: src/util/service.c:1201 #, c-format @@ -257,7 +252,6 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 #: src/util/service.c:1206 #, fuzzy, c-format @@ -265,7 +259,6 @@ msgid "Using `%s' instead\n" msgstr "%s: flagga \"%s\" är tvetydig\n" #: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 #, c-format msgid "" @@ -274,7 +267,6 @@ msgid "" msgstr "" #: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -283,7 +275,6 @@ msgstr "" #: src/arm/gnunet-service-arm.c:556 #: src/transport/plugin_transport_http_server.c:2688 #: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 #, fuzzy, c-format msgid "Failed to resolve `%s': %s\n" @@ -292,7 +283,6 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n" #: src/arm/gnunet-service-arm.c:575 #: src/transport/plugin_transport_http_server.c:2706 #: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 #, fuzzy, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -7569,8 +7559,6 @@ msgstr "meddelandestorlek" #: src/transport/plugin_transport_http_server.c:3530 #: src/transport/plugin_transport_tcp.c:3901 #: src/transport/plugin_transport_tcp.c:3908 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7642,7 +7630,6 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:2905 #: src/transport/plugin_transport_udp.c:3627 -#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7754,8 +7741,6 @@ msgstr "# byte kastade via TCP (utgående)" #: src/transport/plugin_transport_tcp.c:1557 #: src/transport/plugin_transport_tcp.c:2883 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" @@ -7764,9 +7749,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1964 #: src/transport/plugin_transport_tcp.c:3147 #: src/transport/plugin_transport_tcp.c:4024 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 #, fuzzy msgid "# TCP sessions active" msgstr "# sessionsnycklar accepterade" @@ -7777,91 +7759,70 @@ msgstr "# sessionsnycklar accepterade" #: src/transport/plugin_transport_tcp.c:2143 #: src/transport/plugin_transport_tcp.c:2243 #: src/transport/plugin_transport_tcp.c:2268 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 #, fuzzy msgid "# bytes currently in TCP buffers" msgstr "# byte skickades via TCP" #: src/transport/plugin_transport_tcp.c:1785 -#: src/transport/plugin_transport_xt.c:1781 #, fuzzy msgid "# bytes discarded by TCP (disconnect)" msgstr "# byte kastade via TCP (utgående)" #: src/transport/plugin_transport_tcp.c:2073 -#: src/transport/plugin_transport_xt.c:2069 #, fuzzy msgid "# bytes discarded by TCP (timeout)" msgstr "# byte kastade via TCP (utgående)" #: src/transport/plugin_transport_tcp.c:2147 -#: src/transport/plugin_transport_xt.c:2143 #, fuzzy msgid "# bytes transmitted via TCP" msgstr "# byte skickade av typen %d" #: src/transport/plugin_transport_tcp.c:2545 -#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2721 -#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3213 -#: src/transport/plugin_transport_xt.c:3209 #, fuzzy msgid "# TCP WELCOME messages received" msgstr "# krypterade PONG-meddelanden mottagna" #: src/transport/plugin_transport_tcp.c:3419 -#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "# byte mottogs via TCP" #: src/transport/plugin_transport_tcp.c:3470 #: src/transport/plugin_transport_tcp.c:3528 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr "Nätverksanslutning" #: src/transport/plugin_transport_tcp.c:3474 -#: src/transport/plugin_transport_xt.c:3470 #, fuzzy msgid "# TCP server connect events" msgstr "# av anslutna parter" #: src/transport/plugin_transport_tcp.c:3480 -#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3482 -#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3532 -#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3851 -#: src/transport/plugin_transport_xt.c:3849 #, fuzzy msgid "Failed to start service.\n" msgstr "Misslyckades att starta samling.\n" @@ -7915,7 +7876,6 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Misslyckades att binda till UDP6-port %d.\n" #: src/transport/plugin_transport_udp.c:3721 -#: src/transport/plugin_transport_xu.c:2143 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" @@ -7926,19 +7886,15 @@ msgstr "Misslyckades att binda till UDP6-port %d.\n" #: src/transport/plugin_transport_udp.c:3883 #: src/transport/plugin_transport_udp.c:3897 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3929 -#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "\"%s\" är inte tillgänglig." #: src/transport/plugin_transport_udp.c:3956 -#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "\"%s\" är inte tillgänglig." @@ -8025,54 +7981,6 @@ msgstr "" msgid "# sessions allocated" msgstr "# sessionsnycklar accepterade" -#: src/transport/plugin_transport_xt.c:4010 -#, c-format -msgid "XT transport listening on port %llu\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4014 -msgid "XT transport not listening on any port (client only)\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4018 -#, c-format -msgid "XT transport advertises itself as being on port %llu\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4022 -#, fuzzy -msgid "# XT sessions active" -msgstr "# sessionsnycklar accepterade" - -#: src/transport/plugin_transport_xu.c:1237 -#, c-format -msgid "" -"XU could not transmit message to `%s': Network seems down, please check your " -"network configuration\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:1251 -msgid "" -"XU could not transmit IPv6 message! Please check your network configuration " -"and disable IPv6 if your connection does not have a global IPv6 address\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 -#, fuzzy, c-format -msgid "Failed to bind XU socket to %s: %s\n" -msgstr "Misslyckades att binda till UDP6-port %d.\n" - -#: src/transport/plugin_transport_xu.c:2234 -#, fuzzy -msgid "Failed to open XU sockets\n" -msgstr "Misslyckades att binda till UDP6-port %d.\n" - -#: src/transport/plugin_transport_xu.c:2398 -#, fuzzy -msgid "Failed to create XU network sockets\n" -msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" - #: src/transport/tcp_connection_legacy.c:452 #, fuzzy, c-format msgid "Access denied to `%s'\n" @@ -9274,6 +9182,22 @@ msgstr "" msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n" +#, fuzzy +#~ msgid "# XT sessions active" +#~ msgstr "# sessionsnycklar accepterade" + +#, fuzzy +#~ msgid "Failed to bind XU socket to %s: %s\n" +#~ msgstr "Misslyckades att binda till UDP6-port %d.\n" + +#, fuzzy +#~ msgid "Failed to open XU sockets\n" +#~ msgstr "Misslyckades att binda till UDP6-port %d.\n" + +#, fuzzy +#~ msgid "Failed to create XU network sockets\n" +#~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" + #, fuzzy #~ msgid "Print information about DV state" #~ msgstr "Skriv ut information om GNUnets motparter." diff --git a/po/vi.po b/po/vi.po index daaaf1a49..b791c8153 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.8.0a\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-04-03 14:36+0200\n" +"POT-Creation-Date: 2019-04-03 16:13+0200\n" "PO-Revision-Date: 2008-09-10 22:05+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -234,7 +234,6 @@ msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" #: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 #, c-format msgid "" @@ -245,9 +244,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3835 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 #: src/util/service.c:1162 @@ -256,7 +252,6 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 #: src/util/service.c:1201 #, c-format @@ -264,7 +259,6 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 #: src/util/service.c:1206 #, fuzzy, c-format @@ -272,7 +266,6 @@ msgid "Using `%s' instead\n" msgstr "%s: tùy chọn « %s » là mơ hồ\n" #: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 #, c-format msgid "" @@ -281,7 +274,6 @@ msgid "" msgstr "" #: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -290,7 +282,6 @@ msgstr "" #: src/arm/gnunet-service-arm.c:556 #: src/transport/plugin_transport_http_server.c:2688 #: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 #, fuzzy, c-format msgid "Failed to resolve `%s': %s\n" @@ -299,7 +290,6 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" #: src/arm/gnunet-service-arm.c:575 #: src/transport/plugin_transport_http_server.c:2706 #: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 #, fuzzy, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -7634,8 +7624,6 @@ msgstr "kích cỡ tin nhắn" #: src/transport/plugin_transport_http_server.c:3530 #: src/transport/plugin_transport_tcp.c:3901 #: src/transport/plugin_transport_tcp.c:3908 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7706,7 +7694,6 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:2905 #: src/transport/plugin_transport_udp.c:3627 -#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7810,8 +7797,6 @@ msgstr "# các byte loại đi bởi SMTP (đi ra)" #: src/transport/plugin_transport_tcp.c:1557 #: src/transport/plugin_transport_tcp.c:2883 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 #, fuzzy, c-format msgid "Unexpected address length: %u bytes\n" msgstr "Gặp sự kiện bất thường: %d\n" @@ -7820,9 +7805,6 @@ msgstr "Gặp sự kiện bất thường: %d\n" #: src/transport/plugin_transport_tcp.c:1964 #: src/transport/plugin_transport_tcp.c:3147 #: src/transport/plugin_transport_tcp.c:4024 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 #, fuzzy msgid "# TCP sessions active" msgstr "# các khoá phiên chạy được chấp nhận" @@ -7833,91 +7815,70 @@ msgstr "# các khoá phiên chạy được chấp nhận" #: src/transport/plugin_transport_tcp.c:2143 #: src/transport/plugin_transport_tcp.c:2243 #: src/transport/plugin_transport_tcp.c:2268 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 #, fuzzy msgid "# bytes currently in TCP buffers" msgstr "# các byte đã gừi qua TCP" #: src/transport/plugin_transport_tcp.c:1785 -#: src/transport/plugin_transport_xt.c:1781 #, fuzzy msgid "# bytes discarded by TCP (disconnect)" msgstr "# các byte loại đi bởi TCP (đi ra)" #: src/transport/plugin_transport_tcp.c:2073 -#: src/transport/plugin_transport_xt.c:2069 #, fuzzy msgid "# bytes discarded by TCP (timeout)" msgstr "# các byte loại đi bởi TCP (đi ra)" #: src/transport/plugin_transport_tcp.c:2147 -#: src/transport/plugin_transport_xt.c:2143 #, fuzzy msgid "# bytes transmitted via TCP" msgstr "# các byte được gửi" #: src/transport/plugin_transport_tcp.c:2545 -#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2721 -#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3213 -#: src/transport/plugin_transport_xt.c:3209 #, fuzzy msgid "# TCP WELCOME messages received" msgstr "# các thông báo PONG đã mật mã được nhận" #: src/transport/plugin_transport_tcp.c:3419 -#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "# các byte đã nhận qua TCP" #: src/transport/plugin_transport_tcp.c:3470 #: src/transport/plugin_transport_tcp.c:3528 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr "# các kết nối dht" #: src/transport/plugin_transport_tcp.c:3474 -#: src/transport/plugin_transport_xt.c:3470 #, fuzzy msgid "# TCP server connect events" msgstr "# của các đồng đẳng đã kết nối" #: src/transport/plugin_transport_tcp.c:3480 -#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3482 -#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3532 -#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3851 -#: src/transport/plugin_transport_xt.c:3849 #, fuzzy msgid "Failed to start service.\n" msgstr "Lỗi bắt đầu thu thập.\n" @@ -7971,7 +7932,6 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" #: src/transport/plugin_transport_udp.c:3721 -#: src/transport/plugin_transport_xu.c:2143 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" @@ -7982,19 +7942,15 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" #: src/transport/plugin_transport_udp.c:3883 #: src/transport/plugin_transport_udp.c:3897 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3929 -#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "« %s » không sẵn sàng.\n" #: src/transport/plugin_transport_udp.c:3956 -#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "« %s » không sẵn sàng.\n" @@ -8081,54 +8037,6 @@ msgstr "" msgid "# sessions allocated" msgstr "# các khoá phiên chạy được chấp nhận" -#: src/transport/plugin_transport_xt.c:4010 -#, c-format -msgid "XT transport listening on port %llu\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4014 -msgid "XT transport not listening on any port (client only)\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4018 -#, c-format -msgid "XT transport advertises itself as being on port %llu\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4022 -#, fuzzy -msgid "# XT sessions active" -msgstr "# các khoá phiên chạy được chấp nhận" - -#: src/transport/plugin_transport_xu.c:1237 -#, c-format -msgid "" -"XU could not transmit message to `%s': Network seems down, please check your " -"network configuration\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:1251 -msgid "" -"XU could not transmit IPv6 message! Please check your network configuration " -"and disable IPv6 if your connection does not have a global IPv6 address\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 -#, fuzzy, c-format -msgid "Failed to bind XU socket to %s: %s\n" -msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" - -#: src/transport/plugin_transport_xu.c:2234 -#, fuzzy -msgid "Failed to open XU sockets\n" -msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" - -#: src/transport/plugin_transport_xu.c:2398 -#, fuzzy -msgid "Failed to create XU network sockets\n" -msgstr "Không thể tạo miền tên.\n" - #: src/transport/tcp_connection_legacy.c:452 #, fuzzy, c-format msgid "Access denied to `%s'\n" @@ -9331,6 +9239,22 @@ msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n" msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n" +#, fuzzy +#~ msgid "# XT sessions active" +#~ msgstr "# các khoá phiên chạy được chấp nhận" + +#, fuzzy +#~ msgid "Failed to bind XU socket to %s: %s\n" +#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" + +#, fuzzy +#~ msgid "Failed to open XU sockets\n" +#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" + +#, fuzzy +#~ msgid "Failed to create XU network sockets\n" +#~ msgstr "Không thể tạo miền tên.\n" + #, fuzzy #~ msgid "Print information about DV state" #~ msgstr "In ra thông tin về các đồng đẳng GNUnet." diff --git a/po/zh_CN.po b/po/zh_CN.po index 345c26790..88a016d83 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet-0.8.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2019-04-03 14:36+0200\n" +"POT-Creation-Date: 2019-04-03 16:13+0200\n" "PO-Revision-Date: 2011-07-09 12:12+0800\n" "Last-Translator: Wylmer Wang \n" "Language-Team: Chinese (simplified) \n" @@ -221,7 +221,6 @@ msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" #: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 #, c-format msgid "" @@ -232,9 +231,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3835 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 #: src/util/service.c:1162 @@ -243,7 +239,6 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 #: src/util/service.c:1201 #, c-format @@ -251,7 +246,6 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 #: src/util/service.c:1206 #, fuzzy, c-format @@ -259,7 +253,6 @@ msgid "Using `%s' instead\n" msgstr "%s：选项“%s”有歧义\n" #: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 #, c-format msgid "" @@ -268,7 +261,6 @@ msgid "" msgstr "" #: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -277,7 +269,6 @@ msgstr "" #: src/arm/gnunet-service-arm.c:556 #: src/transport/plugin_transport_http_server.c:2688 #: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 #, fuzzy, c-format msgid "Failed to resolve `%s': %s\n" @@ -286,7 +277,6 @@ msgstr "打开日志文件“%s”失败：%s\n" #: src/arm/gnunet-service-arm.c:575 #: src/transport/plugin_transport_http_server.c:2706 #: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 #, fuzzy, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -7343,8 +7333,6 @@ msgstr "消息尺寸" #: src/transport/plugin_transport_http_server.c:3530 #: src/transport/plugin_transport_tcp.c:3901 #: src/transport/plugin_transport_tcp.c:3908 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7415,7 +7403,6 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:2905 #: src/transport/plugin_transport_udp.c:3627 -#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7519,8 +7506,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1557 #: src/transport/plugin_transport_tcp.c:2883 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" @@ -7529,9 +7514,6 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1964 #: src/transport/plugin_transport_tcp.c:3147 #: src/transport/plugin_transport_tcp.c:4024 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 msgid "# TCP sessions active" msgstr "" @@ -7541,54 +7523,39 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:2143 #: src/transport/plugin_transport_tcp.c:2243 #: src/transport/plugin_transport_tcp.c:2268 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 msgid "# bytes currently in TCP buffers" msgstr "" #: src/transport/plugin_transport_tcp.c:1785 -#: src/transport/plugin_transport_xt.c:1781 msgid "# bytes discarded by TCP (disconnect)" msgstr "" #: src/transport/plugin_transport_tcp.c:2073 -#: src/transport/plugin_transport_xt.c:2069 msgid "# bytes discarded by TCP (timeout)" msgstr "" #: src/transport/plugin_transport_tcp.c:2147 -#: src/transport/plugin_transport_xt.c:2143 msgid "# bytes transmitted via TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:2545 -#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2721 -#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3213 -#: src/transport/plugin_transport_xt.c:3209 msgid "# TCP WELCOME messages received" msgstr "" #: src/transport/plugin_transport_tcp.c:3419 -#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3470 #: src/transport/plugin_transport_tcp.c:3528 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr "" @@ -7596,7 +7563,6 @@ msgstr "" "按任意键继续\n" #: src/transport/plugin_transport_tcp.c:3474 -#: src/transport/plugin_transport_xt.c:3470 #, fuzzy msgid "# TCP server connect events" msgstr "" @@ -7604,27 +7570,22 @@ msgstr "" "按任意键继续\n" #: src/transport/plugin_transport_tcp.c:3480 -#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3482 -#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3532 -#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3851 -#: src/transport/plugin_transport_xt.c:3849 #, fuzzy msgid "Failed to start service.\n" msgstr "初始化“%s”服务失败。\n" @@ -7677,7 +7638,6 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "打开日志文件“%s”失败：%s\n" #: src/transport/plugin_transport_udp.c:3721 -#: src/transport/plugin_transport_xu.c:2143 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" @@ -7688,19 +7648,15 @@ msgstr "打开日志文件“%s”失败：%s\n" #: src/transport/plugin_transport_udp.c:3883 #: src/transport/plugin_transport_udp.c:3897 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3929 -#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "“%s”不可用。\n" #: src/transport/plugin_transport_udp.c:3956 -#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "“%s”不可用。\n" @@ -7777,56 +7733,6 @@ msgstr "" msgid "# sessions allocated" msgstr "" -#: src/transport/plugin_transport_xt.c:4010 -#, c-format -msgid "XT transport listening on port %llu\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4014 -msgid "XT transport not listening on any port (client only)\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4018 -#, c-format -msgid "XT transport advertises itself as being on port %llu\n" -msgstr "" - -#: src/transport/plugin_transport_xt.c:4022 -#, fuzzy -msgid "# XT sessions active" -msgstr "" -"\n" -"按任意键继续\n" - -#: src/transport/plugin_transport_xu.c:1237 -#, c-format -msgid "" -"XU could not transmit message to `%s': Network seems down, please check your " -"network configuration\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:1251 -msgid "" -"XU could not transmit IPv6 message! Please check your network configuration " -"and disable IPv6 if your connection does not have a global IPv6 address\n" -msgstr "" - -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 -#, fuzzy, c-format -msgid "Failed to bind XU socket to %s: %s\n" -msgstr "打开日志文件“%s”失败：%s\n" - -#: src/transport/plugin_transport_xu.c:2234 -#, fuzzy -msgid "Failed to open XU sockets\n" -msgstr "打开日志文件“%s”失败：%s\n" - -#: src/transport/plugin_transport_xu.c:2398 -#, fuzzy -msgid "Failed to create XU network sockets\n" -msgstr "发送消息失败。\n" - #: src/transport/tcp_connection_legacy.c:452 #, fuzzy, c-format msgid "Access denied to `%s'\n" @@ -9012,6 +8918,24 @@ msgstr "" msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "" +#, fuzzy +#~ msgid "# XT sessions active" +#~ msgstr "" +#~ "\n" +#~ "按任意键继续\n" + +#, fuzzy +#~ msgid "Failed to bind XU socket to %s: %s\n" +#~ msgstr "打开日志文件“%s”失败：%s\n" + +#, fuzzy +#~ msgid "Failed to open XU sockets\n" +#~ msgstr "打开日志文件“%s”失败：%s\n" + +#, fuzzy +#~ msgid "Failed to create XU network sockets\n" +#~ msgstr "发送消息失败。\n" + #, fuzzy #~ msgid "Print information about DV state" #~ msgstr "无法获取有关用户“%s”的信息：%s\n" diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c index 7d7d04375..b64bfb182 100644 --- a/src/transport/gnunet-service-tng.c +++ b/src/transport/gnunet-service-tng.c @@ -42,10 +42,10 @@ * effective flow control (for uni-directional transports!) * #4 UDP broadcasting logic must be extended to use the new API * #5 only validated addresses go to ATS for scheduling; that - * also ensures we know the RTT + * also ensures we know the RTT * #6 to ensure flow control and RTT are OK, we always do the * 'validation', even if address comes from PEERSTORE - * #7 + * #7 * - ACK handling / retransmission * - address verification * - track RTT, distance, loss, etc. @@ -1497,7 +1497,7 @@ static struct Neighbour * lookup_neighbour (const struct GNUNET_PeerIdentity *pid) { return GNUNET_CONTAINER_multipeermap_get (neighbours, - pid); + pid); } @@ -1561,9 +1561,9 @@ free_distance_vector_hop (struct DistanceVectorHop *dvh) if (NULL == dv->dv_head) { GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multipeermap_remove (dv_routes, - &dv->target, - dv)); + GNUNET_CONTAINER_multipeermap_remove (dv_routes, + &dv->target, + dv)); if (NULL != dv->timeout_task) GNUNET_SCHEDULER_cancel (dv->timeout_task); GNUNET_free (dv); @@ -1602,18 +1602,18 @@ free_dv_route (struct DistanceVector *dv) */ static void notify_monitor (struct TransportClient *tc, - const struct GNUNET_PeerIdentity *peer, - const char *address, - enum GNUNET_NetworkType nt, - const struct MonitorEvent *me) + const struct GNUNET_PeerIdentity *peer, + const char *address, + enum GNUNET_NetworkType nt, + const struct MonitorEvent *me) { struct GNUNET_MQ_Envelope *env; struct GNUNET_TRANSPORT_MonitorData *md; size_t addr_len = strlen (address) + 1; env = GNUNET_MQ_msg_extra (md, - addr_len, - GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_DATA); + addr_len, + GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_DATA); md->nt = htonl ((uint32_t) nt); md->peer = *peer; md->last_validation = GNUNET_TIME_absolute_hton (me->last_validation); @@ -1624,10 +1624,10 @@ notify_monitor (struct TransportClient *tc, md->num_msg_pending = htonl (me->num_msg_pending); md->num_bytes_pending = htonl (me->num_bytes_pending); memcpy (&md[1], - address, - addr_len); + address, + addr_len); GNUNET_MQ_send (tc->mq, - env); + env); } @@ -1642,9 +1642,9 @@ notify_monitor (struct TransportClient *tc, */ static void notify_monitors (const struct GNUNET_PeerIdentity *peer, - const char *address, - enum GNUNET_NetworkType nt, - const struct MonitorEvent *me) + const char *address, + enum GNUNET_NetworkType nt, + const struct MonitorEvent *me) { static struct GNUNET_PeerIdentity zero; @@ -1657,17 +1657,17 @@ notify_monitors (const struct GNUNET_PeerIdentity *peer, if (tc->details.monitor.one_shot) continue; if ( (0 != memcmp (&tc->details.monitor.peer, - &zero, - sizeof (zero))) && - (0 != memcmp (&tc->details.monitor.peer, - peer, - sizeof (*peer))) ) + &zero, + sizeof (zero))) && + (0 != memcmp (&tc->details.monitor.peer, + peer, + sizeof (*peer))) ) continue; notify_monitor (tc, - peer, - address, - nt, - me); + peer, + address, + nt, + me); } } @@ -1683,8 +1683,8 @@ notify_monitors (const struct GNUNET_PeerIdentity *peer, */ static void * client_connect_cb (void *cls, - struct GNUNET_SERVICE_Client *client, - struct GNUNET_MQ_Handle *mq) + struct GNUNET_SERVICE_Client *client, + struct GNUNET_MQ_Handle *mq) { struct TransportClient *tc; @@ -1712,11 +1712,11 @@ free_reassembly_context (struct ReassemblyContext *rc) struct Neighbour *n = rc->neighbour; GNUNET_assert (rc == - GNUNET_CONTAINER_heap_remove_node (rc->hn)); + GNUNET_CONTAINER_heap_remove_node (rc->hn)); GNUNET_assert (GNUNET_OK == - GNUNET_CONTAINER_multishortmap_remove (n->reassembly_map, - &rc->msg_uuid, - rc)); + GNUNET_CONTAINER_multishortmap_remove (n->reassembly_map, + &rc->msg_uuid, + rc)); GNUNET_free (rc); } @@ -1742,8 +1742,8 @@ reassembly_cleanup_task (void *cls) } GNUNET_assert (NULL == n->reassembly_timeout_task); n->reassembly_timeout_task = GNUNET_SCHEDULER_add_at (rc->reassembly_timeout, - &reassembly_cleanup_task, - n); + &reassembly_cleanup_task, + n); return; } } @@ -1783,16 +1783,16 @@ free_neighbour (struct Neighbour *neighbour) GNUNET_assert (NULL == neighbour->session_head); GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multipeermap_remove (neighbours, - &neighbour->pid, - neighbour)); + GNUNET_CONTAINER_multipeermap_remove (neighbours, + &neighbour->pid, + neighbour)); if (NULL != neighbour->timeout_task) GNUNET_SCHEDULER_cancel (neighbour->timeout_task); if (NULL != neighbour->reassembly_map) { GNUNET_CONTAINER_multishortmap_iterate (neighbour->reassembly_map, - &free_reassembly_cb, - NULL); + &free_reassembly_cb, + NULL); GNUNET_CONTAINER_multishortmap_destroy (neighbour->reassembly_map); neighbour->reassembly_map = NULL; GNUNET_CONTAINER_heap_destroy (neighbour->reassembly_heap); @@ -1815,15 +1815,15 @@ free_neighbour (struct Neighbour *neighbour) */ static void core_send_connect_info (struct TransportClient *tc, - const struct GNUNET_PeerIdentity *pid, - struct GNUNET_BANDWIDTH_Value32NBO quota_out) + const struct GNUNET_PeerIdentity *pid, + struct GNUNET_BANDWIDTH_Value32NBO quota_out) { struct GNUNET_MQ_Envelope *env; struct ConnectInfoMessage *cim; GNUNET_assert (CT_CORE == tc->type); env = GNUNET_MQ_msg (cim, - GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT); + GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT); cim->quota_out = quota_out; cim->id = *pid; GNUNET_MQ_send (tc->mq, @@ -1839,7 +1839,7 @@ core_send_connect_info (struct TransportClient *tc, */ static void cores_send_connect_info (const struct GNUNET_PeerIdentity *pid, - struct GNUNET_BANDWIDTH_Value32NBO quota_out) + struct GNUNET_BANDWIDTH_Value32NBO quota_out) { for (struct TransportClient *tc = clients_head; NULL != tc; @@ -1848,8 +1848,8 @@ cores_send_connect_info (const struct GNUNET_PeerIdentity *pid, if (CT_CORE != tc->type) continue; core_send_connect_info (tc, - pid, - quota_out); + pid, + quota_out); } } @@ -1872,10 +1872,10 @@ cores_send_disconnect_info (const struct GNUNET_PeerIdentity *pid) if (CT_CORE != tc->type) continue; env = GNUNET_MQ_msg (dim, - GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT); + GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT); dim->peer = *pid; GNUNET_MQ_send (tc->mq, - env); + env); } } @@ -1910,20 +1910,21 @@ schedule_transmit_on_queue (struct GNUNET_ATS_Session *queue) unsigned int wsize; GNUNET_assert (NULL != pm); - if (queue->tc->details.communicator.total_queue_length >= COMMUNICATOR_TOTAL_QUEUE_LIMIT) + if (queue->tc->details.communicator.total_queue_length >= + COMMUNICATOR_TOTAL_QUEUE_LIMIT) { GNUNET_STATISTICS_update (GST_stats, - "# Transmission throttled due to communicator queue limit", - 1, - GNUNET_NO); + "# Transmission throttled due to communicator queue limit", + 1, + GNUNET_NO); return; } if (queue->queue_length >= SESSION_QUEUE_LIMIT) { GNUNET_STATISTICS_update (GST_stats, - "# Transmission throttled due to session queue limit", - 1, - GNUNET_NO); + "# Transmission throttled due to session queue limit", + 1, + GNUNET_NO); return; } @@ -1931,27 +1932,28 @@ schedule_transmit_on_queue (struct GNUNET_ATS_Session *queue) ? pm->bytes_msg /* FIXME: add overheads? */ : queue->mtu; out_delay = GNUNET_BANDWIDTH_tracker_get_delay (&queue->tracker_out, - wsize); + wsize); out_delay = GNUNET_TIME_relative_max (GNUNET_TIME_absolute_get_remaining (pm->next_attempt), - out_delay); + out_delay); if (0 == out_delay.rel_value_us) return; /* we should run immediately! */ /* queue has changed since we were scheduled, reschedule again */ - queue->transmit_task = GNUNET_SCHEDULER_add_delayed (out_delay, - &transmit_on_queue, - queue); + queue->transmit_task + = GNUNET_SCHEDULER_add_delayed (out_delay, + &transmit_on_queue, + queue); if (out_delay.rel_value_us > DELAY_WARN_THRESHOLD.rel_value_us) GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Next transmission on queue `%s' in %s (high delay)\n", - queue->address, - GNUNET_STRINGS_relative_time_to_string (out_delay, - GNUNET_YES)); + "Next transmission on queue `%s' in %s (high delay)\n", + queue->address, + GNUNET_STRINGS_relative_time_to_string (out_delay, + GNUNET_YES)); else GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Next transmission on queue `%s' in %s\n", - queue->address, - GNUNET_STRINGS_relative_time_to_string (out_delay, - GNUNET_YES)); + "Next transmission on queue `%s' in %s\n", + queue->address, + GNUNET_STRINGS_relative_time_to_string (out_delay, + GNUNET_YES)); } @@ -1978,19 +1980,19 @@ free_session (struct GNUNET_ATS_Session *session) session->transmit_task = NULL; } GNUNET_CONTAINER_MDLL_remove (neighbour, - neighbour->session_head, - neighbour->session_tail, - session); + neighbour->session_head, + neighbour->session_tail, + session); GNUNET_CONTAINER_MDLL_remove (client, - tc->details.communicator.session_head, - tc->details.communicator.session_tail, - session); + tc->details.communicator.session_head, + tc->details.communicator.session_tail, + session); maxxed = (COMMUNICATOR_TOTAL_QUEUE_LIMIT >= tc->details.communicator.total_queue_length); while (NULL != (qe = session->queue_head)) { GNUNET_CONTAINER_DLL_remove (session->queue_head, - session->queue_tail, - qe); + session->queue_tail, + qe); session->queue_length--; tc->details.communicator.total_queue_length--; GNUNET_free (qe); @@ -2001,18 +2003,18 @@ free_session (struct GNUNET_ATS_Session *session) { /* Communicator dropped below threshold, resume all queues */ GNUNET_STATISTICS_update (GST_stats, - "# Transmission throttled due to communicator queue limit", - -1, - GNUNET_NO); + "# Transmission throttled due to communicator queue limit", + -1, + GNUNET_NO); for (struct GNUNET_ATS_Session *s = tc->details.communicator.session_head; - NULL != s; - s = s->next_client) + NULL != s; + s = s->next_client) schedule_transmit_on_queue (s); } notify_monitors (&neighbour->pid, - session->address, - session->nt, - &me); + session->address, + session->nt, + &me); GNUNET_ATS_session_del (session->sr); GNUNET_BANDWIDTH_tracker_notification_stop (&session->tracker_in); GNUNET_BANDWIDTH_tracker_notification_stop (&session->tracker_out); @@ -2036,8 +2038,8 @@ free_address_list_entry (struct AddressListEntry *ale) struct TransportClient *tc = ale->tc; GNUNET_CONTAINER_DLL_remove (tc->details.communicator.addr_head, - tc->details.communicator.addr_tail, - ale); + tc->details.communicator.addr_tail, + ale); if (NULL != ale->sc) { GNUNET_PEERSTORE_store_cancel (ale->sc); @@ -2062,8 +2064,8 @@ free_address_list_entry (struct AddressListEntry *ale) */ static void client_disconnect_cb (void *cls, - struct GNUNET_SERVICE_Client *client, - void *app_ctx) + struct GNUNET_SERVICE_Client *client, + void *app_ctx) { struct TransportClient *tc = app_ctx; @@ -2083,11 +2085,11 @@ client_disconnect_cb (void *cls, while (NULL != (pm = tc->details.core.pending_msg_head)) { - GNUNET_CONTAINER_MDLL_remove (client, - tc->details.core.pending_msg_head, - tc->details.core.pending_msg_tail, - pm); - pm->client = NULL; + GNUNET_CONTAINER_MDLL_remove (client, + tc->details.core.pending_msg_head, + tc->details.core.pending_msg_tail, + pm); + pm->client = NULL; } } break; @@ -2121,15 +2123,15 @@ client_disconnect_cb (void *cls, */ static int notify_client_connect_info (void *cls, - const struct GNUNET_PeerIdentity *pid, - void *value) + const struct GNUNET_PeerIdentity *pid, + void *value) { struct TransportClient *tc = cls; struct Neighbour *neighbour = value; core_send_connect_info (tc, - pid, - neighbour->quota_out); + pid, + neighbour->quota_out); return GNUNET_OK; } @@ -2144,7 +2146,7 @@ notify_client_connect_info (void *cls, */ static void handle_client_start (void *cls, - const struct StartMessage *start) + const struct StartMessage *start) { struct TransportClient *tc = cls; uint32_t options; @@ -2169,8 +2171,8 @@ handle_client_start (void *cls, } tc->type = CT_CORE; GNUNET_CONTAINER_multipeermap_iterate (neighbours, - ¬ify_client_connect_info, - tc); + ¬ify_client_connect_info, + tc); GNUNET_SERVICE_client_continue (tc->client); } @@ -2183,7 +2185,7 @@ handle_client_start (void *cls, */ static int check_client_send (void *cls, - const struct OutboundMessage *obm) + const struct OutboundMessage *obm) { struct TransportClient *tc = cls; uint16_t size; @@ -2248,14 +2250,14 @@ free_pending_message (struct PendingMessage *pm) if (NULL != tc) { GNUNET_CONTAINER_MDLL_remove (client, - tc->details.core.pending_msg_head, - tc->details.core.pending_msg_tail, - pm); + tc->details.core.pending_msg_head, + tc->details.core.pending_msg_tail, + pm); } GNUNET_CONTAINER_MDLL_remove (neighbour, - target->pending_msg_head, - target->pending_msg_tail, - pm); + target->pending_msg_head, + target->pending_msg_tail, + pm); free_fragment_tree (pm); GNUNET_free_non_null (pm->bpm); GNUNET_free (pm); @@ -2276,8 +2278,8 @@ free_pending_message (struct PendingMessage *pm) */ static void client_send_response (struct PendingMessage *pm, - int success, - uint32_t bytes_physical) + int success, + uint32_t bytes_physical) { struct TransportClient *tc = pm->client; struct Neighbour *target = pm->target; @@ -2287,7 +2289,7 @@ client_send_response (struct PendingMessage *pm, if (NULL != tc) { env = GNUNET_MQ_msg (som, - GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK); + GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK); som->success = htonl ((uint32_t) success); som->bytes_msg = htons (pm->bytes_msg); som->bytes_physical = htonl (bytes_physical); @@ -2324,22 +2326,22 @@ check_queue_timeouts (void *cls) if (pos->timeout.abs_value_us <= now.abs_value_us) { GNUNET_STATISTICS_update (GST_stats, - "# messages dropped (timeout before confirmation)", - 1, - GNUNET_NO); + "# messages dropped (timeout before confirmation)", + 1, + GNUNET_NO); client_send_response (pm, GNUNET_NO, 0); continue; } earliest_timeout = GNUNET_TIME_absolute_min (earliest_timeout, - pos->timeout); + pos->timeout); } n->earliest_timeout = earliest_timeout; if (NULL != n->pending_msg_head) n->timeout_task = GNUNET_SCHEDULER_add_at (earliest_timeout, - &check_queue_timeouts, - n); + &check_queue_timeouts, + n); } @@ -2351,13 +2353,14 @@ check_queue_timeouts (void *cls) */ static void handle_client_send (void *cls, - const struct OutboundMessage *obm) + const struct OutboundMessage *obm) { struct TransportClient *tc = cls; struct PendingMessage *pm; const struct GNUNET_MessageHeader *obmm; struct Neighbour *target; uint32_t bytes_msg; + int was_empty; GNUNET_assert (CT_CORE == tc->type); obmm = (const struct GNUNET_MessageHeader *) &obm[1]; @@ -2373,36 +2376,37 @@ handle_client_send (void *cls, struct SendOkMessage *som; env = GNUNET_MQ_msg (som, - GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK); + GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK); som->success = htonl (GNUNET_SYSERR); som->bytes_msg = htonl (bytes_msg); som->bytes_physical = htonl (0); som->peer = obm->peer; GNUNET_MQ_send (tc->mq, - env); + env); GNUNET_SERVICE_client_continue (tc->client); GNUNET_STATISTICS_update (GST_stats, - "# messages dropped (neighbour unknown)", - 1, - GNUNET_NO); + "# messages dropped (neighbour unknown)", + 1, + GNUNET_NO); return; } + was_empty = (NULL == target->pending_msg_head); pm = GNUNET_malloc (sizeof (struct PendingMessage) + bytes_msg); pm->client = tc; pm->target = target; pm->bytes_msg = bytes_msg; pm->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_ntoh (obm->timeout)); memcpy (&pm[1], - &obm[1], - bytes_msg); + &obm[1], + bytes_msg); GNUNET_CONTAINER_MDLL_insert (neighbour, - target->pending_msg_head, - target->pending_msg_tail, - pm); + target->pending_msg_head, + target->pending_msg_tail, + pm); GNUNET_CONTAINER_MDLL_insert (client, - tc->details.core.pending_msg_head, - tc->details.core.pending_msg_tail, - pm); + tc->details.core.pending_msg_head, + tc->details.core.pending_msg_tail, + pm); if (target->earliest_timeout.abs_value_us > pm->timeout.abs_value_us) { target->earliest_timeout.abs_value_us = pm->timeout.abs_value_us; @@ -2410,8 +2414,19 @@ handle_client_send (void *cls, GNUNET_SCHEDULER_cancel (target->timeout_task); target->timeout_task = GNUNET_SCHEDULER_add_at (target->earliest_timeout, - &check_queue_timeouts, - target); + &check_queue_timeouts, + target); + } + if (! was_empty) + return; /* all queues must already be busy */ + for (struct GNUNET_ATS_Session *queue = target->session_head; + NULL != queue; + queue = queue->next_neighbour) + { + /* try transmission on any queue that is idle */ + if (NULL == queue->transmit_task) + queue->transmit_task = GNUNET_SCHEDULER_add_now (&transmit_on_queue, + queue); } } @@ -3835,9 +3850,9 @@ transmit_on_queue (void *cls) respect that even if MTU is 0 for this queue */) ) s = fragment_message (s, - (0 == queue->mtu) - ? UINT16_MAX - sizeof (struct GNUNET_TRANSPORT_SendMessageTo) - : queue->mtu); + (0 == queue->mtu) + ? UINT16_MAX - sizeof (struct GNUNET_TRANSPORT_SendMessageTo) + : queue->mtu); if (NULL == s) { /* Fragmentation failed, try next message... */ @@ -3868,13 +3883,13 @@ transmit_on_queue (void *cls) smt->mid = qe->mid; smt->receiver = n->pid; memcpy (&smt[1], - &s[1], - s->bytes_msg); + &s[1], + s->bytes_msg); GNUNET_assert (CT_COMMUNICATOR == queue->tc->type); queue->queue_length++; queue->tc->details.communicator.total_queue_length++; GNUNET_MQ_send (queue->tc->mq, - env); + env); // FIXME: do something similar to the logic below // in defragmentation / reliability ACK handling! @@ -3886,8 +3901,8 @@ transmit_on_queue (void *cls) { /* Full message sent, and over reliabile channel */ client_send_response (pm, - GNUNET_YES, - pm->bytes_msg); + GNUNET_YES, + pm->bytes_msg); } else if ( (GNUNET_TRANSPORT_CC_RELIABLE == queue->tc->details.communicator.cc) && (PMT_FRAGMENT_BOX == s->pmt) ) @@ -3898,9 +3913,9 @@ transmit_on_queue (void *cls) free_fragment_tree (s); pos = s->frag_parent; GNUNET_CONTAINER_MDLL_remove (frag, - pos->head_frag, - pos->tail_frag, - s); + pos->head_frag, + pos->tail_frag, + s); GNUNET_free (s); /* check if subtree is done */ while ( (NULL == pos->head_frag) && @@ -3910,9 +3925,9 @@ transmit_on_queue (void *cls) s = pos; pos = s->frag_parent; GNUNET_CONTAINER_MDLL_remove (frag, - pos->head_frag, - pos->tail_frag, - s); + pos->head_frag, + pos->tail_frag, + s); GNUNET_free (s); } @@ -3920,8 +3935,8 @@ transmit_on_queue (void *cls) if ( (NULL == pm->head_frag) && (pm->frag_off == pm->bytes_msg) ) client_send_response (pm, - GNUNET_YES, - pm->bytes_msg /* FIXME: calculate and add overheads! */); + GNUNET_YES, + pm->bytes_msg /* FIXME: calculate and add overheads! */); } else if (PMT_CORE != pm->pmt) { @@ -3941,25 +3956,25 @@ transmit_on_queue (void *cls) message urgency and size when delaying ACKs, etc.) */ s->next_attempt = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply (queue->rtt, - 4)); + 4)); if (s == pm) { struct PendingMessage *pos; /* re-insert sort in neighbour list */ GNUNET_CONTAINER_MDLL_remove (neighbour, - neighbour->pending_msg_head, - neighbour->pending_msg_tail, - pm); + neighbour->pending_msg_head, + neighbour->pending_msg_tail, + pm); pos = neighbour->pending_msg_tail; while ( (NULL != pos) && (pm->next_attempt.abs_value_us > pos->next_attempt.abs_value_us) ) - pos = pos->prev_neighbour; + pos = pos->prev_neighbour; GNUNET_CONTAINER_MDLL_insert_after (neighbour, - neighbour->pending_msg_head, - neighbour->pending_msg_tail, - pos, - pm); + neighbour->pending_msg_head, + neighbour->pending_msg_tail, + pos, + pm); } else { @@ -3968,18 +3983,18 @@ transmit_on_queue (void *cls) struct PendingMessage *pos; GNUNET_CONTAINER_MDLL_remove (frag, - fp->head_frag, - fp->tail_frag, - s); + fp->head_frag, + fp->tail_frag, + s); pos = fp->tail_frag; while ( (NULL != pos) && (s->next_attempt.abs_value_us > pos->next_attempt.abs_value_us) ) - pos = pos->prev_frag; + pos = pos->prev_frag; GNUNET_CONTAINER_MDLL_insert_after (frag, - fp->head_frag, - fp->tail_frag, - pos, - s); + fp->head_frag, + fp->tail_frag, + pos, + s); } } @@ -4028,9 +4043,9 @@ tracker_excess_out_cb (void *cls) from here via a message instead! */ /* TODO: maybe inform ATS at this point? */ GNUNET_STATISTICS_update (GST_stats, - "# Excess outbound bandwidth reported", - 1, - GNUNET_NO); + "# Excess outbound bandwidth reported", + 1, + GNUNET_NO); } @@ -4046,9 +4061,9 @@ tracker_excess_in_cb (void *cls) { /* TODO: maybe inform ATS at this point? */ GNUNET_STATISTICS_update (GST_stats, - "# Excess inbound bandwidth reported", - 1, - GNUNET_NO); + "# Excess inbound bandwidth reported", + 1, + GNUNET_NO); } @@ -4083,12 +4098,12 @@ handle_add_queue_message (void *cls, neighbour->earliest_timeout = GNUNET_TIME_UNIT_FOREVER_ABS; neighbour->pid = aqm->receiver; GNUNET_assert (GNUNET_OK == - GNUNET_CONTAINER_multipeermap_put (neighbours, - &neighbour->pid, - neighbour, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); + GNUNET_CONTAINER_multipeermap_put (neighbours, + &neighbour->pid, + neighbour, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); cores_send_connect_info (&neighbour->pid, - GNUNET_BANDWIDTH_ZERO); + GNUNET_BANDWIDTH_ZERO); } addr_len = ntohs (aqm->header.size) - sizeof (*aqm); addr = (const char *) &aqm[1]; @@ -4117,8 +4132,8 @@ handle_add_queue_message (void *cls, &tracker_excess_out_cb, queue); memcpy (&queue[1], - addr, - addr_len); + addr, + addr_len); /* notify ATS about new queue */ { struct GNUNET_ATS_Properties prop = { @@ -4129,10 +4144,10 @@ handle_add_queue_message (void *cls, }; queue->sr = GNUNET_ATS_session_add (ats, - &neighbour->pid, - queue->address, - queue, - &prop); + &neighbour->pid, + queue->address, + queue, + &prop); if (NULL == queue->sr) { /* This can only happen if the 'address' was way too long for ATS @@ -4159,18 +4174,18 @@ handle_add_queue_message (void *cls, }; notify_monitors (&neighbour->pid, - queue->address, - queue->nt, - &me); + queue->address, + queue->nt, + &me); } GNUNET_CONTAINER_MDLL_insert (neighbour, - neighbour->session_head, - neighbour->session_tail, - queue); + neighbour->session_head, + neighbour->session_tail, + queue); GNUNET_CONTAINER_MDLL_insert (client, - tc->details.communicator.session_head, - tc->details.communicator.session_tail, - queue); + tc->details.communicator.session_head, + tc->details.communicator.session_tail, + queue); GNUNET_SERVICE_client_continue (tc->client); } @@ -4273,21 +4288,21 @@ handle_send_message_ack (void *cls, { /* Communicator dropped below threshold, resume all queues */ GNUNET_STATISTICS_update (GST_stats, - "# Transmission throttled due to communicator queue limit", - -1, - GNUNET_NO); + "# Transmission throttled due to communicator queue limit", + -1, + GNUNET_NO); for (struct GNUNET_ATS_Session *session = tc->details.communicator.session_head; - NULL != session; - session = session->next_client) + NULL != session; + session = session->next_client) schedule_transmit_on_queue (session); } else if (SESSION_QUEUE_LIMIT - 1 == queue->session->queue_length) { /* queue dropped below threshold; only resume this one queue */ GNUNET_STATISTICS_update (GST_stats, - "# Transmission throttled due to session queue limit", - -1, - GNUNET_NO); + "# Transmission throttled due to session queue limit", + -1, + GNUNET_NO); schedule_transmit_on_queue (queue->session); } @@ -4361,8 +4376,8 @@ handle_monitor_start (void *cls, tc->details.monitor.peer = start->peer; tc->details.monitor.one_shot = ntohl (start->one_shot); GNUNET_CONTAINER_multipeermap_iterate (neighbours, - ¬ify_client_queues, - tc); + ¬ify_client_queues, + tc); GNUNET_SERVICE_client_mark_monitor (tc->client); GNUNET_SERVICE_client_continue (tc->client); } @@ -4414,8 +4429,8 @@ lookup_communicator (const char *prefix) return tc; } GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "ATS suggested use of communicator for `%s', but we do not have such a communicator!\n", - prefix); + "ATS suggested use of communicator for `%s', but we do not have such a communicator!\n", + prefix); return NULL; } @@ -4451,21 +4466,21 @@ ats_suggestion_cb (void *cls, if (NULL == tc) { GNUNET_STATISTICS_update (GST_stats, - "# ATS suggestions ignored due to missing communicator", - 1, - GNUNET_NO); + "# ATS suggestions ignored due to missing communicator", + 1, + GNUNET_NO); return; } /* forward suggestion for queue creation to communicator */ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Request #%u for `%s' communicator to create queue to `%s'\n", - (unsigned int) idgen, - prefix, - address); + "Request #%u for `%s' communicator to create queue to `%s'\n", + (unsigned int) idgen, + prefix, + address); alen = strlen (address) + 1; env = GNUNET_MQ_msg_extra (cqm, - alen, - GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE); + alen, + GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE); cqm->request_id = htonl (idgen++); cqm->receiver = *pid; memcpy (&cqm[1], @@ -4485,7 +4500,7 @@ ats_suggestion_cb (void *cls, */ static void handle_queue_create_ok (void *cls, - const struct GNUNET_TRANSPORT_CreateQueueResponse *cqr) + const struct GNUNET_TRANSPORT_CreateQueueResponse *cqr) { struct TransportClient *tc = cls; @@ -4496,12 +4511,12 @@ handle_queue_create_ok (void *cls, return; } GNUNET_STATISTICS_update (GST_stats, - "# ATS suggestions succeeded at communicator", - 1, - GNUNET_NO); + "# ATS suggestions succeeded at communicator", + 1, + GNUNET_NO); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Request #%u for communicator to create queue succeeded\n", - (unsigned int) ntohs (cqr->request_id)); + "Request #%u for communicator to create queue succeeded\n", + (unsigned int) ntohs (cqr->request_id)); GNUNET_SERVICE_client_continue (tc->client); } @@ -4527,12 +4542,12 @@ handle_queue_create_fail (void *cls, return; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Request #%u for communicator to create queue failed\n", - (unsigned int) ntohs (cqr->request_id)); + "Request #%u for communicator to create queue failed\n", + (unsigned int) ntohs (cqr->request_id)); GNUNET_STATISTICS_update (GST_stats, - "# ATS suggestions failed in queue creation at communicator", - 1, - GNUNET_NO); + "# ATS suggestions failed in queue creation at communicator", + 1, + GNUNET_NO); GNUNET_SERVICE_client_continue (tc->client); } @@ -4601,8 +4616,8 @@ handle_address_consider_verify (void *cls, */ static int free_neighbour_cb (void *cls, - const struct GNUNET_PeerIdentity *pid, - void *value) + const struct GNUNET_PeerIdentity *pid, + void *value) { struct Neighbour *neighbour = value; @@ -4625,8 +4640,8 @@ free_neighbour_cb (void *cls, */ static int free_dv_routes_cb (void *cls, - const struct GNUNET_PeerIdentity *pid, - void *value) + const struct GNUNET_PeerIdentity *pid, + void *value) { struct DistanceVector *dv = value; @@ -4648,8 +4663,8 @@ free_dv_routes_cb (void *cls, */ static int free_ephemeral_cb (void *cls, - const struct GNUNET_PeerIdentity *pid, - void *value) + const struct GNUNET_PeerIdentity *pid, + void *value) { struct EphemeralCacheEntry *ece = value; @@ -4734,9 +4749,9 @@ run (void *cls, /* setup globals */ GST_cfg = c; neighbours = GNUNET_CONTAINER_multipeermap_create (1024, - GNUNET_YES); + GNUNET_YES); dv_routes = GNUNET_CONTAINER_multipeermap_create (1024, - GNUNET_YES); + GNUNET_YES); ephemeral_map = GNUNET_CONTAINER_multipeermap_create (32, GNUNET_YES); ephemeral_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); @@ -4790,50 +4805,50 @@ GNUNET_SERVICE_MAIN NULL, /* communication with core */ GNUNET_MQ_hd_fixed_size (client_start, - GNUNET_MESSAGE_TYPE_TRANSPORT_START, - struct StartMessage, - NULL), + GNUNET_MESSAGE_TYPE_TRANSPORT_START, + struct StartMessage, + NULL), GNUNET_MQ_hd_var_size (client_send, - GNUNET_MESSAGE_TYPE_TRANSPORT_SEND, - struct OutboundMessage, - NULL), + GNUNET_MESSAGE_TYPE_TRANSPORT_SEND, + struct OutboundMessage, + NULL), /* communication with communicators */ GNUNET_MQ_hd_var_size (communicator_available, - GNUNET_MESSAGE_TYPE_TRANSPORT_NEW_COMMUNICATOR, - struct GNUNET_TRANSPORT_CommunicatorAvailableMessage, - NULL), + GNUNET_MESSAGE_TYPE_TRANSPORT_NEW_COMMUNICATOR, + struct GNUNET_TRANSPORT_CommunicatorAvailableMessage, + NULL), GNUNET_MQ_hd_var_size (communicator_backchannel, - GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL, - struct GNUNET_TRANSPORT_CommunicatorBackchannel, - NULL), + GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL, + struct GNUNET_TRANSPORT_CommunicatorBackchannel, + NULL), GNUNET_MQ_hd_var_size (add_address, - GNUNET_MESSAGE_TYPE_TRANSPORT_ADD_ADDRESS, - struct GNUNET_TRANSPORT_AddAddressMessage, - NULL), + GNUNET_MESSAGE_TYPE_TRANSPORT_ADD_ADDRESS, + struct GNUNET_TRANSPORT_AddAddressMessage, + NULL), GNUNET_MQ_hd_fixed_size (del_address, GNUNET_MESSAGE_TYPE_TRANSPORT_DEL_ADDRESS, struct GNUNET_TRANSPORT_DelAddressMessage, NULL), GNUNET_MQ_hd_var_size (incoming_msg, - GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG, - struct GNUNET_TRANSPORT_IncomingMessage, - NULL), + GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG, + struct GNUNET_TRANSPORT_IncomingMessage, + NULL), GNUNET_MQ_hd_fixed_size (queue_create_ok, - GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_OK, - struct GNUNET_TRANSPORT_CreateQueueResponse, - NULL), + GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_OK, + struct GNUNET_TRANSPORT_CreateQueueResponse, + NULL), GNUNET_MQ_hd_fixed_size (queue_create_fail, - GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_FAIL, - struct GNUNET_TRANSPORT_CreateQueueResponse, - NULL), + GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_FAIL, + struct GNUNET_TRANSPORT_CreateQueueResponse, + NULL), GNUNET_MQ_hd_var_size (add_queue_message, - GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_SETUP, - struct GNUNET_TRANSPORT_AddQueueMessage, - NULL), + GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_SETUP, + struct GNUNET_TRANSPORT_AddQueueMessage, + NULL), GNUNET_MQ_hd_var_size (address_consider_verify, - GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_CONSIDER_VERIFY, - struct GNUNET_TRANSPORT_AddressToVerify, - NULL), + GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_CONSIDER_VERIFY, + struct GNUNET_TRANSPORT_AddressToVerify, + NULL), GNUNET_MQ_hd_fixed_size (del_queue_message, GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_TEARDOWN, struct GNUNET_TRANSPORT_DelQueueMessage, -- cgit v1.2.3