nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert part of that last change

Browse Source 
time for bed


svn:r840
This commit is contained in:
Roger Dingledine 2003-11-18 10:38:13 +00:00
parent c00953d2a1
commit a6595f4579
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/connection_or.c
View File

@ -224,6 +224,11 @@ static int connection_tls_finish_handshake(connection_t *conn) {
} }
log_fn(LOG_DEBUG,"The router's pk matches the one we meant to connect to. Good."); log_fn(LOG_DEBUG,"The router's pk matches the one we meant to connect to. Good.");
} else { } else {
if(connection_exact_get_by_addr_port(router->addr,router->or_port)) {
log_fn(LOG_INFO,"Router %s is already connected. Dropping.", router->nickname);
crypto_free_pk_env(pk);
return -1;
}
connection_or_init_conn_from_router(conn, router); connection_or_init_conn_from_router(conn, router);
} }
crypto_free_pk_env(pk); crypto_free_pk_env(pk);
@ -232,11 +237,6 @@ static int connection_tls_finish_handshake(connection_t *conn) {
nickname, conn->nickname); nickname, conn->nickname);
return -1; return -1;
} }
otherconn = connection_exact_get_by_addr_port(router->addr,router->or_port);
if(otherconn && connection_state_is_open(otherconn)) {
log_fn(LOG_INFO,"Router %s is already connected. Dropping.", router->nickname);
return -1;
}
if (!options.OnionRouter) { /* If I'm an OP... */ if (!options.OnionRouter) { /* If I'm an OP... */
conn->receiver_bucket = conn->bandwidth = DEFAULT_BANDWIDTH_OP; conn->receiver_bucket = conn->bandwidth = DEFAULT_BANDWIDTH_OP;
circuit_n_conn_open(conn); /* send the pending creates, if any. */ circuit_n_conn_open(conn); /* send the pending creates, if any. */