nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

if they ask for exactly one entrynode, don't pick it as an exitnode.

Browse Source 
also, fix part of the zero-identity-router-in-stats bug


svn:r2252
This commit is contained in:
Roger Dingledine 2004-08-17 07:09:02 +00:00
parent 9e5fc55564
commit 2d8a1f208a
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/or/circuitbuild.c
View File

@ -798,9 +798,12 @@ static routerinfo_t *choose_good_exit_server_general(routerlist_t *dir)
int n_connections; int n_connections;
int best_support = -1; int best_support = -1;
int n_best_support=0; int n_best_support=0;
smartlist_t *sl, *preferredexits, *excludedexits; smartlist_t *sl, *preferredexits, *preferredentries, *excludedexits;
routerinfo_t *router; routerinfo_t *router;
preferredentries = smartlist_create();
add_nickname_list_to_smartlist(preferredentries,options.EntryNodes);
get_connection_array(&carray, &n_connections); get_connection_array(&carray, &n_connections);
/* Count how many connections are waiting for a circuit to be built. /* Count how many connections are waiting for a circuit to be built.
@ -850,6 +853,12 @@ static routerinfo_t *choose_good_exit_server_general(routerlist_t *dir)
router->nickname, i); router->nickname, i);
continue; /* skip routers that reject all */ continue; /* skip routers that reject all */
} }
if(smartlist_len(preferredentries)==1 &&
router == (routerinfo_t*)smartlist_get(preferredentries, 0)) {
n_supported[i] = -1;
log_fn(LOG_DEBUG,"Skipping node %s (index %d) -- it's our only preferred entry node.", router->nickname, i);
continue;
}
n_supported[i] = 0; n_supported[i] = 0;
for (j = 0; j < n_connections; ++j) { /* iterate over connections */ for (j = 0; j < n_connections; ++j) { /* iterate over connections */
if (carray[j]->type != CONN_TYPE_AP || if (carray[j]->type != CONN_TYPE_AP ||
@ -917,6 +926,7 @@ static routerinfo_t *choose_good_exit_server_general(routerlist_t *dir)
} }
smartlist_free(preferredexits); smartlist_free(preferredexits);
smartlist_free(preferredentries);
smartlist_free(excludedexits); smartlist_free(excludedexits);
smartlist_free(sl); smartlist_free(sl);
tor_free(n_supported); tor_free(n_supported);
@ -943,7 +953,6 @@ static routerinfo_t *choose_good_exit_server_general(routerlist_t *dir)
static routerinfo_t *choose_good_exit_server(uint8_t purpose, routerlist_t *dir) static routerinfo_t *choose_good_exit_server(uint8_t purpose, routerlist_t *dir)
{ {
routerinfo_t *r; routerinfo_t *r;
/* XXX one day, consider picking chosen_exit knowing what's in EntryNodes */
switch(purpose) { switch(purpose) {
case CIRCUIT_PURPOSE_C_GENERAL: case CIRCUIT_PURPOSE_C_GENERAL:
return choose_good_exit_server_general(dir); return choose_good_exit_server_general(dir);

2
src/or/connection.c
View File

@ -199,7 +199,7 @@ void connection_about_to_close_connection(connection_t *conn)
rep_hist_note_connect_failed(conn->identity_digest, time(NULL)); rep_hist_note_connect_failed(conn->identity_digest, time(NULL));
} else if (0) { // XXX reason == CLOSE_REASON_UNUSED_OR_CONN) { } else if (0) { // XXX reason == CLOSE_REASON_UNUSED_OR_CONN) {
rep_hist_note_disconnect(conn->identity_digest, time(NULL)); rep_hist_note_disconnect(conn->identity_digest, time(NULL));
} else { } else if(conn->identity_digest) {
rep_hist_note_connection_died(conn->identity_digest, time(NULL)); rep_hist_note_connection_died(conn->identity_digest, time(NULL));
} }
break; break;