aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorKarsten Loesing <karsten.loesing@gmx.net>2013-02-06 14:15:32 +0100
committerKarsten Loesing <karsten.loesing@gmx.net>2013-05-16 13:48:35 +0200
commit8d1f78c556abb570bb80ea84261c954d9746cf33 (patch)
treeab3888a02792bc7a7e04989e7f8035c747f43e93 /src/or/main.c
parente54d664f7bb1205162c1df3495f8ebc30c23d867 (diff)
downloadtor-8d1f78c556abb570bb80ea84261c954d9746cf33.tar
tor-8d1f78c556abb570bb80ea84261c954d9746cf33.tar.gz
Add new CONN_BW event.
Jointly authored with Rob Jansen <jansen@cs.umn.edu>.
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c
index fd8b6cf67..c145f9dfd 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -351,6 +351,8 @@ connection_remove(connection_t *conn)
(int)conn->s, conn_type_to_string(conn->type),
smartlist_len(connection_array));
+ control_event_conn_bandwidth(conn);
+
tor_assert(conn->conn_array_index >= 0);
current_index = conn->conn_array_index;
connection_unregister_events(conn); /* This is redundant, but cheap. */
@@ -1638,6 +1640,7 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg)
control_event_bandwidth_used((uint32_t)bytes_read,(uint32_t)bytes_written);
control_event_stream_bandwidth_used();
+ control_event_conn_bandwidth_used();
if (server_mode(options) &&
!net_is_disabled() &&