diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-13 11:40:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-13 11:40:38 -0400 |
| commit | 5a3d9636f5e0ead80a46163af9ffadcbf6d5195f (patch) | |
| tree | 3f9a94eba2b969a313aa9ea01dd40f9b0eed9fca /src/or/connection_edge.h | |
| parent | 62a77f1117335f2ddee86f696379dde106ad1ee0 (diff) | |
| parent | ba9a12119c88676fa0dd2a282d927840cd5d94fb (diff) | |
| download | tor-5a3d9636f5e0ead80a46163af9ffadcbf6d5195f.tar.gz tor-5a3d9636f5e0ead80a46163af9ffadcbf6d5195f.zip | |
Merge remote-tracking branch 'public/bug3940_redux'
Diffstat (limited to 'src/or/connection_edge.h')
| -rw-r--r-- | src/or/connection_edge.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 78baf75b68..c320d6ba49 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -74,7 +74,8 @@ void addressmap_clean(time_t now); void addressmap_clear_configured(void); void addressmap_clear_transient(void); void addressmap_free_all(void); -int addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out); +int addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, + addressmap_entry_source_t *exit_source_out); int addressmap_have_mapping(const char *address, int update_timeout); void addressmap_register(const char *address, char *new_address, @@ -101,7 +102,7 @@ int connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, typedef enum hostname_type_t { NORMAL_HOSTNAME, ONION_HOSTNAME, EXIT_HOSTNAME, BAD_HOSTNAME } hostname_type_t; -hostname_type_t parse_extended_hostname(char *address, int allowdotexit); +hostname_type_t parse_extended_hostname(char *address); #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H) int get_pf_socket(void); |