mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Fix more madness from the split_circuitbuild merge

Browse source
This commit is contained in:
Nick Mathewson 2012-10-22 14:36:30 -04:00
parent fa6a65756f
commit 848333c6d6
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/or/circuitbuild.c
View file

@ -993,7 +993,8 @@ pathbias_get_notice_rate(const or_options_t *options)
DFLT_PATH_BIAS_NOTICE_PCT, 0, 100)/100.0; 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) pathbias_get_disable_rate(const or_options_t *options)
{ {
// XXX: This needs tuning based on use + experimentation before we set it // 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 * If <b>state</b> is NULL, we're choosing a router to serve as an entry
* guard, not for any particular circuit. * 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) choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state)
{ {
const node_t *choice; const node_t *choice;

4
src/or/circuitbuild.h
View file

@ -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 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 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 #endif

5
src/or/entrynodes.c
View file

@ -13,13 +13,16 @@
**/ **/
#include "or.h" #include "or.h"
#include "circuitbuild.c" #include "circuitbuild.h"
#include "circuitstats.h"
#include "config.h" #include "config.h"
#include "confparse.h"
#include "connection.h" #include "connection.h"
#include "connection_or.h" #include "connection_or.h"
#include "control.h" #include "control.h"
#include "directory.h" #include "directory.h"
#include "entrynodes.h" #include "entrynodes.h"
#include "main.h"
#include "nodelist.h" #include "nodelist.h"
#include "policies.h" #include "policies.h"
#include "router.h" #include "router.h"