diff options
| author | Andrea Shepard <andrea@persephoneslair.org> | 2012-09-04 00:33:16 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2012-10-08 03:06:09 -0700 |
| commit | 28f108bcceab59fcf9f27e33065f64bfdb0f159a (patch) | |
| tree | 1783e99ca74fb68a9f1116274757f46c903dc2be /src/or/directory.c | |
| parent | 8b14db9628f0e8982e894034e86c8efdd78cff32 (diff) | |
| download | tor-28f108bcceab59fcf9f27e33065f64bfdb0f159a.tar.gz tor-28f108bcceab59fcf9f27e33065f64bfdb0f159a.zip | |
Use dirreq_id from channel_t when appropriate
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 7df91fb57e..8003444c6f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2855,8 +2855,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, geoip_note_ns_response(act, GEOIP_SUCCESS); /* Note that a request for a network status has started, so that we * can measure the download time later on. */ - if (TO_CONN(conn)->dirreq_id) - geoip_start_dirreq(TO_CONN(conn)->dirreq_id, dlen, act, + if (conn->dirreq_id) + geoip_start_dirreq(conn->dirreq_id, dlen, act, DIRREQ_TUNNELED); else geoip_start_dirreq(TO_CONN(conn)->global_identifier, dlen, act, @@ -3529,8 +3529,8 @@ connection_dir_finished_flushing(dir_connection_t *conn) /* Note that we have finished writing the directory response. For direct * connections this means we're done, for tunneled connections its only * an intermediate step. */ - if (TO_CONN(conn)->dirreq_id) - geoip_change_dirreq_state(TO_CONN(conn)->dirreq_id, DIRREQ_TUNNELED, + if (conn->dirreq_id) + geoip_change_dirreq_state(conn->dirreq_id, DIRREQ_TUNNELED, DIRREQ_FLUSHING_DIR_CONN_FINISHED); else geoip_change_dirreq_state(TO_CONN(conn)->global_identifier, |