diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-05-08 09:09:26 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-05-08 09:09:26 +0000 |
| commit | e4f40dd794591856e89723d3c852f94be3b92a52 (patch) | |
| tree | af283fc4392805ca5e2430357ff14866eecc9082 /src/or/router.c | |
| parent | 89753e2163b68e15f9ad64c62446e01c3aa15334 (diff) | |
| download | tor-e4f40dd794591856e89723d3c852f94be3b92a52.tar.gz tor-e4f40dd794591856e89723d3c852f94be3b92a52.zip | |
Change the PublishServerDescriptor config option from a boolean
into a string: "v1", "v2", bridge", "". Continue to support
"0" and "1".
svn:r10136
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/router.c b/src/or/router.c index ba384b07c7..42e1ce2fc0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -528,7 +528,7 @@ router_orport_found_reachable(void) routerinfo_t *me = router_get_my_routerinfo(); log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from " "the outside. Excellent.%s", - get_options()->PublishServerDescriptor ? + get_options()->_PublishServerDescriptor != NO_AUTHORITY ? " Publishing server descriptor." : ""); can_reach_or_port = 1; mark_my_descriptor_dirty(); @@ -676,7 +676,7 @@ proxy_mode(or_options_t *options) /** Decide if we're a publishable server. We are a publishable server if: * - We don't have the ClientOnly option set * and - * - We have the PublishServerDescriptor option set + * - We have the PublishServerDescriptor option set to non-empty * and * - We have ORPort set * and @@ -690,7 +690,7 @@ decide_if_publishable_server(void) if (options->ClientOnly) return 0; - if (!options->PublishServerDescriptor) + if (options->_PublishServerDescriptor == NO_AUTHORITY) return 0; if (!server_mode(options)) return 0; @@ -771,7 +771,7 @@ router_upload_dir_desc_to_dirservers(int force) return; } ei = router_get_my_extrainfo(); - if (!get_options()->PublishServerDescriptor) + if (get_options()->_PublishServerDescriptor == NO_AUTHORITY) return; if (!force && !desc_needs_upload) return; |