commit 848333c6d6d65775cb787755577c4b24ae512389 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 22 14:36:30 2012 -0400

Fix more madness from the split_circuitbuild merge --- src/or/circuitbuild.c | 6 ++++-- src/or/circuitbuild.h | 4 ++++ src/or/entrynodes.c | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 5e85b3e..1fb93bb 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -993,7 +993,8 @@ pathbias_get_notice_rate(const or_options_t *options) DFLT_PATH_BIAS_NOTICE_PCT, 0, 100)/100.0; }

-static double +/* XXXX024 I'd like to have this be static again, but entrynodes.c needs it. */ +double pathbias_get_disable_rate(const or_options_t *options) { // XXX: This needs tuning based on use + experimentation before we set it @@ -2152,7 +2153,8 @@ choose_good_middle_server(uint8_t purpose, * If <b>state</b> is NULL, we're choosing a router to serve as an entry * guard, not for any particular circuit. */ -static const node_t * +/* XXXX024 I'd like to have this be static again, but entrynodes.c needs it. */ +const node_t * choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) { const node_t *choice; diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index a1d4072..78575af 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -51,5 +51,9 @@ void extend_info_free(extend_info_t *info); const node_t *build_state_get_exit_node(cpath_build_state_t *state); const char *build_state_get_exit_nickname(cpath_build_state_t *state);

+const node_t *choose_good_entry_server(uint8_t purpose, + cpath_build_state_t *state); +double pathbias_get_disable_rate(const or_options_t *options); + #endif

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index a9651d8..edb26dc 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -13,13 +13,16 @@ **/

#include "or.h" -#include "circuitbuild.c" +#include "circuitbuild.h" +#include "circuitstats.h" #include "config.h" +#include "confparse.h" #include "connection.h" #include "connection_or.h" #include "control.h" #include "directory.h" #include "entrynodes.h" +#include "main.h" #include "nodelist.h" #include "policies.h" #include "router.h"