[GNUnet-SVN] r17325 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2011-10-10 14:48:35 +0200 (Mon, 10 Oct 2011)
New Revision: 17325

Modified:
   gnunet/src/core/core.h
   gnunet/src/core/gnunet-service-core.h
   gnunet/src/core/gnunet-service-core_clients.c
   gnunet/src/core/gnunet-service-core_sessions.c
Log:
cleaner

Modified: gnunet/src/core/core.h
===================================================================
--- gnunet/src/core/core.h      2011-10-10 12:31:57 UTC (rev 17324)
+++ gnunet/src/core/core.h      2011-10-10 12:48:35 UTC (rev 17325)
@@ -23,7 +23,11 @@
  * @brief common internal definitions for core service
  * @author Christian Grothoff
  */
+#ifndef CORE_H
+#define CORE_H
+
 #include "gnunet_bandwidth_lib.h"
+#include "gnunet_transport_service.h"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_time_lib.h"
 
@@ -33,11 +37,6 @@
 #define DEBUG_CORE GNUNET_EXTRA_LOGGING
 
 /**
- * Debugging interaction core-clients.
- */
-#define DEBUG_CORE_CLIENT GNUNET_EXTRA_LOGGING
-
-/**
  * Definition of bits in the InitMessage's options field that specify
  * which events this client cares about.  Note that inbound messages
  * for handlers that were specifically registered are always
@@ -383,4 +382,5 @@
 
 };
 
+#endif
 /* end of core.h */

Modified: gnunet/src/core/gnunet-service-core.h
===================================================================
--- gnunet/src/core/gnunet-service-core.h       2011-10-10 12:31:57 UTC (rev 
17324)
+++ gnunet/src/core/gnunet-service-core.h       2011-10-10 12:48:35 UTC (rev 
17325)
@@ -27,10 +27,8 @@
 #define GNUNET_SERVICE_CORE_H
 
 #include "gnunet_statistics_service.h"
+#include "core.h"
 
-
-#define DEBUG_CORE GNUNET_EXTRA_LOGGING
-
 /**
  * Opaque handle to a client.
  */

Modified: gnunet/src/core/gnunet-service-core_clients.c
===================================================================
--- gnunet/src/core/gnunet-service-core_clients.c       2011-10-10 12:31:57 UTC 
(rev 17324)
+++ gnunet/src/core/gnunet-service-core_clients.c       2011-10-10 12:48:35 UTC 
(rev 17325)
@@ -141,7 +141,7 @@
                const struct GNUNET_MessageHeader *msg,
                 int can_drop)
 {
-#if DEBUG_CORE_CLIENT
+#if DEBUG_CORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Preparing to send %u bytes of message of type %u to client.\n",
               (unsigned int) ntohs (msg->size),
@@ -220,7 +220,7 @@
            ( (0 != (options & GNUNET_CORE_OPTION_SEND_FULL_INBOUND)) &&
              (GNUNET_YES == type_match (type, c)) ) ) )
       continue; /* skip */
-#if DEBUG_CORE_CLIENT > 1
+#if DEBUG_CORE > 1
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                "Sending message of type %u to client.\n",
                (unsigned int) ntohs (msg->type));
@@ -280,7 +280,7 @@
   GNUNET_CONTAINER_DLL_insert (client_head,
                               client_tail,
                               c);
-#if DEBUG_CORE_CLIENT
+#if DEBUG_CORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Client connecting to core service is interested in %u message 
types\n", 
               (unsigned int) c->tcnt);
@@ -504,7 +504,7 @@
 
   if (client == NULL)
     return;
-#if DEBUG_CORE_CLIENT
+#if DEBUG_CORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Client %p has disconnected from core service.\n", client);
 #endif
@@ -619,7 +619,7 @@
            sizeof (struct GNUNET_TRANSPORT_ATS_Information) * atsi_count);
     a[atsi_count].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
     a[atsi_count].value = htonl (0);
-#if DEBUG_CORE_CLIENT
+#if DEBUG_CORE
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
                "Sending `%s' message to client.\n",
                 "NOTIFY_CONNECT");

Modified: gnunet/src/core/gnunet-service-core_sessions.c
===================================================================
--- gnunet/src/core/gnunet-service-core_sessions.c      2011-10-10 12:31:57 UTC 
(rev 17324)
+++ gnunet/src/core/gnunet-service-core_sessions.c      2011-10-10 12:48:35 UTC 
(rev 17325)
@@ -32,7 +32,6 @@
 #include "gnunet-service-core_clients.h"
 #include "gnunet_constants.h"
 
-
 /**
  * Message ready for encryption.  This struct is followed by the
  * actual content of the message.
@@ -301,7 +300,7 @@
     /* neighbour must have disconnected since request was issued,
      * ignore (client will realize it once it processes the
      * disconnect notification) */
-#if DEBUG_CORE_CLIENT
+#if DEBUG_CORE
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Dropped client request for transmission (am disconnected)\n");
 #endif
@@ -318,7 +317,7 @@
     GSC_CLIENTS_reject_request (car);
     return;
   }
-#if DEBUG_CORE_CLIENT
+#if DEBUG_CORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received client transmission request. queueing\n");
 #endif