diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-11 10:19:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-11 10:19:24 -0500 |
| commit | 0e911abf27c7a7ede6dea81167c6e8b12b53174c (patch) | |
| tree | bd97884dccbc6c5283e785bcb162f1b1cab6b08f /src/or/circuituse.c | |
| parent | 17113448d26f02576a2aabe8163ef5b65c810bae (diff) | |
| download | tor-0e911abf27c7a7ede6dea81167c6e8b12b53174c.tar.gz tor-0e911abf27c7a7ede6dea81167c6e8b12b53174c.zip | |
Rename CIRC2 to CIRC_MINOR
Also give the arguments to control_event_circuit_status_minor real
names.
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index cd288aba90..55ec88a33f 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1228,9 +1228,9 @@ circuit_launch_by_extend_info(uint8_t purpose, * began. */ tor_gettimeofday(&circ->_base.timestamp_created); - control_event_circuit_status_2(circ, CIRC2_EVENT_CANNIBALIZED, - (int)old_purpose, - &old_timestamp_created); + control_event_circuit_status_minor(circ, CIRC_MINOR_EVENT_CANNIBALIZED, + (int)old_purpose, + &old_timestamp_created); switch (purpose) { case CIRCUIT_PURPOSE_C_ESTABLISH_REND: @@ -1965,9 +1965,9 @@ circuit_change_purpose(circuit_t *circ, uint8_t new_purpose) circ->purpose = new_purpose; if (CIRCUIT_IS_ORIGIN(circ)) { - control_event_circuit_status_2(TO_ORIGIN_CIRCUIT(circ), - CIRC2_EVENT_PURPOSE_CHANGED, - (int)old_purpose, NULL); + control_event_circuit_status_minor(TO_ORIGIN_CIRCUIT(circ), + CIRC_MINOR_EVENT_PURPOSE_CHANGED, + (int)old_purpose, NULL); } } |