[tor-commits] [tor/release-0.2.8] Include IPv6 consensus downloads in dirreq stats.

[nickm at torproject.org]

commit b79d8590c914c394e3edb3bfab5a39fc649fe071
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Fri Mar 25 20:53:36 2016 +0100

    Include IPv6 consensus downloads in dirreq stats.
    
    Fixes #18460.
---
 changes/bug18460   | 4 ++++
 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 0000000..457e5df
--- /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 e4feda4..b269a3f 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2956,10 +2956,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));