diff options
| author | Karsten Loesing <karsten.loesing@gmx.net> | 2013-10-28 11:30:49 +0100 |
|---|---|---|
| committer | Karsten Loesing <karsten.loesing@gmx.net> | 2013-10-28 12:09:42 +0100 |
| commit | 2e0fad542cccddf9ad8b8dbaeba8b1e825c09ff4 (patch) | |
| tree | f4639f6ed8b224087e665373ba147df1fd53144d /src/or/main.c | |
| parent | 49278cd68a0d84727ae1131e677bc3481b3e2fc7 (diff) | |
| parent | e46de82c97e694d3bfa399af48b9de9365e264bd (diff) | |
| download | tor-2e0fad542cccddf9ad8b8dbaeba8b1e825c09ff4.tar.gz tor-2e0fad542cccddf9ad8b8dbaeba8b1e825c09ff4.zip | |
Merge branch 'morestats4' into morestats5
Conflicts:
doc/tor.1.txt
src/or/config.c
src/or/connection.h
src/or/control.c
src/or/control.h
src/or/or.h
src/or/relay.c
src/or/relay.h
src/test/test.c
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 4d691bb189..aa5642509b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -352,6 +352,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. */ @@ -1668,6 +1670,9 @@ 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(); + control_event_circ_bandwidth_used(); + control_event_circuit_cell_stats(); if (server_mode(options) && !net_is_disabled() && |