summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2017-10-05Merge branch 'maint-0.3.1'Nick Mathewson
2017-10-05Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-10-05Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-10-05Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-10-05Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-10-05Update geoip and geoip6 to the October 4 2017 database.Karsten Loesing
2017-10-04Don't expect permission failure if running as rootTaylor Yu
Skip test_config_include_no_permission() when running as root, because it will get an unexpected success from config_get_lines_include(). This affects some continuous integration setups. Fixes bug 23758.
2017-10-03hs-v3: Always generate the public key file on diskcathugger
Fixes #23748 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-03Merge branch 'bug23672_032_01_squashed'Nick Mathewson
2017-10-03test: Add an HS v3 descriptor fetch unit testDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-03hs-v3: Close pending SOCKS connection on descriptor fetch errorDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-03Merge remote-tracking branch 'asn/bug23670'Nick Mathewson
2017-10-03entrynodes: Better naming for dir info check functions.George Kadianakis
2017-10-03Merge branch 'bug23678_032'Nick Mathewson
2017-10-03Follow-up on 23678: fix socks/wrong_protocol testNick Mathewson
2017-10-03torcert.c: mark some lines unreachable by testsNick Mathewson
These are related to handling of failures on functions which can't fail.
2017-10-03Make the fp_pair_map tests cover {get,set}_by_digestsNick Mathewson
2017-10-03entrynodes: Error msg for missing guard descs is now more informative.George Kadianakis
2017-10-03entrynodes: Move guard dirinfo check below path dirinfo check.George Kadianakis
We do that because we want to use the path fraction dirinfo data in case we are missing primary guard dirinfo.
2017-10-03entrynodes: Be specific about how many primary descriptors we miss.George Kadianakis
2017-10-02bump master to 0.3.2.2-alpha-devNick Mathewson
2017-10-02Bump version to 0.3.2.2-alpha.Alexander Færøy
Signed-off-by: Isis Lovecruft <isis@torproject.org>
2017-10-02Fix our "not an HTTP Proxy" message in light of HTTPTunnelPortNick Mathewson
When we added HTTPTunnelPort, the answer that we give when you try to use your SOCKSPort as an HTTP proxy became wrong. Now we explain that Tor sorta _is_ an HTTP proxy, but a SOCKSPort isn't. I have left the status line the same, in case anything is depending on it. I have removed the extra padding for Internet Explorer, since the message is well over 512 bytes without it. Fixes bug 23678; bugfix on 0.3.2.1-alpha.
2017-09-29Merge remote-tracking branch 'dgoulet/ticket23696_032_01'Nick Mathewson
2017-09-29Merge branches 'bug8185_031' and 'bug8185_diagnostic_032'Nick Mathewson
2017-09-29sched: Always initialize scheduler_last_run to nowDavid Goulet
Because our monotonic time interface doesn't play well with value set to 0, always initialize to now() the scheduler_last_run at init() of the KIST scheduler. Fixes #23696 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-29sched: Don't get KIST stuck in an infinite loopMatt Traudt
When a channel is scheduled and flush cells returns 0 that is no cells to flush, we flag it back in waiting for cells so it doesn't get stuck in a possible infinite loop. It has been observed on moria1 where a closed channel end up in the scheduler where the flush process returned 0 cells but it was ultimately kept in the scheduling loop forever. We suspect that this is due to a more deeper problem in tor where the channel_more_to_flush() is actually looking at the wrong queue and was returning 1 for an empty channel thus putting the channel in the "Case 4" of the scheduler which is to go back in pending state thus re-considered at the next iteration. This is a fix that allows the KIST scheduler to recover properly from a not entirelly diagnosed problem in tor. Fixes #23676 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-29Merge branch 'bug23690_additional_032'Nick Mathewson
2017-09-29Make some assertions nonfatal to help prevent bug23690 recurrence.Nick Mathewson
2017-09-29Merge branch 'bug23690_028'Nick Mathewson
2017-09-29Clear outbuf_flushlen when we clear a connection's outbufNick Mathewson
When we added single_conn_free_bytes(), we cleared the outbuf on a connection without setting outbuf_flushlen() to 0. This could cause an assertion failure later on in flush_buf(). Fixes bug 23690; bugfix on 0.2.6.1-alpha.
2017-09-29Merge branch 'bug8185_025' into bug8185_031Nick Mathewson
2017-09-29Don't package cells onto marked circuits.Nick Mathewson
This caused a BUG log when we noticed that the circuit had no channel. The likeliest culprit for exposing that behavior is d769cab3e5097980, where we made circuit_mark_for_close() NULL out the n_chan and p_chan fields of the circuit. Fixes bug 8185; bugfix on 0.2.5.4-alpha, I think.
2017-09-29Log more information when bug8185 is about to trigger.Nick Mathewson
My current theory is that this is just a marked circuit that hasn't closed yet, but let's gather more information in case that theory is wrong. Diagnostic for 8185.
2017-09-28Merge remote-tracking branch 'catalyst-oniongit/bug23691'Nick Mathewson
2017-09-28Fix leak in test_util.cTaylor Yu
AddressSanitizer found a leak in test_util_decompress_dos_impl(). Fixes bug #23691.
2017-09-28Better error handling when trying to compress/decompress into empty buffer.Alexander Færøy
This patch ensures that we return TOR_COMPRESS_BUFFER_FULL in case we have a input bytes left to process, but are out of output buffer or in case we need to finish where the compression implementation might need to write an epilogue. See: https://bugs.torproject.org/23551
2017-09-28Enable disabled test that was disabled due to bug #23551Alexander Færøy
See: https://bugs.torproject.org/23551
2017-09-28Better error handling when trying to compress/decompress into empty buffer.Alexander Færøy
This patch ensures that we return TOR_COMPRESS_BUFFER_FULL in case we have a input bytes left to process, but are out of output buffer or in case we need to finish where the compression implementation might need to write an epilogue. See: https://bugs.torproject.org/23551
2017-09-28Fix whitespace issue in compress.cAlexander Færøy
2017-09-28Fix typo in buffers.c.Alexander Færøy
2017-09-28Improve unit test coverage for compression code.Nick Mathewson
These tests try uncompressing garbage, verify that we won't make compression bombs, and verify that we won't uncompress compression bombs.
2017-09-28Fix spelling: compressing, not compresingNick Mathewson
2017-09-28Unit test for case where %included dir exists but is unreadableNick Mathewson
2017-09-28unit test for config_lines_dup_and_filterNick Mathewson
2017-09-28Correct docs for config_lines_dup_and_filterNick Mathewson
2017-09-28Move around some LCOV_EXCLs in src/commonNick Mathewson
Apparently, my compiler now generates coverage markers for label-only lines, so we need to exclude those too if they are meant to be unreachable.
2017-09-28Add unit test for buf_get_line().Nick Mathewson
2017-09-28Note an unreachable (?) section in buffers.cNick Mathewson
2017-09-27Let's get 100% coverage for proto_http while we're at it.Nick Mathewson
There was some coverage before, but it was mostly accidental.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion