Nick Mathewson
6eba3584b1
Merge remote-tracking branch 'public/bug10987_024'
2014-02-21 17:29:48 +00:00
Nick Mathewson
f3e8271652
Style tweaks on code, changes file for 10987
2014-02-21 17:27:35 +00:00
David Goulet
1532cff2ce
Fix: send back correct IPv6 SOCKS5 connect reply
...
For a client using a SocksPort connection and IPv6, the connect reply
from tor daemon did not handle AF_INET6 thus sending back the wrong
payload to the client.
A changes file is provided and this fixes #10987
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2014-02-21 17:19:11 +00:00
Nick Mathewson
8d5215c6a0
Changes file for b063ebbc60
...
This bugfix didn't get a trac ticket because the internet in this
room is an exercise in futility.
2014-02-20 11:55:38 +00:00
Nick Hopper
b063ebbc60
fixed long -> int implicit cast warning line 3453
2014-02-20 11:54:01 +00:00
Nick Mathewson
c0835f8e75
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-18 01:16:22 +00:00
Nick Mathewson
e616f5b513
whoops; mistaek in a496010642
. so many comma
2014-02-18 01:15:59 +00:00
Nick Mathewson
bafae045ba
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-17 23:06:34 +00:00
Nick Mathewson
9f38cd9350
add changes file for bug 10929
2014-02-17 23:06:18 +00:00
dana koch
a496010642
Enveigle configure to look for a2x.py as well as a2x.
...
It's not guaranteed that every package symlinks a2x to a2x.py; OpenBSD
does not do this, so let's just look for a2x.py as well.
2014-02-17 23:05:15 +00:00
Nick Mathewson
3899cde2cb
changes file for 10928
2014-02-17 23:00:55 +00:00
dana koch
f49805b681
Restitute a successful stat call to this test case.
...
Since the first stat call is made for it to deliberately fail, and we
reference st.st_mode without st having valid data, st.st_mode can contain
garbage and cause chmod to fail with EINVAL. We rerun stat and ensure it
succeeded.
Also make use of tt_abort_perror, to properly convey failure reasons to
the user.
2014-02-17 22:55:40 +00:00
dana koch
8999150f71
Appropriately condition the _le64toh macro definition for OpenBSD.
...
This corrects a linker error on OpenBSD, where the function is called letoh64. See also http://git.kernel.org/cgit/docs/man-pages/man-pages.git/tree/man3/endian.3#n84 .
2014-02-17 22:42:19 +00:00
Nick Mathewson
e1deb01e5f
mingw fix: Rename a variable in the unit tests
...
Apparently, MS C is #defining "IN" on us, so we can't name a
variable IN. Delightful!
2014-02-16 12:51:35 -05:00
Nick Mathewson
3dfed0806c
Merge remote-tracking branch 'public/bug10722'
2014-02-16 12:13:12 -05:00
Nick Mathewson
b5d6e47002
Warning message when bug 10722 would trigger
...
If somebody's excludenodes settings are keeping their hidden service
connections from working, they should probably get notified about it.
2014-02-16 12:11:07 -05:00
Nick Mathewson
35423d397f
Merge branch 'bug4900_siphash_v2'
2014-02-15 15:59:10 -05:00
Nick Mathewson
1ad6dd0dbe
Remove string hash in ht.h so we can't accidentally use it
2014-02-15 15:45:38 -05:00
Nick Mathewson
b3a6907493
Remove a bunch of functions that were never called.
2014-02-15 15:33:34 -05:00
Nick Mathewson
67749475f5
Merge remote-tracking branch 'public/bug10841'
2014-02-15 15:06:06 -05:00
Nick Mathewson
9d0af78e3c
Merge remote-tracking branch 'karsten/mmdb-convert'
2014-02-15 00:08:36 -05:00
Nick Mathewson
c64b549621
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-15 00:07:15 -05:00
Nick Mathewson
bc58bfda70
Merge remote-tracking branch 'karsten/geoip6-feb2014' into maint-0.2.4
2014-02-15 00:06:40 -05:00
Nick Mathewson
260b3b1a19
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-02-15 00:06:25 -05:00
Nick Mathewson
405d055465
Merge remote-tracking branch 'karsten/geoip-feb2014' into maint-0.2.3
2014-02-15 00:06:01 -05:00
Nick Mathewson
339a47e80b
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-15 00:03:29 -05:00
Nick Mathewson
e4bc757cde
changes file for bug 10904
2014-02-14 23:51:14 -05:00
Sebastian Hahn
3f567f529f
gcc/clang: Mark macro-generated functions as possible unused
...
clang 3.4 introduced a new by-default warning about unused static
functions, which we triggered heavily for the hashtable and map function
generating macros. We can use __attribute__ ((unused)) (thanks nickm for
the suggestion :-) ) to silence these warnings.
2014-02-14 23:43:15 -05:00
Nick Mathewson
ac5ae794bd
tristate->enum in rendcommon functions
...
When we have more than two return values, we should really be using
an enum rather than "-2 means this, -1 means that, 0 means this, and
1 or more means a number."
2014-02-14 23:23:53 -05:00
Nick Mathewson
1987894626
fix a whitespace snafu
2014-02-14 23:00:04 -05:00
Karsten Loesing
c024ff8671
Remove another unused v0 hidserv function.
...
Noted by Nick on #10841 .
2014-02-14 17:54:16 +01:00
Karsten Loesing
f6f691df73
Update geoip6 to the February 2014 GeoIP database.
2014-02-13 19:04:51 +01:00
Karsten Loesing
436f7106b4
Exclude Teredo IPv6 prefix from geoip6.
...
The latest GeoLite2 database includes a pointer from 2001::/32 to the root
node of the IPv4 address space in the tree. We need to exclude this whole
address space from geoip6, similar to how we exclude IPv4-mapped IPv6
addresses and the 6to4 mapping subnet.
2014-02-13 18:58:21 +01:00
Roger Dingledine
745434d29a
bump to 0.2.5.2-alpha
2014-02-13 04:06:36 -05:00
Roger Dingledine
f63b394d90
give 0.2.5.2-alpha a release blurb
2014-02-13 03:49:46 -05:00
Roger Dingledine
8028d8fded
fold in the changes files to the new 0.2.5.2-alpha changelog
2014-02-13 02:46:26 -05:00
Nick Mathewson
24add404ac
eventdns.c: survive broken resolv.conf files
...
If you had a resolv.conf file with a nameserver line containing no
nameserver IP, we would crash. That's not terrible, but it's not
desirable.
Fixes bug 8788; bugfix on 0.1.1.23. Libevent already has this fix.
2014-02-12 15:11:31 -05:00
Nick Mathewson
79c234e0e3
On OOM, also log N circuits remaining
2014-02-12 13:09:02 -05:00
Nick Mathewson
c8d41da52d
More unit tests for OOM handling.
...
This gets us up to no interesting untested new or changed lines for
the 10169 code.
2014-02-12 12:50:16 -05:00
Nick Mathewson
48877e24a8
Initial unit tests for OOM handling
2014-02-12 12:49:56 -05:00
Nick Mathewson
9a07ec751f
Refactor OOM-handling functions for more testability
...
This patch splits out some of the functions in OOM handling so that
it's easier to check them without involving the rest of Tor or
requiring that the circuits be "wired up".
2014-02-12 12:48:20 -05:00
Nick Mathewson
52d222aafb
Add tests for buffer time tracking.
2014-02-12 12:48:11 -05:00
Nick Mathewson
d379fc6e0f
Several tests for buffer allocation
2014-02-12 12:48:00 -05:00
Nick Mathewson
f425cf8338
Start writing tests for 10169.
...
Now we cover more chunk allocation functions.
2014-02-12 12:47:49 -05:00
Nick Mathewson
eb6f433bdb
Debugging code inbuffers.c for debugging chunk allocation.
...
Currently on; will disable later in this branch.
2014-02-12 12:46:17 -05:00
Nick Mathewson
87fb1e324c
Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2
...
Conflicts:
src/or/circuitlist.c
2014-02-12 12:44:58 -05:00
Nick Mathewson
05d8111eed
Merge remote-tracking branch 'public/bug10169_023' into bug10169_024
2014-02-12 12:39:15 -05:00
Nick Mathewson
fd28754dd3
Actually release buffer freelists when handling OOM conditions.
...
Otherwise freeing buffers won't help for a little while.
2014-02-12 12:38:20 -05:00
Nick Mathewson
7951591744
Fix bugs in bug10169 bugfix memory tracking
...
The chunk_grow() and chunk_copy() functions weren't adjusting the
memory totals properly.
Bugfix not on any released Tor version.
2014-02-12 12:37:41 -05:00
Nick Mathewson
10d1b0b33e
Changes file for feature4900
2014-02-12 12:20:29 -05:00