diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-04-01 08:10:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-04-01 08:10:58 -0400 |
| commit | e247093e0efba100ec6f3abdfa9d3433d51389f0 (patch) | |
| tree | a455843b1793dd710efae7603f7c787ebf09b466 | |
| parent | ba87f5bb25cd001ab8560f23a88e60a504c7059a (diff) | |
| parent | b79d8590c914c394e3edb3bfab5a39fc649fe071 (diff) | |
| download | tor-e247093e0efba100ec6f3abdfa9d3433d51389f0.tar.gz tor-e247093e0efba100ec6f3abdfa9d3433d51389f0.zip | |
Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
| -rw-r--r-- | changes/bug18460 | 4 | ||||
| -rw-r--r-- | src/or/directory.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/changes/bug18460 b/changes/bug18460 new file mode 100644 index 0000000000..457e5dfc17 --- /dev/null +++ b/changes/bug18460 @@ -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. + diff --git a/src/or/directory.c b/src/or/directory.c index 9139dbcdd5..749b3a8f74 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2960,10 +2960,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, } if (1) { - 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)); + if (tor_addr_parse(&addr, (TO_CONN(conn))->address) >= 0) { geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, NULL, time(NULL)); |