[GNUnet-SVN] r1720 - in GNUnet/src/applications: fs/module gap

[grothoff]

Author: grothoff
Date: 2005-08-17 19:13:24 -0700 (Wed, 17 Aug 2005)
New Revision: 1720

Modified:
   GNUnet/src/applications/fs/module/fs.c
   GNUnet/src/applications/gap/gap.c
Log:
debg

Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c      2005-08-18 01:46:42 UTC (rev 
1719)
+++ GNUnet/src/applications/fs/module/fs.c      2005-08-18 02:13:24 UTC (rev 
1720)
@@ -41,6 +41,8 @@
 #include "querymanager.h"
 #include "fs.h"
 
+#define DEBUG_FS YES
+
 #define EXTRA_CHECKS YES
 
 typedef struct {
@@ -730,7 +732,7 @@
        hash2enc(&keys[0],
                 &enc));
   LOG(LOG_DEBUG,
-      "GAP requests content for %s of type %u\n",
+      "GAP requests content for '%s' of type %u\n",
       &enc,
       type);
   myClosure.count = 0;

Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c   2005-08-18 01:46:42 UTC (rev 1719)
+++ GNUnet/src/applications/gap/gap.c   2005-08-18 02:13:24 UTC (rev 1720)
@@ -1487,7 +1487,8 @@
 static int
 queryLocalResultCallback(const HashCode512 * primaryKey,
                         const DataContainer * value,
-                        struct qLRC * cls) {
+                        void * closure) {
+  struct qLRC * cls = closure;
   HashCode512 hc;
   HashCode512 hc1;
   int i;
@@ -1586,13 +1587,11 @@
         hash2enc(&query->queries[0],
                 &enc));
   LOG(LOG_DEBUG,
-      "GAP is executing request for %s: %s %s\n",
+      "GAP is executing request for '%s': %s %s\n",
       &enc,
       doForward ? "forwarding" : "",
       isRouted ? "routing" : "");
 
-
-
   cls.values = NULL;
   cls.valueCount = 0;
   cls.sender = sender;
@@ -1604,7 +1603,7 @@
            1 + ( ntohs(query->header.size)
                  - sizeof(P2P_gap_query_MESSAGE)) / sizeof(HashCode512),
            &query->queries[0],
-           (DataProcessor) &queryLocalResultCallback,
+           &queryLocalResultCallback,
            &cls);
   }
 
@@ -1995,6 +1994,7 @@
   int ttl;
   unsigned int prio;
   double preference;
+  EncName enc;
 
   if (bs == NULL) {
     BREAK();
@@ -2039,8 +2039,16 @@
   prio = ntohl(qmsg->priority);
   policy = evaluateQuery(sender,
                         &prio);
+  IFLOG(LOG_DEBUG,
+       hash2enc(&qmsg->queries[0],
+                &enc));
+  LOG(LOG_DEBUG,
+      "Received GAP query '%s'.\n",
+      &enc);
   if ((policy & QUERY_DROPMASK) == 0) {
     FREE(qmsg);
+    LOG(LOG_DEBUG,
+       "Dropping query, policy decided that this peer is too busy.\n");
     return OK; /* straight drop. */
   }
   preference = (double) prio;