Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Install correct incoming cell handlers on reachability testing channels | Andrea Shepard | 2012-10-12 |
| | | | | Fix for bug 7086. | ||
* | Merge branch 'move_contrib_source' of git://git.torproject.org/nickm/tor | Andrea Shepard | 2012-10-11 |
|\ | |||
| * | Move all externally maintained source files into src/ext | Nick Mathewson | 2012-10-11 |
| | | | | | | | | | | | | The rationale for treating these files differently is that we should be checking upstream for changes as applicable, and merging changes upstream as warranted. | ||
* | | Make very sure to handle cells in-order on channels. | Nick Mathewson | 2012-10-11 |
|/ | | | | Fix on code for 6465, not yet in any release. | ||
* | Merge branch 'bug7011' | Nick Mathewson | 2012-10-10 |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: src/or/circuitbuild.c The conflict was trivial, since no line of code actually changed in both branches: There was a fmt_addr() that turned into fmt_addrport() in bug7011, and a "if (!n_conn)" that turned into "if (!n_chan)" in master. | ||
| * | Use fmt_addrport in pt_get_extra_info_descriptor_string. | David Fifield | 2012-10-10 |
| | | | | | | | | | | This patch is by asn. https://trac.torproject.org/projects/tor/ticket/7011#comment:11 | ||
| * | Use fmt_addrport where appropriate. | David Fifield | 2012-10-10 |
| | | | | | | | | | | | | | | | | | | This is mostly a conversion from this pattern: log("... %s:%d ...", fmt_and_decorate_addr(&addr), port); to this: log("... %s ...", fmt_addrport(&addr, port)); The output is the same in all cases. | ||
| * | Add fmt_addrport. | David Fifield | 2012-10-10 |
| | | | | | | | | | | This function formats an addr:port pair, and always decorates IPv6 addresses. | ||
| * | Use fmt_and_decorate_addr in extra-info "transport" lines. | David Fifield | 2012-10-10 |
| | | | | | | | | | | | | | | Apparently BridgeDB is already expecting transport lines to be formatted thus; see https://trac.torproject.org/projects/tor/ticket/7011#comment:12 ff. It may be that there are no extant IPv6 pluggable transport bridges yet, so this didn't cause a problem. | ||
| * | Use fmt_and_decorate_addr in TransportProxy statefile entry. | David Fifield | 2012-10-10 |
| | | | | | | | | | | | | | | | | | | | | | | state_transport_line_is_valid calls tor_addr_port_lookup, which expects brackets around an IPv6 address. Without this, cached transport addresses can't be parsed later: [warn] state: Could not parse addrport. [warn] state: State file seems to be broken. See #7011. | ||
| * | Decorate addresses given to a HTTP CONNECT proxy. | David Fifield | 2012-10-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This affects the Request-URI and the value of the Host header. RFC 2616 doesn't directly address the formatting of IPv6 addresses, but it delegates some productions to RFC 2396 "Uniform Resource Identifiers (URI): Generic Syntax," which is obsoleted by RFC 3986, which requires square brackets for IPv6 addresses in both places. I tested this with HTTPSProxy 127.0.0.1:8000 Bridge <IPv6 bridge> UseBridges 1 and an Ncat HTTP proxy: ncat --proxy-type http -l 8000 -vvv https://tools.ietf.org/html/rfc2616#section-3.2.1 https://tools.ietf.org/html/rfc2616#section-5.1.2 https://tools.ietf.org/html/rfc2616#section-14.23 https://tools.ietf.org/html/rfc3986#section-3.2.2 | ||
| * | Use fmt_and_decorate_addr in log messages. | David Fifield | 2012-10-10 |
| | | |||
* | | Merge branch 'bug6816_squashed_nowarn' of git://git.torproject.org/nickm/tor | Andrea Shepard | 2012-10-10 |
|\ \ | |/ |/| | |||
| * | Remove variables; fix gcc 4.7 warnings | Nick Mathewson | 2012-10-10 |
| | | | | | | | | | | My GCC warns when variables are assigned to but never used. There were a few like that in the 6816/6465 branches. | ||
| * | Fix formatting in various places after 6465/6816 work | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Make channel_flush_some_cells() compile cleanly on machines with ssize_t ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | larger than int per sjumrdoch comment | ||
| * | Don't remove circuitmux hash table entries in circuitmux_detach_circuit() ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | until after circuitmux_make_circuit_inactive() | ||
| * | Fix 'warning: circuit was already inactive' and assert in ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | circuitmux_make_circuit_inactive() during circuitmux_detach_all_circuits() | ||
| * | Bring summary comment block in circuitmux.c up to date | Andrea Shepard | 2012-10-10 |
| | | |||
| * | New and improved circuitmux_detach_all_circuits(), now without the stupid | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Correctly set magic numbers on ewma policy data/circuit data when allocating | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Set circuitmux policy on existing active channels when ewma_enabled changes | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Set circuitmux policy on new channels in channeltls.c | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Implement cell_ewma_enabled() | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Implement channel_set_cmux_policy_everywhere() | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Fix broken circuitmux_move_active_circ_to_tail(); don't assume n_chan is not ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | NULL in circuitmux_detach_circuit() | ||
| * | Allow n_chan to be NULL in circuitmux_find_map_entry(); it can be but with ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | non-NULL p_chan when extending a circuit | ||
| * | Use circuit_get_by_circid_channel_even_if_marked() and fix some asserts in ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | circuitmux.c | ||
| * | Fix some circuitmux-related asserts in relay.c | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Fix detach when setting circuit ID to 0 bug in ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | circuit_set_circid_chan_helper() and add circuit_get_by_circid_channel_even_if_marked() | ||
| * | Detach circuits from circuitmux early when freeing channel so they can find ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | the channel by ID | ||
| * | Handle closing circuits correctly with circuitmux_t | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Add a bunch of paranoid-mode expensive asserts incircuitmux.c | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Adjust the circuitmux_t counter correctly in circuitmux_notify_xmit_cells() | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Fix circuitmux attach/detach logic in circuit_set_circid_chan_helper(); it's ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | possible for id to be zero (not assigned yet) and shouldn't be attached then | ||
| * | Update circuitmux-related TODOs in channeltls.c | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Fix comment on circuit_t.n_hop and remove circuitmux TODO in or.h | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Move all EWMA code into circuitmux.c and implement circuitmux_policy_t ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | methods using it | ||
| * | Add circuitmux.h, circuitmux_ewma.h includes now necessary in networkstatus.c | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Remove cell_ewma_t from or.h and from circuit_t/or_circuit_t; all that goes ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | to the new circuitmux_ewma.c now | ||
| * | Add circuitmux.h, circuitmux_ewma.h includes now necessary in config.c | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Remove EWMA code from relay.{c,h}; it goes to a circuitmux policy now | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Remove ewma setup code in init_circuit_base()/or_circuit_new() of ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | circuitlist.c; it gets allocated when the circuit is attached to a circuitmux_t with that policy now | ||
| * | Add upcasts for circuitmux_policy_data_t and circuitmux_policy_circ_data_t ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | to circuitmux.h | ||
| * | Add initial circuitmux_ewma.{c,h} | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Implement circuitmux_assert_okay() and helper functions in circuitmux.c | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Implement circuitmux_get_first_active_circuit() in circuitmux.c; add ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | pick_active_circuit() to circuitmux_policy_t in circuitmux.h | ||
| * | Add comment for circuitmux_notify_xmit_cells() in circuitmux.c | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Add comment for circuitmux_move_active_circ_to_tail() in circuitmux.c | Andrea Shepard | 2012-10-10 |
| | | |||
| * | Implement circuitmux_notify_xmit_cells() and ↵ | Andrea Shepard | 2012-10-10 |
| | | | | | | | | circuitmux_move_active_circ_to_tail() helper in circuitmux.c |