diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-09-21 21:49:03 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-09-21 21:49:03 +0000 |
| commit | adade79f68a1eda3a7b8d3d369afd3e8425484a1 (patch) | |
| tree | d7400fdfa487c85ed9721416651a8a2d7b661936 /src | |
| parent | 7c21dabef12cdce4c5b0d09127ccd55d1aecd733 (diff) | |
| download | tor-adade79f68a1eda3a7b8d3d369afd3e8425484a1.tar.gz tor-adade79f68a1eda3a7b8d3d369afd3e8425484a1.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/router.c | 4 | ||||
| -rw-r--r-- | src/or/test.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c index 65f34c19c7..1f132607f7 100644 --- a/src/or/router.c +++ b/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, diff --git a/src/or/test.c b/src/or/test.c index 536927639a..4f9d79ccf5 100644 --- a/src/or/test.c +++ b/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 |