From: Christian Grothoff Date: Wed, 2 Nov 2011 12:09:39 +0000 (+0000) Subject: undo 17914, 915, 916 X-Git-Tag: initial-import-from-subversion-38251~16110 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0ac0a301c63b5cb1fed345e620f9a106bcce9850;p=oweals%2Fgnunet.git undo 17914, 915, 916 --- diff --git a/po/de.gmo b/po/de.gmo index 5386e51fd..909168959 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index b44575b0c..4e94209ea 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNUnet 0.7.0b\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2011-10-31 18:51+0100\n" +"POT-Creation-Date: 2011-10-31 18:55+0100\n" "PO-Revision-Date: 2006-03-17 21:37+0100\n" "Last-Translator: Nils Durner \n" "Language-Team: German \n" @@ -4312,16 +4312,16 @@ msgstr "Teste Transport(e) %s\n" msgid "Failed to load block plugin `%s'\n" msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n" -#: src/mesh/gnunet-service-mesh.c:4161 +#: src/mesh/gnunet-service-mesh.c:4170 msgid "MESH: Wrong CORE service\n" msgstr "" -#: src/mesh/gnunet-service-mesh.c:4365 +#: src/mesh/gnunet-service-mesh.c:4374 #, fuzzy msgid "Mesh service is lacking key configuration settings. Exiting.\n" msgstr "GNUnet Konfiguration" -#: src/mesh/gnunet-service-mesh.c:4374 +#: src/mesh/gnunet-service-mesh.c:4383 #, fuzzy msgid "Mesh service could not access hostkey. Exiting.\n" msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n" diff --git a/po/es.gmo b/po/es.gmo index a96b498ef..510f02165 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 6dce235ed..620d191e3 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNUnet 0.7.0e\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2011-10-31 18:51+0100\n" +"POT-Creation-Date: 2011-10-31 18:55+0100\n" "PO-Revision-Date: 2006-06-29 12:05+0200\n" "Last-Translator: Miguel Angel Arruga \n" "Language-Team: Spanish\n" @@ -4291,16 +4291,16 @@ msgstr "Probando transporte(s) %s\n" msgid "Failed to load block plugin `%s'\n" msgstr "Imposible inicializar la aplicación '%s'\n" -#: src/mesh/gnunet-service-mesh.c:4161 +#: src/mesh/gnunet-service-mesh.c:4170 msgid "MESH: Wrong CORE service\n" msgstr "" -#: src/mesh/gnunet-service-mesh.c:4365 +#: src/mesh/gnunet-service-mesh.c:4374 #, fuzzy msgid "Mesh service is lacking key configuration settings. Exiting.\n" msgstr "Configuración de GNUnet" -#: src/mesh/gnunet-service-mesh.c:4374 +#: src/mesh/gnunet-service-mesh.c:4383 #, fuzzy msgid "Mesh service could not access hostkey. Exiting.\n" msgstr "Imposible acceder a la información del espacio.\n" diff --git a/po/gnunet.pot b/po/gnunet.pot index a4bc67147..ced32f6ec 100644 --- a/po/gnunet.pot +++ b/po/gnunet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2011-10-31 18:51+0100\n" +"POT-Creation-Date: 2011-10-31 18:55+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4049,15 +4049,15 @@ msgstr "" msgid "Failed to load block plugin `%s'\n" msgstr "" -#: src/mesh/gnunet-service-mesh.c:4161 +#: src/mesh/gnunet-service-mesh.c:4170 msgid "MESH: Wrong CORE service\n" msgstr "" -#: src/mesh/gnunet-service-mesh.c:4365 +#: src/mesh/gnunet-service-mesh.c:4374 msgid "Mesh service is lacking key configuration settings. Exiting.\n" msgstr "" -#: src/mesh/gnunet-service-mesh.c:4374 +#: src/mesh/gnunet-service-mesh.c:4383 msgid "Mesh service could not access hostkey. Exiting.\n" msgstr "" diff --git a/po/sv.gmo b/po/sv.gmo index 69c4e75bb..b69af23b1 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index 4538965cb..33ae78913 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: 2011-10-31 18:51+0100\n" +"POT-Creation-Date: 2011-10-31 18:55+0100\n" "PO-Revision-Date: 2006-01-21 17:16+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -4238,16 +4238,16 @@ msgstr "Testar transport(er) %s\n" msgid "Failed to load block plugin `%s'\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/mesh/gnunet-service-mesh.c:4161 +#: src/mesh/gnunet-service-mesh.c:4170 msgid "MESH: Wrong CORE service\n" msgstr "" -#: src/mesh/gnunet-service-mesh.c:4365 +#: src/mesh/gnunet-service-mesh.c:4374 #, fuzzy msgid "Mesh service is lacking key configuration settings. Exiting.\n" msgstr "GNUnet-konfiguration" -#: src/mesh/gnunet-service-mesh.c:4374 +#: src/mesh/gnunet-service-mesh.c:4383 #, fuzzy msgid "Mesh service could not access hostkey. Exiting.\n" msgstr "Kunde inte komma åt namnrymdsinformation.\n" diff --git a/po/vi.gmo b/po/vi.gmo index 483b038c1..2702b540b 100644 Binary files a/po/vi.gmo and b/po/vi.gmo differ diff --git a/po/vi.po b/po/vi.po index 1cb3bbdd8..dbbe026fa 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: 2011-10-31 18:51+0100\n" +"POT-Creation-Date: 2011-10-31 18:55+0100\n" "PO-Revision-Date: 2008-09-10 22:05+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -4311,16 +4311,16 @@ msgstr "Đang nạp các truyền tải « %s »\n" msgid "Failed to load block plugin `%s'\n" msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n" -#: src/mesh/gnunet-service-mesh.c:4161 +#: src/mesh/gnunet-service-mesh.c:4170 msgid "MESH: Wrong CORE service\n" msgstr "" -#: src/mesh/gnunet-service-mesh.c:4365 +#: src/mesh/gnunet-service-mesh.c:4374 #, fuzzy msgid "Mesh service is lacking key configuration settings. Exiting.\n" msgstr "Lưu cấu hình ngay bây giờ không?" -#: src/mesh/gnunet-service-mesh.c:4374 +#: src/mesh/gnunet-service-mesh.c:4383 #, fuzzy msgid "Mesh service could not access hostkey. Exiting.\n" msgstr "Không thể truy cập đến thông tin về không gian tên.\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 29dfffab2..34e55a957 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: 2011-10-31 18:51+0100\n" +"POT-Creation-Date: 2011-10-31 18:55+0100\n" "PO-Revision-Date: 2011-07-09 12:12+0800\n" "Last-Translator: Wylmer Wang \n" "Language-Team: Chinese (simplified) \n" @@ -4099,16 +4099,16 @@ msgstr "" msgid "Failed to load block plugin `%s'\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/mesh/gnunet-service-mesh.c:4161 +#: src/mesh/gnunet-service-mesh.c:4170 msgid "MESH: Wrong CORE service\n" msgstr "" -#: src/mesh/gnunet-service-mesh.c:4365 +#: src/mesh/gnunet-service-mesh.c:4374 #, fuzzy msgid "Mesh service is lacking key configuration settings. Exiting.\n" msgstr "立即保存配置？" -#: src/mesh/gnunet-service-mesh.c:4374 +#: src/mesh/gnunet-service-mesh.c:4383 #, fuzzy msgid "Mesh service could not access hostkey. Exiting.\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c index d080f54da..b07f20407 100644 --- a/src/fragmentation/defragmentation.c +++ b/src/fragmentation/defragmentation.c @@ -536,8 +536,6 @@ GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc, { delay = GNUNET_TIME_UNIT_ZERO; } - if (NULL != getenv ("infinitebandwidth")) - delay = GNUNET_TIME_UNIT_ZERO; if (GNUNET_SCHEDULER_NO_TASK != mc->ack_task) GNUNET_SCHEDULER_cancel (mc->ack_task); mc->ack_task = GNUNET_SCHEDULER_add_delayed (delay, &send_ack, mc); diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c index fc69b8a3a..ef3a57a87 100644 --- a/src/fragmentation/fragmentation.c +++ b/src/fragmentation/fragmentation.c @@ -160,8 +160,6 @@ transmit_next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) delay = GNUNET_BANDWIDTH_tracker_get_delay (fc->tracker, fsize); else delay = GNUNET_TIME_UNIT_ZERO; - if (NULL != getenv ("infinitebandwidth")) - delay = GNUNET_TIME_UNIT_ZERO; if (delay.rel_value > 0) { fc->task = GNUNET_SCHEDULER_add_delayed (delay, &transmit_next, fc); @@ -210,8 +208,6 @@ transmit_next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) fc->last_round = GNUNET_TIME_absolute_get (); fc->wack = GNUNET_YES; } - if (NULL != getenv ("infinitebandwidth")) - delay = GNUNET_TIME_UNIT_ZERO; fc->proc_busy = GNUNET_YES; fc->delay_until = GNUNET_TIME_relative_to_absolute (delay); fc->proc (fc->proc_cls, &fh->header); diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 0f35afc0c..a1ce1364f 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c @@ -1583,11 +1583,6 @@ GST_neighbours_calculate_receive_delay (const struct GNUNET_PeerIdentity struct NeighbourMapEntry *n; struct GNUNET_TIME_Relative ret; - if (NULL != getenv ("infinitebandwidth")) - { - *do_forward = GNUNET_YES; - return GNUNET_TIME_UNIT_ZERO; - } GNUNET_assert (neighbours != NULL); n = lookup_neighbour (sender); diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c index 894618986..2ececc10d 100644 --- a/src/transport/transport_api.c +++ b/src/transport/transport_api.c @@ -681,7 +681,7 @@ transport_notify_ready (void *cls, size_t size, void *buf) } th = n->th; if (th->notify_size + sizeof (struct OutboundMessage) > size) - break; /* does not fit */ + break; /* does not fit */ if (GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker, th->notify_size).rel_value > 0) break; /* too early */ @@ -708,8 +708,7 @@ transport_notify_ready (void *cls, size_t size, void *buf) memcpy (&cbuf[ret], &obm, sizeof (struct OutboundMessage)); ret += (mret + sizeof (struct OutboundMessage)); size -= (mret + sizeof (struct OutboundMessage)); - if (NULL == getenv ("infinitebandwidth")) - GNUNET_BANDWIDTH_tracker_consume (&n->out_tracker, mret); + GNUNET_BANDWIDTH_tracker_consume (&n->out_tracker, mret); } GNUNET_free (th); }