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

Use dirreq_id from channel_t when appropriate

Browse Source
This commit is contained in:
Andrea Shepard 2012-09-04 00:33:16 -07:00 committed by Andrea Shepard
parent 8b14db9628
commit 28f108bcce
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/channel.h
View File

@ -38,11 +38,6 @@ struct channel_s {
*/ */
unsigned int is_listener:1; unsigned int is_listener:1;
/** Unique ID for measuring direct network status requests;vtunneled ones
* come over a circuit_t, which has a dirreq_id field as well, but is a
* distinct namespace. */
uint64_t dirreq_id;
/** Why did we close? /** Why did we close?
*/ */
enum { enum {

4
src/or/connection_edge.c
View File

@ -3124,7 +3124,7 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ)
/* Remember the tunneled request ID in the new edge connection, so that /* Remember the tunneled request ID in the new edge connection, so that
* we can measure download times. */ * we can measure download times. */
TO_CONN(n_stream)->dirreq_id = circ->dirreq_id; n_stream->dirreq_id = circ->dirreq_id;
n_stream->_base.purpose = EXIT_PURPOSE_CONNECT; n_stream->_base.purpose = EXIT_PURPOSE_CONNECT;
@ -3366,7 +3366,7 @@ connection_exit_connect_dir(edge_connection_t *exitconn)
/* Note that the new dir conn belongs to the same tunneled request as /* Note that the new dir conn belongs to the same tunneled request as
* the edge conn, so that we can measure download times. */ * the edge conn, so that we can measure download times. */
TO_CONN(dirconn)->dirreq_id = TO_CONN(exitconn)->dirreq_id; dirconn->dirreq_id = exitconn->dirreq_id;
connection_link_connections(TO_CONN(dirconn), TO_CONN(exitconn)); connection_link_connections(TO_CONN(dirconn), TO_CONN(exitconn));

8
src/or/directory.c
View File

@ -2855,8 +2855,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
geoip_note_ns_response(act, GEOIP_SUCCESS); geoip_note_ns_response(act, GEOIP_SUCCESS);
/* Note that a request for a network status has started, so that we /* Note that a request for a network status has started, so that we
* can measure the download time later on. */ * can measure the download time later on. */
if (TO_CONN(conn)->dirreq_id) if (conn->dirreq_id)
geoip_start_dirreq(TO_CONN(conn)->dirreq_id, dlen, act, geoip_start_dirreq(conn->dirreq_id, dlen, act,
DIRREQ_TUNNELED); DIRREQ_TUNNELED);
else else
geoip_start_dirreq(TO_CONN(conn)->global_identifier, dlen, act, 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 /* Note that we have finished writing the directory response. For direct
* connections this means we're done, for tunneled connections its only * connections this means we're done, for tunneled connections its only
* an intermediate step. */ * an intermediate step. */
if (TO_CONN(conn)->dirreq_id) if (conn->dirreq_id)
geoip_change_dirreq_state(TO_CONN(conn)->dirreq_id, DIRREQ_TUNNELED, geoip_change_dirreq_state(conn->dirreq_id, DIRREQ_TUNNELED,
DIRREQ_FLUSHING_DIR_CONN_FINISHED); DIRREQ_FLUSHING_DIR_CONN_FINISHED);
else else
geoip_change_dirreq_state(TO_CONN(conn)->global_identifier, geoip_change_dirreq_state(TO_CONN(conn)->global_identifier,

6
src/or/geoip.c
View File

@ -578,7 +578,7 @@ _c_hist_compare(const void **_a, const void **_b)
* failed, the others as still running. */ * failed, the others as still running. */
#define DIRREQ_TIMEOUT (10*60) #define DIRREQ_TIMEOUT (10*60)
/** Entry in a map from either conn->global_identifier for direct requests /** Entry in a map from either chan->global_identifier for direct requests
* or a unique circuit identifier for tunneled requests to request time, * or a unique circuit identifier for tunneled requests to request time,
* response size, and completion time of a network status request. Used to * response size, and completion time of a network status request. Used to
* measure download times of requests to derive average client * measure download times of requests to derive average client
@ -586,7 +586,7 @@ _c_hist_compare(const void **_a, const void **_b)
typedef struct dirreq_map_entry_t { typedef struct dirreq_map_entry_t {
HT_ENTRY(dirreq_map_entry_t) node; HT_ENTRY(dirreq_map_entry_t) node;
/** Unique identifier for this network status request; this is either the /** Unique identifier for this network status request; this is either the
* conn->global_identifier of the dir conn (direct request) or a new * chan->global_identifier of the dir channel (direct request) or a new
* locally unique identifier of a circuit (tunneled request). This ID is * locally unique identifier of a circuit (tunneled request). This ID is
* only unique among other direct or tunneled requests, respectively. */ * only unique among other direct or tunneled requests, respectively. */
uint64_t dirreq_id; uint64_t dirreq_id;
@ -705,7 +705,7 @@ geoip_change_dirreq_state(uint64_t dirreq_id, dirreq_type_t type,
if ((type == DIRREQ_DIRECT && if ((type == DIRREQ_DIRECT &&
new_state == DIRREQ_FLUSHING_DIR_CONN_FINISHED) || new_state == DIRREQ_FLUSHING_DIR_CONN_FINISHED) ||
(type == DIRREQ_TUNNELED && (type == DIRREQ_TUNNELED &&
new_state == DIRREQ_OR_CONN_BUFFER_FLUSHED)) { new_state == DIRREQ_CHANNEL_BUFFER_FLUSHED)) {
tor_gettimeofday(&ent->completion_time); tor_gettimeofday(&ent->completion_time);
ent->completed = 1; ent->completed = 1;
} }