Include IPv6 consensus downloads in dirreq stats.

Fixes #18460.
This commit is contained in:
Karsten Loesing 2016-03-25 20:53:36 +01:00
parent 9fc472e1a8
commit b79d8590c9
2 changed files with 5 additions and 3 deletions

4
changes/bug18460 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (statistics):
- Include consensus downloads via IPv6 in directory-request statistics.
Fixes bug 18480; bugfix on 4741aa4 in 0.2.3.14-alpha.

View File

@ -2956,10 +2956,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
} }
if (1) { if (1) {
struct in_addr in;
tor_addr_t addr; tor_addr_t addr;
if (tor_inet_aton((TO_CONN(conn))->address, &in)) { if (tor_addr_parse(&addr, (TO_CONN(conn))->address) >= 0) {
tor_addr_from_ipv4h(&addr, ntohl(in.s_addr));
geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS,
&addr, NULL, &addr, NULL,
time(NULL)); time(NULL));