diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-03-23 13:37:35 +1100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-03-24 10:13:58 -0400 |
| commit | f2153f9716876b87bfcc53ff13b86b878edaae86 (patch) | |
| tree | f4ea20d094c9fbf4cb1d2ba594d52248cfc94f24 /src/or/entrynodes.h | |
| parent | 45681f695c6096e280bc7ec3bf0a67c27708dbbc (diff) | |
| download | tor-f2153f9716876b87bfcc53ff13b86b878edaae86.tar.gz tor-f2153f9716876b87bfcc53ff13b86b878edaae86.zip | |
Always allow OR connections to bridges on private addresses
Regardless of the setting of ExtendAllowPrivateAddresses.
This fixes a bug with pluggable transports that ignore the
(potentially private) address in their bridge line.
Fixes bug 18517; bugfix on 23b088907f in tor-0.2.8.1-alpha.
Diffstat (limited to 'src/or/entrynodes.h')
| -rw-r--r-- | src/or/entrynodes.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 59147d19b5..247c80940e 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -127,6 +127,9 @@ int getinfo_helper_entry_guards(control_connection_t *conn, void mark_bridge_list(void); void sweep_bridge_list(void); +int addr_is_a_configured_bridge(const tor_addr_t *addr, uint16_t port, + const char *digest); +int extend_info_is_a_configured_bridge(const extend_info_t *ei); int routerinfo_is_a_configured_bridge(const routerinfo_t *ri); int node_is_a_configured_bridge(const node_t *node); void learned_router_identity(const tor_addr_t *addr, uint16_t port, |