summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2012-06-04Add about 60 more DOCDOC comments to 0.2.3Nick Mathewson
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.
2012-06-04Resolve some markup complaints from doxygenNick Mathewson
2012-06-04Resolve all currently pending DOCDOC items in masterNick Mathewson
2012-06-04Merge origin/maint-0.2.2 for 6007_strictNick Mathewson
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.
2012-06-04Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2Nick Mathewson
2012-06-04Kill non-open OR connections with any data on their inbufs.Nick Mathewson
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.
2012-05-31Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2012-05-31Make all begindir or one-hop circuits internalNick Mathewson
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.
2012-05-31Merge remote-tracking branch 'public/bug5374'Nick Mathewson
2012-05-31Merge remote-tracking branch 'linus/bug4873_ln'Nick Mathewson
2012-05-31Merge remote-tracking branch 'public/bug5541_v2'Nick Mathewson
2012-05-31Merge remote-tracking branch 'public/bug1938'Nick Mathewson
2012-05-31Merge remote-tracking branch 'public/bug2954_more'Nick Mathewson
2012-05-31Remove unexpected "unexpectedly".Linus Nordberg
2012-05-31Remove spurioius return in one out of four if-else clauses.Linus Nordberg
We do return right after the if-else. This return (with its confusing comments) comes from before 6b7c3b42 but doesn't make sense now.
2012-05-31Merge remote-tracking branch 'public/bug3196'Nick Mathewson
2012-05-31Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
(For bug 5969 fix)
2012-05-30Fix more clang format-nonliteral warnings (bug 5969)Nick Mathewson
2012-05-30Merge branch 'bug5604'Nick Mathewson
2012-05-30Add a little documentation for the bug5604 fixNick Mathewson
2012-05-30Merge remote-tracking branch 'public/bug5954'Nick Mathewson
2012-05-30Merge remote-tracking branch 'linus/bug4369'Nick Mathewson
2012-05-30Merge remote-tracking branch 'public/bug5916'Nick Mathewson
2012-05-29Fix minor typo in warning printout.Linus Nordberg
2012-05-24Delay getsockname() call until after connect() is doneNick Mathewson
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.
2012-05-24Change an assertion into a warning in connection_or_handle_event_cb()Nick Mathewson
Possibly addresses bug 4873, though IMO that's likely not a real bug: it seems likely to have been an ssl version mismatch.
2012-05-24Abort writing cached-microdescs if a failed write has occurred.Nick Mathewson
Bug 2954; fix on 0.2.2.6-alpha.
2012-05-24New "GETINFO dormant" to report whether Tor has gone idleNick Mathewson
Torbutton needs this; see bug 5954 and 4718.
2012-05-18Merge remote-tracking branch 'asn/bug5602'Nick Mathewson
2012-05-18Fix a hard-to-trigger memory leak in launch_resolveNick Mathewson
To hit this leak, you need to be a relay that gets a RESOLVE request or an exit node getting a BEGIN or RESOLVE request. You must either have unconfigured (and unconfigurable) nameservers, or you must have somehow set DisableNetwork after a network request arrived but before you managed to process it. So, I doubt this is reached often. Still, a leak's a leak. Fix for bug 5916; bugfix on 0.2.3.9-alpha and 0.1.2.1-alpha.
2012-05-18Merge remote-tracking branch 'asn/bug5646'Nick Mathewson
2012-05-18Extract data from DESTROY cell _after_ protocol violation checks.George Kadianakis
2012-05-18Ignore unknown lines from managed proxies.George Kadianakis
2012-05-18Use a more helpful log message when we can't find a proxy.George Kadianakis
2012-05-16Merge remote-tracking branch 'public/bug5139'Nick Mathewson
2012-05-16In connection_ap_handshake_process_socks(), mark the socks request as ↵Fabian Keil
finished if a reply is send after a parse error Silences the log message: [warn] {BUG} _connection_mark_unattached_ap(): Bug: stream (marked at connection_edge.c:2224) sending two socks replies? after the client triggered the "Tor is not an HTTP Proxy" response. No additional socks reply was sent, though.
2012-05-16Remove over-two-months-old entry guards even while running.Roger Dingledine
Previously, we only did this check at startup, which could lead to us holding a guard indefinitely, and give weird results. Fixes bug 5380; bugfix on 0.2.1.14-rc. (Patch by Roger; changes file and commit message by Nick)
2012-05-16Correct documentation for remove_obsolete_entry_guards.Nick Mathewson
2012-05-16Merge remote-tracking branch 'public/bug2297'Nick Mathewson
2012-05-16Merge remote-tracking branch 'public/bug2822'Nick Mathewson
2012-05-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2012-05-16Correct the bulletproofing of routerlist_insert()Nick Mathewson
The original code updated some variables, but forgot to remove a replaced old-routerdesc from rl->old_routers. Related to bug 1776.
2012-05-16Merge remote-tracking branch 'public/bug3296'Nick Mathewson
2012-05-16When ReloadTorrcOnSIGHUP=1, do non-reload activities anywayNick Mathewson
Previously, we skipped everything that got invoked from options_init_from_torrc. But some of the stuff in options_act_reversible and options_act is actually important, like reopening the logs. Now, a SIGHUP always makes the effects of an options_set() happen, even though the options haven't changed. Fix for bug 5095; bugfix on 0.2.1.9-alpha, which introduced __ReloadTorrcOnSIGHUP.
2012-05-16Merge branch 'win32_winnt'Nick Mathewson
2012-05-15Prevent an (impossible) null-pointer dereference in ↵Nick Mathewson
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!
2012-05-15Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2012-05-15Merge branch 'bug5796_022_squashed' into maint-0.2.2Nick Mathewson
2012-05-15Fix a crash bug on SETCIRCUITPURPOSE.Nick Mathewson
2012-05-15Merge remote-tracking branch 'linus/task-5891'Nick Mathewson