aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Update copyright dates to 2012; add a few missing copyright statementsNick Mathewson2012-06-04
|
* Add about 60 more DOCDOC comments to 0.2.3Nick Mathewson2012-06-04
| | | | | | | | Also, try to resolve some doxygen issues. First, define a magic "This is doxygen!" macro so that we take the correct branch in various #if/#else/#endifs in order to get the right documentation. Second, add in a few grouping @{ and @} entries in order to get some variables and fields to get grouped together.
* Resolve some markup complaints from doxygenNick Mathewson2012-06-04
|
* Resolve all currently pending DOCDOC items in masterNick Mathewson2012-06-04
|
* Merge origin/maint-0.2.2 for 6007_strictNick Mathewson2012-06-04
|\ | | | | | | | | | | | | | | | | | | | | This code shouldn't have any effect in 0.2.3, since we already accept (and handle) data received while we are expecting a renegotiation. (That's because the 0.2.3.x handshake _does_ have data there instead of the renegotiation.) I'm leaving it in anyway, since if it breaks anything, we'll want it broken in master too so we can find out about it. I added an XXX023 comment so that we can come back later and fix that.
| * Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2Nick Mathewson2012-06-04
| |\
| | * Kill non-open OR connections with any data on their inbufs.Nick Mathewson2012-06-04
| | | | | | | | | | | | | | | | | | This fixes a DoS issue where a client could send so much data in 5 minutes that they exhausted the server's RAM. Fix for bug 5934 and 6007. Bugfix on 0.2.0.20-rc, which enabled the v2 handshake.
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-06-04
|\| |
| * | Merge remote-tracking branch 'public/bug6033' into maint-0.2.2Nick Mathewson2012-06-04
| |\ \
| | * | Work around a bug in OpenSSL 1.0.1's TLS 1.1 and TLS 1.2 supportNick Mathewson2012-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that when OpenSSL negotiates a 1.1 or 1.2 connection, and it decides to renegotiate, the client will send a record with version "1.0" rather than with the current TLS version. This would cause the connection to fail whenever both sides had OpenSSL 1.0.1, and the v2 Tor handshake was in use. As a workaround, disable TLS 1.1 and TLS 1.2. When a later version of OpenSSL is released, we can make this conditional on running a fixed version of OpenSSL. Alternatively, we could disable TLS 1.1 and TLS 1.2 only on the client side. But doing it this way for now means that we not only fix TLS with patched clients; we also fix TLS when the server has this patch and the client does not. That could be important to keep the network running well. Fixes bug 6033.
* | | | Fix build warning on Lenny about strtok_r unit testNick Mathewson2012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a warning in efb8a09f, where Debain Lenny's GCC doesn't get that for (i=0; i<3; ++i) { const char *p; switch(i) { case 0: p="X"; break; case 1: p="Y"; break; case 2: p="Z"; break; } printf("%s\n", p); } will never try to print an uninitialezed value. Found by buildbots. Bug in no released versions of Tor.
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-05-31
|\| | |
| * | | Make all begindir or one-hop circuits internalNick Mathewson2012-05-31
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This solves bug 5283, where client traffic could get sent over the same circuit as an anonymized connection to a directory, even if that circuit used an exit node unsuitable for clients. By marking the directory connection as needs_internal, we ensure that the (non-internal!) client-traffic connection won't be sent over the same circuit.
* | | Merge remote-tracking branch 'public/bug5089'Nick Mathewson2012-05-31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/test/test_util.c Merge the unit tests; I added some when I did this branch against 0.2.2, and then the test format changed and master added more tests.
| * | | A few more get_parent_directory tests.Nick Mathewson2012-05-31
| | | |
| * | | Have get_parent_directory() handle "/foo" and "/" correctly.Nick Mathewson2012-05-24
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent of "/foo" is "/"; and "/" is its own parent. This would cause Tor to fail if you tried to have a PF_UNIX control socket in the root directory. That would be a stupid thing to do for other reasons, but there's no reason to fail like _this_. Bug found by Esteban Manchado Velázquez. Fix for bug 5089; bugfix on Tor 0.2.2.26-beta. Unit test included.
* | | Merge remote-tracking branch 'public/bug5374'Nick Mathewson2012-05-31
|\ \ \
| * | | Delay getsockname() call until after connect() is doneNick Mathewson2012-05-24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | On Windows, getsockname() on a nonblocking apparently won't work until the connection is done connecting. On XP, it seems to fail by reporting success and declaring that your address is INADDR_ANY. On the Win8 preview, though, it fails more loudly and says WSAEINVAL. Fix for bug 5374; bugfix on 0.1.1.14-alpha.
* | | Merge remote-tracking branch 'linus/bug4873_ln'Nick Mathewson2012-05-31
|\ \ \
| * | | Remove unexpected "unexpectedly".Linus Nordberg2012-05-31
| | | |
| * | | Remove spurioius return in one out of four if-else clauses.Linus Nordberg2012-05-31
| | | | | | | | | | | | | | | | | | | | We do return right after the if-else. This return (with its confusing comments) comes from before 6b7c3b42 but doesn't make sense now.
| * | | Change an assertion into a warning in connection_or_handle_event_cb()Nick Mathewson2012-05-24
| | | | | | | | | | | | | | | | | | | | Possibly addresses bug 4873, though IMO that's likely not a real bug: it seems likely to have been an ssl version mismatch.
* | | | Merge remote-tracking branch 'public/bug5541_v2'Nick Mathewson2012-05-31
|\ \ \ \
| * | | | Prevent an (impossible) null-pointer dereference in ↵Nick Mathewson2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection_edge_process_relay_cell This would happen if the deliver window could become negative because of an nonexistent connection. (Fortunately, _that_ can't occur, thanks to circuit_consider_sending_sendme. Still, if we change our windowing logic at all, we won't want this to become triggerable.) Fix for bug 5541. Bugfix on 4a66865d, back from 0.0.2pre14. asn found this. Nice catch, asn!
* | | | | Merge remote-tracking branch 'public/close_file_mapping'Nick Mathewson2012-05-31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/compat.h Conflict was between replacement of MS_WINDOWS with _WIN32 in master, and with removal of file_handle from tor_mmap_t struct in close_file_mapping branch (for bug 5951 fix).
| * | | | | reindent CreateFile arguments.Nick Mathewson2012-05-31
| | | | | |
| * | | | | Close the windows file handle after CreateFileMapping; it isn't neededNick Mathewson2012-05-23
| | |_|/ / | |/| | | | | | | | | | | | | I did the changes file; the rest came pseudonymously
* | | | | Merge remote-tracking branch 'linus/bug5355_ln'Nick Mathewson2012-05-31
|\ \ \ \ \
| * | | | | Don't stomp on errno.Linus Nordberg2012-05-29
| | | | | |
| * | | | | Refactor new getcwd codeNick Mathewson2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the "path_length *= 2" statement can't overflow. Move the "malloc and getcwd" loop into its own function.
| * | | | | Stop using MAX_PATH, it might not be definedSebastian Hahn2012-03-10
| | | | | | | | | | | | | | | | | | | | | | | | This broke compilation on Hurd
* | | | | | Merge remote-tracking branch 'public/bug1938'Nick Mathewson2012-05-31
|\ \ \ \ \ \
| * | | | | | When downloading bridge descs from a bridge authority, always be anonymousNick Mathewson2012-04-27
| | | | | | |
* | | | | | | Merge remote-tracking branch 'public/bug2954_more'Nick Mathewson2012-05-31
|\ \ \ \ \ \ \
| * | | | | | | Abort writing cached-microdescs if a failed write has occurred.Nick Mathewson2012-05-24
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Bug 2954; fix on 0.2.2.6-alpha.
* | | | | | | Merge remote-tracking branch 'public/bug3196'Nick Mathewson2012-05-31
|\ \ \ \ \ \ \
| * | | | | | | Raise thresholds for declaring bootstrapping complete.Nick Mathewson2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the total serverdesc threshold from 25% to 75% and the exit threshold from 33% to 50%. The goal is to make initially constructed circuits less horrible, and to make initial less awful (since fetching directory information in parallel with whatever the user is trying to do can hurt their performance). Implements ticket 3196.
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-05-31
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | (For bug 5969 fix)
| * | | | | | | Fix more clang format-nonliteral warnings (bug 5969)Nick Mathewson2012-05-30
| | | | | | | |
| * | | | | | | Add __attribute__(format)s for our varargs printf/scanf wrappersNick Mathewson2012-05-30
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that if you set the third argument of __attribute__(format) to 0, GCC and Clang will check the format argument without expecting to find variadic arguments. This is the correct behavior for vsnprintf, vasprintf, and vscanf. I'm hoping this will fix bug 5969 (a clang warning) by telling clang that the format argument to tor_vasprintf is indeed a format string.
* | | | | | | Merge branch 'bug5604'Nick Mathewson2012-05-30
|\ \ \ \ \ \ \
| * | | | | | | Add a little documentation for the bug5604 fixNick Mathewson2012-05-30
| | | | | | | |
| * | | | | | | If DisableNetwork, don't even try to open non-controller listenersNick Mathewson2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for 5604; bugfix on 0.2.3.9-alpha, which introduced DisableNetwork.
* | | | | | | | Merge remote-tracking branch 'public/bug5954'Nick Mathewson2012-05-30
|\ \ \ \ \ \ \ \
| * | | | | | | | New "GETINFO dormant" to report whether Tor has gone idleNick Mathewson2012-05-24
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Torbutton needs this; see bug 5954 and 4718.
* | | | | | | | Merge remote-tracking branch 'linus/bug4369'Nick Mathewson2012-05-30
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix minor typo in warning printout.Linus Nordberg2012-05-29
| | | | | | | | |
| * | | | | | | | Close OR connections that send junk before AUTHORIZE/VERSIONSNick Mathewson2012-04-27
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Fix for 4369.
* | | | | | | | Fix clang 3.1 compile warning in crypto.cSebastian Hahn2012-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Tweaked by nickm)
* | | | | | | | Merge remote-tracking branch 'public/bug5916'Nick Mathewson2012-05-30
|\ \ \ \ \ \ \ \