diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-11-14 00:06:45 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-11-14 00:06:45 +0000 |
| commit | 0f6402f17b9d4017aec608b10cb031512c543bc5 (patch) | |
| tree | 1efa5847002b0156d9aaed773be1f2f0b802de1a /src/or/config.c | |
| parent | 1913cb915ee3f91f18dfcefeb8202380ed4cfcbc (diff) | |
| download | tor-0f6402f17b9d4017aec608b10cb031512c543bc5.tar.gz tor-0f6402f17b9d4017aec608b10cb031512c543bc5.zip | |
r9309@totoro: nickm | 2006-11-13 19:05:41 -0500
Whitespace fixes, and clean up code from last natd patch.
svn:r8947
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c index 6dfb40dafc..36e829bc71 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2100,18 +2100,19 @@ options_validate(or_options_t *old_options, or_options_t *options, int is_socks = i==0; int is_trans = i==1; config_line_t *line, *opt, *old; - const char *tp = is_socks ? "SOCKS proxy" : - is_trans ? "transparent proxy" - : "natd proxy"; + const char *tp; if (is_socks) { opt = options->SocksListenAddress; old = old_options ? old_options->SocksListenAddress : NULL; + tp = "SOCKS proxy"; } else if (is_trans) { opt = options->TransListenAddress; old = old_options ? old_options->TransListenAddress : NULL; + tp = "transparent proxy"; } else { opt = options->NatdListenAddress; old = old_options ? old_options->NatdListenAddress : NULL; + tp = "natd proxy"; } for (line = opt; line; line = line->next) { |