[GNUnet-SVN] r231 - GNUnet GNUnet/src/applications/fs/ecrs branches/GNUnet06/po

[grothoff]

Author: grothoff
Date: 2005-02-10 13:41:13 -0800 (Thu, 10 Feb 2005)
New Revision: 231

Modified:
   GNUnet/src/applications/fs/ecrs/download.c
   GNUnet/src/applications/fs/ecrs/tree.c
   GNUnet/src/applications/fs/ecrs/uri.c
   GNUnet/todo
   branches/GNUnet06/po/de.po
Log:
first fixes to gnunet-download

Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c  2005-02-10 21:08:45 UTC (rev 
230)
+++ GNUnet/src/applications/fs/ecrs/download.c  2005-02-10 21:41:13 UTC (rev 
231)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004 Christian Grothoff (and other contributing 
authors)
+     (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other 
contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -1020,7 +1020,7 @@
   perm = permute(rm->requestListIndex);
   for (i=0;i<rm->requestListIndex;i++) {
     int j = perm[i];
-    if (rm->requestList[i]->lastTimeout < now + TTL_DECREMENT) {
+    if (rm->requestList[i]->lastTimeout + TTL_DECREMENT < now) {
       int pOCWCubed;
       int pendingOverCWin = pending - rm->congestionWindow;
       if (pendingOverCWin <= 0)
@@ -1040,7 +1040,7 @@
        delta = 0;
       }
     } else {
-      delta = (rm->requestList[j]->lastTimeout - now) + TTL_DECREMENT;
+      delta = (rm->requestList[j]->lastTimeout + TTL_DECREMENT - now);
     }      
     if (delta < minSleep )
       minSleep = delta;
@@ -1076,6 +1076,7 @@
   NodeClosure top;
   FileIdentifier fid;
 
+  fid = uri->data.chk;
   if (! ECRS_isFileURI(uri))
     return SYSERR;
 

Modified: GNUnet/src/applications/fs/ecrs/tree.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/tree.c      2005-02-10 21:08:45 UTC (rev 
230)
+++ GNUnet/src/applications/fs/ecrs/tree.c      2005-02-10 21:41:13 UTC (rev 
231)
@@ -33,6 +33,10 @@
   fl = DBLOCK_SIZE;
   while (fl < (unsigned long long)flen) {
     treeDepth++;
+    if (fl * CHK_PER_INODE < fl) {
+      /* integer overflow, this is a HUGE file... */
+      return treeDepth; 
+    }
     fl = fl * CHK_PER_INODE;
   }  
   return treeDepth;

Modified: GNUnet/src/applications/fs/ecrs/uri.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uri.c       2005-02-10 21:08:45 UTC (rev 
230)
+++ GNUnet/src/applications/fs/ecrs/uri.c       2005-02-10 21:41:13 UTC (rev 
231)
@@ -451,9 +451,9 @@
 unsigned long long ECRS_fileSize(const struct ECRS_URI * uri) {
   switch (uri->type) {
   case chk:
-    return uri->data.chk.file_length;
+    return ntohll(uri->data.chk.file_length);
   case loc:
-    return uri->data.loc.size;
+    return ntohll(uri->data.loc.size);
   default:
     GNUNET_ASSERT(0);
   }

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2005-02-10 21:08:45 UTC (rev 230)
+++ GNUnet/todo 2005-02-10 21:41:13 UTC (rev 231)
@@ -12,8 +12,8 @@
   generated public keys are fishy 
   (far to many 0-values in N!)
 - Need testing:
-  * gnunet-insert
-  * gnunet-search
+  * gnunet-insert - ok
+  * gnunet-search - ok
   * gnunet-download
   * FS/ECRS upload/download
   * ECRS-directories (build, iterate)

Modified: branches/GNUnet06/po/de.po
===================================================================
--- branches/GNUnet06/po/de.po  2005-02-10 21:08:45 UTC (rev 230)
+++ branches/GNUnet06/po/de.po  2005-02-10 21:41:13 UTC (rev 231)
@@ -4,12 +4,11 @@
 # This file is distributed under the same license as the GNUnet package.
 # Christian Grothoff <address@hidden>, 2004.
 #
-#: src/applications/afs/tools/gnunet-pseudonym.c:60
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.6.3a-cvs\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-02-06 06:40-0500\n"
+"POT-Creation-Date: 2005-02-09 16:05-0500\n"
 "PO-Revision-Date: 2004-08-21 00:55+0530\n"
 "Last-Translator: Christian Grothoff <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -2738,6 +2737,10 @@
 "namespace (use when creating a new pseudonym)"
 msgstr ""
 
+#: src/applications/afs/tools/gnunet-pseudonym.c:60
+msgid "change the rating for the given namespace"
+msgstr ""
+
 #: src/applications/afs/tools/gnunet-pseudonym.c:62
 msgid ""
 "use DESCRIPTION to describe the content of the namespace (use when creating "
@@ -4375,7 +4378,7 @@
 msgstr ""
 
 #: src/transports/http.c:1226 src/transports/tcp.c:1028 src/util/tcpio.c:165
-#: src/util/tcpio.c:192
+#: src/util/tcpio.c:195
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
@@ -4829,21 +4832,61 @@
 msgid "Wrong format '%s' for network: %s\n"
 msgstr ""
 
-#: src/util/logging.c:164
+#: src/util/logging.c:90
+msgid "NOTHING"
+msgstr ""
+
+#: src/util/logging.c:91
+msgid "FATAL"
+msgstr ""
+
+#: src/util/logging.c:92
+msgid "ERROR"
+msgstr ""
+
+#: src/util/logging.c:93
+msgid "FAILURE"
+msgstr ""
+
+#: src/util/logging.c:94
+msgid "WARNING"
+msgstr ""
+
+#: src/util/logging.c:95
+msgid "MESSAGE"
+msgstr ""
+
+#: src/util/logging.c:96
+msgid "INFO"
+msgstr ""
+
+#: src/util/logging.c:97
+msgid "DEBUG"
+msgstr ""
+
+#: src/util/logging.c:98
+msgid "CRON"
+msgstr ""
+
+#: src/util/logging.c:99
+msgid "EVERYTHING"
+msgstr ""
+
+#: src/util/logging.c:237
 msgid "LOGLEVEL not specified, that is not ok.\n"
 msgstr ""
 
-#: src/util/logging.c:174
+#: src/util/logging.c:248
 #, c-format
 msgid "Invalid LOGLEVEL '%s' specified.\n"
 msgstr ""
 
-#: src/util/logging.c:282
+#: src/util/logging.c:353
 #, c-format
 msgid "Failure at %s:%d.\n"
 msgstr ""
 
-#: src/util/logging.c:288
+#: src/util/logging.c:359
 #, c-format
 msgid "Failure at at %s:%d.\n"
 msgstr ""