[GNUnet-SVN] r17350 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2011-10-10 15:50:43 +0200 (Mon, 10 Oct 2011)
New Revision: 17350

Modified:
   gnunet/src/transport/transport_api.c
Log:
use LOG macro in transport_api.c

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2011-10-10 13:48:38 UTC (rev 
17349)
+++ gnunet/src/transport/transport_api.c        2011-10-10 13:50:43 UTC (rev 
17350)
@@ -41,6 +41,8 @@
 #include "gnunet_transport_service.h"
 #include "transport.h"
 
+#define LOG(kind,...) GNUNET_log_from (kind, "transport-api",__VA_ARGS__)
+
 /**
  * How large to start with for the hashmap of neighbours.
  */
@@ -340,8 +342,8 @@
   struct Neighbour *n;
 
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating entry for neighbour `%4s'.\n",
-              GNUNET_i2s (pid));
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Creating entry for neighbour `%4s'.\n",
+       GNUNET_i2s (pid));
 #endif
   n = GNUNET_malloc (sizeof (struct Neighbour));
   n->id = *pid;
@@ -413,8 +415,8 @@
   if (msg == NULL)
   {
 #if DEBUG_TRANSPORT_API
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Error receiving from transport service, disconnecting 
temporarily.\n");
+    LOG (GNUNET_ERROR_TYPE_INFO,
+         "Error receiving from transport service, disconnecting 
temporarily.\n");
 #endif
     disconnect_and_schedule_reconnect (h);
     return;
@@ -432,9 +434,9 @@
       break;
     }
 #if DEBUG_TRANSPORT_API
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Receiving (my own) `%s' message, I am `%4s'.\n", "HELLO",
-                GNUNET_i2s (&me));
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Receiving (my own) `%s' message, I am `%4s'.\n", "HELLO",
+         GNUNET_i2s (&me));
 #endif
     GNUNET_free_non_null (h->my_hello);
     h->my_hello = NULL;
@@ -470,8 +472,8 @@
       break;
     }
 #if DEBUG_TRANSPORT_API
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message for `%4s'.\n",
-                "CONNECT", GNUNET_i2s (&cim->id));
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message for `%4s'.\n",
+         "CONNECT", GNUNET_i2s (&cim->id));
 #endif
     n = neighbour_find (h, &cim->id);
     if (n != NULL)
@@ -492,8 +494,8 @@
     dim = (const struct DisconnectInfoMessage *) msg;
     GNUNET_break (ntohl (dim->reserved) == 0);
 #if DEBUG_TRANSPORT_API_DISCONNECT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message for `%4s'.\n",
-                "DISCONNECT", GNUNET_i2s (&dim->peer));
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message for `%4s'.\n",
+         "DISCONNECT", GNUNET_i2s (&dim->peer));
 #endif
     n = neighbour_find (h, &dim->peer);
     if (n == NULL)
@@ -511,9 +513,8 @@
     }
     okm = (const struct SendOkMessage *) msg;
 #if DEBUG_TRANSPORT_API
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Receiving `%s' message, transmission %s.\n", "SEND_OK",
-                ntohl (okm->success) == GNUNET_OK ? "succeeded" : "failed");
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message, transmission %s.\n",
+         "SEND_OK", ntohl (okm->success) == GNUNET_OK ? "succeeded" : 
"failed");
 #endif
     n = neighbour_find (h, &okm->peer);
     if (n == NULL)
@@ -533,7 +534,7 @@
     break;
   case GNUNET_MESSAGE_TYPE_TRANSPORT_RECV:
 #if DEBUG_TRANSPORT_API
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message.\n", "RECV");
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message.\n", "RECV");
 #endif
     if (size <
         sizeof (struct InboundMessage) + sizeof (struct GNUNET_MessageHeader))
@@ -553,9 +554,8 @@
       break;
     }
 #if DEBUG_TRANSPORT_API
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received message of type %u from `%4s'.\n", ntohs (imm->type),
-                GNUNET_i2s (&im->peer));
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Received message of type %u from `%4s'.\n",
+         ntohs (imm->type), GNUNET_i2s (&im->peer));
 #endif
     n = neighbour_find (h, &im->peer);
     if (n == NULL)
@@ -568,7 +568,7 @@
     break;
   case GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA:
 #if DEBUG_TRANSPORT_API
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message.\n", 
"SET_QUOTA");
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving `%s' message.\n", "SET_QUOTA");
 #endif
     if (size != sizeof (struct QuotaSetMessage))
     {
@@ -585,9 +585,9 @@
     GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, qm->quota);
     break;
   default:
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Received unexpected message of type %u in %s:%u\n"),
-                ntohs (msg->type), __FILE__, __LINE__);
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _("Received unexpected message of type %u in %s:%u\n"),
+         ntohs (msg->type), __FILE__, __LINE__);
     GNUNET_break (0);
     break;
   }
@@ -655,8 +655,8 @@
     GNUNET_CONTAINER_DLL_remove (h->control_head, h->control_tail, th);
     nret = th->notify (th->notify_cls, size, &cbuf[ret]);
 #if DEBUG_TRANSPORT_API
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Added %u bytes of control message at %u\n", nret, ret);
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Added %u bytes of control message at %u\n",
+         nret, ret);
 #endif
     GNUNET_free (th);
     ret += nret;
@@ -716,8 +716,8 @@
   /* if there are more pending messages, try to schedule those */
   schedule_transmission (h);
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmitting %u bytes to transport service\n", ret);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting %u bytes to transport service\n",
+       ret);
 #endif
   return ret;
 }
@@ -752,9 +752,9 @@
     GNUNET_assert (n == GNUNET_CONTAINER_heap_remove_root (h->ready_heap));
     n->hn = NULL;
 #if DEBUG_TRANSPORT_API
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Signalling timeout for transmission to peer %s due to 
congestion\n",
-                GNUNET_i2s (&n->id));
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Signalling timeout for transmission to peer %s due to congestion\n",
+         GNUNET_i2s (&n->id));
 #endif
     GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
     GNUNET_free (th);
@@ -773,7 +773,7 @@
     size = n->th->notify_size + sizeof (struct OutboundMessage);
   }
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Calling notify_transmit_ready\n");
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Calling notify_transmit_ready\n");
 #endif
   h->cth =
       GNUNET_CLIENT_notify_transmit_ready (h->client, size,
@@ -811,9 +811,9 @@
   else
     return;                     /* no work to be done */
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Scheduling next transmission to service in %llu ms\n",
-              (unsigned long long) delay.rel_value);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Scheduling next transmission to service in %llu ms\n",
+       (unsigned long long) delay.rel_value);
 #endif
   h->quota_task =
       GNUNET_SCHEDULER_add_delayed (delay, &schedule_transmission_task, h);
@@ -837,8 +837,8 @@
   struct GNUNET_TRANSPORT_TransmitHandle *th;
 
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Control transmit of %u bytes requested\n", size);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Control transmit of %u bytes requested\n",
+       size);
 #endif
   th = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_TransmitHandle));
   th->notify = notify;
@@ -867,13 +867,13 @@
   {
     /* Can only be shutdown, just give up */
 #if DEBUG_TRANSPORT_API
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Shutdown while trying to transmit `%s' request.\n", "START");
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Shutdown while trying to transmit `%s' request.\n", "START");
 #endif
     return 0;
   }
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", 
"START");
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", "START");
 #endif
   GNUNET_assert (size >= sizeof (struct StartMessage));
   s.header.size = htons (sizeof (struct StartMessage));
@@ -905,7 +905,7 @@
     return;
   }
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service.\n");
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service.\n");
 #endif
   GNUNET_assert (h->client == NULL);
   GNUNET_assert (h->control_head == NULL);
@@ -952,9 +952,9 @@
     GNUNET_free (th);
   }
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Scheduling task to reconnect to transport service in %llu 
ms.\n",
-              h->reconnect_delay.rel_value);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Scheduling task to reconnect to transport service in %llu ms.\n",
+       h->reconnect_delay.rel_value);
 #endif
   h->reconnect_task =
       GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h);
@@ -1009,9 +1009,9 @@
     return 0;
   }
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmitting `%s' request with respect to `%4s'.\n", 
"SET_QUOTA",
-              GNUNET_i2s (&sqc->target));
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Transmitting `%s' request with respect to `%4s'.\n", "SET_QUOTA",
+       GNUNET_i2s (&sqc->target));
 #endif
   GNUNET_assert (size >= sizeof (struct QuotaSetMessage));
   msg.header.size = htons (sizeof (struct QuotaSetMessage));
@@ -1045,22 +1045,21 @@
   n = neighbour_find (handle, target);
   if (NULL == n)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Quota changed to %u for peer `%s', but I have no such 
neighbour!\n",
-                (unsigned int) ntohl (quota_out.value__), GNUNET_i2s (target));
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Quota changed to %u for peer `%s', but I have no such neighbour!\n",
+         (unsigned int) ntohl (quota_out.value__), GNUNET_i2s (target));
     return;
   }
   GNUNET_assert (NULL != handle->client);
 #if DEBUG_TRANSPORT_API
   if (ntohl (quota_out.value__) != n->out_tracker.available_bytes_per_s__)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Quota changed from %u to %u for peer `%s'\n",
-                (unsigned int) n->out_tracker.available_bytes_per_s__,
-                (unsigned int) ntohl (quota_out.value__), GNUNET_i2s (target));
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Quota changed from %u to %u for peer 
`%s'\n",
+         (unsigned int) n->out_tracker.available_bytes_per_s__,
+         (unsigned int) ntohl (quota_out.value__), GNUNET_i2s (target));
   else
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Quota remains at %u for peer `%s'\n",
-                (unsigned int) n->out_tracker.available_bytes_per_s__,
-                GNUNET_i2s (target));
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Quota remains at %u for peer `%s'\n",
+         (unsigned int) n->out_tracker.available_bytes_per_s__,
+         GNUNET_i2s (target));
 #endif
   GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, quota_out);
   sqc = GNUNET_malloc (sizeof (struct SetQuotaContext));
@@ -1091,9 +1090,9 @@
     return 0;
   }
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmitting `%s' request with respect to `%4s'.\n",
-              "REQUEST_CONNECT", GNUNET_i2s (pid));
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Transmitting `%s' request with respect to `%4s'.\n", "REQUEST_CONNECT",
+       GNUNET_i2s (pid));
 #endif
   GNUNET_assert (size >= sizeof (struct TransportRequestConnectMessage));
   msg.header.size = htons (sizeof (struct TransportRequestConnectMessage));
@@ -1146,14 +1145,14 @@
   if (buf == NULL)
   {
 #if DEBUG_TRANSPORT_TIMEOUT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Timeout while trying to transmit `%s' request.\n", "HELLO");
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Timeout while trying to transmit `%s' request.\n", "HELLO");
 #endif
     GNUNET_free (msg);
     return 0;
   }
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", 
"HELLO");
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", "HELLO");
 #endif
   ssize = ntohs (msg->size);
   GNUNET_assert (size >= ssize);
@@ -1197,9 +1196,9 @@
   msg = GNUNET_malloc (size);
   memcpy (msg, hello, size);
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Offering `%s' message of `%4s' to transport for validation.\n",
-              "HELLO", GNUNET_i2s (&peer));
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Offering `%s' message of `%4s' to transport for validation.\n", 
"HELLO",
+       GNUNET_i2s (&peer));
 #endif
   schedule_control_transmit (handle, size, &send_hello, msg);
 }
@@ -1300,7 +1299,7 @@
 GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle)
 {
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transport disconnect called!\n");
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Transport disconnect called!\n");
 #endif
   /* this disconnects all neighbours... */
   if (handle->reconnect_task == GNUNET_SCHEDULER_NO_TASK)
@@ -1387,9 +1386,9 @@
   if (delay.rel_value > timeout.rel_value)
     delay.rel_value = 0;        /* notify immediately (with failure) */
 #if DEBUG_TRANSPORT_API
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Bandwidth tracker allows next transmission to peer %s in %llu 
ms\n",
-              GNUNET_i2s (target), (unsigned long long) delay.rel_value);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Bandwidth tracker allows next transmission to peer %s in %llu ms\n",
+       GNUNET_i2s (target), (unsigned long long) delay.rel_value);
 #endif
   n->hn = GNUNET_CONTAINER_heap_insert (handle->ready_heap, n, 
delay.rel_value);
   schedule_transmission (handle);