Make reachabiity test in dirserv.c use channel_t

This commit is contained in:
Andrea Shepard 2012-08-25 15:27:50 -07:00 committed by Andrea Shepard
parent e136f7ccb4
commit 35924435d2

View File

@ -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);
}
}