diff options
| author | George Kadianakis <desnacked@riseup.net> | 2012-10-30 04:17:13 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-27 22:18:08 -0500 |
| commit | f88c3038697b00f50b2da12f46fc76ee0e20d646 (patch) | |
| tree | db68c911949c43bfcf596ceb62e1c20d27965f0d /src/or/statefile.c | |
| parent | 848333c6d6d65775cb787755577c4b24ae512389 (diff) | |
| download | tor-f88c3038697b00f50b2da12f46fc76ee0e20d646.tar.gz tor-f88c3038697b00f50b2da12f46fc76ee0e20d646.zip | |
Add a torrc option to specify the bind address of managed proxies.
Diffstat (limited to 'src/or/statefile.c')
| -rw-r--r-- | src/or/statefile.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/or/statefile.c b/src/or/statefile.c index beb9cf81ba..704c4e5355 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -517,8 +517,17 @@ get_stored_bindaddr_for_server_transport(const char *transport) { char *default_addrport = NULL; const char *stored_bindaddr = NULL; + config_line_t *line = NULL; + + { + /* See if the user explicitly asked for a specific listening + address for this transport. */ + char *conf_bindaddr = get_transport_bindaddr_from_config(transport); + if (conf_bindaddr) + return conf_bindaddr; + } - config_line_t *line = get_transport_in_state_by_name(transport); + line = get_transport_in_state_by_name(transport); if (!line) /* Found no references in state for this transport. */ goto no_bindaddr_found; |