[GNUnet-SVN] r18089 - in gnunet/src: ats transport

[gnunet]

Author: wachs
Date: 2011-11-10 10:29:23 +0100 (Thu, 10 Nov 2011)
New Revision: 18089

Modified:
   gnunet/src/ats/gnunet-service-ats_scheduling.c
   gnunet/src/transport/gnunet-service-transport_neighbours.c
   gnunet/src/transport/transport_api.c
Log:
removing quota test output


Modified: gnunet/src/ats/gnunet-service-ats_scheduling.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_scheduling.c      2011-11-10 08:52:19 UTC 
(rev 18088)
+++ gnunet/src/ats/gnunet-service-ats_scheduling.c      2011-11-10 09:29:23 UTC 
(rev 18089)
@@ -142,7 +142,7 @@
   memcpy (addrp, plugin_addr, plugin_addr_len);
   strcpy (&addrp[plugin_addr_len], plugin_name);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ATS sends quota for peer `%s': 
(in/out) %u/%u\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS sends quota for peer `%s': 
(in/out) %u/%u\n",
       GNUNET_i2s (peer), ntohl (bandwidth_in.value__), 
ntohl(bandwidth_out.value__));
 
   GNUNET_SERVER_notification_context_unicast (nc, my_client, &msg->header,

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2011-11-10 
08:52:19 UTC (rev 18088)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2011-11-10 
09:29:23 UTC (rev 18089)
@@ -1255,12 +1255,11 @@
     GST_neighbours_set_incoming_quota (&n->id, n->bandwidth_in);
     
 #if DEBUG_TRANSPORT
-#endif
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Sending outbound quota of %u Bps and inbound quota of %u Bps 
for peer `%s' to all clients\n",
                 ntohl (n->bandwidth_out.value__),
                 ntohl (n->bandwidth_in.value__), GNUNET_i2s (peer));
-    
+#endif
     q_msg.header.size = htons (sizeof (struct QuotaSetMessage));
     q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
     q_msg.quota = n->bandwidth_out;
@@ -1794,10 +1793,11 @@
                               1, GNUNET_NO);
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+#if DEBUG_TRANSPORT
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Setting inbound quota of %u Bps for peer `%s' to all clients\n",
               ntohl (quota.value__), GNUNET_i2s (&n->id));
-
+#endif
   GNUNET_BANDWIDTH_tracker_update_quota (&n->in_tracker, quota);
   if (0 != ntohl (quota.value__))
     return;
@@ -2086,11 +2086,10 @@
   connect_notify_cb (callback_cls, &n->id, ats, ats_count);  
 
 #if DEBUG_TRANSPORT
-#endif
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Sending outbound quota of %u Bps for peer `%s' to all 
clients\n",
               ntohl (n->bandwidth_out.value__), GNUNET_i2s (peer));
-
+#endif
   q_msg.header.size = htons (sizeof (struct QuotaSetMessage));
   q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
   q_msg.quota = n->bandwidth_out;
@@ -2171,11 +2170,10 @@
 #endif
   connect_notify_cb (callback_cls, &n->id, ats, ats_count);  
 #if DEBUG_TRANSPORT
-#endif
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Sending outbound quota of %u Bps for peer `%s' to all 
clients\n",
               ntohl (n->bandwidth_out.value__), GNUNET_i2s (peer));
-
+#endif
   q_msg.header.size = htons (sizeof (struct QuotaSetMessage));
   q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
   q_msg.quota = n->bandwidth_out;

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2011-11-10 08:52:19 UTC (rev 
18088)
+++ gnunet/src/transport/transport_api.c        2011-11-10 09:29:23 UTC (rev 
18089)
@@ -581,9 +581,6 @@
     n = neighbour_find (h, &qm->peer);
     if (n == NULL)
       break;
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Received `%s' message, setting outbound 
quoto to %u\n",
-        "SET_QUOTA",
-        ntohl(qm->quota.value__));
     GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, qm->quota);
     break;
   default: