[GNUnet-SVN] r17917 - in gnunet: po src/fragmentation src/transport

[gnunet]

Author: grothoff
Date: 2011-11-02 13:09:39 +0100 (Wed, 02 Nov 2011)
New Revision: 17917

Modified:
   gnunet/po/de.gmo
   gnunet/po/de.po
   gnunet/po/es.gmo
   gnunet/po/es.po
   gnunet/po/gnunet.pot
   gnunet/po/sv.gmo
   gnunet/po/sv.po
   gnunet/po/vi.gmo
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/fragmentation/defragmentation.c
   gnunet/src/fragmentation/fragmentation.c
   gnunet/src/transport/gnunet-service-transport_neighbours.c
   gnunet/src/transport/transport_api.c
Log:
undo 17914, 915, 916

Modified: gnunet/po/de.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2011-11-02 10:49:23 UTC (rev 17916)
+++ gnunet/po/de.po     2011-11-02 12:09:39 UTC (rev 17917)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -4312,16 +4312,16 @@
 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"

Modified: gnunet/po/es.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2011-11-02 10:49:23 UTC (rev 17916)
+++ gnunet/po/es.po     2011-11-02 12:09:39 UTC (rev 17917)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -4291,16 +4291,16 @@
 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"

Modified: gnunet/po/gnunet.pot
===================================================================
--- gnunet/po/gnunet.pot        2011-11-02 10:49:23 UTC (rev 17916)
+++ gnunet/po/gnunet.pot        2011-11-02 12:09:39 UTC (rev 17917)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -4049,15 +4049,15 @@
 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 ""
 

Modified: gnunet/po/sv.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2011-11-02 10:49:23 UTC (rev 17916)
+++ gnunet/po/sv.po     2011-11-02 12:09:39 UTC (rev 17917)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -4238,16 +4238,16 @@
 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"

Modified: gnunet/po/vi.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2011-11-02 10:49:23 UTC (rev 17916)
+++ gnunet/po/vi.po     2011-11-02 12:09:39 UTC (rev 17917)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -4311,16 +4311,16 @@
 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"

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2011-11-02 10:49:23 UTC (rev 17916)
+++ gnunet/po/zh_CN.po  2011-11-02 12:09:39 UTC (rev 17917)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -4099,16 +4099,16 @@
 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"

Modified: gnunet/src/fragmentation/defragmentation.c
===================================================================
--- gnunet/src/fragmentation/defragmentation.c  2011-11-02 10:49:23 UTC (rev 
17916)
+++ gnunet/src/fragmentation/defragmentation.c  2011-11-02 12:09:39 UTC (rev 
17917)
@@ -536,8 +536,6 @@
   {
     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);

Modified: gnunet/src/fragmentation/fragmentation.c
===================================================================
--- gnunet/src/fragmentation/fragmentation.c    2011-11-02 10:49:23 UTC (rev 
17916)
+++ gnunet/src/fragmentation/fragmentation.c    2011-11-02 12:09:39 UTC (rev 
17917)
@@ -160,8 +160,6 @@
     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 @@
     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);

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2011-11-02 
10:49:23 UTC (rev 17916)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2011-11-02 
12:09:39 UTC (rev 17917)
@@ -1583,11 +1583,6 @@
   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);

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2011-11-02 10:49:23 UTC (rev 
17916)
+++ gnunet/src/transport/transport_api.c        2011-11-02 12:09:39 UTC (rev 
17917)
@@ -681,7 +681,7 @@
     }
     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 @@
       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);
   }