nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

formatting cleanups

Browse Source 
svn:r11273
This commit is contained in:
Roger Dingledine 2007-08-25 21:31:34 +00:00
parent df98447be5
commit da1485088c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4,6 +4,8 @@ Changes in version 0.2.0.6-alpha - 2007-??-??
mean-times-between-failures. When we have 4 or more days of data, mean-times-between-failures. When we have 4 or more days of data,
use measured MTBF rather than declared uptime to decide whether use measured MTBF rather than declared uptime to decide whether
to call a router Stable. Implements proposal 108. to call a router Stable. Implements proposal 108.
o Major bugfixes (load balancing):
- When choosing nodes for non-guard positions, weight guards - When choosing nodes for non-guard positions, weight guards
proportionally less, since they already have enough load. Patch proportionally less, since they already have enough load. Patch
from Mike Perry. from Mike Perry.

6
src/or/config.c
View File

@ -4359,9 +4359,9 @@ or_state_validate(or_state_t *old_state, or_state_t *state,
"file. Proceeding anyway.", state->TorVersion); "file. Proceeding anyway.", state->TorVersion);
} else { /* take action based on v */ } else { /* take action based on v */
if ((tor_version_as_new_as(state->TorVersion, "0.1.1.10-alpha") && if ((tor_version_as_new_as(state->TorVersion, "0.1.1.10-alpha") &&
!tor_version_as_new_as(state->TorVersion, "0.1.2.16-dev")) !tor_version_as_new_as(state->TorVersion, "0.1.2.16-dev")) ||
|| (tor_version_as_new_as(state->TorVersion, "0.2.0.0-alpha") && (tor_version_as_new_as(state->TorVersion, "0.2.0.0-alpha") &&
!tor_version_as_new_as(state->TorVersion, "0.2.0.6-alpha"))) { !tor_version_as_new_as(state->TorVersion, "0.2.0.6-alpha"))) {
log_notice(LD_CONFIG, "Detected state file from old version '%s'. " log_notice(LD_CONFIG, "Detected state file from old version '%s'. "
"Choosing new entry guards for you.", "Choosing new entry guards for you.",
state->TorVersion); state->TorVersion);

2
src/or/routerlist.c
View File

@ -1320,7 +1320,7 @@ smartlist_choose_by_bandwidth(smartlist_t *sl, bandwidth_weight_rule_t rule,
/* First count the total bandwidth weight, and make a list /* First count the total bandwidth weight, and make a list
* of each value. <0 means "unknown; no routerinfo." We use the * of each value. <0 means "unknown; no routerinfo." We use the
* bits of negative values to remember whether the router was fast (-x)&1 * bits of negative values to remember whether the router was fast (-x)&1
* and whether it was an exit (-x)&2. Yes, it's a hack. */ * and whether it was an exit (-x)&2 or guard (-x)&4. Yes, it's a hack. */
bandwidths = tor_malloc(sizeof(int32_t)*smartlist_len(sl)); bandwidths = tor_malloc(sizeof(int32_t)*smartlist_len(sl));
exit_bits = bitarray_init_zero(smartlist_len(sl)); exit_bits = bitarray_init_zero(smartlist_len(sl));
guard_bits = bitarray_init_zero(smartlist_len(sl)); guard_bits = bitarray_init_zero(smartlist_len(sl));