aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-01-12Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-12Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-01-12Make our replacement INT32_MAX always signedNick Mathewson
The C standard says that INT32_MAX is supposed to be a signed integer. On platforms that have it, we get the correct platform-defined value. Our own replacement, however, was unsigned. That's going to cause a bug somewhere eventually.
2011-01-12Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-12Merge remote branch 'public/bug2363' into maint-0.2.2Nick Mathewson
2011-01-12Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-12Merge remote branch 'sebastian/bug2337' into maint-0.2.2Nick Mathewson
2011-01-12Merge branch 'bug2320'Nick Mathewson
2011-01-12Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-12Merge branch 'bug2331' into maint-0.2.2Nick Mathewson
2011-01-12add a missing "not" in bug2331 changelogNick Mathewson
2011-01-12Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-12Merge branch 'bug2346' into maint-0.2.2Nick Mathewson
2011-01-12Explain bug2346 fix better based on suggestions from armaNick Mathewson
2011-01-12Fix a autoconf warningSebastian Hahn
2011-01-10Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/buffers.c
2011-01-10Pull up more data when parsing socks messagesNick Mathewson
Previously, we only looked at up to 128 bytes. This is a bad idea since socks messages can be at least 256+x bytes long. Now we look at up to 512 bytes; this should be enough for 0.2.2.x to handle all valid SOCKS messages. For 0.2.3.x, we can think about handling trickier cases. Fixes 2330. Bugfix on 0.2.0.16-alpha.
2011-01-10Wait 60 minutes before retrying failed state save; bug2346Nick Mathewson
2011-01-10Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-10Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-01-10Update to the January 1 2011 Maxmind GeoLite Country database.Karsten Loesing
2011-01-09Add missing parens to evdns_base_resolve_* macros while I am at itNick Mathewson
2011-01-09Fix check for failed evdns request creationNick Mathewson
When using libevent 2, we use evdns_base_resolve_*(). When not, we fake evdns_base_resolve_*() using evdns_resolve_*(). Our old check was looking for negative values (like libevent 2 returns), but our eventdns.c code returns 1. This code makes the check just test for nonzero. Note that this broken check was not for _resolve_ failures or even for failures to _launch_ a resolve: it was for failures to _create_ or _encode_ a resolve request. Bug introduced in 81eee0ecfff3dac1e9438719d2f7dc0ba7e84a71; found by lodger; uploaded to trac by rransom. Bug 2363. Fix on 0.2.2.6-alpha.
2011-01-09Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-09Describe tor-resolve defaults. Bug 2364.Nick Mathewson
2011-01-07Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-07Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-01-07Remove a loud info log messageNick Mathewson
2011-01-07Correctly detect and exclude addresses outside of our virtual address rangeNick Mathewson
Found by cypherpunks; fixes more of 2328. Bug was introduced in 3623a122; first appeared in 0.2.0.5-alpha.
2011-01-07Fix wide lines in control.cNick Mathewson
2011-01-07GETINFO options for querying traffic usageDamian Johnson
This was originally a patch provided by pipe (http://www.mail-archive.com/or-talk@freehaven.net/msg13085.html) to provide a method for controllers to query the total amount of traffic tor has handled (this is a frequently requested piece of information by relay operators).
2011-01-06Use autoconf's FLEXIBLE_ARRAY_MEMBER for unspecified-length arraysNick Mathewson
C99 allows a syntax for structures whose last element is of unspecified length: struct s { int elt1; ... char last_element[]; }; Recent (last-5-years) autoconf versions provide an AC_C_FLEXIBLE_ARRAY_MEMBER test that defines FLEXIBLE_ARRAY_MEMBER to either no tokens (if you have c99 flexible array support) or to 1 (if you don't). At that point you just use offsetof [STRUCT_OFFSET() for us] to see where last_element begins, and allocate your structures like: struct s { int elt1; ... char last_element[FLEXIBLE_ARRAY_MEMBER]; }; tor_malloc(STRUCT_OFFSET(struct s, last_element) + n_elements*sizeof(char)); The advantages are: 1) It's easier to see which structures and elements are of unspecified length. 2) The compiler and related checking tools can also see which structures and elements are of unspecified length, in case they wants to try weird bounds-checking tricks or something. 3) The compiler can warn us if we do something dumb, like try to stack-allocate a flexible-length structure.
2011-01-06Fix a strdup() of uninitialized buffer in addressmap_get_virtual_addressNick Mathewson
Partial revert of 22f723e4a3fc32983480c7403af9d7e77a3200ea. Bugfix on 0.2.3.0-alpha
2011-01-06Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-06Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-01-06Merge branch 'bug2328_021' into maint-0.2.1Nick Mathewson
2011-01-06Notice a little faster if we're running out of virtual addressesNick Mathewson
We were not decrementing "available" every time we did ++next_virtual_addr in addressmap_get_virtual_address: we left out the --available when we skipped .00 and .255 addresses. This didn't actually cause a bug in most cases, since the failure mode was to keep looping around the virtual addresses until we found one, or until available hit zero. It could have given you an infinite loop rather than a useful message, however, if you said "VirtualAddrNetwork 127.0.0.255/32" or something broken like that. Spotted by cypherpunks
2011-01-05Handle a NULL return from addressmap_get_virtual_addressNick Mathewson
Fix for bug 2328; bugfix on 0.1.2.1-alpha; bug found by doorss.
2011-01-05Fix a double-counting bug in addrmap_get_virtual_addressNick Mathewson
We were decrementing "available" twice for each in-use address we ran across. This would make us declare that we ran out of virtual addresses when the address space was only half full.
2011-01-05Fix size_t vs unsigned comparison tooNick Mathewson
2011-01-03Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: Makefile.am
2011-01-03Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-01-03Note that Tor requires Automake 1.7. Fixes bug 2305Nick Mathewson
2011-01-03Detect signed size_t and report an error at configure time.Nick Mathewson
2011-01-03Fix up size and sign issues in base32 codeNick Mathewson
Fixes bug 2331.
2011-01-03Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-03Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-01-03Avoid assertion on read_file_to_str() with size==SIZE_T_CEILING-1Nick Mathewson
Spotted by doors, fixes bug 2326.
2011-01-03Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-03Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson