summaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@persephoneslair.org>2012-08-25 15:27:50 -0700
committerAndrea Shepard <andrea@torproject.org>2012-10-08 03:06:07 -0700
commit35924435d22c2469ecbe06156c8069a928859d63 (patch)
treeafe97e182a41e5e698ef037dfa5bf0fc7bc460c5 /src/or/dirserv.c
parente136f7ccb4e671e33b6c92a48df819082291f5c1 (diff)
downloadtor-35924435d22c2469ecbe06156c8069a928859d63.tar.gz
tor-35924435d22c2469ecbe06156c8069a928859d63.zip
Make reachabiity test in dirserv.c use channel_t
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 0d98324bfd..1480cb60dd 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -8,6 +8,8 @@
#include "buffers.h"
#include "config.h"
#include "confparse.h"
+#include "channel.h"
+#include "channeltls.h"
#include "connection.h"
#include "connection_or.h"
#include "control.h"
@@ -3410,8 +3412,8 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router)
log_debug(LD_OR,"Testing reachability of %s at %s:%u.",
router->nickname, router->address, router->or_port);
tor_addr_from_ipv4h(&router_addr, router->addr);
- connection_or_connect(&router_addr, router->or_port,
- router->cache_info.identity_digest);
+ channel_tls_connect(&router_addr, router->or_port,
+ router->cache_info.identity_digest);
/* Possible IPv6. */
if (get_options()->AuthDirHasIPv6Connectivity == 1 &&
@@ -3421,8 +3423,8 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router)
router->nickname,
tor_addr_to_str(addrstr, &router->ipv6_addr, sizeof(addrstr), 1),
router->ipv6_orport);
- connection_or_connect(&router->ipv6_addr, router->ipv6_orport,
- router->cache_info.identity_digest);
+ channel_tls_connect(&router->ipv6_addr, router->ipv6_orport,
+ router->cache_info.identity_digest);
}
}