[GNUnet-SVN] r2915 - in GNUnet/src: applications/fs/ecrs applications/stats include server

[grothoff]

Author: grothoff
Date: 2006-05-27 12:25:27 -0700 (Sat, 27 May 2006)
New Revision: 2915

Modified:
   GNUnet/src/applications/fs/ecrs/ecrs.h
   GNUnet/src/applications/fs/ecrs/uri.c
   GNUnet/src/applications/stats/statistics.c
   GNUnet/src/include/gnunet_core.h
   GNUnet/src/server/core.c
Log:
fix

Modified: GNUnet/src/applications/fs/ecrs/ecrs.h
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrs.h      2006-05-27 17:01:41 UTC (rev 
2914)
+++ GNUnet/src/applications/fs/ecrs/ecrs.h      2006-05-27 19:25:27 UTC (rev 
2915)
@@ -31,7 +31,7 @@
 #include "tree.h"
 #include <extractor.h>
 
-#define EXTRA_CHECKS YES
+#define EXTRA_CHECKS ALLOW_EXTRA_CHECKS
 
 
 /**

Modified: GNUnet/src/applications/fs/ecrs/uri.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uri.c       2006-05-27 17:01:41 UTC (rev 
2914)
+++ GNUnet/src/applications/fs/ecrs/uri.c       2006-05-27 19:25:27 UTC (rev 
2915)
@@ -85,8 +85,6 @@
 #include "ecrs.h"
 #include "gnunet_ecrs_lib.h"
 
-#define EXTRA_CHECKS ALLOW_EXTRA_CHECKS
-
 /**
  * Generate a keyword URI.
  * @return NULL on error (i.e. keywordCount == 0)

Modified: GNUnet/src/applications/stats/statistics.c
===================================================================
--- GNUnet/src/applications/stats/statistics.c  2006-05-27 17:01:41 UTC (rev 
2914)
+++ GNUnet/src/applications/stats/statistics.c  2006-05-27 19:25:27 UTC (rev 
2915)
@@ -1,6 +1,6 @@
 /*
   This file is part of GNUnet.
-  (C) 2001, 2002, 2004 Christian Grothoff (and other contributing authors)
+  (C) 2001, 2002, 2004, 2006 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
@@ -291,8 +291,8 @@
 /**
  * Handle a request to see if a particular p2p message is supported.
  */
-static int handlep2pMessageSupported(ClientHandle sock,
-                                    const CS_MESSAGE_HEADER * message) {
+static int handleMessageSupported(ClientHandle sock,
+                                 const CS_MESSAGE_HEADER * message) {
   unsigned short type;
   unsigned short htype;
   int supported;
@@ -362,7 +362,9 @@
   capi->registerClientHandler(CS_PROTO_stats_GET_STATISTICS,
                              &sendStatistics);
   capi->registerClientHandler(CS_PROTO_stats_GET_P2P_MESSAGE_SUPPORTED,
-                             &handlep2pMessageSupported);
+                             &handleMessageSupported);
+  capi->registerClientHandler(CS_PROTO_stats_GET_CS_MESSAGE_SUPPORTED,
+                             &handleMessageSupported);
   capi->registerClientHandler(CS_PROTO_traffic_COUNT,
                                &processGetConnectionCountRequest);
   capi->registerHandler(P2P_PROTO_noise,
@@ -378,7 +380,9 @@
   coreAPI->unregisterClientHandler(CS_PROTO_stats_GET_STATISTICS,
                                   &sendStatistics);
   coreAPI->unregisterClientHandler(CS_PROTO_stats_GET_P2P_MESSAGE_SUPPORTED,
-                                  &handlep2pMessageSupported);
+                                  &handleMessageSupported);
+  coreAPI->unregisterClientHandler(CS_PROTO_stats_GET_CS_MESSAGE_SUPPORTED,
+                                  &handleMessageSupported);
   coreAPI->unregisterClientHandler(CS_PROTO_traffic_COUNT,
                                   &processGetConnectionCountRequest);
   coreAPI->unregisterHandler(P2P_PROTO_noise,

Modified: GNUnet/src/include/gnunet_core.h
===================================================================
--- GNUnet/src/include/gnunet_core.h    2006-05-27 17:01:41 UTC (rev 2914)
+++ GNUnet/src/include/gnunet_core.h    2006-05-27 19:25:27 UTC (rev 2915)
@@ -597,6 +597,7 @@
    */
   void (*terminateClientConnection)(ClientHandle handle);
 
+
   /* ************************ MISC ************************ */
 
   /**

Modified: GNUnet/src/server/core.c
===================================================================
--- GNUnet/src/server/core.c    2006-05-27 17:01:41 UTC (rev 2914)
+++ GNUnet/src/server/core.c    2006-05-27 19:25:27 UTC (rev 2915)
@@ -1,5 +1,6 @@
 /*
      This file is part of GNUnet
+     (C) 2001, 2002, 2004, 2006 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