summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2013-06-15Merge branch 'bug9072-024' into bug9072-025Andrea Shepard
2013-06-15Merge branch 'bug9072-023' into bug9072-024Andrea Shepard
2013-06-15Disable middle relay queue overfill detection code due to possible guard ↵Andrea Shepard
discovery attack
2013-06-14Instead of testing for __GNUC__, use CHECK_SCANF, like CHECK_PRINTF.dana koch
This lets us have the possibility of fine-tuning the check in the tor_sscanf test cases at a later date.
2013-06-14Merge branch 'circuit_queue_cap-0.2.5-squashed'Nick Mathewson
Conflicts: src/or/relay.c
2013-06-14Fix signed/unsigned comparison warningNick Mathewson
2013-06-14Increase the limit so leaky pipe might workNick Mathewson
2013-06-14Increase the limit so leaky pipe might workNick Mathewson
2013-06-14Increase the limit so leaky pipe might workNick Mathewson
2013-06-13Don't queue more cells as a middle relay than the spec allows to be in flightAndrea Shepard
2013-06-13Don't queue more cells as a middle relay than the spec allows to be in flightAndrea Shepard
2013-06-13Don't queue more cells as a middle relay than the spec allows to be in flightAndrea Shepard
2013-06-13Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-06-13Define SEEK_SET for platforms that lack it.Nick Mathewson
2013-06-13Rename networkstatus_dl_interval() -> networkstatus_dl_check_interval()Nick Mathewson
2013-06-13Merge remote-tracking branch 'linus/bug8532'Nick Mathewson
2013-06-13If we write the annotation but not the microdescriptor, rewind.Nick Mathewson
This fixes bug 9047 (and some parts of 9031, 8922, 8883 that weren't fixed in 8822). Bugfix on 0.2.2.6-alpha.
2013-06-13Merge remote-tracking branch 'public/bug7912_squashed'Nick Mathewson
2013-06-13Fix compile warnings wrt printf formating of int64_tNick Mathewson
2013-06-13Add destroy balance tracking and logging to circuitmuxAndrea Shepard
2013-06-13Implementation of a fix for bug 7912Nick Mathewson
I added the code to pass a destroy cell to a queueing function rather than writing it immediately, and the code to remember that we shouldn't reuse the circuit id until the destroy is actually sent, and the code to release the circuit id once the destroy has been sent... and then I finished by hooking destroy_cell_queue into the rest of Tor.
2013-06-13Code to track on a circuit whether it has a "pending" delete cellNick Mathewson
This will be used in a fix for bug7912.
2013-06-13Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-06-13Merge remote-tracking branch 'public/bug8822' into maint-0.2.4Nick Mathewson
2013-06-12Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-06-12Merge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4Nick Mathewson
2013-06-12Fix #9043 - simplyfy the code and use EVP_PKEY_cmp instead of pkey_eq / ↵Marek Majkowski
tor_tls_evp_pkey_eq
2013-06-12Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-06-12Make all consumers of microdesc_t.body tolerate NULLNick Mathewson
This is another fix to try to mitigate recurrences of 8031/8822.
2013-06-12Unmap the microdescriptor cache before replacing it.Nick Mathewson
This is a reprise of the fix in bdff7e3299d78; 6905c1f6 reintroduced that bug. Briefly: windows doesn't seem to like deleting a mapped file. I tried adding the PROT_SHARED_DELETE flag to the createfile all, but that didn't actually fix this issue. Fortunately, the unit test I added in 4f4fc63fea0589a4fa03f3859dc27860cdde75af should prevent us from making this particular screw-up again. This patch also tries to limit the crash potential of a failure to write by a little bit, although it could do a better job of retaining microdescriptor bodies. Fix for bug 8822, bugfix on 0.2.4.12-alpha.
2013-06-12Revert "Use the FILE_SHARE_DELETE flag for CreateFile on a mapping"Nick Mathewson
This reverts commit 884a0e269c382f9e927d8c8b1ef4ef9d2d48379d. I'm reverting this because it doesn't actually make the problem go away. It appears that instead we need to do unmap-then-replace.
2013-06-12Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-06-12Merge remote-tracking branch 'public/bug2077_share_delete' into maint-0.2.4Nick Mathewson
2013-06-12Use the FILE_SHARE_DELETE flag for CreateFile on a mappingNick Mathewson
A comment by rransom on #8795 taken together with a comment by doorss recorded on #2077 suggest that *every* attempt to replace the md cache will fail on Vista/Win7 if we don't have the FILE_SHARE_DELETE flag passed to CreateFile, and if we try to replace the file ourselves before unmapping it. I'm adding the FILE_SHARE_DELETE, since that's this simplest fix. Broken indexers (the favored #2077 hypothesis) could still cause trouble here, but at least this patch should make us stop stepping on our own feet. Likely fix for #2077 and its numerous duplicates. Bugfix on 0.2.2.6-alpha, which first had a microdescriptor cache that would get replaced before remapping it.
2013-06-12Expand microdesc cache testsNick Mathewson
Is it possible that *every* attempt to replace the microdesc cache on windows 7 is going to fail because of our lack of FILE_SHARE_DELETE while opening the file? If so, this test will catch #2077 and let us know when it's fixed.
2013-06-10Hide consensus download interval, depending on TestingTorNetwork, in a macro.Linus Nordberg
2013-06-10Fix tor-fw-helper exit code.Arlo Breault
It's returning the number of initialized backends. (changes file added by nickm; this is a fix for bug #9030)
2013-06-10Fix "make check-spaces"Nick Mathewson
2013-06-10Make OPENSSL_free(dh_string_repr) conditional.Nick Mathewson
2013-06-10Merge remote-tracking branch 'majek/bug5170'Nick Mathewson
2013-06-10Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-06-10Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2013-06-10Merge branch 'bug9017' into maint-0.2.3Nick Mathewson
2013-06-10Fix (Open?)BSD fast-connect bug with optimistic data.Nick Mathewson
There's an assertion failure that can occur if a connection has optimistic data waiting, and then the connect() call returns 0 on the first attempt (rather than -1 and EINPROGRESS). That latter behavior from connect() appears to be an (Open?)BSDism when dealing with remote addresses in some cases. (At least, I've only seen it reported with the BSDs under libevent, even when the address was 127.0.0.1. And we've only seen this problem in Tor with OpenBSD.) Fixes bug 9017; bugfix on 0.2.3.1-alpha, which first introduced optimistic data. (Although you could also argue that the commented-out connection_start_writing in 155c9b80 back in 2002 is the real source of the issue.)
2013-06-10Bug #5170 - make pkey_eq testable, introduce test_tortls.cMarek Majkowski
2013-06-10Bug #5170 - test crypto_pk_get_all_digestsMarek Majkowski
2013-06-08Add support for offsetting the voting interval in order to bootstrap faster.Linus Nordberg
A new option TestingV3AuthVotingStartOffset is added which offsets the starting time of the voting interval. This is possible only when TestingTorNetwork is set. This patch makes run_scheduled_events() check for new consensus downloads every second when TestingTorNetwork, instead of every minute. This should be fine, see #8532 for reasoning. This patch also brings MIN_VOTE_SECONDS and MIN_DIST_SECONDS down from 20 to 2 seconds, unconditionally. This makes sanity checking of misconfiguration slightly less sane. Addresses #8532.
2013-06-06Bug 5170 - simplify i2d_PublicKey in pkey_eqMarek Majkowski
2013-06-06Bug #5170 - simplify i2d_X509Marek Majkowski
2013-06-06Bug #5170 - also simplify i2d_DHparamsMarek Majkowski
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion