diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-14 10:21:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-14 10:21:41 -0400 |
| commit | af70e4313160b792e8e8b4717f3cab828e4de42f (patch) | |
| tree | de7d0e8a836b8c2c61177d2c0df4bbe8fda84aa3 /src/or/config.h | |
| parent | 9615ad338f4d40934deee92ee5e5bad7dac52148 (diff) | |
| parent | 05aed5b635fa7148fe2a4ea87e7296fa6bec3087 (diff) | |
| download | tor-af70e4313160b792e8e8b4717f3cab828e4de42f.tar.gz tor-af70e4313160b792e8e8b4717f3cab828e4de42f.zip | |
Merge remote-tracking branch 'public/spaces_in_unix_addrs'
Diffstat (limited to 'src/or/config.h')
| -rw-r--r-- | src/or/config.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/config.h b/src/or/config.h index 89429329f3..6645532514 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -130,7 +130,11 @@ int addressmap_register_auto(const char *from, const char *to, time_t expires, addressmap_entry_source_t addrmap_source, const char **msg); -int config_parse_unix_port(const char *addrport, char **path_out); + +int port_cfg_line_extract_addrport(const char *line, + char **addrport_out, + int *is_unix_out, + const char **rest_out); /** Represents the information stored in a torrc Bridge line. */ typedef struct bridge_line_t { |