[or-cvs] r8444: Oops from earlier patch; add "opt eventdns" to unittests, fi (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2006-09-21 17:49:03 -0400 (Thu, 21 Sep 2006)
New Revision: 8444

Modified:
   tor/trunk/
   tor/trunk/src/or/router.c
   tor/trunk/src/or/test.c
Log:
 r8879@Kushana:  nickm | 2006-09-21 17:20:31 -0400
 Oops from earlier patch; add "opt eventdns" to unittests, fix bug in routerdesc generation.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/branches/eventdns [r8879] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2006-09-21 21:48:55 UTC (rev 8443)
+++ tor/trunk/src/or/router.c	2006-09-21 21:49:03 UTC (rev 8444)
@@ -1149,13 +1149,13 @@
                     "uptime %ld\n"
                     "bandwidth %d %d %d\n"
                     "onion-key\n%s"
-                    "signing-key\n"
+                    "signing-key\n%s"
 #ifdef USE_EVENTDNS
                     "opt eventdns 1\n"
 #else
                     "opt eventdns 0\n"
 #endif
-                    "%s%s%s%s",
+                    "%s%s%s",
     router->nickname,
     router->address,
     router->or_port,

Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c	2006-09-21 21:48:55 UTC (rev 8443)
+++ tor/trunk/src/or/test.c	2006-09-21 21:49:03 UTC (rev 8444)
@@ -1357,6 +1357,11 @@
   strcat(buf2, pk1_str);
   strcat(buf2, "signing-key\n");
   strcat(buf2, pk2_str);
+#ifdef USE_EVENTDNS
+  strcat(buf2, "opt eventdns 1\n");
+#else
+  strcat(buf2, "opt eventdns 0\n");
+#endif
   strcat(buf2, bw_lines);
   strcat(buf2, "router-signature\n");
   buf[strlen(buf2)] = '\0'; /* Don't compare the sig; it's never the same