[GNUnet-SVN] r235 - in GNUnet: . src/applications/datastore src/applications/fs src/applications/fs/ecrs src/applications/fs/lib src/applications/gap

[grothoff]

Author: grothoff
Date: 2005-02-10 16:55:50 -0800 (Thu, 10 Feb 2005)
New Revision: 235

Modified:
   GNUnet/src/applications/datastore/datastore.c
   GNUnet/src/applications/fs/ecrs/download.c
   GNUnet/src/applications/fs/ecrs_core.c
   GNUnet/src/applications/fs/lib/fslib.c
   GNUnet/src/applications/gap/gap.c
   GNUnet/todo
Log:
more bugs found, more fixed, more pending

Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c       2005-02-11 00:37:17 UTC 
(rev 234)
+++ GNUnet/src/applications/datastore/datastore.c       2005-02-11 00:55:50 UTC 
(rev 235)
@@ -1,4 +1,4 @@
-/*
+*
      This file is part of GNUnet.
      (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other 
contributing authors)
 

Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c  2005-02-11 00:37:17 UTC (rev 
234)
+++ GNUnet/src/applications/fs/ecrs/download.c  2005-02-11 00:55:50 UTC (rev 
235)
@@ -972,7 +972,7 @@
     = FS_start_search(rm->sctx,
                      D_BLOCK,
                      1,
-                     &entry->node->chk.key,
+                     &entry->node->chk.query,
                      entry->node->ctx->anonymityLevel,
                      priority,
                      timeout,

Modified: GNUnet/src/applications/fs/ecrs_core.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core.c      2005-02-11 00:37:17 UTC (rev 
234)
+++ GNUnet/src/applications/fs/ecrs_core.c      2005-02-11 00:55:50 UTC (rev 
235)
@@ -268,7 +268,7 @@
                      const HashCode160 * keys) {
   HashCode160 hc;
 
-  if (type != getTypeOfBlock(size, data)) {
+  if (type != getTypeOfBlock(size, data)) {    
     BREAK();
     return SYSERR; /* type mismatch */
   }

Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c      2005-02-11 00:37:17 UTC (rev 
234)
+++ GNUnet/src/applications/fs/lib/fslib.c      2005-02-11 00:55:50 UTC (rev 
235)
@@ -178,6 +178,7 @@
   req->prio = htonl(prio);
   req->anonymityLevel = htonl(anonymityLevel);
   req->expiration = htonll(timeout);
+  req->type = htonl(type);
   memcpy(&req->query[0],
         keys,
         keyCount * sizeof(HashCode160));
@@ -196,8 +197,9 @@
        hash2enc(&req->query[0],
                 &enc));
   LOG(LOG_DEBUG,
-      "FS initiating search for %s\n",
-      &enc);
+      "FS initiating search for %s of type %u\n",
+      &enc,
+      type);
   if (OK != writeToSocket(ctx->sock,
                          &req->header)) {
     FS_stop_search(ctx,

Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c   2005-02-11 00:37:17 UTC (rev 234)
+++ GNUnet/src/applications/gap/gap.c   2005-02-11 00:55:50 UTC (rev 235)
@@ -1418,10 +1418,14 @@
   int max;
   int * perm;
   int doForward;
+  EncName enc;
   
+  IFLOG(LOG_DEBUG,
+        hash2enc(&query->queries[0],
+                &enc));
   LOG(LOG_DEBUG,
-      "Executing request %u.\n",
-      query->queries[0].a);
+      "Executing request %s.\n",
+      &enc);
 
   ite = &ROUTING_indTable_[computeRoutingIndex(&query->queries[0])];
   MUTEX_LOCK(&ite->lookup_exclusion); 

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2005-02-11 00:37:17 UTC (rev 234)
+++ GNUnet/todo 2005-02-11 00:55:50 UTC (rev 235)
@@ -14,7 +14,10 @@
 - Need testing:
   * gnunet-insert - ok
   * gnunet-search - ok
-  * gnunet-download
+  * gnunet-download:
+    - type for on-demand content wrong (out of mysql DB,
+      wrong in DB? wrong before put?)
+    - getIndexed (ondemand.c) is not even used yet!
   * FS/ECRS upload/download
   * ECRS-directories (build, iterate)
   * gnunet-directory