[or-cvs] r17826: {tor} Indeed, arma was right. There was one ntohl too many in debu (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-12-29 23:08:45 -0500 (Mon, 29 Dec 2008)
New Revision: 17826

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/eventdns.c
Log:
Indeed, arma was right.  There was one ntohl too many in debug_ntop in eventdns.c

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-12-30 02:36:11 UTC (rev 17825)
+++ tor/trunk/ChangeLog	2008-12-30 04:08:45 UTC (rev 17826)
@@ -25,6 +25,7 @@
       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

Modified: tor/trunk/src/or/eventdns.c
===================================================================
--- tor/trunk/src/or/eventdns.c	2008-12-30 02:36:11 UTC (rev 17825)
+++ tor/trunk/src/or/eventdns.c	2008-12-30 04:08:45 UTC (rev 17826)
@@ -402,9 +402,7 @@
 {
 	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. */