diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-08-15 15:36:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-08-15 15:36:04 -0400 |
| commit | d4634d1b72d660b1ea5ce9874fcd6b04a15968e9 (patch) | |
| tree | 57ee2a0b0a1b5c41d13ac455884a826b000c675e /src/or/circuitbuild.c | |
| parent | 1743144c341218e4af88423cccd2bf93e72730a1 (diff) | |
| parent | 1555876d5f27acaa9326045e33b6e2bfc1013c7f (diff) | |
| download | tor-d4634d1b72d660b1ea5ce9874fcd6b04a15968e9.tar.gz tor-d4634d1b72d660b1ea5ce9874fcd6b04a15968e9.zip | |
Merge remote-tracking branch 'majek/bug9108'
Conflicts:
src/or/circuitlist.h
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 43d2ffe4db..0b5a8556c9 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -46,13 +46,6 @@ #define MIN(a,b) ((a)<(b)?(a):(b)) #endif -/********* START VARIABLES **********/ - -/** A global list of all circuits at this hop. */ -extern circuit_t *global_circuitlist; - -/********* END VARIABLES ************/ - static channel_t * channel_connect_for_circuit(const tor_addr_t *addr, uint16_t port, const char *id_digest); @@ -2181,7 +2174,7 @@ pathbias_count_circs_in_states(entry_guard_t *guard, int open_circuits = 0; /* Count currently open circuits. Give them the benefit of the doubt. */ - for (circ = global_circuitlist; circ; circ = circ->next) { + TOR_LIST_FOREACH(circ, circuit_get_global_list_(), head) { origin_circuit_t *ocirc = NULL; if (!CIRCUIT_IS_ORIGIN(circ) || /* didn't originate here */ circ->marked_for_close) /* already counted */ |