diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-07-04 20:25:17 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-07-04 20:25:17 +0000 |
| commit | 98c6bf619261026439bdd4dd9ba95113d77ac641 (patch) | |
| tree | 8c9b809030fe00c42bb43a13662c0c537b068d96 | |
| parent | 4fc7426b938c7840456604d6010552340f59ce2d (diff) | |
| download | tor-98c6bf619261026439bdd4dd9ba95113d77ac641.tar tor-98c6bf619261026439bdd4dd9ba95113d77ac641.tar.gz | |
oops, we were ignoring options->ExcludeNodes when picking entry guards.
it is still the case that we ignore it with respect to entry guards
that we've already picked.
svn:r6726
| -rw-r--r-- | src/or/circuitbuild.c | 1 | ||||
| -rw-r--r-- | src/or/config.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e6d13d667..53d9744b7 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1574,6 +1574,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) } excluded = smartlist_create(); + add_nickname_list_to_smartlist(excluded,options->ExcludeNodes,0,0,1); if (state && (r = build_state_get_exit_router(state))) { smartlist_add(excluded, r); diff --git a/src/or/config.c b/src/or/config.c index a052aa432..fcac6fff5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -808,6 +808,12 @@ options_act(or_options_t *old_options) !opt_streq(old_options->EntryNodes, options->EntryNodes))) entry_nodes_should_be_added(); + /* If the user wants to avoid certain nodes, make sure none of them + * are already entryguards */ + if (options->ExcludeNodes) { + // XXX TODO + } + /* Since our options changed, we might need to regenerate and upload our * server descriptor. */ |