aboutsummaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2011-12-09Refactor stream attachment in circuit_has_openedRobert Ransom
Put the 'try attaching streams, clear isolation state if possible, retry attaching streams' loop in its own separate function, where it belongs.
2011-12-08paint bug2474's fix a different neon colorRoger Dingledine
this way people with 80-column logs may read more of the warning
2011-12-07Merge remote-tracking branch 'public/revert_4312'Nick Mathewson
2011-12-07clarify a debug lineRoger Dingledine
2011-12-06Revert "Get rid of tor_tls_block_renegotiation()."Nick Mathewson
This reverts commit 340809dd224b244675496e301d3ba154a6fe68d0.
2011-12-06Revert "Use callback-driven approach to block renegotiations."Nick Mathewson
This reverts commit 406ae1ba5ad529a4d0e710229dab6ed645d42b50.
2011-12-06Revert "Refactor tor_event_base_once to do what we actually want"Nick Mathewson
This reverts commit 7920ea55b8d994268d2b07f27316b0f34d8f27e5.
2011-12-06Revert "Avoid a double-mark in connection_or_close_connection_cb"Nick Mathewson
This reverts commit 633071eb3bcf2c4106e93de28d727594bd23b1db.
2011-12-06Revert "Make pending libevent actions cancelable"Nick Mathewson
This reverts commit aba25a6939a5907d40dbcff7433a8c130ffd12ad.
2011-12-06Revert "Set renegotiation callbacks immediately on tls inititation"Nick Mathewson
This reverts commit e27a26d568a257cf350814a9abfa47d3b41ad9f3.
2011-12-05Merge remote-tracking branch 'sebastian/coverity'Nick Mathewson
2011-12-05Add comment about bug4651 fixNick Mathewson
2011-12-04cid 432: Remove dead code if we don't handle a consensusSebastian Hahn
Bugfix on 0.2.3.1, fixes the second half of bug 4637.
2011-12-03Don't send two ESTABLISH_RENDEZVOUS cells when opening a new rend circRobert Ransom
2011-12-02Don't just tell the controller "foo" on id mismatchNick Mathewson
Fixes bug 4169; bugfix on 0.2.1.1-alpha.
2011-12-02Init conn->addr to "unspec" on cpuworker connectionsNick Mathewson
Fixes bug 4532 reported by "troll_un"
2011-12-02Give DirAllowPrivateAddress an explicit defaultNick Mathewson
By convention, we say whether each bool's default is 0 or 1 Fixes 4536; found by "troll_un"
2011-12-02Resolve bug 3448: remove mention of tor-ops (which is not in use)Nick Mathewson
2011-12-01Don't segfault when checking whether a not-yet-used intro point should expireRobert Ransom
Found by katmagic. Bugfix on the #3460 branch, not yet in any release.
2011-12-01Fix warnings.Linus Nordberg
Remove environ declaration. Use ORPort->value. And it's a string. Make tmp a char *.
2011-11-30Only define set_buffer_lengths_to_zero if bufferevents are enabledMurdoch@cl.cam.ac.uk
Otherwise, on Windows, gcc will warn about the function being unused
2011-11-30Merge branch 'feature2553-v4-rebased'Nick Mathewson
2011-11-30Add some more documentationArturo Filastò
2011-11-30Turn off LearnCircuitBuildTimeout when tor2web mode is onRobert Ransom
2011-11-30Add ifdefs to disable assertion in connection_ap_handshake_send_beginRobert Ransom
2011-11-30Add ifdefs to disable #3332 assertionsRobert Ransom
2011-11-30Use single-hop intro and rend circuits when in tor2web modeRobert Ransom
2011-11-30Perform single-hop HS desc fetches when in tor2web modeRobert Ransom
2011-11-30Don't allow tor2web-mode Tors to connect to non-HS addressesRobert Ransom
The client's anonymity when accessing a non-HS address in tor2web-mode would be easily nuked by inserting an inline image with a .onion URL, so don't even pretend to access non-HS addresses through Tor.
2011-11-30Warn loudly on startup and SIGHUP if Tor is built for a non-anonymous modeRobert Ransom
2011-11-30Add a compile-time #define to control whether Tor runs in 'tor2web mode'Robert Ransom
The Tor2webMode torrc option is still required to run a Tor client in 'tor2web mode', but now it can't be turned on at runtime in a normal build of Tor. (And a tor2web build of Tor can't be used as a normal Tor client, so we don't have to worry as much about someone distributing packages with this particular pistol accessible to normal users.)
2011-11-30Merge branch 'bug933_nm_rebased_v2'Nick Mathewson
Conflicts: src/test/test.c
2011-11-30Tweak addressmap_rewrite a little moreNick Mathewson
This resolves a loop warning on "MapAddress *.example.com example.com", makes the rewrite log messages correct, and fixes the behavior of "MapAddress *.a *.b" when just given "a" as an input.
2011-11-30Fix an issue in my mapaddress domains code spotted by armaNick Mathewson
MapAddress *.torproject.org torproject.org would have been interpreted as a map from a domain to itself, and would have cleared the mapping. Now we require not only a match of domains, but of wildcards.
2011-11-30Add some post-comma spaces to please armaNick Mathewson
Incidentally, we've got 30969 lines in master with a comma in them, of which 1995 have a comma followed by a non-newline, non-space character. So about 93% of our commas are right, but we have a substantial number of "crowded" lines.
2011-11-30Forbid remapping of *Nick Mathewson
It might be nice to support this someday, but for now it would fail with an infinite remap cycle. (If I say "remap * *.foo.exit", then example.com -> example.com.foo.exit -> example.com.foo.exit.foo.exit -> example.com.foo.exit.foo.exit.foo.exit -> ...)
2011-11-30Refactor addressmap_match_superdomains and representation of wildcardsNick Mathewson
In this new representation for wildcarded addresses, there are no longer any 'magic addresses': rather, "a.b c.d", "*.a.b c.d" and "*.a.b *.c.d" are all represented by a mapping from "a.b" to "c.d". we now distinguish them by setting bits in the addressmap_entry_t structure, where src_wildcard is set if the source address had a wildcard, and dst_wildcard is set if the target address had a wildcard. This lets the case where "*.a.b *.c.d" or "*.a.b c.d" remap the address "a.b" get handled trivially, and lets us simplify and improve the addressmap_match_superdomains implementation: we can now have it run in O(parts of address) rather than O(entries in addressmap).
2011-11-30Address nickm's comments at ↵Robert Hogan
https://trac.torproject.org/projects/tor/ticket/933#comment:8 1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'. This has resulted in a slight refactoring of config_register_addressmaps. 2. Add some more detail to the man page entry for AddressMap. 3. Fix initialization of a pointer to NULL rather than 0. 4. Update the unit tests to cater for the changes in 1 and test more explicitly for recursive mapping.
2011-11-30Address nickm's comments at ↵Robert Hogan
https://trac.torproject.org/projects/tor/ticket/933#comment:4 1. Implement the following mapping rules: MapAddress a.b.c d.e.f # This is what we have now MapAddress .a.b.c d.e.f # Replaces any address ending with .a.b.c with d.e.f MapAddress .a.b.c .d.e.f # Replaces the .a.b.c at the end of any addr with .d.e.f (Note that 'a.b.c .d.e.f' is invalid, and will be rejected.) 2. Add tests for the new rules. 3. Allow proper wildcard annotation, i.e. '*.d.e' '.d.e' will still work. 4. Update addressmap_entry_t with an is_wildcard member.
2011-11-30bug933 - Match against super-domains in MapAddressRobert Hogan
Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
2011-11-30Fix a memory leak in error path of my default-torrc codeNick Mathewson
Fixes Coverity CID # 500
2011-11-30appease "make check-spaces"Nick Mathewson
2011-11-30Merge branch 'ipv6_bridges_squashed'Nick Mathewson
2011-11-30Rename one more recalcitrant function.Nick Mathewson
2011-11-30Warn user about client ignoring non-preferred IP address for a bridge.Linus Nordberg
2011-11-30Whitespace changes.Linus Nordberg
2011-11-30Make the router_get_*_orport interface consistent with node_*.Linus Nordberg
2011-11-30Make router_get_{prim,alt,pref}_addr_port take tor_addr_port_t *.Linus Nordberg
Rename to *_orport for consistency with node_*.
2011-11-30Merge node_get_{prim,pref,pref_ipv6}_addr with their _orport counterparts.Linus Nordberg
This keeps the IP address and TCP for a given OR port together, reducing the risk of using an address for one address family with a port of another. Make node_get_addr() a wrapper function for compatibility.
2011-11-30Use correct address family where necessary for bridges on IPv6.Linus Nordberg