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

Launch intro services after launching connections; allow ORs to build circuits through as-yet-unconnectd ORs

Browse Source 
svn:r1562
This commit is contained in:
Nick Mathewson
2004-04-08 03:53:39 +00:00
parent fe73ae795e
commit 8cb30357e7
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/or/circuit.c
-5
View File
@@ -1268,11 +1268,6 @@ static circuit_t *circuit_establish_circuit(uint8_t purpose,
if(!n_conn || n_conn->state != OR_CONN_STATE_OPEN) { /* not currently connected */
circ->n_addr = firsthop->addr;
circ->n_port = firsthop->or_port;
if(options.ORPort) { /* we would be connected if he were up. and he's not. */
log_fn(LOG_INFO,"Route's firsthop isn't connected.");
circuit_mark_for_close(circ);
return NULL;
}
if(!n_conn) { /* launch the connection */
n_conn = connection_or_connect(firsthop);
trunk/src/or/directory.c
+3 -3
View File
@@ -243,13 +243,13 @@ int connection_dir_process_inbuf(connection_t *conn) {
} else {
log_fn(LOG_INFO,"updated routers.");
}
if(options.ORPort) { /* connect to them all */
router_retry_connections();
}
if (has_fetched_directory==0) {
has_fetched_directory=1;
directory_has_arrived(); /* do things we've been waiting to do */
}
if(options.ORPort) { /* connect to them all */
router_retry_connections();
}
}
if(conn->purpose == DIR_PURPOSE_UPLOAD_DIR) {