diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-27 22:18:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-27 22:18:16 -0500 |
| commit | 190c1d4981e5751aabd3d894095851c830f1d570 (patch) | |
| tree | a832d932339382cb7f43fb33a255d7507e037c2e /src/or/statefile.c | |
| parent | 267c0e5aa14deeb2ca0d7997b4ef5a5c2bbf5fd4 (diff) | |
| parent | 6f21d2e49657ada264cace9da7cf6945b4fc073d (diff) | |
| download | tor-190c1d4981e5751aabd3d894095851c830f1d570.tar.gz tor-190c1d4981e5751aabd3d894095851c830f1d570.zip | |
Merge branch 'bug7013_take2_squashed'
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 55ba0c1602..1429efda12 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; |