summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | | Fix warnings.Linus Nordberg2011-12-01
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove environ declaration. Use ORPort->value. And it's a string. Make tmp a char *.
* | | | | | | Add an initializer to appease older gccNick Mathewson2011-11-30
| | | | | | |
* | | | | | | Only define set_buffer_lengths_to_zero if bufferevents are enabledMurdoch@cl.cam.ac.uk2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, on Windows, gcc will warn about the function being unused
* | | | | | | Merge remote-tracking branch 'sjmurdoch/bug1983-port-tor-fw-helper-to-windows'Nick Mathewson2011-11-30
|\ \ \ \ \ \ \
| * | | | | | | Make file descriptor type an unsigned integerSteven Murdoch2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids a warning from gcc (comparison between signed and unsigned integer expressions [-Werror=sign-compare]), under Windows
| * | | | | | | Support NAT-PMP on WindowsSteven Murdoch2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Link in libws32 and libiphlpapi, needed for libnatpmp (both in ./configure and when compiling tor-fw-helper-natpmp.c) - Define STATICLIB under Windows, to allow tor-fw-helper-natpmp.c to link - Don't include arpa/inet.h which isn't present in Mingw32 and doesn't appear to be needed on either Windows or MacOS X
* | | | | | | | Merge branch 'feature2553-v4-rebased'Nick Mathewson2011-11-30
|\ \ \ \ \ \ \ \
| * | | | | | | | Add some more documentationArturo Filastò2011-11-30
| | | | | | | | |
| * | | | | | | | Add support for tor2web mode via configureArturo Filastò2011-11-30
| | | | | | | | |
| * | | | | | | | Turn off LearnCircuitBuildTimeout when tor2web mode is onRobert Ransom2011-11-30
| | | | | | | | |
| * | | | | | | | Add ifdefs to disable assertion in connection_ap_handshake_send_beginRobert Ransom2011-11-30
| | | | | | | | |
| * | | | | | | | Add ifdefs to disable #3332 assertionsRobert Ransom2011-11-30
| | | | | | | | |
| * | | | | | | | Use single-hop intro and rend circuits when in tor2web modeRobert Ransom2011-11-30
| | | | | | | | |
| * | | | | | | | Perform single-hop HS desc fetches when in tor2web modeRobert Ransom2011-11-30
| | | | | | | | |
| * | | | | | | | Don't allow tor2web-mode Tors to connect to non-HS addressesRobert Ransom2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Warn loudly on startup and SIGHUP if Tor is built for a non-anonymous modeRobert Ransom2011-11-30
| | | | | | | | |
| * | | | | | | | Add a compile-time #define to control whether Tor runs in 'tor2web mode'Robert Ransom2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.)
| * | | | | | | | Add Tor2webMode configuration optionRobert Ransom2011-11-24
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'bug933_nm_rebased_v2'Nick Mathewson2011-11-30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/test/test.c
| * | | | | | | | Tweak addressmap_rewrite a little moreNick Mathewson2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Fix an issue in my mapaddress domains code spotted by armaNick Mathewson2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Add some post-comma spaces to please armaNick Mathewson2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Revise MapAddress manpageNick Mathewson2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make the asciidoc work; make the example more generic; tighten the prose a little; be more specific that *.example.com matches example.com; simplify an example.
| * | | | | | | | Forbid remapping of *Nick Mathewson2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 -> ...)
| * | | | | | | | Refactor addressmap_match_superdomains and representation of wildcardsNick Mathewson2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | | | | | | No new "LEGACY" tests allowed.Nick Mathewson2011-11-30
| | | | | | | | |
| * | | | | | | | Fix compilation: get_options() now returns constNick Mathewson2011-11-30
| | | | | | | | |
| * | | | | | | | Address nickm's comments at ↵Robert Hogan2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Address nickm's comments at ↵Robert Hogan2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | bug933 - Match against super-domains in MapAddressRobert Hogan2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow MapAddress to handle directives such as: MapAddress .torproject.org .torserver.exit MapAddress .org 1.1.1.1 Add tests for addressmap_rewrite.
* | | | | | | | | Merge branch 'bug4538_v2'Nick Mathewson2011-11-30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Free the global DH parameters in crypto_global_cleanup().George Kadianakis2011-11-30
| | | | | | | | | |
| * | | | | | | | | Move crypto_global_cleanup() to the bottom of crypto.c.George Kadianakis2011-11-30
|/ / / / / / / / /
* | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-11-30
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Detect tor_addr_to_str failure in tor_dup_addr.Nick Mathewson2011-11-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids a possible strdup of an uninitialized buffer. Fixes 4529; fix on 0.2.1.3-alpha; reported by troll_un.
* | | | | | | | | Fix a memory leak in error path of my default-torrc codeNick Mathewson2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Coverity CID # 500
* | | | | | | | | Resolve a resource leak in test_util_split_linesNick Mathewson2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes coverity CID # 488
* | | | | | | | | appease "make check-spaces"Nick Mathewson2011-11-30
| | | | | | | | |
* | | | | | | | | Merge branch 'ipv6_bridges_squashed'Nick Mathewson2011-11-30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename one more recalcitrant function.Nick Mathewson2011-11-30
| | | | | | | | | |
| * | | | | | | | | Add changes file.Linus Nordberg2011-11-30
| | | | | | | | | |
| * | | | | | | | | Warn user about client ignoring non-preferred IP address for a bridge.Linus Nordberg2011-11-30
| | | | | | | | | |
| * | | | | | | | | Whitespace changes.Linus Nordberg2011-11-30
| | | | | | | | | |
| * | | | | | | | | Make the router_get_*_orport interface consistent with node_*.Linus Nordberg2011-11-30
| | | | | | | | | |
| * | | | | | | | | Make router_get_{prim,alt,pref}_addr_port take tor_addr_port_t *.Linus Nordberg2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename to *_orport for consistency with node_*.
| * | | | | | | | | Merge node_get_{prim,pref,pref_ipv6}_addr with their _orport counterparts.Linus Nordberg2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | Use correct address family where necessary for bridges on IPv6.Linus Nordberg2011-11-30
| | | | | | | | | |
| * | | | | | | | | Use the preferred address and port when initiating a connection.Linus Nordberg2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not as conservative as we could do it, f.ex. by looking at the connection and only do this for connections to bridges. A non-bridge should never have anything else than its primary IPv4 address set though, so I think this is safe.
| * | | | | | | | | Take IPv6 into account when rewriting routerinfo for a bridge and maintain ↵Linus Nordberg2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ipv6_preferred. Don't touch the string representation in routerinfo_t->address. Also, set or clear the routerinfo_t->ipv6_preferred flag based on the address family of the bridge.
| * | | | | | | | | Use preferred address when looking for bridges by routerinfo_t.Linus Nordberg2011-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be safe to do for all uses of get_configured_bridge_by_routerinfo().