nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Control port call to emit a CIRC_BW event for a single circuit.

Browse Source 
This commit only moves code. No functionality has been changed.
This commit is contained in:
Mike Perry 2018-09-13 01:22:02 +00:00
parent f308e81fa7
commit 80ffedd3ca
2 changed files with 52 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/feature/control/control.c
View File

@ -6049,41 +6049,69 @@ control_event_stream_bandwidth_used(void)
int int
control_event_circ_bandwidth_used(void) control_event_circ_bandwidth_used(void)
{ {
origin_circuit_t *ocirc;
struct timeval now;
char tbuf[ISO_TIME_USEC_LEN+1];
if (!EVENT_IS_INTERESTING(EVENT_CIRC_BANDWIDTH_USED)) if (!EVENT_IS_INTERESTING(EVENT_CIRC_BANDWIDTH_USED))
return 0; return 0;
SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, circ) { SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, circ) {
if (!CIRCUIT_IS_ORIGIN(circ)) if (!CIRCUIT_IS_ORIGIN(circ))
continue; continue;
ocirc = TO_ORIGIN_CIRCUIT(circ);
if (!ocirc->n_read_circ_bw && !ocirc->n_written_circ_bw) control_event_circ_bandwidth_used_for_circ(TO_ORIGIN_CIRCUIT(circ));
continue;
tor_gettimeofday(&now);
format_iso_time_nospace_usec(tbuf, &now);
send_control_event(EVENT_CIRC_BANDWIDTH_USED,
"650 CIRC_BW ID=%d READ=%lu WRITTEN=%lu TIME=%s "
"DELIVERED_READ=%lu OVERHEAD_READ=%lu "
"DELIVERED_WRITTEN=%lu OVERHEAD_WRITTEN=%lu\r\n",
ocirc->global_identifier,
(unsigned long)ocirc->n_read_circ_bw,
(unsigned long)ocirc->n_written_circ_bw,
tbuf,
(unsigned long)ocirc->n_delivered_read_circ_bw,
(unsigned long)ocirc->n_overhead_read_circ_bw,
(unsigned long)ocirc->n_delivered_written_circ_bw,
(unsigned long)ocirc->n_overhead_written_circ_bw);
ocirc->n_written_circ_bw = ocirc->n_read_circ_bw = 0;
ocirc->n_overhead_written_circ_bw = ocirc->n_overhead_read_circ_bw = 0;
ocirc->n_delivered_written_circ_bw = ocirc->n_delivered_read_circ_bw = 0;
} }
SMARTLIST_FOREACH_END(circ); SMARTLIST_FOREACH_END(circ);
return 0; return 0;
} }
/**
* Emit a CIRC_BW event line for a specific circuit.
*
* This function sets the values it emits to 0, and does not emit
* an event if there is no new data to report since the last call.
*
* Therefore, it may be called at any frequency.
*/
int
control_event_circ_bandwidth_used_for_circ(origin_circuit_t *ocirc)
{
struct timeval now;
char tbuf[ISO_TIME_USEC_LEN+1];
tor_assert(ocirc);
if (!EVENT_IS_INTERESTING(EVENT_CIRC_BANDWIDTH_USED))
return 0;
/* n_read_circ_bw and n_written_circ_bw are always updated
* when there is any new cell on a circuit, and set to 0 after
* the event, below.
*
* Therefore, checking them is sufficient to determine if there
* is new data to report. */
if (!ocirc->n_read_circ_bw && !ocirc->n_written_circ_bw)
return 0;
tor_gettimeofday(&now);
format_iso_time_nospace_usec(tbuf, &now);
send_control_event(EVENT_CIRC_BANDWIDTH_USED,
"650 CIRC_BW ID=%d READ=%lu WRITTEN=%lu TIME=%s "
"DELIVERED_READ=%lu OVERHEAD_READ=%lu "
"DELIVERED_WRITTEN=%lu OVERHEAD_WRITTEN=%lu\r\n",
ocirc->global_identifier,
(unsigned long)ocirc->n_read_circ_bw,
(unsigned long)ocirc->n_written_circ_bw,
tbuf,
(unsigned long)ocirc->n_delivered_read_circ_bw,
(unsigned long)ocirc->n_overhead_read_circ_bw,
(unsigned long)ocirc->n_delivered_written_circ_bw,
(unsigned long)ocirc->n_overhead_written_circ_bw);
ocirc->n_written_circ_bw = ocirc->n_read_circ_bw = 0;
ocirc->n_overhead_written_circ_bw = ocirc->n_overhead_read_circ_bw = 0;
ocirc->n_delivered_written_circ_bw = ocirc->n_delivered_read_circ_bw = 0;
return 0;
}
/** Print out CONN_BW event for a single OR/DIR/EXIT <b>conn</b> and reset /** Print out CONN_BW event for a single OR/DIR/EXIT <b>conn</b> and reset
* bandwidth counters. */ * bandwidth counters. */
int int

2
src/feature/control/control.h
View File

@ -146,6 +146,7 @@ int control_event_bandwidth_used(uint32_t n_read, uint32_t n_written);
int control_event_stream_bandwidth(edge_connection_t *edge_conn); int control_event_stream_bandwidth(edge_connection_t *edge_conn);
int control_event_stream_bandwidth_used(void); int control_event_stream_bandwidth_used(void);
int control_event_circ_bandwidth_used(void); int control_event_circ_bandwidth_used(void);
int control_event_circ_bandwidth_used_for_circ(origin_circuit_t *ocirc);
int control_event_conn_bandwidth(connection_t *conn); int control_event_conn_bandwidth(connection_t *conn);
int control_event_conn_bandwidth_used(void); int control_event_conn_bandwidth_used(void);
int control_event_circuit_cell_stats(void); int control_event_circuit_cell_stats(void);
@ -246,7 +247,6 @@ void control_event_hs_descriptor_content(const char *onion_address,
const char *desc_id, const char *desc_id,
const char *hsdir_fp, const char *hsdir_fp,
const char *content); const char *content);
void control_free_all(void); void control_free_all(void);
#ifdef CONTROL_PRIVATE #ifdef CONTROL_PRIVATE