aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Changes file for feature2841.Nick Mathewson2011-07-11
|
* Fix compilation from 2841 branchNick Mathewson2011-07-11
|
* Merge remote-tracking branch 'public/bug2841'Nick Mathewson2011-07-11
|\ | | | | | | | | Conflicts: src/or/config.c
| * Refactor the interfaces of transport/proxy lookup fnsNick Mathewson2011-07-03
| | | | | | | | | | | | | | | | | | | | Returning a tristate is needless here; we can just use the yielded transport/proxy_type field to tell whether there's a proxy, and have the return indicate success/failure. Also, store the proxy_type in the or_connection_t rather than letting it get out of sync if a configuration reload happens between launching the or_connection and deciding what to say with it.
| * Future-proof and user-proof parse_bridge_lineNick Mathewson2011-07-03
| |
| * Simplify parse_client_transport_lineNick Mathewson2011-07-02
| |
| * Style and grammar tweaks on 2841 branchNick Mathewson2011-07-02
| |
| * Small tweaks to 2841 codeNick Mathewson2011-07-02
| | | | | | | | | | | | | | - const-ify some transport_t pointers - Remove a vestigial argument to parse_bridge_line - Make it compile without warnings on my laptop with --enable-gcc-warnings
| * Trivial code tweaks and documentation updates.George Kadianakis2011-06-28
| |
| * Revised how we handle ClientTransportPlugin and Bridge lines.George Kadianakis2011-06-22
| | | | | | | | | | | | | | | | Multiple Bridge lines can point to the same one ClientTransportPlugin line, and we can have multiple ClientTransportPlugin lines in our configuration file that don't match with a bridge. We also issue a warning when we have a Bridge line with a pluggable transport but we can't match it to a ClientTransportPlugin line.
| * Various small tweaks around config.c and or.hGeorge Kadianakis2011-06-21
| |
| * Tweaked connection{.c,.h,_or.c} based on nick's comments.George Kadianakis2011-06-21
| | | | | | | | | | | | | | * Tweaked doxygen comments. * Changed returns of get_proxy_addrport(). * Ran make check-spaces. * Various small code tweaks.
| * Fixes on circuitbuild.[ch] based on nick's comments.George Kadianakis2011-06-21
| | | | | | | | | | | | | | | | | | * Renamed transport_info_t to transport_t. * Introduced transport_get_by_name(). * Killed match_bridges_with_transports(). We currently *don't* detect whether any bridges miss their transports, of if any transports miss their bridges. * Various code and aesthetic tweaks and English language changes.
| * Fixes small bugs.George Kadianakis2011-06-14
| |
| * This commit is an attempt to beautify the previous commit.George Kadianakis2011-06-14
| | | | | | | | It creates some helper functions that return the proxy type, proxy addr/port, etc.
| * Our warning now is much more specific, mentioning proxy type/addr/port.George Kadianakis2011-06-14
| | | | | | | | | | Not included in the previous commit, because the implementation is ugly; I see no other way of doing this though.
| * We now warn the user if a proxy server is not up when we try to connect with it.George Kadianakis2011-06-14
| |
| * Various trivial changes.George Kadianakis2011-06-12
| | | | | | | | | | | | | | | | * Improved function documentation. * Renamed find_bridge_transport_by_addrport() to find_transport_by_bridge_addrport(). * Sanitized log severities we use. * Ran check-spaces.
| * We can now connect using transports as well!George Kadianakis2011-06-12
| |
| * We can now match our transports with our bridges.George Kadianakis2011-06-11
| |
| * ClientTransportPlugin parsing done.George Kadianakis2011-06-11
| |
* | Look at the right consensus in router_add_to_routerlist()Nick Mathewson2011-07-11
| | | | | | | | | | | | | | | | | | Just looking at the "latest" consensus could give us a microdesc consensus, if microdescs were enabled. That would make us decide that every routerdesc was unlisted in the latest consensus and drop them all: Ouch. Fixes bug 3113; bugfix on 0.2.3.1-alpha.
* | Merge branch 'bug2797'Nick Mathewson2011-07-11
|\ \
| * | Kill redundant checks around routerset_contains_*()Nick Mathewson2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of the routerset_contains*() functions return 0 if their routerset_t argument is NULL. Therefore, there's no point in doing "if (ExcludeNodes && routerset_contains*(ExcludeNodes...))", for example. This patch fixes every instance of if (X && routerstatus_contains*(X,...)) Note that there are other patterns that _aren't_ redundant. For example, we *don't* want to change: if (EntryNodes && !routerstatus_contains(EntryNodes,...)) Fixes #2797. No bug here; just needless code.
* | | Remove a redundant condition in compare_addr_to_node_policyNick Mathewson2011-07-08
| | | | | | | | | | | | | | | | | | A && A == A. Found by frosty_un
* | | Make nodelist_purge avoid orphaned microdescs in rs-less nodesNick Mathewson2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have an invariant that a node_t should have an md only if it has a routerstatus. nodelist_purge tried to preserve this by removing all nodes without a routerstatus or a routerinfo. But this left nodes with a routerinfo and a microdesc untouched, even if they had a routerstatus. Bug found by frosty_un.
* | | Merge branch 'maint-0.2.2'Roger Dingledine2011-07-07
|\ \ \ | |/ / |/| |
| * | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-07-07
| |\ \
| | * | update to the july 2011 geoip dbRoger Dingledine2011-07-07
| | | |
* | | | Merge remote-tracking branch 'public/bug3153'Nick Mathewson2011-07-07
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/nodelist.c
| * | | | Track where microdescs are referenced to prevent free errsNick Mathewson2011-05-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On IRC, wanoskarnet notes that if we ever do microdesc_free() on a microdesc that's in the nodelist, we're in trouble. Also, we're in trouble if we free one that's still in the microdesc_cache map. This code adds a flag to microdesc_t to note where the microdesc is referenced from, and checks those flags from microdesc_free(). I don't believe we have any errors here now, but if we introduce some later, let's log and recover from them rather than introducing heisenbugs later on. Addresses bug 3153.
* | | | | Merge branch 'bug3263'Nick Mathewson2011-07-07
|\ \ \ \ \
| * | | | | Have transitions in public_server_mode count as affects_descriptorNick Mathewson2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we'd get a new descriptor for free when public_server_mode() changed, since it would count as affects_workers, which would call init_keys(), which would make us regenerate a new descriptor. But now that we fixed bug 3263, init_keys() is no longer necessarily a new descriptor, and so we need to make sure that public_server_mode() counts as a descriptor transition.
| * | | | | don't mark our descriptor dirty if our onion key hasn't changedRoger Dingledine2011-05-21
| | | | | |
* | | | | | oops; wrong bug number.Nick Mathewson2011-07-07
| | | | | |
* | | | | | Remove unused var in write_to_evbuffer_zlibNick Mathewson2011-07-07
| | | | | |
* | | | | | Avoid double-free in bufferevent read/write cbsNick Mathewson2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 3404; bugfix on 0.2.3.1-alpha.
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-07-07
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Correctly send a SUCCEEDED event for rdns requestsSebastian Hahn2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was that we overlooked the possibility of reverse DNS success at the end of connection_ap_handshake_socks_resolved(). Issue discovered by katmagic, thanks!
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-07-06
|\| | | | |
| * | | | | Fix weird formatting of html manpageSebastian Hahn2011-07-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Asciidoc was inserting <pre> tags for paragraphs that started with a '+' at the beginning of the line. Instead, we need a space in front of the plus.
* | | | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-07-06
|\| | | | |
| * | | | | appease check-spacesRoger Dingledine2011-07-06
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-07-05
|\| | | | |
| * | | | | Merge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2Nick Mathewson2011-07-05
| |\ \ \ \ \
* | \ \ \ \ \ Merge remote-tracking branch 'rransom-tor/bug3465-023-v2'Nick Mathewson2011-07-05
|\ \ \ \ \ \ \
| * | | | | | | Make handle_control_setevents table-drivenRobert Ransom2011-06-25
| | | | | | | |
| * | | | | | | Merge branch 'bug3465-022' into bug3465-023Robert Ransom2011-06-25
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug3465-022: Add BUILDTIMEOUT_SET to the result of GETINFO events/names Correct a comment Fix minor comment issues
| | * | | | | | Add BUILDTIMEOUT_SET to the result of GETINFO events/namesRobert Ransom2011-06-25
| | | | | | | |
| | * | | | | | Correct a commentRobert Ransom2011-06-24
| | | | | | | |