summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2016-01-29Merge branch 'feature17840-v11-squashed' into feature17840-v11-mergedteor (Tim Wilson-Brown)
Conflicts: src/or/directory.c src/test/test_routerlist.c Fix minor conflicts.
2016-01-29Tor2Web: tell extend_info_from_node intro point connections are directteor (Tim Wilson-Brown)
2016-01-29Return NULL from extend_info_from_node if the node has no allowed addressteor (Tim Wilson-Brown)
Modify callers to correctly handle these new NULL returns: * fix assert in onion_extend_cpath * warn and discard circuit in circuit_get_open_circ_or_launch * warn, discard circuit, and tell controller in handle_control_extendcircuit
2016-01-29Automatically use IPv6 when ClientUseIPv4 is 0teor (Tim Wilson-Brown)
Consequential changes to log messages: * it's no longer possible to disable both IPv4 and IPv6, * refactor common string out of remaining log messages
2016-01-29Minor whitespace-only fixteor (Tim Wilson-Brown)
2016-01-29Consistently format addresses in node_get_address_stringteor (Tim Wilson-Brown)
Also, don't write to a buffer with length zero.
2016-01-29Optimise reachability checks when iterating through relay liststeor (Tim Wilson-Brown)
Skip address checks on servers. Skip allowed-only address checks on non-bridge clients with IPv4.
2016-01-29Add firewall_is_fascist_dir()teor (Tim Wilson-Brown)
Refactor common parts of firewall_is_fascist_or().
2016-01-29Use fascist firewall and ClientUseIPv4 for bridge clientsteor (Tim Wilson-Brown)
Bridge clients ignore ClientUseIPv6, acting as if it is always 1. This preserves existing behaviour. Make ClientPreferIPv6OR/DirPort auto by default: * Bridge clients prefer IPv6 by default. * Other clients prefer IPv4 by default. This preserves existing behaviour.
2016-01-29Make entry_guard_set_status consistent with entry_is_liveteor (Tim Wilson-Brown)
Check fascist_firewall_allows_node in entry_guard_set_status and return the same message as entry_is_live.
2016-01-29Choose bridge addresses by IPv4/IPv6 preferencesteor (Tim Wilson-Brown)
2016-01-29Log when IPv4/IPv6 restrictions or preferences weren't metteor (Tim Wilson-Brown)
2016-01-29Choose directory servers by IPv4/IPv6 preferencesteor (Tim Wilson-Brown)
Add unit tests, refactor pick_directory functions.
2016-01-29Choose OR Entry Guards using IPv4/IPv6 preferencesteor (Tim Wilson-Brown)
Update unit tests.
2016-01-29Add ClientUseIPv4 and ClientPreferIPv6DirPort torrc optionsteor (Tim Wilson-Brown)
ClientUseIPv4 0 tells tor to avoid IPv4 client connections. ClientPreferIPv6DirPort 1 tells tor to prefer IPv6 directory connections. Refactor policy for IPv4/IPv6 preferences. Fix a bug where node->ipv6_preferred could become stale if ClientPreferIPv6ORPort was changed after the consensus was loaded. Update documentation, existing code, add unit tests.
2016-01-29Fix *_get_all_orports to use ipv6_orportteor (Tim Wilson-Brown)
node_get_all_orports and router_get_all_orports incorrectly used or_port with IPv6 addresses. They now use ipv6_orport. Also refactor and remove duplicated code.
2016-01-26Merge remote-tracking branch 'teor/bug18145'Nick Mathewson
2016-01-26Replace "Alice" with "the client" in a hidden service log messageteor (Tim Wilson-Brown)
2016-01-26Replace Alice/Bob with client/service in hidden service commentsteor (Tim Wilson-Brown)
2016-01-26Correct grammatical errors in tor log messagesteor (Tim Wilson-Brown)
Avoid using gender for things that don't have it.
2016-01-26Correct grammatical errors in tor commentsteor (Tim Wilson-Brown)
Avoid using gender for things that don't have it. Avoid assigning a gender to tor users.
2016-01-22Fix redundant-declaration warningNick Mathewson
2016-01-21Merge remote-tracking branch 'twstrike/parse_port_config_tests'Nick Mathewson
2016-01-19Merge remote-tracking branch 'twstrike/options_test'Nick Mathewson
2016-01-19Make sure that tests for domain sockets only run on OSes with domain socketsOla Bini
2016-01-19Use correct u64 int ops instead of regular int ops, in order to avoid ↵Ola Bini
warnings on 32bit clang
2016-01-19Merge branch 'maint-0.2.7'Nick Mathewson
2016-01-19Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-01-19Refine the memwipe() arguments check for 18089 a little more.Nick Mathewson
We still silently ignore memwipe(NULL, ch, 0); and memwipe(ptr, ch, 0); /* for ptr != NULL */ But we now assert on: memwipe(NULL, ch, 30);
2016-01-18Merge branch 'fallbacks-0281-squashed'Nick Mathewson
2016-01-18Add default fallback directories for the 0.2.8 alpha releasesteor (Tim Wilson-Brown)
Allow fallback directories which have been stable for 30 days to work around #18050, which causes relays to submit descriptors with 0 DirPorts when restarted. (Particularly during Tor version upgrades.) Ignore low fallback directory count in alpha builds.
2016-01-18Merge branch 'maint-0.2.7'Nick Mathewson
2016-01-18Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-01-18Make memwipe() do nothing when passed a NULL pointer or zero sizeteor (Tim Wilson-Brown)
Check size argument to memwipe() for underflow. Closes bug #18089. Reported by "gk", patch by "teor". Bugfix on 0.2.3.25 and 0.2.4.6-alpha (#7352), commit 49dd5ef3 on 7 Nov 2012.
2016-01-18Merge remote-tracking branch 'origin/maint-0.2.7'Nick Mathewson
2016-01-18Merge remote-tracking branch 'teor/bug18050' into maint-0.2.7Nick Mathewson
2016-01-18Check ORPort and DirPort reachability before publishing a relay descriptorteor (Tim Wilson-Brown)
Otherwise, relays publish a descriptor with DirPort 0 when the DirPort reachability test takes longer than the ORPort reachability test. Closes bug #18050. Reported by "starlight", patch by "teor". Bugfix on 0.1.0.1-rc, commit a1f1fa6ab on 27 Feb 2005.
2016-01-15Fix some leaks in the unit tests.Nick Mathewson
2016-01-15Make the new directory tests build and run again.Nick Mathewson
Had to disable a couple. Also add changes file for 17003.
2016-01-15Merge remote-tracking branch 'twstrike/directory-tests'Nick Mathewson
2016-01-15Whitespace cleanupNick Mathewson
2016-01-15Merge remote-tracking branch 'twstrike/options_test'Nick Mathewson
2016-01-13Update tests to match current changes to options_validateOla Bini
2016-01-13Move clearing of log messages on advice from @cypherpunks, in order to ↵Ola Bini
minimize risk of race conditions leading to another memory leak
2016-01-13Revert my addition of callback cleaner and instead use existing ↵Ola Bini
functionality for temporary log files
2016-01-13Remove a small memory leak in log callback setupOla Bini
2016-01-13Fix memory leaksOla Bini
2016-01-13Fix all white space issuesOla Bini
2016-01-13Fix some issues in gcc warningsOla Bini
2016-01-13Add tests for options_actOla Bini