diff options
| author | George Kadianakis <desnacked@riseup.net> | 2019-04-30 19:13:30 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2019-04-30 19:13:30 +0300 |
| commit | 86f8dfe41955175c9125b699320bd28a07faae6a (patch) | |
| tree | ac833875d6d1ebf52eb1cc55bdc5dd852d4adb28 /src/core | |
| parent | 43c119fedbdf599241cd2e3e4292ae5fd55d527c (diff) | |
| parent | 806539b40a18dec15e1d3d108eb5aec9d9f3ca40 (diff) | |
| download | tor-86f8dfe41955175c9125b699320bd28a07faae6a.tar.gz tor-86f8dfe41955175c9125b699320bd28a07faae6a.zip | |
Merge branch 'tor-github/pr/983'
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/or/circuitbuild.c | 5 | ||||
| -rw-r--r-- | src/core/or/circuitbuild.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index f8e87bf026..cfe0a97bcf 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1683,7 +1683,8 @@ route_len_for_purpose(uint8_t purpose, extend_info_t *exit_ei) * to handle the desired path length, return -1. */ STATIC int -new_route_len(uint8_t purpose, extend_info_t *exit_ei, smartlist_t *nodes) +new_route_len(uint8_t purpose, extend_info_t *exit_ei, + const smartlist_t *nodes) { int routelen; @@ -2345,7 +2346,7 @@ circuit_extend_to_new_exit(origin_circuit_t *circ, extend_info_t *exit_ei) * particular router. See bug #25885.) */ MOCK_IMPL(STATIC int, -count_acceptable_nodes, (smartlist_t *nodes, int direct)) +count_acceptable_nodes, (const smartlist_t *nodes, int direct)) { int num=0; diff --git a/src/core/or/circuitbuild.h b/src/core/or/circuitbuild.h index b19bc41235..b45bc816a3 100644 --- a/src/core/or/circuitbuild.h +++ b/src/core/or/circuitbuild.h @@ -83,8 +83,8 @@ void circuit_upgrade_circuits_from_guard_wait(void); #ifdef CIRCUITBUILD_PRIVATE STATIC circid_t get_unique_circ_id_by_chan(channel_t *chan); STATIC int new_route_len(uint8_t purpose, extend_info_t *exit_ei, - smartlist_t *nodes); -MOCK_DECL(STATIC int, count_acceptable_nodes, (smartlist_t *nodes, + const smartlist_t *nodes); +MOCK_DECL(STATIC int, count_acceptable_nodes, (const smartlist_t *nodes, int direct)); STATIC int onion_extend_cpath(origin_circuit_t *circ); |