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

Roger notes that address and addr are two different things.

Browse Source
This commit is contained in:
Karsten Loesing 2012-02-09 15:54:00 +01:00
parent cc94a48ff4
commit 4741aa48a2
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/or/directory.c
View File

@ -2843,16 +2843,23 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
goto done;
}
geoip_note_client_seen(act, &TO_CONN(conn)->addr, time(NULL));
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,
DIRREQ_TUNNELED);
else
geoip_start_dirreq(TO_CONN(conn)->global_identifier, dlen, act,
DIRREQ_DIRECT);
{
struct in_addr in;
tor_addr_t addr;
if (tor_inet_aton((TO_CONN(conn))->address, &in)) {
tor_addr_from_ipv4h(&addr, ntohl(in.s_addr));
geoip_note_client_seen(act, &addr, time(NULL));
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,
DIRREQ_TUNNELED);
else
geoip_start_dirreq(TO_CONN(conn)->global_identifier, dlen, act,
DIRREQ_DIRECT);
}
}
// note_request(request_type,dlen);
(void) request_type;