torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

expire dir connections that live for more than 5 minutes

Browse Source 
svn:r1663
This commit is contained in:
Roger Dingledine
2004-04-18 06:35:31 +00:00
parent 688e8e9bb9
commit ccdb2528a8
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/or/connection_edge.c
+3 -1
View File
@@ -757,7 +757,9 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
return connection_ap_handshake_attach_circuit(conn);
} else {
conn->state = AP_CONN_STATE_RENDDESC_WAIT;
if(!connection_get_by_type_rendquery(CONN_TYPE_DIR, conn->rend_query)) {
if(connection_get_by_type_rendquery(CONN_TYPE_DIR, conn->rend_query)) {
log_fn(LOG_INFO,"Would fetch a new renddesc here (for %s), but one is already in progress.", conn->rend_query);
} else {
/* not one already; initiate a dir rend desc lookup */
directory_initiate_command(router_pick_directory_server(),
DIR_PURPOSE_FETCH_RENDDESC,
trunk/src/or/main.c
+7
View File
@@ -306,6 +306,13 @@ static void run_connection_housekeeping(int i, time_t now) {
cell_t cell;
connection_t *conn = connection_array[i];
if(conn->type == CONN_TYPE_DIR &&
conn->timestamp_created + 5*60 > now) {
log_fn(LOG_INFO,"Expiring wedged directory conn (purpose %d)", conn->purpose);
connection_mark_for_close(conn,0);
return;
}
/* check connections to see whether we should send a keepalive, expire, or wait */
if(!connection_speaks_cells(conn))
return;