From 6e29a6969fd9fa6eb772fb77751fca5a85f4e717 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 10 Nov 2011 09:29:23 +0000 Subject: [PATCH] removing quota test output --- src/ats/gnunet-service-ats_scheduling.c | 2 +- .../gnunet-service-transport_neighbours.c | 20 +++++++++---------- src/transport/transport_api.c | 3 --- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c index 493ff840f..dac84676f 100644 --- a/src/ats/gnunet-service-ats_scheduling.c +++ b/src/ats/gnunet-service-ats_scheduling.c @@ -142,7 +142,7 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity 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, diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 629cecefa..54e5c61bc 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c @@ -1255,12 +1255,11 @@ GST_neighbours_switch_to_address_3way (const struct GNUNET_PeerIdentity *peer, 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 @@ GST_neighbours_set_incoming_quota (const struct GNUNET_PeerIdentity *neighbour, 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 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, 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 @@ GST_neighbours_handle_ack (const struct GNUNET_MessageHeader *message, #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; diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c index d2d1d7053..b7704e512 100644 --- a/src/transport/transport_api.c +++ b/src/transport/transport_api.c @@ -581,9 +581,6 @@ demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg) 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: -- 2.25.1