aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-11-10 09:29:23 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-11-10 09:29:23 +0000
commit6e29a6969fd9fa6eb772fb77751fca5a85f4e717 (patch)
tree4672d1379217e1dc86ab9a07792c19042f1c33ff /src/transport
parent0af038fabc668461dcb73ed8d80fe3f0aebc26f8 (diff)
downloadgnunet-6e29a6969fd9fa6eb772fb77751fca5a85f4e717.tar.gz
gnunet-6e29a6969fd9fa6eb772fb77751fca5a85f4e717.zip
removing quota test output
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/gnunet-service-transport_neighbours.c20
-rw-r--r--src/transport/transport_api.c3
2 files changed, 9 insertions, 14 deletions
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,
1255 GST_neighbours_set_incoming_quota (&n->id, n->bandwidth_in); 1255 GST_neighbours_set_incoming_quota (&n->id, n->bandwidth_in);
1256 1256
1257#if DEBUG_TRANSPORT 1257#if DEBUG_TRANSPORT
1258#endif 1258 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1259 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
1260 "Sending outbound quota of %u Bps and inbound quota of %u Bps for peer `%s' to all clients\n", 1259 "Sending outbound quota of %u Bps and inbound quota of %u Bps for peer `%s' to all clients\n",
1261 ntohl (n->bandwidth_out.value__), 1260 ntohl (n->bandwidth_out.value__),
1262 ntohl (n->bandwidth_in.value__), GNUNET_i2s (peer)); 1261 ntohl (n->bandwidth_in.value__), GNUNET_i2s (peer));
1263 1262#endif
1264 q_msg.header.size = htons (sizeof (struct QuotaSetMessage)); 1263 q_msg.header.size = htons (sizeof (struct QuotaSetMessage));
1265 q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA); 1264 q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
1266 q_msg.quota = n->bandwidth_out; 1265 q_msg.quota = n->bandwidth_out;
@@ -1794,10 +1793,11 @@ GST_neighbours_set_incoming_quota (const struct GNUNET_PeerIdentity *neighbour,
1794 1, GNUNET_NO); 1793 1, GNUNET_NO);
1795 return; 1794 return;
1796 } 1795 }
1797 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 1796#if DEBUG_TRANSPORT
1797 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1798 "Setting inbound quota of %u Bps for peer `%s' to all clients\n", 1798 "Setting inbound quota of %u Bps for peer `%s' to all clients\n",
1799 ntohl (quota.value__), GNUNET_i2s (&n->id)); 1799 ntohl (quota.value__), GNUNET_i2s (&n->id));
1800 1800#endif
1801 GNUNET_BANDWIDTH_tracker_update_quota (&n->in_tracker, quota); 1801 GNUNET_BANDWIDTH_tracker_update_quota (&n->in_tracker, quota);
1802 if (0 != ntohl (quota.value__)) 1802 if (0 != ntohl (quota.value__))
1803 return; 1803 return;
@@ -2086,11 +2086,10 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message,
2086 connect_notify_cb (callback_cls, &n->id, ats, ats_count); 2086 connect_notify_cb (callback_cls, &n->id, ats, ats_count);
2087 2087
2088#if DEBUG_TRANSPORT 2088#if DEBUG_TRANSPORT
2089#endif 2089 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
2090 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
2091 "Sending outbound quota of %u Bps for peer `%s' to all clients\n", 2090 "Sending outbound quota of %u Bps for peer `%s' to all clients\n",
2092 ntohl (n->bandwidth_out.value__), GNUNET_i2s (peer)); 2091 ntohl (n->bandwidth_out.value__), GNUNET_i2s (peer));
2093 2092#endif
2094 q_msg.header.size = htons (sizeof (struct QuotaSetMessage)); 2093 q_msg.header.size = htons (sizeof (struct QuotaSetMessage));
2095 q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA); 2094 q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
2096 q_msg.quota = n->bandwidth_out; 2095 q_msg.quota = n->bandwidth_out;
@@ -2171,11 +2170,10 @@ GST_neighbours_handle_ack (const struct GNUNET_MessageHeader *message,
2171#endif 2170#endif
2172 connect_notify_cb (callback_cls, &n->id, ats, ats_count); 2171 connect_notify_cb (callback_cls, &n->id, ats, ats_count);
2173#if DEBUG_TRANSPORT 2172#if DEBUG_TRANSPORT
2174#endif 2173 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
2175 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
2176 "Sending outbound quota of %u Bps for peer `%s' to all clients\n", 2174 "Sending outbound quota of %u Bps for peer `%s' to all clients\n",
2177 ntohl (n->bandwidth_out.value__), GNUNET_i2s (peer)); 2175 ntohl (n->bandwidth_out.value__), GNUNET_i2s (peer));
2178 2176#endif
2179 q_msg.header.size = htons (sizeof (struct QuotaSetMessage)); 2177 q_msg.header.size = htons (sizeof (struct QuotaSetMessage));
2180 q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA); 2178 q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
2181 q_msg.quota = n->bandwidth_out; 2179 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)
581 n = neighbour_find (h, &qm->peer); 581 n = neighbour_find (h, &qm->peer);
582 if (n == NULL) 582 if (n == NULL)
583 break; 583 break;
584 LOG (GNUNET_ERROR_TYPE_ERROR, "Received `%s' message, setting outbound quoto to %u\n",
585 "SET_QUOTA",
586 ntohl(qm->quota.value__));
587 GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, qm->quota); 584 GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker, qm->quota);
588 break; 585 break;
589 default: 586 default: