From: Nick Mathewson Date: Tue, 30 Dec 2008 04:08:45 +0000 (+0000) Subject: Indeed, arma was right. There was one ntohl too many in debug_ntop in eventdns.c X-Git-Tag: tor-0.2.1.10-alpha~41 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffe22fab9b81f4b0dea35bc2fb756d4a60cf3ed3;p=thirdparty%2Ftor.git 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 ccaa3b4cec..76c0ae26dc 100644 --- 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 7e2f037f1a..3ecc795ed8 100644 --- 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. */