aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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.
* Fix whitespace issues in patches merged today so farNick Mathewson2011-09-07
|
* chown() sockets when User option is setJérémy Bobbio2011-09-07
| | | | Fixes bug 3421
* fix a const warningNick Mathewson2011-09-07
|
* Merge branch 'bug3327_squashed'Nick Mathewson2011-09-07
|\
| * Report reason for generating descriptor in an HTTP headerNick Mathewson2011-09-07
| | | | | | | | Suggested by arma; based on 3327.
| * Clean up HTTP request header generation a littleNick Mathewson2011-09-07
| | | | | | | | | | Use a list of headers rather than trying to printf every header that might exist.
| * Upload descriptors more often when recent desc is unlistedNick Mathewson2011-09-07
|/ | | | | | | | | | | | | | | | | | Right now we only force a new descriptor upload every 18 hours. This can make servers become unlisted if they upload a descriptor at time T which the authorities reject as being "too similar" to one they uploaded before. Nothing will actually make the server upload a new descriptor later on, until another 18 hours have passed. This patch changes the upload behavior so that the 18 hour interval applies only when we're listed in a live consensus with a descriptor published within the last 18 hours. Otherwise--if we're not listed in the live consensus, or if we're listed with a publication time over 18 hours in the past--we upload a new descriptor every 90 minutes. This is an attempted bugfix for #3327. If we merge it, it should obsolete #535.
* Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-09-07
|\ | | | | | | | | | | | | | | Conflicts: src/or/dirserv.c src/or/networkstatus.c Conflicts were related to routerinfo->node shift.
| * Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2Nick Mathewson2011-09-07
| |\
| | * Increase default required uptime for HSDirs to 25 hoursRobert Ransom2011-06-03
| | |
| | * Add a VoteOnHidServDirectoriesV2 configuration optionRobert Ransom2011-06-03
| | |
* | | changes file for split_entry_conn (ticket 3627)Nick Mathewson2011-09-07
| | |
* | | Remove a now-needless test.Nick Mathewson2011-09-07
| | |
* | | Merge remote-tracking branch 'public/split_entry_conn'Nick Mathewson2011-09-07
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/connection.c src/or/connection_edge.c src/or/connection_edge.h src/or/dnsserv.c Some of these were a little tricky, since they touched code that changed because of the prop171 fixes.
| * | | Move entry-only fields from edge_connection_t to entry_connection_tNick Mathewson2011-07-21
| | | | | | | | | | | | | | | | Also, refactor the code accordingly.
| * | | Add a new type entry_connection_t for entry connectionsNick Mathewson2011-07-21
| | | | | | | | | | | | | | | | No fields have moved there yet; for now, it's just a placeholder type.
* | | | Die if tor_vasprintf fails in connection_printf_to_bufRobert Ransom2011-09-07
| | | | | | | | | | | | | | | | tor_asprintf already asserts if it fails.
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-09-07
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.in Conflict was between two pieces of configure.in logic added to the same place. Trivial.
| * | | Look for correct "ar" to cross-compileNick Mathewson2011-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, autoconf doesn't by default have an "AC_PROG_AR" for this -- possibly it's assumed that any "ar" you have will work everyplace. Fixes bug 3909; found by sid77. This fixes a build issue first present in fdbdb4dc1500, but the bug (of not using a correct ar) has been in every Tor version ever: it just didn't matter until then.
* | | | Merge remote-tracking branch 'public/bug3851'Nick Mathewson2011-09-07
|\ \ \ \
| * | | | Make FetchUselessDescriptors fetch all desc typesNick Mathewson2011-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if you were set up to use microdescriptors, and you weren't a cache, you'd never fetch router descriptors (except for bridges). Now FetchUselessDescriptors causes descriptors and mirodescs to get cached. Also, FetchUselessDescriptors changes the behavior of "UseMicrodescriptors auto" to be off, since there's no point in saying "UseMicrodescriptors 1" when you have full descriptors too. Fix for bug 3851; bugfix on 0.2.3.1-alpha.
* | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-09-06
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/connection_edge.c Conflicted on a router->node transition; fix was easy.
| * | | | Fix assertion in addressmap_clear_excluded_trackexithostsNick Mathewson2011-09-06
| | | | | | | | | | | | | | | | | | | | Fixes bug 3923; bugfix on 0.2.2.25-alpha; bugfix from 'laruldan' on trac.
* | | | | bump to 0.2.3.3-alpha-devRoger Dingledine2011-09-02
| | | | |
* | | | | merge in one moreRoger Dingledine2011-09-02
| | | | |
* | | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-09-02
|\| | | |
| * | | | Correct man page: multiple control auth styles can be set at onceRoger Dingledine2011-09-02
| | | | |
* | | | | bump to 0.2.3.3-alphaRoger Dingledine2011-09-02
| | | | |
* | | | | fold in last changes itemRoger Dingledine2011-09-01
| | | | |
* | | | | Handle test case where fgets() sees EOF on the last readSteven Murdoch2011-09-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some platforms, with non-blocking IO, on EOF you first get EAGAIN, and then on the second read you get zero bytes and EOF is set. However on others, the EOF flag is set as soon as the last byte is read. This patch fixes the test case in the latter scenario.
* | | | | Merge branch 'bug3888'Nick Mathewson2011-09-01
|\ \ \ \ \
| * | | | | Changes file for bug3888Nick Mathewson2011-09-01
| | | | | |
| * | | | | Explicitly set bucket_cfg to NULL after we freed itSebastian Hahn2011-09-01
| | | | | | | | | | | | | | | | | | | | | | | | This should fix bug 3888.
* | | | | | Fix double-closing a stdio streamSteven Murdoch2011-09-01
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a stream reached eof, we fclose it, but then test_util_spawn_background_partial_read() reads from it again, which causes an error and thus another fclose(). Some platforms are fine with this, others (e.g. debian-sid-i386) trigger a double-free() error. The actual code used by Tor (log_from_pipe() and tor_check_port_forwarding()) handle this case correctly.
* | | | | clean 0.2.3.3-alpha changelogRoger Dingledine2011-09-01
| | | | | | | | | | | | | | | | | | | | ready when you are, nick
* | | | | Tweaks on last process-launch patchesNick Mathewson2011-08-31
| | | | |
* | | | | Make a version of tor_read_all_handle() for non-Windows platformsSteven Murdoch2011-09-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly used for testing reading from subprocesses. To be more generic we now pass in a pointer to a process_handle_t rather than a Windows- specific HANDLE.
* | | | | Fix off-by-one error when allocating memory in test_util_split_lines()Steven Murdoch2011-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | Triggered "failed OVER picket-fence magic-number check (err 27)" when memory debugging using dmalloc is enabled (at 'low' or higher).
* | | | | First draft of an 0.2.3.3-alpha changelogNick Mathewson2011-08-31
| | | | |
generated by cgit v1.2.3 (git 2.45.0) at 2024-12-04 05:38:39 +0000