summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-12-30 04:08:45 +0000
committerNick Mathewson <nickm@torproject.org>2008-12-30 04:08:45 +0000
commitffe22fab9b81f4b0dea35bc2fb756d4a60cf3ed3 (patch)
tree146cae7b3779dfda8690a561faddaa036b9e23be
parentc190842a343b2fad1981e6c009110fc24d46c51c (diff)
downloadtor-ffe22fab9b81f4b0dea35bc2fb756d4a60cf3ed3.tar.gz
tor-ffe22fab9b81f4b0dea35bc2fb756d4a60cf3ed3.zip
Indeed, arma was right. There was one ntohl too many in debug_ntop in eventdns.c
svn:r17826
-rw-r--r--ChangeLog1
-rw-r--r--src/or/eventdns.c4
2 files changed, 2 insertions, 3 deletions
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. */