From 3031def7268ce0cc6f3ab015c0df382295494bb9 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Thu, 29 Mar 2012 16:45:25 -0400 Subject: checking "same addr/port but with nonmatching keys" is obsolete Specifically, I believe it dates back to when extend cells had address:port but no digest in them. The special edge case is certainly not worth the complexity these days. --- src/or/dirserv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/or/dirserv.c') diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 467129c728..dfecbc8a09 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3271,16 +3271,11 @@ dirserv_orconn_tls_done(const char *address, uint16_t or_port, const char *digest_rcvd) { - routerinfo_t *ri = NULL; + routerinfo_t *ri = router_get_mutable_by_digest(digest_rcvd); time_t now = time(NULL); tor_assert(address); tor_assert(digest_rcvd); - /* FFFF Maybe we should reinstate the code that dumps routers with the same - * addr/port but with nonmatching keys, but instead of dumping, we should - * skip testing. */ - - ri = router_get_mutable_by_digest(digest_rcvd); if (ri == NULL) return; -- cgit v1.2.3-54-g00ecf