diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-06-15 15:02:08 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-06-23 09:25:36 -0400 |
| commit | 47f9edde699ad687884b6222b557c10dee2592c9 (patch) | |
| tree | 0c9d84200f85884e5f20ddb1f679684c2f4439c1 /src/app/config/or_options_st.h | |
| parent | d3bcbccab9d50fd0dafc682f7ee63902ea344be7 (diff) | |
| download | tor-47f9edde699ad687884b6222b557c10dee2592c9.tar.gz tor-47f9edde699ad687884b6222b557c10dee2592c9.zip | |
config: Change Address to be a LINELIST
With prop312, we want to support IPv4 and IPv6 thus multiple Address statement
(up to 2) will be accepted.
For this, "Address" option becomes a LINELIST so we can properly process the
IPv4 or/and IPv6.
Part of #33233
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/app/config/or_options_st.h')
| -rw-r--r-- | src/app/config/or_options_st.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index bf58205f89..2f375f5d9b 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -71,7 +71,10 @@ struct or_options_t { int CacheDirectoryGroupReadable; /**< Boolean: Is the CacheDirectory g+r? */ char *Nickname; /**< OR only: nickname of this onion router. */ - char *Address; /**< OR only: configured address for this onion router. */ + /** OR only: configured address for this onion router. Up to two times this + * options is accepted as in IPv4 and IPv6. */ + struct config_line_t *Address; + char *PidFile; /**< Where to store PID of Tor process. */ struct routerset_t *ExitNodes; /**< Structure containing nicknames, digests, |