aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-05-07 08:26:50 +0000
committerRoger Dingledine <arma@torproject.org>2007-05-07 08:26:50 +0000
commitf8a8b27dd2b76ddae26fcf51304b626f6aada9ca (patch)
treed5a5146ccc153a04957fa70baba62eba9e89ed95 /src/or/config.c
parent5ea3f37db7f39ae2204d972f651ddb966c5164ca (diff)
downloadtor-f8a8b27dd2b76ddae26fcf51304b626f6aada9ca.tar
tor-f8a8b27dd2b76ddae26fcf51304b626f6aada9ca.tar.gz
add a 'bridge' flag for dirserver config entries
svn:r10128
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 838a2ef12..960c2a34e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3444,7 +3444,8 @@ parse_dir_server_line(const char *line, int validate_only)
uint16_t dir_port = 0, or_port = 0;
char digest[DIGEST_LEN];
int is_v1_authority = 0, is_hidserv_authority = 0,
- is_not_hidserv_authority = 0, is_v2_authority = 1;
+ is_not_hidserv_authority = 0, is_v2_authority = 1,
+ is_bridge_authority = 0;
items = smartlist_create();
smartlist_split_string(items, line, NULL,
@@ -3469,6 +3470,8 @@ parse_dir_server_line(const char *line, int validate_only)
is_hidserv_authority = 1;
} else if (!strcasecmp(flag, "no-hs")) {
is_not_hidserv_authority = 1;
+ } else if (!strcasecmp(flag, "bridge")) {
+ is_bridge_authority = 1;
} else if (!strcasecmp(flag, "no-v2")) {
is_v2_authority = 0;
} else if (!strcasecmpstart(flag, "orport=")) {
@@ -3519,8 +3522,8 @@ parse_dir_server_line(const char *line, int validate_only)
(int)dir_port,
(char*)smartlist_get(items,1));
add_trusted_dir_server(nickname, address, dir_port, or_port, digest,
- is_v1_authority,
- is_v2_authority, is_hidserv_authority);
+ is_v1_authority, is_v2_authority,
+ is_bridge_authority, is_hidserv_authority);
}