nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

simplify further

Browse Source
This commit is contained in:
Roger Dingledine 2012-03-29 16:37:50 -04:00
parent 20eb38a588
commit 5cb82e44d1
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/connection_or.c
View File

@ -1453,7 +1453,6 @@ int
connection_or_client_learned_peer_id(or_connection_t *conn, connection_or_client_learned_peer_id(or_connection_t *conn,
const uint8_t *peer_id) const uint8_t *peer_id)
{ {
int as_expected = 1;
const or_options_t *options = get_options(); const or_options_t *options = get_options();
int severity = server_mode(options) ? LOG_PROTOCOL_WARN : LOG_WARN; int severity = server_mode(options) ? LOG_PROTOCOL_WARN : LOG_WARN;
@ -1492,14 +1491,12 @@ connection_or_client_learned_peer_id(or_connection_t *conn,
control_event_bootstrap_problem( control_event_bootstrap_problem(
"Unexpected identity in router certificate", "Unexpected identity in router certificate",
END_OR_CONN_REASON_OR_IDENTITY); END_OR_CONN_REASON_OR_IDENTITY);
as_expected = 0; return -1;
} }
if (authdir_mode_tests_reachability(options)) { if (authdir_mode_tests_reachability(options)) {
dirserv_orconn_tls_done(conn->_base.address, conn->_base.port, dirserv_orconn_tls_done(conn->_base.address, conn->_base.port,
(const char*)peer_id, as_expected); (const char*)peer_id);
} }
if (!as_expected)
return -1;
return 0; return 0;
} }

9
src/or/dirserv.c
View File

@ -3264,14 +3264,12 @@ dirserv_get_routerdescs(smartlist_t *descs_out, const char *key,
* router listening at <b>address</b>:<b>or_port</b>, and has yielded * router listening at <b>address</b>:<b>or_port</b>, and has yielded
* a certificate with digest <b>digest_rcvd</b>. * a certificate with digest <b>digest_rcvd</b>.
* *
* If as_advertised is 1, then inform the reachability checker that we * Inform the reachability checker that we could get to this guy.
* could get to this guy.
*/ */
void void
dirserv_orconn_tls_done(const char *address, dirserv_orconn_tls_done(const char *address,
uint16_t or_port, uint16_t or_port,
const char *digest_rcvd, const char *digest_rcvd)
int as_advertised)
{ {
routerinfo_t *ri = NULL; routerinfo_t *ri = NULL;
time_t now = time(NULL); time_t now = time(NULL);
@ -3282,9 +3280,6 @@ dirserv_orconn_tls_done(const char *address,
* addr/port but with nonmatching keys, but instead of dumping, we should * addr/port but with nonmatching keys, but instead of dumping, we should
* skip testing. */ * skip testing. */
if (!as_advertised)
return;
ri = router_get_mutable_by_digest(digest_rcvd); ri = router_get_mutable_by_digest(digest_rcvd);
if (ri == NULL) if (ri == NULL)
return; return;

3
src/or/dirserv.h
View File

@ -108,8 +108,7 @@ int dirserv_get_routerdescs(smartlist_t *descs_out, const char *key,
const char **msg); const char **msg);
void dirserv_orconn_tls_done(const char *address, void dirserv_orconn_tls_done(const char *address,
uint16_t or_port, uint16_t or_port,
const char *digest_rcvd, const char *digest_rcvd);
int as_advertised);
int dirserv_should_launch_reachability_test(const routerinfo_t *ri, int dirserv_should_launch_reachability_test(const routerinfo_t *ri,
const routerinfo_t *ri_old); const routerinfo_t *ri_old);
void dirserv_single_reachability_test(time_t now, routerinfo_t *router); void dirserv_single_reachability_test(time_t now, routerinfo_t *router);