Nick Mathewson
c8056dcbbb
Fix some wide lines
2012-12-07 14:14:20 -05:00
Nick Mathewson
3fa9151f26
Merge branch 'win64-7260'
...
Conflicts:
src/or/dns.c
2012-12-07 14:12:17 -05:00
Nick Mathewson
cd4f56a37c
Fix infinite loop in circuit_expire_bulding
...
Fixes bug 7663; bug introduced in 42e3c04a7a
. Not in any
released version of Tor.
2012-12-07 14:08:07 -05:00
Nick Mathewson
504d4aa8c6
Expand the manpage to say: watch out for nonlocal socks
...
This clears up the remaining issue stopping me from closing bug 6297.
2012-12-07 12:42:55 -05:00
Nick Mathewson
f366b0112e
Merge remote-tracking branch 'karsten/task-6266'
2012-12-07 11:39:56 -05:00
Nick Mathewson
81fcebcd05
Merge branch 'bug7306'
2012-12-07 11:11:26 -05:00
Nick Mathewson
025dc19b63
Merge remote-tracking branch 'public/bug6887'
2012-12-07 11:02:27 -05:00
Nick Mathewson
f4f7e7a6f8
Merge branch 'bug3443_squashed'
2012-12-07 10:35:41 -05:00
Mike Perry
42e3c04a7a
Bug 3443: Don't count ORconn setup in circuit build time.
...
Also, add a hack Roger suggested where we're more patient if no circuits are
opened yet.
2012-12-07 10:34:09 -05:00
Nick Mathewson
b326e76144
Use FreeLibrary, not CloseHandle, for library in test_util.c
...
Fix for bug 7306. Bugfix on 0.2.2.17-alpha.
2012-12-06 10:59:02 -05:00
Karsten Loesing
c718921d34
Update to the December 2012 GeoIP database.
2012-12-06 11:29:47 +01:00
Nick Mathewson
bd93ff8dd7
Merge remote-tracking branch 'asn/bug7592_take2'
2012-12-04 21:47:45 -05:00
George Kadianakis
c01dfd5d7b
Return connection_exit_connect() if payload creation failed.
...
Fixes bug #7592 ; bugfix on 882b389668
.
The bug is not present in any released versions of Tor.
2012-12-05 04:32:11 +02:00
Roger Dingledine
e899d49e2f
fix some typos
2012-12-03 13:33:43 -05:00
Nick Mathewson
190c1d4981
Merge branch 'bug7013_take2_squashed'
2012-11-27 22:18:16 -05:00
George Kadianakis
6f21d2e496
Introduce tor_addr_port_parse() and use it to parse ServerTransportListenAddr.
2012-11-27 22:18:08 -05:00
George Kadianakis
f88c303869
Add a torrc option to specify the bind address of managed proxies.
2012-11-27 22:18:08 -05:00
Karsten Loesing
35d09dd6ac
Update to the November 2012 GeoIP database.
2012-11-27 21:26:52 -05:00
Karsten Loesing
2bf195d0ce
Add script to fix "A1" entries in geoip file.
...
Fixes #6266 .
2012-11-27 21:24:07 -05:00
Nick Mathewson
267c0e5aa1
Make sure that the error in ADDRMAP events is well-formed
...
"error=Unable to launch resolve request" is not a nice thing to tell
the controller. Bugfix on 0.2.0.19-alpha (c11c48fc
).
2012-11-23 11:36:44 -05:00
Nick Mathewson
06703f84df
Minor documentation fix
2012-11-23 10:51:11 -05:00
Nick Mathewson
99669c69b3
Note limitation of parse_rfc_1123_time
...
RFC1123 suggests that we should handle two-year times, and a full
range of time zones, and other stuff too. We don't.
2012-11-23 10:06:16 -05:00
Nick Mathewson
864e15cd1c
In comments and logs, say "UTC" not "GMT"
...
Fix for #6113 .
Note that the RFC1123 times we generate still all say 'GMT'. I'm
going to suggest this is not worth changing.
2012-11-23 10:05:16 -05:00
Nick Mathewson
e6828ea634
Refer to RFC 4648 instead of the obsolete RFC 3548
...
Affects comments only. For ticket 6849.
2012-11-23 09:51:35 -05:00
Roger Dingledine
0f9524dbd0
forward-port the 0.2.3.25 changelog and release notes
2012-11-20 03:46:56 -05:00
Nick Mathewson
ea893a3c30
Merge branch 'bug7493_redux'
2012-11-18 18:46:57 -05:00
Nick Mathewson
bfe8d829c2
Initialize ipv{4,6}_traffic_ok in entry_connection_new
...
This one is necessary for sending BEGIN cells with sane flags when
self-testing a directory port. All real entry connections were
getting their ipv{4,6}_traffic_ok flags set from their listeners, and
for begindir entry connections we didn't care, but for directory
self-testing, we had a problem.
Fixes at least one more case of 7493; if there are more lingering
cases of 7493, this might fix them too.
Bug not in any released version of Tor.
2012-11-18 17:15:41 -05:00
Roger Dingledine
06d367ea36
when counting available descs, say whether we're counting exits
2012-11-16 11:38:56 -05:00
Nick Mathewson
ecb619d96b
Give useful warning when both IPv4 and IPv6 are disabled on a socksport
2012-11-15 22:58:54 -05:00
Nick Mathewson
28cbe90839
Allow IPv4 traffic on default and old-style-config SocksPorts.
...
Looks like when i was writing the code to set the ipv4_traffic flag on
port_cfg_t, I missed some cases, such as the one where the port was
set from its default value.
Fix for 7493. Bug not in any released Tor.
2012-11-15 22:49:43 -05:00
Nick Mathewson
ca0c71551e
Merge branch 'ipv6_exits'
2012-11-15 14:45:15 -05:00
Nick Mathewson
1e46952f36
Set IPv4/IPv6 flags correctly when being a SOCKS client
2012-11-15 13:00:19 -05:00
Nick Mathewson
a4fce0fee8
Remove some XXXX commens in dns.c
...
Previously, I was freaking out about passing an unspec address to
dns_found_answer() on an error, since I was using the address type to
determine whether the error was an error on an ipv4 address lookup or
on an ipv6 address lookup. But now dns_found_answer() has a separate
orig_query_type argument to tell what kind of query it is, so there's
no need to freak out.
2012-11-15 12:17:36 -05:00
Nick Mathewson
12f997528d
Fix up some comments in connection_edge.c
2012-11-15 12:17:30 -05:00
Nick Mathewson
b1ad84dce6
Add a changes file for IPv6 exits
2012-11-14 23:35:55 -05:00
Nick Mathewson
61d740ed01
Add manual page entries for new IPv6-exits options
2012-11-14 23:35:13 -05:00
Nick Mathewson
e3ceac38d9
Add another missing function doc
2012-11-14 23:16:58 -05:00
Nick Mathewson
d643487cc2
Initial support for AAAA requests on DNSPort.
...
This is imperfect, since it sends back whatever we would send to
a socks RESOLVE request, when in reality we should send back whatever
was asked for.
2012-11-14 23:16:58 -05:00
Nick Mathewson
053f2cb7c8
Let tor-resolve generate PTR requests for IPv6 addresses
2012-11-14 23:16:57 -05:00
Nick Mathewson
50af1087c4
Accept reverse resolve requests for IPv6 addresses
2012-11-14 23:16:57 -05:00
Nick Mathewson
4db49f2b27
Add IPv6 support to tor-resolve so it can hear about IPv6 answers
2012-11-14 23:16:57 -05:00
Nick Mathewson
0f899518cf
Make DNS resolve requests work for IPv6
...
* If there's an IPv4 and an IPv6 address, return both in the resolved
cell.
* Treat all resolve requests as permitting IPv6, since by the spec they're
allowed to, and by the code that won't break anything.
2012-11-14 23:16:57 -05:00
Nick Mathewson
bb2145b45b
Fix a bug in policy_is_reject_star() that was making IPv4 exits break
...
IPv4-only exits have an implicit "reject [::]/0", which was making
policy_is_reject_star() return 1 for them, making us refuse to do
hostname lookups.
This fix chanes policy_is_reject_star() to ask about which family we meant.
2012-11-14 23:16:57 -05:00
Nick Mathewson
85e8d35fca
Add some missing doxygen for ipv6 exit code
2012-11-14 23:16:57 -05:00
Nick Mathewson
882b389668
Actually send back correctly-formed IPv6 CONNECTED cells
...
We had some old code to send back connected cells for IPv6 addresses,
but it was wrong. Fortunately, it was also unreachable.
2012-11-14 23:16:41 -05:00
Nick Mathewson
6b36142bcc
Remove some unused defines in dns.c
2012-11-14 23:16:40 -05:00
Nick Mathewson
7197c9f14a
Repair DNS NEXIST hijacking workaround
...
The code previously detected wildcarding and replaced wildcarded
answers with DNS_STATUS_FAILED_PERMANENT. But that status variable
was no longer used! Remove the status variable, and instead change
the value of 'result' in evdns_callback.
Thank goodness for compiler warnings. In this case,
unused-but-set-variable.
Thanks to Linus for finding this one.
2012-11-14 23:16:40 -05:00
Nick Mathewson
363cf02455
Implement a PreferIPv6 flag for SocksPorts
2012-11-14 23:16:40 -05:00
Nick Mathewson
c4830bfbe2
Define a wrapper for evdns_base_resolve_ipv6 for systems w/o libevent 2
2012-11-14 23:16:40 -05:00
Nick Mathewson
35ce42118f
Make address_is_invalid_destination recognize ipv6 addrs as valid.
2012-11-14 23:16:40 -05:00