r8879@Kushana: nickm | 2006-09-21 17:20:31 -0400

Oops from earlier patch; add "opt eventdns" to unittests, fix bug in routerdesc generation.


svn:r8444

src/or/router.c

@@ -1149,13 +1149,13 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
                     "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,

src/or/test.c

@@ -1357,6 +1357,11 @@ test_dir_format(void)
   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