diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-02-28 05:09:37 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-02-28 05:09:37 +0000 |
| commit | b354ecfecdefd9e02f8f0a71efc1acedf5244815 (patch) | |
| tree | 479f74fbb416ab0bc9fe6f645c49ac74f6e21f49 | |
| parent | f3ea6be7e561dd361b4f68ea03e31e5ca4515767 (diff) | |
| download | tor-b354ecfecdefd9e02f8f0a71efc1acedf5244815.tar.gz tor-b354ecfecdefd9e02f8f0a71efc1acedf5244815.zip | |
rename ExcludedNodes config option to ExcludeNodes
svn:r1155
| -rw-r--r-- | src/or/config.c | 6 | ||||
| -rw-r--r-- | src/or/onion.c | 4 | ||||
| -rw-r--r-- | src/or/or.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/or/config.c b/src/or/config.c index 6017847cdf..0b75f74404 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -165,7 +165,7 @@ static void config_assign(or_options_t *options, struct config_line *list) { config_compare(list, "ExitNodes", CONFIG_TYPE_STRING, &options->ExitNodes) || config_compare(list, "EntryNodes", CONFIG_TYPE_STRING, &options->EntryNodes) || config_compare(list, "ExitPolicy", CONFIG_TYPE_STRING, &options->ExitPolicy) || - config_compare(list, "ExcludedNodes", CONFIG_TYPE_STRING, &options->ExcludedNodes) || + config_compare(list, "ExcludeNodes", CONFIG_TYPE_STRING, &options->ExcludeNodes) || config_compare(list, "Group", CONFIG_TYPE_STRING, &options->Group) || @@ -352,7 +352,7 @@ static void free_options(or_options_t *options) { tor_free(options->PidFile); tor_free(options->ExitNodes); tor_free(options->EntryNodes); - tor_free(options->ExcludedNodes); + tor_free(options->ExcludeNodes); tor_free(options->ExitPolicy); tor_free(options->SocksBindAddress); tor_free(options->ORBindAddress); @@ -368,7 +368,7 @@ static void init_options(or_options_t *options) { options->LogLevel = tor_strdup("warn"); options->ExitNodes = tor_strdup(""); options->EntryNodes = tor_strdup(""); - options->ExcludedNodes = tor_strdup(""); + options->ExcludeNodes = tor_strdup(""); options->ExitPolicy = tor_strdup(""); options->SocksBindAddress = tor_strdup("127.0.0.1"); options->ORBindAddress = tor_strdup("0.0.0.0"); diff --git a/src/or/onion.c b/src/or/onion.c index ce132177c6..5768c41e66 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -298,7 +298,7 @@ static routerinfo_t *choose_good_exit_server(routerlist_t *dir) add_nickname_list_to_smartlist(preferredexits,options.ExitNodes); excludedexits = smartlist_create(MAX_ROUTERS_IN_DIR); - add_nickname_list_to_smartlist(excludedexits,options.ExcludedNodes); + add_nickname_list_to_smartlist(excludedexits,options.ExcludeNodes); sl = smartlist_create(MAX_ROUTERS_IN_DIR); @@ -445,7 +445,7 @@ int onion_extend_cpath(crypt_path_t **head_ptr, cpath_build_state_t *state, rout state->desired_path_len); excludednodes = smartlist_create(MAX_ROUTERS_IN_DIR); - add_nickname_list_to_smartlist(excludednodes,options.ExcludedNodes); + add_nickname_list_to_smartlist(excludednodes,options.ExcludeNodes); if(cur_len == state->desired_path_len - 1) { /* Picking last node */ log_fn(LOG_DEBUG, "Contemplating last hop: choice already made: %s", diff --git a/src/or/or.h b/src/or/or.h index 11834cd78c..369d0da8b3 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -501,7 +501,7 @@ typedef struct { char *PidFile; char *ExitNodes; char *EntryNodes; - char *ExcludedNodes; + char *ExcludeNodes; char *ExitPolicy; char *SocksBindAddress; char *ORBindAddress; |