Indeed, arma was right. There was one ntohl too many in debug_ntop in eventdns.c

svn:r17826

diff --git a/ChangeLog b/ChangeLog
index ccaa3b4cec56b4be97b1e5b016ab23207dc4c201..76c0ae26dc07036bd344146909beafb7261d81b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ Changes in version 0.2.1.10-alpha - 2009-01-??
       it easier to cannibalize circuits like this later.
     - Authorities now list vote for the Stable flag for any router whose
       weighted MTBF is at least 5 days, regardless of the mean MTBF.
+    - Stop logging nameserver addresses in reverse order.
 
   o Code simplifications and refactoring:
     - Change our header file guard macros to be less likely to conflict

diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index 7e2f037f1a73d4b39b70972dd5b919abac236767..3ecc795ed8ef7e79a90784d67ce471a2ddee66e4 100644 (file)
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -402,9 +402,7 @@ debug_ntop(const struct sockaddr *sa)
 {
        if (sa->sa_family == AF_INET) {
                struct sockaddr_in *sin = (struct sockaddr_in *) sa;
-               return debug_ntoa(ntohl(sin->sin_addr.s_addr));
-               /* XXX021 Nick: the above does ntoa of ntohl. This is
-                * probably one to-host too many. -RD */
+               return debug_ntoa(sin->sin_addr.s_addr);
        }
        if (sa->sa_family == AF_INET6) {
                /* Tor-specific.  In libevent, add more check code. */