[GNUnet-SVN] r494 - in GNUnet/src: applications/fs/ecrs applications/fs/module include server

[grothoff]

Author: grothoff
Date: 2005-03-26 13:30:44 -0800 (Sat, 26 Mar 2005)
New Revision: 494

Modified:
   GNUnet/src/applications/fs/ecrs/download.c
   GNUnet/src/applications/fs/module/fs.c
   GNUnet/src/applications/fs/module/querymanager.c
   GNUnet/src/include/gnunet_gap_service.h
   GNUnet/src/server/connection.c
Log:
argh

Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c  2005-03-26 21:09:41 UTC (rev 
493)
+++ GNUnet/src/applications/fs/ecrs/download.c  2005-03-26 21:30:44 UTC (rev 
494)
@@ -942,9 +942,6 @@
 
   cronTime(&now);
   entry = rm->requestList[requestIndex];
-  if (entry->searchHandle != NULL)
-    FS_stop_search(rm->sctx,
-                  entry->searchHandle);
 
   /* compute priority */
   if (lastmpritime + 10 * cronSECONDS < now) {
@@ -1014,6 +1011,9 @@
       "Starting FS search for %s\n",
       &enc);
 
+  if (entry->searchHandle != NULL)
+    FS_stop_search(rm->sctx,
+                  entry->searchHandle);
   entry->searchHandle
     = FS_start_search(rm->sctx,
                      D_BLOCK,

Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c      2005-03-26 21:09:41 UTC (rev 
493)
+++ GNUnet/src/applications/fs/module/fs.c      2005-03-26 21:30:44 UTC (rev 
494)
@@ -241,7 +241,6 @@
   return OK;
 }
 
-
 /**
  * Stop processing a query.
  *
@@ -1038,8 +1037,8 @@
                                                      &csHandleRequestInsert));
   GNUNET_ASSERT(SYSERR != capi->registerClientHandler(AFS_CS_PROTO_INDEX,
                                                      &csHandleRequestIndex));
-  GNUNET_ASSERT(SYSERR != 
coreAPI->registerClientHandler(AFS_CS_PROTO_INIT_INDEX,
-                 &csHandleRequestInitIndex));
+  GNUNET_ASSERT(SYSERR != capi->registerClientHandler(AFS_CS_PROTO_INIT_INDEX,
+                                                     
&csHandleRequestInitIndex));
   GNUNET_ASSERT(SYSERR != capi->registerClientHandler(AFS_CS_PROTO_DELETE,
                                                      &csHandleRequestDelete));
   GNUNET_ASSERT(SYSERR != capi->registerClientHandler(AFS_CS_PROTO_UNINDEX,

Modified: GNUnet/src/applications/fs/module/querymanager.c
===================================================================
--- GNUnet/src/applications/fs/module/querymanager.c    2005-03-26 21:09:41 UTC 
(rev 493)
+++ GNUnet/src/applications/fs/module/querymanager.c    2005-03-26 21:30:44 UTC 
(rev 494)
@@ -163,8 +163,14 @@
     }
   }
   if (matchCount == 0) {      
+    EncName enc;
+
+    IFLOG(LOG_DEBUG,
+         hash2enc(key,
+                  &enc));
     LOG(LOG_DEBUG,
-       "Reply did not match any request.\n");
+       "Reply '%s' did not match any request.\n",
+       &enc);
   }
   MUTEX_UNLOCK(&queryManagerLock);
 }

Modified: GNUnet/src/include/gnunet_gap_service.h
===================================================================
--- GNUnet/src/include/gnunet_gap_service.h     2005-03-26 21:09:41 UTC (rev 
493)
+++ GNUnet/src/include/gnunet_gap_service.h     2005-03-26 21:30:44 UTC (rev 
494)
@@ -38,8 +38,7 @@
  * a given reply is the one and only reply for a given
  * request.
  */
-typedef int (*UniqueReplyIdentifier)(const void * content,
-                                    unsigned int size,
+typedef int (*UniqueReplyIdentifier)(const DataContainer * content,
                                     unsigned int query_type,
                                     const HashCode512 * primaryKey);
 

Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c      2005-03-26 21:09:41 UTC (rev 493)
+++ GNUnet/src/server/connection.c      2005-03-26 21:30:44 UTC (rev 494)
@@ -1974,7 +1974,7 @@
     if (res == SYSERR) {
       LOG(LOG_WARNING,
          _("Invalid sequence number"
-           " %u <= %u, dropping rest of packet.\n"),
+           " %u <= %u, dropping message.\n"),
          sequenceNumber,
          be->lastSequenceNumberReceived);
       MUTEX_UNLOCK(&lock);