aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorMarek Majkowski <marek@popcount.org>2013-06-20 16:40:05 +0100
committerMarek Majkowski <marek@popcount.org>2013-06-20 16:40:05 +0100
commitd7538b57b49669afef0cb3dd03e0ed1a118a98fd (patch)
tree2ab7062acafbd2f089acec279d8d039dc1e3d4fe /src/or/circuitbuild.c
parent097f257078070eb1ebe2795550a813242d7ebdb2 (diff)
downloadtor-d7538b57b49669afef0cb3dd03e0ed1a118a98fd.tar
tor-d7538b57b49669afef0cb3dd03e0ed1a118a98fd.tar.gz
Don't access global_circuitlist variable directly. Use a getter instead.
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 43d2ffe4d..8cdb22718 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) {
+ for (circ = circuit_get_global_list_(); circ; circ = circ->next) {
origin_circuit_t *ocirc = NULL;
if (!CIRCUIT_IS_ORIGIN(circ) || /* didn't originate here */
circ->marked_for_close) /* already counted */