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

bugfix: tor-resolve requests were ignoring .exit if there was

Browse Source 
a working circuit they could use instead.


svn:r3502
This commit is contained in:
Roger Dingledine 2005-02-02 06:26:52 +00:00
parent cbb1b33fb5
commit c1656f41b4
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/or/circuituse.c
View File

@ -85,17 +85,15 @@ static int circuit_is_acceptable(circuit_t *circ,
conn->socks_request->port))
return 0;
if (conn->socks_request->command == SOCKS_COMMAND_CONNECT) {
if (purpose == CIRCUIT_PURPOSE_C_GENERAL) {
if (!connection_ap_can_use_exit(conn, exitrouter)) {
/* can't exit from this router */
return 0;
}
} else { /* not general */
if (rend_cmp_service_ids(conn->rend_query, circ->rend_query)) {
/* this circ is not for this conn */
return 0;
}
if (purpose == CIRCUIT_PURPOSE_C_GENERAL) {
if (!connection_ap_can_use_exit(conn, exitrouter)) {
/* can't exit from this router */
return 0;
}
} else { /* not general */
if (rend_cmp_service_ids(conn->rend_query, circ->rend_query)) {
/* this circ is not for this conn */
return 0;
}
}
return 1;
@ -958,10 +956,12 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
link_apconn_to_circ(conn, circ);
tor_assert(conn->socks_request);
if (conn->socks_request->command == SOCKS_COMMAND_CONNECT)
if (conn->socks_request->command == SOCKS_COMMAND_CONNECT) {
// consider_recording_trackhost(conn, circ);
connection_ap_handshake_send_begin(conn, circ);
else
} else {
connection_ap_handshake_send_resolve(conn, circ);
}
return 1;
} else { /* we're a rendezvous conn */