Nick Mathewson
c6846d7bf0
Merge remote-tracking branch 'andrea/bug18322_v3_squashed'
2016-06-30 11:18:00 -04:00
Nick Mathewson
a31f55b16b
Merge remote-tracking branch 'teor/bug19483-fix-v2'
2016-06-30 11:04:13 -04:00
Andrea Shepard
13a16e0011
Also check if the sandbox is configured as well as if it's active; sandbox_init() runs rather late in the startup process
2016-06-30 09:37:23 +00:00
Andrea Shepard
34d9dabed1
Do sandbox_is_active() check before reconstructing dump_desc() FIFO on startup too
2016-06-30 07:45:55 +00:00
Andrea Shepard
9580b99dab
Add unit test for dump_desc_populate_fifo_from_directory()
2016-06-30 07:03:26 +00:00
Andrea Shepard
f99c9df02b
Make things mockable for dump_desc_populate_fifo_from_directory() unit test
2016-06-30 07:03:26 +00:00
Andrea Shepard
42f089473a
Unit test for dump_desc_populate_one_file()
2016-06-30 07:03:26 +00:00
Andrea Shepard
2154160a24
Add support for mocking functions declared with attributes without causing gcc warnings
2016-06-30 07:03:26 +00:00
Andrea Shepard
421cf21b3c
Reload unparseable descriptor dump FIFO state from on-disk dumped descriptors at startup
2016-06-30 07:03:26 +00:00
Andrea Shepard
38cced90ef
Move unparseable descriptor dumps into subdirectory of DataDir
2016-06-30 07:03:25 +00:00
Andrea Shepard
dc37546cff
Add sandbox_is_active() check to dump_desc()
2016-06-30 07:03:25 +00:00
Andrea Shepard
603f483092
Use uint64_t for total length of dumped descriptors, nad be careful about overflows in the loop in dump_desc_fifo_add_and_clean()
2016-06-30 07:03:25 +00:00
Andrea Shepard
824ee581b0
Add dir/dump_unparseable_descriptors unit test
2016-06-30 07:03:25 +00:00
Andrea Shepard
2a17b93cc4
Make options_get_datadir_fname2_suffix() mockable
2016-06-30 07:03:25 +00:00
Andrea Shepard
35fc5879fb
Expose a few more dump_desc()-related things to the test suite
2016-06-30 07:03:25 +00:00
Andrea Shepard
4e4a760491
Add extern support for file-scope variables in testsupport.h
2016-06-30 07:03:25 +00:00
Andrea Shepard
cc6753939c
Update description in man page to match new MaxUnparseableDescSizeToLog option name and semantics
2016-06-30 07:03:25 +00:00
Andrea Shepard
17ed2fed68
Expose dump_desc() to the test suite and make things it calls mockable
2016-06-30 07:03:24 +00:00
Andrea Shepard
726dc9acf5
Remove old unparseable descriptor logging mechanism, add bump-to-head-of-queue for repeated unparseable descriptors, rename config variable
2016-06-30 07:03:24 +00:00
Andrea Shepard
2442673ef6
Changes file for bug 18322
2016-06-30 07:03:24 +00:00
Andrea Shepard
1055cd65b8
Document new DetailedLogForUnparseableDescriptors option in man page
2016-06-30 07:03:24 +00:00
Andrea Shepard
1cde3e2776
Add multiple descriptor dump support for dump_desc() in routerparse.c; fixes bug 18322
2016-06-30 07:03:24 +00:00
Roger Dingledine
4dc7b3ca28
fix typo
2016-06-29 22:56:56 -04:00
teor (Tim Wilson-Brown)
69535f1284
Add tv_udiff and tv_mdiff unit tests with negative values
2016-06-30 09:29:18 +10:00
teor (Tim Wilson-Brown)
aae14f8346
Fix bug19483: avoid range checks when they are always true
...
Some compilers are smart enough to work out that comparisons to
LONG_MAX are a no-op on L64.
2016-06-30 09:29:14 +10:00
Nick Mathewson
11ba7f0037
Merge remote-tracking branch 'weasel/bug19504'
2016-06-29 16:18:00 -04:00
Nick Mathewson
ff5b10c916
changes-on for 19505
2016-06-29 16:17:17 -04:00
Nick Mathewson
560e976e4b
Merge remote-tracking branch 'weasel/bug19505'
2016-06-29 16:12:15 -04:00
Nick Mathewson
2fb177e8c9
bugfix stanza in changes file for 19503
2016-06-29 16:10:35 -04:00
Nick Mathewson
7602b0b31f
Merge remote-tracking branch 'weasel/bug19503'
2016-06-29 16:10:10 -04:00
Nick Mathewson
79b2ba8598
changes file for 19449
2016-06-29 14:58:27 -04:00
U+039b
e607a2d9a0
Fix #19449 Remove --disable-transparent configure option
2016-06-29 14:54:14 -04:00
teor (Tim Wilson-Brown)
8938250c10
Add changes file for bug19483
2016-06-29 17:23:46 +10:00
teor (Tim Wilson-Brown)
d36a0c4d22
Add more unit tests for tv_udiff and tv_mdiff
2016-06-29 17:23:42 +10:00
teor (Tim Wilson-Brown)
4234ca3bf2
Improve overflow checks in tv_udiff and tv_mdiff
...
Validate that tv_usec inputs to tv_udiff and tv_mdiff are in range.
Do internal calculations in tv_udiff and tv_mdiff in 64-bit,
which makes the function less prone to integer overflow,
particularly on platforms where long and time_t are 32-bit,
but tv_sec is 64-bit, like some BSD configurations.
Check every addition and subtraction that could overflow.
2016-06-29 17:23:24 +10:00
teor (Tim Wilson-Brown)
2e51608a8b
Fix an integer overflow bug in the tv_mdiff range check
...
The temporary second used for rounding can cause overflow,
depending on the order the compiler performs the operations.
2016-06-29 12:53:50 +10:00
Nick Mathewson
f42dbc4e26
Merge branch 'maint-0.2.8'
2016-06-28 19:15:43 -04:00
Nick Mathewson
2c9354fc10
Merge branch 'bug19071-extra-squashed' into maint-0.2.8
2016-06-28 19:15:20 -04:00
teor (Tim Wilson-Brown)
26146dbe9e
Comment-out fallbacks in a way the stem fallback parser understands
...
If we manually remove fallbacks in C by adding '/*' and '*/' on separate
lines, stem still parses them as being present, because it only looks at
the start of a line.
Add a comment to this effect in the generated source code.
2016-06-28 19:15:08 -04:00
Nick Mathewson
d793a988cd
Merge branch 'maint-0.2.8'
2016-06-28 11:22:48 -04:00
Nick Mathewson
bc9a0f82b3
whitespace fixes
2016-06-28 11:14:42 -04:00
Nick Mathewson
f87aa4555d
Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8
2016-06-28 11:12:51 -04:00
teor (Tim Wilson-Brown)
608c12baaf
Resolve bug18812 by logging fallback key changes at info level
2016-06-28 14:18:16 +10:00
teor (Tim Wilson-Brown)
812fd416ef
Make it clear that fallbacks include authorities
...
Comment-only change
2016-06-28 14:14:04 +10:00
teor (Tim Wilson-Brown)
14b1c7a66e
Refactor connection_or_client_learned_peer_id for bug18812
...
No behavioural change.
Also clarify some comments.
2016-06-28 14:12:18 +10:00
Nick Mathewson
4e2a7cd3ae
Add missing braces around conditional.
2016-06-27 13:19:49 -04:00
Nick Mathewson
14169a3d70
Remove an always-true condition: all ints are <= INT_MAX
2016-06-27 13:18:54 -04:00
Nick Mathewson
2197bfcc6a
Merge branch 'maint-0.2.8'
2016-06-27 13:17:42 -04:00
Peter Palfrader
869e5688b7
Actually, the tor --passphrase-fd is different from the tor-gencert one
2016-06-25 16:53:07 +02:00
Peter Palfrader
135800f75c
tor-gencert.1: fix --passphrase-fd description
2016-06-25 16:48:42 +02:00
