Nick Mathewson
9619c395ac
Merge remote-tracking branch 'andrea/ticket6456'
...
Somewhat tricky conflicts:
src/or/config.c
Also, s/test_assert/tt_assert in test_config.c
2014-11-04 09:52:04 -05:00
Nick Mathewson
fcdcb377a4
Add another year to our copyright dates.
...
Because in 95 years, we or our successors will surely care about
enforcing the BSD license terms on this code. Right?
2014-10-28 15:30:16 -04:00
teor
ff42222845
Improve DIRINFO flags' usage comments
...
Document usage of the NO_DIRINFO and ALL_DIRINFO flags clearly in functions
which take them as arguments. Replace 0 with NO_DIRINFO in a function call
for clarity.
Seeks to prevent future issues like 13163.
2014-10-08 05:36:54 +11:00
Nick Mathewson
1a1e695800
Merge remote-tracking branch 'public/bug7733a'
2014-09-22 10:38:05 -04:00
Nick Mathewson
87f9c51f64
Avoid unsigned/sign compare warning from last patch.
2014-09-01 15:42:17 -04:00
Philip Van Hoof
60a3897ed9
Bounds check while looping over a fixed size table or array
...
(Edited to use existing ARRAY_LENGTH macro --nickm)
2014-09-01 15:40:47 -04:00
rl1987
8b539cc276
Unit testing entry_is_time_to_retry().
2014-08-20 15:29:56 -04:00
rl1987
c731a1c68f
Write comments for members of periods array.
2014-08-20 15:29:56 -04:00
rl1987
197d855009
Rewriting entry_is_time_to_retry() using table approach.
2014-08-20 15:29:55 -04:00
Andrea Shepard
b8b46e8ef8
Add some mocks needed to unit test ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-25 21:41:03 -07:00
Roger Dingledine
bc9866e13f
Merge branch 'maint-0.2.5'
2014-07-24 16:23:26 -04:00
Roger Dingledine
a4c641cce9
Merge branch 'maint-0.2.4' into maint-0.2.5
2014-07-24 16:23:08 -04:00
Roger Dingledine
9fc276a1c7
add a NumDirectoryGuards consensus param too
2014-07-24 16:19:47 -04:00
Roger Dingledine
56ee61b8ae
Add and use a new NumEntryGuards consensus parameter.
...
When specified, it overrides our default of 3 entry guards.
(By default, it overrides the number of directory guards too.)
Implements ticket 12688.
2014-07-24 16:19:47 -04:00
Nick Mathewson
5690284559
Fix wide lines, make entry_is_live() non-inline
2014-07-16 16:52:16 +02:00
George Kadianakis
8bbb217964
Change the interface of entry_is_live() to take a bitmap.
2014-06-25 15:44:36 -04:00
George Kadianakis
46d41e6e9b
Basic entry_is_live() unittest.
2014-06-25 15:39:00 -04:00
George Kadianakis
61629b4f6c
Document choose_random_entry_impl() and populate_live_entry_guards().
2014-06-15 19:03:38 -07:00
George Kadianakis
bf263a9b99
Make a few entrynodes.c functions testable.
2014-06-15 19:02:59 -07:00
George Kadianakis
71da44f159
Make populate_live_entry_guards() more smoothly testable.
2014-06-15 19:02:59 -07:00
George Kadianakis
c7b05a6aef
Constify aggressively in populate_live_entry_guards().
2014-06-15 19:02:59 -07:00
George Kadianakis
a59429f1e4
Fix the functionality of populate_live_entry_guards().
2014-06-15 19:02:55 -07:00
George Kadianakis
427cc8a452
Move code from choose_random_entry_impl() to the new function.
...
This commit only _moves_ code.
2014-06-15 18:25:45 -07:00
George Kadianakis
e8c366e9ea
Create skeleton for populate_live_entry_guards().
...
Now we are ready to move code from choose_random_entry_impl() to it.
2014-06-15 18:25:45 -07:00
George Kadianakis
f75c6ce981
choose_random_entry_impl(): Remove useless consider_exit_family.
...
The variable was useless since it was only toggled off in disabled code.
If the 'exit_family' smartlist is empty, we don't consider exit family
anyway.
2014-06-15 18:25:45 -07:00
George Kadianakis
115b3e7645
Remove a piece of disabled code in choose_random_entry_impl().
2014-06-15 18:25:45 -07:00
Nick Mathewson
79c875ecdc
Would-be fix for bug 7733: learn bridge ID from descriptor
...
If somebody has configured a client to use a bridge without setting
an identity digest (not recommended), learn the identity digest from
whatever bridge descriptor we have downloaded or have in our cache.
2014-05-14 14:34:01 -04:00
Nick Mathewson
1bbd3811c1
Merge remote-tracking branch 'public/bug10849_025'
...
Conflicts:
src/or/config.c
2014-05-01 11:51:22 -04:00
Nick Mathewson
7b4b137dc9
Merge remote-tracking branch 'public/bug9229_025'
...
Conflicts:
src/or/entrynodes.c
2014-04-23 11:00:49 -04:00
Nick Mathewson
6ab10a5466
Make num_bridges_usable work properly.
...
My first implementation was broken, since it returned "whether there
is one bridge" rather than "how many bridges."
Also, the implementation for the n_options_out feature in
choose_random_entry_impl was completely broken due to a missing *.
2014-04-08 15:51:40 -04:00
Nick Mathewson
cce06b649e
Merge remote-tracking branch 'asn/bug11069_take2'
2014-03-11 11:04:47 -04:00
George Kadianakis
1c475eb018
Throw control port warning if we failed to connect to all our bridges.
2014-03-10 22:52:07 +00:00
Nick Mathewson
7aa2192048
Fix our check for the "first" bridge descriptor.
...
This is meant to be a better bug 9229 fix -- or at least, one more
in tune with the intent of the original code, which calls
router_retry_directory_downloads() only on the first bridge descriptor.
2014-03-10 15:11:21 -04:00
Nick Mathewson
db72479eea
Update ns downloads when we receive a bridge descriptor
...
This prevents long stalls when we're starting with a state file but
with no bridge descriptors. Fixes bug 9229. I believe this bug has
been present since 0.2.0.3-alpha.
2014-03-10 15:01:27 -04:00
Nick Mathewson
f0b2dc83b6
Merge remote-tracking branch 'arma/ticket5528'
...
Conflicts:
src/or/router.c
src/test/test_dir.c
2014-03-05 12:44:40 -05:00
Nick Mathewson
ce450bddb7
Remove TunnelDirConns and PreferTunnelledDirConns
...
These options were added back in 0.1.2.5-alpha, but no longer make any
sense now that all directories support tunneled connections and
BEGIN_DIR cells. These options were on by default; now they are
always-on.
This is a fix for 10849, where TunnelDirConns 0 would break hidden
services -- and that bug arrived, I think, in 0.2.0.10-alpha.
2014-02-11 11:10:55 -05:00
rl1987
e6590efaa7
Fix get_configured_bridge_by_addr_port_digest(.,.,NULL)
...
The old behavior was that NULL matched only bridges without known
identities; the correct behavior is that NULL should match all
bridges (assuming that their addr:port matches).
2013-12-09 11:22:22 -05:00
Nick Mathewson
761ee93c69
Add missing includes for circpathbias.h
2013-10-31 14:33:34 -04:00
Nick Mathewson
4b6f074df9
Merge remote-tracking branch 'public/bug5018'
...
Conflicts:
src/or/entrynodes.c
2013-10-29 01:29:59 -04:00
David Fifield
e6e6c245c8
Simplify transport_is_needed.
...
By Roger at
https://trac.torproject.org/projects/tor/ticket/5018#comment:11 .
2013-10-29 01:05:57 -04:00
George Kadianakis
6f33dffec1
Only launch transport proxies that provide useful transports.
2013-10-29 01:05:56 -04:00
Nick Mathewson
71bd100976
DROPGUARDS controller command
...
Implements ticket 9934; patch from "ra"
2013-10-21 13:02:25 -04:00
Roger Dingledine
a26a5794a3
Merge branch 'maint-0.2.4'
2013-10-12 10:48:30 -04:00
Roger Dingledine
8f9fb63cdb
be willing to bootstrap from all three of our directory guards
...
Also fix a bug where if the guard we choose first doesn't answer, we
would try the second guard, but once we connected to the second guard
we would abandon it and retry the first one, slowing down bootstrapping.
The fix in both cases is to treat all our initially chosen guards as
acceptable to use.
Fixes bug 9946.
2013-10-12 10:42:27 -04:00
Roger Dingledine
0d8632e585
fix another confusing whitespace instance
2013-09-30 01:47:24 -04:00
Roger Dingledine
2cf41cc70d
fix confusing whitespace
2013-09-30 01:41:48 -04:00
Nick Mathewson
775c491502
Separate mutable/const accessors for circuit_build_times
...
(These have proved invaluable for other global accessors.)
2013-08-22 10:15:56 -04:00
vagrant
4834641dce
Make circ_times static and add accessor functions.
...
Change the global circ_times to a static variable and use
accessor functions throughout the code, instead of
accessing it directly.
2013-08-22 10:15:56 -04:00
Nick Mathewson
83a859e24c
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-07-31 21:49:30 -04:00
Roger Dingledine
ff6bb13c02
NumDirectoryGuards now tracks NumEntryGuards by default
...
Now a user who changes only NumEntryGuards will get the behavior she
expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha.
2013-07-30 12:05:39 -04:00