aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2011-01-03Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-03Bump copyright statements to 2011 (0.2.2)Nick Mathewson
2011-01-03Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
Conflicts: src/common/test.h src/or/test.c
2011-01-03Bump copyright statements to 2011Nick Mathewson
2010-12-22Disable stats requiring geoip info if we have noneSebastian Hahn
In other parts of the code we will otherwise attempt to collect these statistics, and that will lead to crashes.
2010-12-21Merge remote branch 'karsten/dirreq-stats-default'Nick Mathewson
Conflicts: src/or/config.c
2010-12-21Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-12-21Merge remote branch 'public/bug2060' into maint-0.2.2Nick Mathewson
2010-12-21Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-12-21Merge remote branch 'rransom/bug2190_the_hard_way' into maint-0.2.2Nick Mathewson
2010-12-21Merge remote branch 'public/bug2190_021' into maint-0.2.1Nick Mathewson
2010-12-19Merge branch 'maint-0.2.2'Roger Dingledine
2010-12-16Merge commit 'nickm/fix_security_bug_022' into maint-0.2.2Roger Dingledine
2010-12-16Merge commit 'nickm/fix_security_bug_021' into maint-0.2.1Roger Dingledine
2010-12-16Turn on epoll changelists with libevent 2.0.9-rc and laterNick Mathewson
Libevent 2.0 has a "changelist" feature that avoids making redundant syscalls if we wind up doing a lot of event_add/event_del operations on the same fd in a row. Unfortunately, due to a weird design choice in Linux, it doesn't work right with epoll when multiple fds refer to the same socket (e.g., one is a dup() of the other). We don't dup() anything we give to Libevent, though, so it is safe for us to explicitly turn this feature on.
2010-12-16Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-12-16Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2010-12-16Change gabelmoo's IP address and ports.Karsten Loesing
2010-12-15Merge remote branch fix_security_bug_021 into fix_security_bug_022Nick Mathewson
Conflicts: src/common/memarea.c src/or/or.h src/or/rendclient.c
2010-12-15Make payloads into uint8_t.Nick Mathewson
This will avoid some signed/unsigned assignment-related bugs.
2010-12-14Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-12-14Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
Conflicts: src/config/geoip
2010-12-13Have all of our allocation functions and a few others check for underflowNick Mathewson
It's all too easy in C to convert an unsigned value to a signed one, which will (on all modern computers) give you a huge signed value. If you have a size_t value of size greater than SSIZE_T_MAX, that is way likelier to be an underflow than it is to be an actual request for more than 2gb of memory in one go. (There's nothing in Tor that should be trying to allocate >2gb chunks.)
2010-12-13Base SIZE_T_CEILING on SSIZE_T_MAX.Nick Mathewson
2010-12-11Only add each log message to pending_cb_messages once.Robert Ransom
2010-12-11Don't call flush_pending_log_callbacks while logging LD_NOCB messages.Robert Ransom
Found by boboper.
2010-12-08Update to the December 1 2010 Maxmind GeoLite Country database.Karsten Loesing
2010-12-07Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-12-07Merge branch 'bug2081_followup_022' into maint-0.2.2Nick Mathewson
2010-12-07Reject relay versions older than 0.2.0.26-rcNick Mathewson
This was the first version to cache the correct directory information. Fixes bug 2156.
2010-12-06Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-12-06Fix a bug in calculating wakeup time on 64-bit machines.Nick Mathewson
If you had TIME_MAX > INT_MAX, and your "time_to_exhaust_bw = accountingmax/expected_bandwidth_usage * 60" calculation managed to overflow INT_MAX, then your time_to_consider value could underflow and wind up being rediculously low or high. "Low" was no problem; negative values got caught by the (time_to_consider <= 0) check. "High", however, would get you a wakeup time somewhere in the distant future. The fix is to check for time_to_exhaust_bw overflowing INT_MAX, not TIME_MAX: We don't allow any accounting interval longer than a month, so if time_to_exhaust_bw is significantly larger than 31*24*60*60, we can just clip it. This is a bugfix on 0.0.9pre6, when accounting was first introduced. It fixes bug 2146, unless there are other causes there too. The fix is from boboper. (I tweaked it slightly by removing an assignment that boboper marked as dead, and lowering a variable that no longer needed to be function-scoped.)
2010-12-06Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-12-06Add a missing ! to directory_fetches_from_authoritiesNick Mathewson
The old logic would have us fetch from authorities if we were refusing unknown exits and our exit policy was reject*. Instead, we want to fetch from authorities if we're refusing unknown exits and our exit policy is _NOT_ reject*. Fixed by boboper. Fixes more of 2097. Bugfix on 0.2.2.16-alpha.
2010-12-06Fetch missing certs to authenticate microdesc consensuses as neededNick Mathewson
Fixes bug 2253; fix by rransom
2010-12-03Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-12-03Don't crash when accountingmax is set in non-server TorsNick Mathewson
We use a hash of the identity key to seed a prng to tell when an accounting period should end. But thanks to the bug998 changes, clients no longer have server-identity keys to use as a long-term seed in accounting calculations. In any case, their identity keys (as used in TLS) were never never fixed. So we can just set the wakeup time from a random seed instead there. Still open is whether everybody should be random. This patch fixes bug 2235, which was introduced in 0.2.2.18-alpha. Diagnosed with help from boboper on irc.
2010-12-03Make connection direction statistics compile again.Karsten Loesing
2010-12-03Write bidirectional connection stats in single line.Karsten Loesing
There's no need to have a separate line conn-stats-end for the end date and interval length with only a single line conn-bi-direct following.
2010-12-03Refactor conn stats and add unit tests.Karsten Loesing
2010-12-03Document BIDI_* constants.Karsten Loesing
2010-12-03Call the new config option ConnDirectionStatistics.Karsten Loesing
2010-12-03Add metric on uni/bidirectional connection usage.Karsten Loesing
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-01Fix connecting the stdin of tor-fw-helper to /dev/nullSteven Murdoch
This wasn't working due to the parameters of dup2 being in the wrong order. As a result, tor-fw-helper was inheriting the stdin of Tor.
2010-12-01Merge remote branch 'sjmurdoch/cloexec'Nick Mathewson
2010-12-01Check that FD_CLOEXEC is set before using itSteven Murdoch
I don't know if any platforms we care about don't have FD_CLOEXEC, but this is what we do elsewhere
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-12-01Open log files with CLOEXEC flag setSteven Murdoch