Nick Mathewson
3433216268
Merge remote-tracking branch 'public/easy_ratelim'
...
Conflicts:
src/or/connection.c
2013-02-07 17:13:51 -05:00
Nick Mathewson
ba7d93db16
Merge remote-tracking branch 'public/bug7816_023'
...
Conflicts:
src/common/util.c
2013-02-07 15:20:50 -05:00
Nick Mathewson
0061d42890
Merge remote-tracking branch 'public/bug7816_024'
2013-02-07 15:13:21 -05:00
Nick Mathewson
ad28397bbf
Merge branch 'bug7902'
2013-02-07 15:04:11 -05:00
Nick Mathewson
12c6475c06
Merge branch 'ticket8161_squashed'
2013-02-07 14:31:04 -05:00
Mike Perry
eb15be3d45
Mention a trac ticket relevant to an XXX comment.
2013-02-07 14:30:58 -05:00
Mike Perry
bbd38f293f
Better document an XXX comment about refactoring.
2013-02-07 14:30:58 -05:00
Mike Perry
b03553737c
Separate the flags for logging use bias.
...
I think we want both sets of messages to appear independently to help us know
what needs tuning.
2013-02-07 14:30:58 -05:00
Mike Perry
a99ebaf4c7
Lower path use bias thresholds.
...
I noticed bad wifi networks can have low use success rates.
2013-02-04 16:57:09 -08:00
Nick Mathewson
cd4ad45ba3
Include a flag-thresholds line in each vote to describe flag cutoffs
...
Implements ticket 8151.
2013-02-04 13:44:05 -05:00
Nick Mathewson
12f2d986f3
Merge branch 'authdir_quick_fix'
2013-02-04 12:34:14 -05:00
Nick Mathewson
b1cb9ebb1c
Merge branch 'bug8146_etc'
2013-02-04 12:34:09 -05:00
Nick Mathewson
2e9cd4b724
Quick fix on 5956 for authorities
...
Authorities don't set is_possible_guard on node_t, so they were
never deciding that they could build enough paths. This is a quick
and dirty fix.
Bug not in any released version of Tor
2013-02-04 12:25:43 -05:00
Nick Mathewson
898f2d7c27
Merge branch 'bug8153'
2013-02-04 11:54:38 -05:00
Nick Mathewson
b64dc35b5c
Reinstate some fixes/tweaks from 6e4a4002
...
These seem to have gotten conflicted out of existence while mike was
working on path bias stuff.
Thanks to sysrqb for collecting these in a handy patch.
2013-02-04 11:51:39 -05:00
Nick Mathewson
7cde094fd5
Fix a warning when building with --disable-curve25519
...
It appears that the code for 7291 gave an unused-value warning when
built with --disable-curve25519.
2013-02-04 11:34:23 -05:00
Nick Mathewson
4eff8b6530
When we mark a node as a sybil, mark it down and reset its uptime to 0
...
This prevents bug 8147, where such nodes would accrue points towards
Guard, Fast, HSDir, and so on.
Fixes bug 8147.
2013-02-04 11:11:54 -05:00
Nick Mathewson
61995d3e2c
Ignore tiny bandwidths entirely when computing thresholds
...
Another bug 8145 fix.
2013-02-04 10:47:08 -05:00
Nick Mathewson
317d16de04
Increase the minimum value for the Fast flag to 4096.
...
Fix for 8145.
2013-02-04 10:41:25 -05:00
Nick Mathewson
8be7f69f8d
Refactor should-count-towards-thresholds test into new function
2013-02-04 10:22:45 -05:00
Nick Mathewson
40c13240c0
When computing performance thresholds, ignore omitted-as-sybil nodes.
...
Fixes bug 8146.
2013-02-04 10:19:26 -05:00
Nick Mathewson
acb43c0735
Merge remote-tracking branch 'public/feature7706'
2013-02-01 17:24:08 -05:00
Nick Mathewson
c93f66b103
Merge remote-tracking branch 'public/bug7708_023_v3_squashed'
2013-02-01 17:11:46 -05:00
Nick Mathewson
690ea9e8cf
Clarify documentation of connection_finished_flushing
2013-02-01 17:10:15 -05:00
Nick Mathewson
b442930789
Fix serious breakage in connection_handle_write_impl
...
When we first implemented TLS, we assumed in conneciton_handle_write
that a TOR_TLS_WANT_WRITE from flush_buf_tls meant that nothing had
been written. But when we moved our buffers to a ring buffer
implementation back in 0.1.0.5-rc (!), we broke that invariant: it's
possible that some bytes have been written but nothing.
That's bad. It means that if we do a sequence of TLS writes that ends
with a WANTWRITE, we don't notice that we flushed any bytes, and we
don't (I think) decrement buckets.
Fixes bug 7708; bugfix on 0.1.0.5-rc
2013-02-01 17:10:15 -05:00
Nick Mathewson
996db755c2
Fix a couple of warnings on the 8081 branch.
2013-02-01 17:03:00 -05:00
Mike Perry
fed7f01377
Add EntryGuardPathUseBias to state file keyword list.
2013-02-01 17:01:26 -05:00
Mike Perry
b3e57b760e
Increment an informational counter for use failed state.
...
This informational counter is probably now redundant, but might as well keep
it consistent I guess.
2013-02-01 17:01:26 -05:00
Mike Perry
da5817772d
Rename and relocate the bw weight scale param getter.
...
It had nothing to do with circuit build times.
2013-02-01 17:01:22 -05:00
Mike Perry
6e4610de02
Fix a log typo found by sysrqb.
2013-02-01 17:01:22 -05:00
Mike Perry
95d272f5d8
Bounds-check path bias rate parameters.
...
The other remaining parameters don't really need range checks.
2013-02-01 17:01:22 -05:00
Mike Perry
bce6714f99
Refactor code that rolls back the use state
...
Also document it better.
Mention this refactoring in the comments for the path state machine.
2013-02-01 17:01:16 -05:00
Mike Perry
3a63e5ef42
Refactor and rename pathbias rate evaluation.
2013-02-01 17:01:12 -05:00
Mike Perry
dfcfb5d17d
Refactor the scaling parameter fetching into a single function.
...
Also, deprecate the torrc options for the scaling values. It's unlikely anyone
but developers will ever tweak them, even if we provided a single ratio value.
2013-02-01 17:01:12 -05:00
Mike Perry
2b2c7f23f5
Mark entry guard state dirty everwhere the pathbias code touches it.
2013-02-01 17:01:12 -05:00
Mike Perry
6828a19670
Add a tristate to guard against unexpected circ purpose transitions
2013-02-01 17:01:12 -05:00
Mike Perry
173ed05d2f
Clarify state transition and related pathbias comments
2013-02-01 17:01:12 -05:00
Nick Mathewson
ec90ed4f6d
Merge branch 'rename_log_7599'
2013-02-01 16:23:26 -05:00
Roger Dingledine
fd49226385
Help us track bug 8093:
...
Improve the log message when "Bug/attack: unexpected sendme cell
from client" occurs.
2013-02-01 16:22:34 -05:00
Nick Mathewson
7301339e33
fix wide lines from tor_log rename
2013-02-01 16:19:02 -05:00
Nick Mathewson
a141430ec3
Rename log() to tor_log() for logging
...
This is meant to avoid conflict with the built-in log() function in
math.h. It resolves ticket 7599. First reported by dhill.
This was generated with the following perl script:
#!/usr/bin/perl -w -i -p
s/\blog\(LOG_(ERR|WARN|NOTICE|INFO|DEBUG)\s*,\s*/log_\L$1\(/g;
s/\blog\(/tor_log\(/g;
2013-02-01 15:43:37 -05:00
Nick Mathewson
b0dd355891
Use %d, not %02d, for decimal percentages
...
Cosmetic tweak on 5956; not in any released tor.
2013-01-30 17:35:28 -05:00
Nick Mathewson
35daf6f602
Rename all of the macros in tor_queue.h to start with TOR_
2013-01-30 12:58:49 -05:00
Nick Mathewson
29136bd7e4
Merge branch 'bug5956_squashed'
2013-01-30 11:59:51 -05:00
Nick Mathewson
02c320916e
Parameterize FRAC_USABLE_NEEDED for fraction of circuits
...
Instead of hardcoding the minimum fraction of possible paths to 0.6, we
take it from the user, and failing that from the consensus, and
failing that we fall back to 0.6.
2013-01-30 11:58:17 -05:00
Nick Mathewson
813a0f8c40
Compute whether we're ready to build circuits based on fraction of paths
...
Previously we did this based on the fraction of descriptors we
had. But really, we should be going based on what fraction of paths
we're able to build based on weighted bandwidth, since otherwise a
directory guard or two could make us behave quite oddly.
Implementation for feature 5956
2013-01-30 11:58:17 -05:00
Nick Mathewson
bc52e0488b
Add an optional out-arg to count_usable_descriptors
...
This way we get the usable nodes themselves, so we can feed them into
frac_nodes_with_descriptors
2013-01-30 11:58:17 -05:00
Nick Mathewson
fcf906ec73
Add a function to compute fraction of nodes (by weighted bw) with descriptors
2013-01-30 11:58:17 -05:00
Andrea Shepard
123daffb60
Merge branch 'bug7802' of ssh://git-rw.torproject.org/mikeperry/tor
2013-01-28 16:16:45 -08:00
Andrea Shepard
dfbd19df41
Merge branch 'time_based_onionqueue_v2' of ssh://git-rw.torproject.org/nickm/tor
2013-01-24 08:10:12 -08:00
