Roger Dingledine
5710ea6475
three more cases where maybe we want to exclude
2011-04-26 23:54:15 -04:00
Roger Dingledine
9f47cfc21a
make formal a constraint that's been true a while now
2011-04-26 23:54:15 -04:00
Roger Dingledine
2b5c39211c
refuse moria1.exit if moria1 is excluded
...
add a note reminding us to do this for foo.moria1.exit if we decide to.
2011-04-26 23:54:15 -04:00
Roger Dingledine
bcea155ce0
note another case where strictnodes is considered for exits
2011-04-26 23:54:14 -04:00
Roger Dingledine
0ad3836f73
If ExitNodes and Exclude{Exit}Nodes overlap, obey Exclude{Exit}Nodes.
...
Also, ExitNodes are always strict.
2011-04-26 23:54:14 -04:00
Roger Dingledine
5d12495d98
the new entrynodes behavior is always strict
2011-04-26 23:54:13 -04:00
Roger Dingledine
719b5b87de
don't exit enclave to excluded relays
2011-04-26 23:54:13 -04:00
Roger Dingledine
7e2e8074d5
slight tweak on circuit_conforms_to_options
...
this function really needs to get a total rewrite (or die)
For now, use #if 0 to disable it.
2011-04-26 23:54:04 -04:00
Roger Dingledine
4906188b62
handle excludenodes for dir fetch/post
...
If we're picking a random directory node, never pick an excluded one.
But if we've chosen a specific one (or all), allow it unless strictnodes
is set (in which case warn so the user knows it's their fault).
When warning that we won't connect to a strictly excluded node,
log what it was we were trying to do at that node.
When ExcludeNodes is set but StrictNodes is not set, we only use
non-excluded nodes if we can, but fall back to using excluded nodes
if none of those nodes is usable.
2011-04-26 23:53:50 -04:00
Roger Dingledine
ad3da53536
If EntryNodes and ExcludeNodes overlap, obey ExcludeNodes.
2011-04-26 23:53:49 -04:00
Roger Dingledine
82178a81f6
refuse excluded hidserv nodes if strictnodes
...
Make hidden services more flaky for people who set both ExcludeNodes
and StrictNodes. Not recommended, especially for hidden service operators.
2011-04-26 23:53:20 -04:00
Nick Mathewson
3256627a45
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/main.h
2011-04-26 15:30:51 -04:00
Nick Mathewson
f810a1afe9
Expose a new process_signal(uintptr_t), not signal_callback()
...
This is a tweak to the bug2917 fix. Basically, if we want to simulate
a signal arriving in the controller, we shouldn't have to pretend that
we're Libevent, or depend on how Tor sets up its Libevent callbacks.
2011-04-26 15:20:08 -04:00
Nick Mathewson
a7a906603e
Merge remote-tracking branch 'sebastian/bug2917' into maint-0.2.2
2011-04-26 15:17:03 -04:00
Nick Mathewson
33f058a5ba
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-26 13:12:43 -04:00
Nick Mathewson
b75d1daf40
Merge remote-tracking branch 'public/bug2332' into maint-0.2.2
2011-04-26 13:10:54 -04:00
Nick Mathewson
43ffd023e9
Make SIZE_T_CEILING unsigned; add a signed SSIZE_T_CEILING
...
None of the comparisons were _broken_ previously, but avoiding
signed/unsigned comparisons makes everybody happier.
Fixes bug2475.
2011-04-26 13:03:58 -04:00
Nick Mathewson
47f472510f
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/rephist.c
2011-04-26 12:49:58 -04:00
Nick Mathewson
bb6d45af1f
Downgrade notice to info when downloading a cert.
2011-04-26 12:47:09 -04:00
Roger Dingledine
9d673dcd20
fix some comments before they create conflicts
2011-04-26 11:29:22 -04:00
Nick Mathewson
6a726d34e1
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-26 11:15:03 -04:00
Nick Mathewson
1cff525973
Fix compilation in last patch
2011-04-26 11:14:46 -04:00
Nick Mathewson
f083347adf
Merge remote-tracking branch 'sebastian/bug2704' into maint-0.2.2
2011-04-26 11:07:48 -04:00
Nick Mathewson
075d904d39
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/dirserv.h
2011-04-26 11:05:54 -04:00
Sebastian Hahn
6fde2b46d2
Fix more of bug 2704
...
The last entry of the *Maxima values in the state file was inflated by a
factor of NUM_SECS_ROLLING_MEASURE (currently 10). This could lead to
a wrong maximum value propagating through the state file history.
2011-04-26 15:36:17 +02:00
Sebastian Hahn
4c789ec08c
Don't leak the local hostname in relay nicknames
...
Fixes bug 2979, reported by tagnaq.
2011-04-26 05:08:32 +02:00
Nick Mathewson
5230cc4fe7
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-25 19:04:13 -04:00
Nick Mathewson
f3b58dfa53
Merge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2
2011-04-25 19:03:15 -04:00
Sebastian Hahn
91aa6f08bc
Make the Log configuration option expand ~
2011-04-22 16:06:52 +02:00
Nick Mathewson
fdbdaf8fab
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-21 13:41:38 -04:00
Nick Mathewson
a0514ba531
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-04-21 13:40:00 -04:00
Nick Mathewson
e98583594d
Fix a bug in removing DNSPort requests from their circular list
...
Under heavy load, this could result in an assertion failure. Fix for
bug 2933; bugfix on 0.2.0.10-alpha.
2011-04-21 13:39:00 -04:00
Nick Mathewson
7c83d4043d
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-19 15:39:04 -04:00
Sebastian Hahn
3f7f96d9e7
Prevent hugely inflated observed bandwidth values
...
When reading the bw history from the state file, we'd add the 900-second
value as traffic that occured during one second. Fix that by adding the
average value to each second.
This bug was present since 0.2.0.5-alpha, but was hidden until
0.2.23-alpha when we started using the saved values.
2011-04-19 15:38:26 -04:00
Sebastian Hahn
13c3884ff6
Don't sometimes undercount bw average
...
This fixes the first part of bug 2704. It should occur only rarely when
no bw maxima are known. Bugfix on 0.2.2.23-alpha. Fixes bug 2704.
2011-04-19 15:38:10 -04:00
Nick Mathewson
4a7f979b54
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-19 12:41:01 -04:00
Nick Mathewson
5cc322e547
Standardize our printf code on %d, not %i.
2011-04-19 12:40:29 -04:00
Nick Mathewson
9eeb902d12
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-19 12:37:18 -04:00
Nick Mathewson
177cadff8d
Merge remote-tracking branch 'rransom/bug2948' into maint-0.2.2
2011-04-19 12:36:49 -04:00
Nick Mathewson
f52cfbfc00
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-19 12:31:55 -04:00
Nick Mathewson
0e554f93d6
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-04-19 12:31:42 -04:00
Nick Mathewson
dfc9c6a0f9
Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1
2011-04-19 12:30:50 -04:00
Nick Mathewson
bba47a836c
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-19 12:30:36 -04:00
Nick Mathewson
bc532bb13f
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-04-19 12:30:11 -04:00
Nick Mathewson
cfd7b118a7
Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only)
2011-04-19 12:29:20 -04:00
Nick Mathewson
750b5119c0
Merge remote-tracking branch 'asn/heartbeat'
2011-04-19 12:08:28 -04:00
Sebastian Hahn
c1927d7d5f
Don't report empty bw-history lines in extrainfo
...
Some tor relays would report lines like these in their extrainfo
documents:
dirreq-write-history 2011-03-14 16:46:44 (900 s)
This was confusing to some people who look at the stats. It would happen
whenever a relay first starts up, or when a relay has dirport disabled.
Change this so that lines without actual bw entries are omitted.
Implements ticket 2497.
2011-04-19 14:51:40 +02:00
Nick Mathewson
48bdc2f729
Correct HS descriptor length check
...
Fixes bug 2948.
2011-04-18 13:53:13 -07:00
Robert Ransom
130db1bdeb
Merge branch 'bug2750-v3' into bug2948
2011-04-18 13:36:19 -07:00
Robert Ransom
adc31001c2
Add an XXX
2011-04-18 13:25:48 -07:00
