[GNUnet-SVN] r319 - in GNUnet: . src/applications/fs/ecrs src/applications/fs/lib src/util

[grothoff]

Author: grothoff
Date: 2005-02-25 21:24:20 -0800 (Fri, 25 Feb 2005)
New Revision: 319

Modified:
   GNUnet/src/applications/fs/ecrs/check.conf
   GNUnet/src/applications/fs/ecrs/download.c
   GNUnet/src/applications/fs/ecrs/ecrstest.c
   GNUnet/src/applications/fs/lib/check.conf
   GNUnet/src/util/tcpio.c
   GNUnet/todo
Log:
final fixes, ecrstest now complete and passes

Modified: GNUnet/src/applications/fs/ecrs/check.conf
===================================================================
--- GNUnet/src/applications/fs/ecrs/check.conf  2005-02-26 05:08:45 UTC (rev 
318)
+++ GNUnet/src/applications/fs/ecrs/check.conf  2005-02-26 05:24:20 UTC (rev 
319)
@@ -15,8 +15,9 @@
 # TRANSPORTS = -- no transports!
 
 [MODULES]
-sqstore = "sqstore_mysql"
-# FIXME: use sqstore here once available!
+sqstore = "sqstore_sqlite"
+# you can also use sqstore_mysql here if 
+# that DB is available...
 
 [NETWORK]
 PORT = 2087
@@ -34,12 +35,13 @@
 [FS]
 QUOTA  = 1024
 ACTIVEMIGRATION = NO
-DIR          = $GNUNETD_HOME/data/fs/
+DIR          = /tmp/gnunet-ecrs-test/
 INDEX-DIRECTORY = $GNUNETD_HOME/data/shared/
 INDEX-QUOTA = 8192
 
 [MYSQL]
 DELAYED = NO
+DATABASE = gnunetcheck
 
 [GAP]
 TABLESIZE = 65536

Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c  2005-02-26 05:08:45 UTC (rev 
318)
+++ GNUnet/src/applications/fs/ecrs/download.c  2005-02-26 05:24:20 UTC (rev 
319)
@@ -616,13 +616,15 @@
                      (((double)(eta - 
node->ctx->startTime)/(double)node->ctx->completed)) 
                      * (double)node->ctx->total);
     } 
-    node->ctx->dpcb(node->ctx->total,
-                   node->ctx->completed,
-                   eta,
-                   node->offset,
-                   data,
-                   size,
-                   node->ctx->dpcbClosure);
+    if (node->ctx->dpcb != NULL) {
+      node->ctx->dpcb(node->ctx->total,
+                     node->ctx->completed,
+                     eta,
+                     node->offset,
+                     data,
+                     size,
+                     node->ctx->dpcbClosure);
+    }
   } 
   rm = node->ctx->rm;
 

Modified: GNUnet/src/applications/fs/ecrs/ecrstest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrstest.c  2005-02-26 05:08:45 UTC (rev 
318)
+++ GNUnet/src/applications/fs/ecrs/ecrstest.c  2005-02-26 05:24:20 UTC (rev 
319)
@@ -22,7 +22,7 @@
                                     NULL));
   FREENONNULL(setConfigurationString("GNUNET",
                                     "LOGLEVEL",
-                                    "DEBUG"));
+                                    "NOTHING"));
   return OK;
 }
 
@@ -250,7 +250,7 @@
     if (0 != execlp("gnunetd", /* what binary to execute, must be in $PATH! */
                    "gnunetd", /* arg0, path to gnunet binary */
                    "-d",  /* do not daemonize so we can easily kill you */
-                   "-L", "DEBUG",
+                   /* "-L", "NOTHING", */
                    "-c",
                    "check.conf", /* configuration file */
                    NULL)) {

Modified: GNUnet/src/applications/fs/lib/check.conf
===================================================================
--- GNUnet/src/applications/fs/lib/check.conf   2005-02-26 05:08:45 UTC (rev 
318)
+++ GNUnet/src/applications/fs/lib/check.conf   2005-02-26 05:24:20 UTC (rev 
319)
@@ -16,7 +16,8 @@
 
 [MODULES]
 sqstore = "sqstore_sqlite"
-# FIXME: use sqstore here once available!
+# you can also use sqstore_mysql here if 
+# that DB is available...
 
 [NETWORK]
 PORT = 2087
@@ -34,12 +35,13 @@
 [FS]
 QUOTA  = 1024
 ACTIVEMIGRATION = NO
-DIR          = $GNUNETD_HOME/data/fs/
+DIR          = /tmp/gnunet-fslib-test/
 INDEX-DIRECTORY = $GNUNETD_HOME/data/shared/
 INDEX-QUOTA = 8192
 
 [MYSQL]
 DELAYED = NO
+DATABASE = gnunetcheck
 
 [GAP]
 TABLESIZE = 65536

Modified: GNUnet/src/util/tcpio.c
===================================================================
--- GNUnet/src/util/tcpio.c     2005-02-26 05:08:45 UTC (rev 318)
+++ GNUnet/src/util/tcpio.c     2005-02-26 05:24:20 UTC (rev 319)
@@ -402,7 +402,8 @@
                          size - pos);
 
   if (res != (int)(size - pos)) {  /* error, abort */
-    LOG_STRERROR(LOG_INFO, "recv");
+    if (sock->socket != -1)
+      LOG_STRERROR(LOG_INFO, "recv");
     closeSocketTemporarily(sock);
     if (*buffer == NULL)
       FREE(buf);

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2005-02-26 05:08:45 UTC (rev 318)
+++ GNUnet/todo 2005-02-26 05:24:20 UTC (rev 319)
@@ -11,7 +11,6 @@
 - padding for insert/return requests: we're currently breaking
   8-byte alignment!
 - Need testing:
-  * ECRS upload/download: automated test: complete ecrstest.c testcode!
   * ECRS-directories (build, iterate)
   * gnunet-directory
   * gnunet-pseudonym