aboutsummaryrefslogtreecommitdiff
path: root/src/or/dns.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-03-29 19:51:39 +0000
committerRoger Dingledine <arma@torproject.org>2004-03-29 19:51:39 +0000
commit0edf0ea7cc9d2fabb195f105ae888e42d1351a94 (patch)
tree013b79c02602e215410c8bc86a7b14f85de860ac /src/or/dns.c
parent6a79b1cb57ac524c1085e23f32f410d79d5471d7 (diff)
downloadtor-0edf0ea7cc9d2fabb195f105ae888e42d1351a94.tar
tor-0edf0ea7cc9d2fabb195f105ae888e42d1351a94.tar.gz
make normal exit nodes less likely to crash from the conn-munging bug
but leave dirservers just as likely to crash svn:r1363
Diffstat (limited to 'src/or/dns.c')
-rw-r--r--src/or/dns.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/or/dns.c b/src/or/dns.c
index c07cba8e2..abf08df79 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -113,14 +113,15 @@ int dns_resolve(connection_t *exitconn) {
uint32_t now = time(NULL);
assert_connection_ok(exitconn, 0);
-#if 0 /* only enable this once we've found the conn-munging bug */
- /* first check if exitconn->address is an IP. If so, we already
- * know the answer. */
- if (tor_inet_aton(exitconn->address, &in) != 0) {
- exitconn->addr = ntohl(in.s_addr);
- return 1;
+ /* XXX leave disabled for dirservers so we can find the conn-munging bug */
+ if(!options.DirPort) {
+ /* first check if exitconn->address is an IP. If so, we already
+ * know the answer. */
+ if (tor_inet_aton(exitconn->address, &in) != 0) {
+ exitconn->addr = ntohl(in.s_addr);
+ return 1;
+ }
}
-#endif
/* then take this opportunity to see if there are any expired
* resolves in the tree. */