aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-03-29 19:57:50 +0000
committerRoger Dingledine <arma@torproject.org>2004-03-29 19:57:50 +0000
commit7118c6177d2bdcb9950a9ff991e422ffc6baff72 (patch)
tree6c4c7b096e1d6dc8709bb3bd22b4b5b31e9b6bc3
parent155c777a84e7059ac25084a45d5358811ba1ae5e (diff)
downloadtor-7118c6177d2bdcb9950a9ff991e422ffc6baff72.tar
tor-7118c6177d2bdcb9950a9ff991e422ffc6baff72.tar.gz
clean up a few more bugs
svn:r1365
-rw-r--r--src/or/dns.c2
-rw-r--r--src/or/test.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/or/dns.c b/src/or/dns.c
index abf08df79..4c4ea7a66 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -10,6 +10,8 @@
#include "or.h"
#include "tree.h"
+extern or_options_t options; /* command-line and config-file options */
+
#define MAX_ADDRESSLEN 256
#define MAX_DNSWORKERS 50
diff --git a/src/or/test.c b/src/or/test.c
index 1e8f51833..d992c0268 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -15,6 +15,8 @@
#include "or.h"
#include "../common/test.h"
+extern or_options_t options;
+
int have_failed = 0;
/* These functions are file-local, but are exposed so we can test. */
@@ -760,7 +762,6 @@ test_dir_format()
test_assert(router_dump_router_to_string(buf, 2048, &r2, pk1)>0);
cp = buf;
test_eq(dirserv_add_descriptor((const char**)&cp), 1);
- extern or_options_t options;
options.Nickname = "DirServer";
test_assert(!dirserv_dump_directory_to_string(buf,8192,pk3));
cp = buf;