Nick Mathewson
2f0d57db56
Fix a compilation error in the channel tests.
...
This would only show up on systems like windows where monotime_t and
monotime_coarse_t are different types.
2017-12-21 11:10:30 -05:00
Nick Mathewson
1eeb505e6f
In 0.3.3, we use timestamps, not absolute milliseconds.
2017-12-21 10:57:45 -05:00
Nick Mathewson
b8a3602b2a
Merge branch 'maint-0.3.2'
2017-12-21 10:54:05 -05:00
Nick Mathewson
84adb9fcca
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-21 10:50:33 -05:00
Nick Mathewson
08469a338a
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-21 10:50:06 -05:00
Nick Mathewson
03b4dd92a4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-21 10:49:40 -05:00
Nick Mathewson
79a50afa0e
Use monotime_coarse_absolute_msec() in destroy queue
...
This way it will match the insert queue in 029 and later.
2017-12-21 10:48:37 -05:00
Nick Mathewson
3b08184338
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-21 10:43:12 -05:00
Nick Mathewson
7d845976e3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-21 10:43:06 -05:00
Nick Mathewson
9202087760
Merge branch 'bug24666_squashed_025' into maint-0.2.5
2017-12-21 10:40:10 -05:00
Nick Mathewson
cd1f708a7f
Move free to end of test function so coverity won't complain.
2017-12-21 10:39:29 -05:00
Nick Mathewson
520cf21793
Move destroy cells into a separate queue type of their own, to save RAM
...
We've been seeing problems with destroy cells queues taking up a
huge amount of RAM. We can mitigate this, since while a full packed
destroy cell takes 514 bytes, we only need 5 bytes to remember a
circuit ID and a reason.
Fixes bug 24666. Bugfix on 0.2.5.1-alpha, when destroy cell queues
were introduced.
2017-12-21 10:29:01 -05:00
Nick Mathewson
bcc96c77de
Merge branch 'maint-0.3.2'
2017-12-21 10:27:39 -05:00
Nick Mathewson
c38157be9d
clarify a comment
2017-12-21 10:27:37 -05:00
Nick Mathewson
d0c5fe257b
Merge branch 'maint-0.3.2'
2017-12-21 10:20:35 -05:00
David Goulet
885ba513ff
sched: Consider extra_space even if negative in KIST
...
With extra_space negative, it means that the "notsent" queue is quite large so
we must consider that value with the current computed tcp_space. If we end up
to have negative space, we should not add more data to the kernel since the
notsent queue is just too filled up.
Fixes #24665
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-12-21 09:32:04 -05:00
Nick Mathewson
5db94adac2
Fix a pair of memory leaks in tor_cleanup()
...
Spotted by coverity scan as 1426749 and 1426750
Bug not in any released Tor.
2017-12-21 08:50:41 -05:00
Nick Mathewson
bac0bcbba1
type error fix for monotime_coarse_add_msec on windows
2017-12-20 17:45:59 -05:00
David Goulet
fdfa4a5a14
sched: Use lower layer cell limit with KISTLite
...
Instead of using INT_MAX as a write limit for KISTLite, use the lower layer
limit which is using the specialized num_cells_writeable() of the channel that
will down the line check the connection's outbuf and limit it to 32KB
(OR_CONN_HIGHWATER).
That way we don't take the chance of bloating the connection's outbuf and we
keep the cells in the circuit queue which our OOM handler can take care of,
not the outbuf.
Finally, this commit adds a log_debug() in the update socket information
function of KIST so we can get the socket information in debug.
Fixes #24671
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-12-20 14:17:18 -05:00
Fernando Fernandez Mancera
ac9eebd636
Add some values to OOM log msg #24501
...
Exposing cell_queues_get_total_allocation(), buf_get_total_allocation(),
tor_compress_get_total_allocation(), tor_compress_get_total_allocation() when
hit MaxMemInQueues threshold.
Fixes #24501
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2017-12-20 18:31:30 +01:00
Nick Mathewson
5e92646715
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-20 12:15:24 -05:00
Nick Mathewson
08ed0d7930
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-20 12:15:24 -05:00
Nick Mathewson
7e45720cf4
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-20 12:15:24 -05:00
Nick Mathewson
0e790bb40d
Merge branch 'maint-0.3.2'
2017-12-20 12:15:24 -05:00
Nick Mathewson
c604a76a53
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-20 12:15:23 -05:00
Nick Mathewson
877dd1d6c8
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-20 12:15:23 -05:00
Karsten Loesing
428f8a375b
Update geoip and geoip6 to the December 6 2017 database.
2017-12-20 17:36:29 +01:00
Nick Mathewson
a499be33b8
Merge branch 'maint-0.3.2'
2017-12-20 11:19:23 -05:00
Nick Mathewson
565ec6100f
Merge branch 'stack_again_032' into maint-0.3.2
2017-12-20 11:19:18 -05:00
Nick Mathewson
7ca0a9c4ae
Merge remote-tracking branch 'ahf-oniongit/bugs/24605'
2017-12-20 11:16:17 -05:00
Nick Mathewson
c99ec36def
expand documentation on tor_remove_file
2017-12-20 10:43:27 -05:00
Nick Mathewson
4b7b305bf0
Remove pre-unlink check tor_remove_file; check errno instead.
...
This removes a time-of-check/time-of-use issue, though in this case
it would probably be harmless.
2017-12-20 10:42:02 -05:00
Nick Mathewson
18543c2c9b
Merge remote-tracking branch 'ffmancera/github/bug23271'
2017-12-20 10:40:32 -05:00
Nick Mathewson
3bc5806339
Merge branch 'maint-0.3.2'
2017-12-20 10:39:38 -05:00
Nick Mathewson
0a1b1430c8
Update the unit tests to reflect the change of 24425
2017-12-20 10:39:19 -05:00
Nick Mathewson
8e5450b752
Remove merge-conflict detritus
2017-12-20 10:15:00 -05:00
Nick Mathewson
f92b533757
Merge remote-tracking branch 'teor/ticket24682'
2017-12-20 10:14:43 -05:00
Nick Mathewson
83ced3e7fe
Merge branch 'maint-0.3.2'
2017-12-20 09:59:51 -05:00
Nick Mathewson
fc33caadae
Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2
2017-12-20 09:59:06 -05:00
Nick Mathewson
accd0ea65b
Fix the clz32 and clz64 settings on MSVC.
...
Fixes bug 24633; bugfix on 0.2.9.1-alpha.
2017-12-20 09:37:18 -05:00
Nick Mathewson
28fbfa8712
whitespace fix
2017-12-20 09:17:13 -05:00
Nick Mathewson
69a320ce5d
Merge branch 'xfer_time_coarse'
2017-12-20 09:15:30 -05:00
Nick Mathewson
60bf8f6cf6
Improve add_msec test to cover ms->sec rollover
...
Per mikeperry's suggestion, I'm making sure that the millisecond
part of the time will always roll over in this test.
2017-12-20 09:12:38 -05:00
teor
1a29ad611c
Make fallback script usage instructions create a log file
...
Comment-only change.
Closes 24682.
2017-12-20 12:36:31 +11:00
Nick Mathewson
d43dc120e8
finish documentation on live_consensus_is_missing
2017-12-18 15:01:05 -05:00
Alexander Færøy
d4f4108601
Add MainloopStats option.
...
This patch adds support for MainloopStats that allow developers to get
main event loop statistics via Tor's heartbeat status messages. The new
status log message will show how many succesful, erroneous, and idle
event loop iterations we have had.
See: https://bugs.torproject.org/24605
2017-12-16 02:41:21 +01:00
Alexander Færøy
e44662a7f9
Fix additional whitespace in config module comment.
2017-12-16 02:22:37 +01:00
Nick Mathewson
93e7b837c8
Use same macros to simplify options_transition_affects_*
2017-12-15 15:33:29 -05:00
Nick Mathewson
376f97aaa1
Simplify the very repetitious options_transition_allowed()
2017-12-15 15:32:46 -05:00
Nick Mathewson
424572ee0a
please lintchanges
2017-12-15 12:53:01 -05:00
