summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2010-12-02Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-12-02Fix a harmless off-by-one error in counting controller argument lengthsNick Mathewson
Bugfix on 0.1.1.1-alpha; found by boboper.
2010-12-01Merge remote branch 'sjmurdoch/cloexec'Nick Mathewson
2010-12-01Open connection to DNS resolvers with CLOEXEC flag setSteven Murdoch
NB: this will now register the socket with the socket accounting code
2010-11-30Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/relay.c
2010-11-30Do not invoke tls_renegotiated_cb for non-bufferevent connections too early.Nick Mathewson
This is not the most beautiful fix for this problem, but it is the simplest. Bugfix for 2205. Thanks to Sebastian and Mashael for finding the bug, and boboper/cypherpunks for figuring out why it was happening and how to fix it, and for writing a few fixes.
2010-11-30fix memory leak introduced in 26e89742Roger Dingledine
found via valgrind
2010-11-29Revise comment on 2210 a little; clean up n_streams/num_streams confusionNick Mathewson
Also add a changes file
2010-11-29Add wrappers function for libc random()Nick Mathewson
On windows, it's called something different.
2010-11-29Fix whitespace in patch for 2210 and backport to 0.2.2Nick Mathewson
2010-11-29Improve fairness when activating streams in circuit_resume_edge_reading_helperMashael AlSabah
The reason the "streams problem" occurs is due to the complicated interaction between Tor's congestion control and libevent. At some point during the experiment, the circuit window is exhausted, which blocks all edge streams. When a circuit level sendme is received at Exit, it resumes edge reading by looping over linked list of edge streams, and calling connection_start_reading() to inform libevent to resume reading. When the streams are activated again, Tor gets the chance to service the first three streams activated before the circuit window is exhausted again, which causes all streams to be blocked again. As an experiment, we reversed the order in which the streams are activated, and indeed the first three streams, rather than the last three, got service, while the others starved. Our solution is to change the order in which streams are activated. We choose a random edge connection from the linked list, and then we activate streams starting from that chosen stream. When we reach the end of the list, then we continue from the head of the list until our chosen stream (treating the linked list as a circular linked list). It would probably be better to actually remember which streams have received service recently, but this way is simple and effective.
2010-11-29Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-11-29Merge branch 'exitstats' into maint-0.2.2Nick Mathewson
2010-11-29comment karsten's bug2196 patch a littleNick Mathewson
2010-11-24Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: configure.in contrib/tor-mingw.nsi.in src/win32/orconfig.h
2010-11-24Avoid dereferencing NULL if a bridge fails to build an ei descriptor.Robert Ransom
Reported by an anonymous commenter on Trac.
2010-11-24Report only the top 10 ports in exit-port stats.Karsten Loesing
2010-11-21found this whitespace fix in a sandboxRoger Dingledine
2010-11-20Add missing cast when formatting uintptr_tNick Mathewson
Found by Christian Kujau
2010-11-20Do cloexec on socketpairs and stdio filesNick Mathewson
2010-11-20Initial work to set CLOEXEC on all possible fdsNick Mathewson
Still to go: some pipes, all stdio files.
2010-11-19Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/router.c
2010-11-19Merge branch 'fix2183', remote branch 'rransom/fix2195-v2' into maint-0.2.2Nick Mathewson
2010-11-19Fix logic error in router_dump_router_to_string.Robert Ransom
Spotted by Nick Mathewson.
2010-11-19Add comments to some of the bug2183 fix codeNick Mathewson
2010-11-19Fix wide lines in SIGNAL patchNick Mathewson
2010-11-19Add a SIGNAL event for control connectionsJohn Brooks
Implements ticket #1955
2010-11-17Generate a router descriptor even if generating an extra-info descriptor fails.Robert Ransom
Fixes bug #2195.
2010-11-17Do not emit an extra-info-digest descriptor line if the digest is zero.Robert Ransom
2010-11-17Tweak the bugfix for 2183 a bit more.Karsten Loesing
2010-11-16Merge branch 'maint-0.2.2'Roger Dingledine
2010-11-16warn more about AllowSingleHopExitsRoger Dingledine
2010-11-15Merge commit 'nickm/1776_redux_v1' into maint-0.2.2Roger Dingledine
2010-11-15Clean up my 1776 fix a bitNick Mathewson
Sebastian notes (and I think correctly) that one of our ||s should have been an &&, which simplifies a boolean expression to decide whether to replace bridges. I'm also refactoring out the negation at the start of the expression, to make it more readable.
2010-11-15Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-11-15Move controller event for socks warning into log_unsafe_socks_warningNick Mathewson
2010-11-15Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/buffers.c
2010-11-15Merge branch 'bug2000_nm_022' into maint-0.2.2Nick Mathewson
2010-11-15Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/config.c src/or/cpuworker.c
2010-11-15Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2Nick Mathewson
2010-11-15Rate-limit unsafe socks warningSebastian Hahn
Pick 5 seconds as the limit. 5 seconds is a compromise here between making sure the user notices that the bad behaviour is (still) happening and not spamming their log too much needlessly (the log message is pretty long). We also keep warning every time if safesocks is specified, because then the user presumably wants to hear about every blocked instance. (This is based on the original patch by Sebastian, then backported to 0.2.2 and with warnings split into their own function.)
2010-11-15Don't use log_err for non-criticial warnings.Karsten Loesing
2010-11-15Try harder not to exceed the 50 KB extra-info descriptor limit.Karsten Loesing
Our checks that we don't exceed the 50 KB size limit of extra-info descriptors apparently failed. This patch fixes these checks and reserves another 250 bytes for appending the signature. Fixes bug 2183.
2010-11-12Merge remote branch 'karsten/enhancement1883'Nick Mathewson
2010-11-12Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-11-12Avoid perma-blocking the controller on bug in shrink_freelistNick Mathewson
In all likelihood, this bug would make Tor assert, but if it doesn't, let's not have two bugs.
2010-11-12Disable logging to control port connections in buf_shrink_freelists.Robert Ransom
If buf_shrink_freelists calls log_warn for some reason, we don't want the log call itself to throw buf_shrink_freelists further off the rails.
2010-11-12Move the original log_info call out of the core of buf_shrink_freelists.Robert Ransom
Sending a log message to a control port can cause Tor to allocate a buffer, thereby changing the length of the freelist behind buf_shrink_freelists's back, thereby causing an assertion to fail. Fixes bug #1125.
2010-11-12Add two fixes to the new geoip-db-digest line.Karsten Loesing
2010-11-11Merge remote branch 'public/refactor_pports'Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion