nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename ExcludedNodes config option to ExcludeNodes

Browse Source 
svn:r1155
This commit is contained in:
Roger Dingledine 2004-02-28 05:09:37 +00:00
parent f3ea6be7e5
commit b354ecfecd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/config.c
View File

@ -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, "ExitNodes", CONFIG_TYPE_STRING, &options->ExitNodes) ||
config_compare(list, "EntryNodes", CONFIG_TYPE_STRING, &options->EntryNodes) || config_compare(list, "EntryNodes", CONFIG_TYPE_STRING, &options->EntryNodes) ||
config_compare(list, "ExitPolicy", CONFIG_TYPE_STRING, &options->ExitPolicy) || 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) || 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->PidFile);
tor_free(options->ExitNodes); tor_free(options->ExitNodes);
tor_free(options->EntryNodes); tor_free(options->EntryNodes);
tor_free(options->ExcludedNodes); tor_free(options->ExcludeNodes);
tor_free(options->ExitPolicy); tor_free(options->ExitPolicy);
tor_free(options->SocksBindAddress); tor_free(options->SocksBindAddress);
tor_free(options->ORBindAddress); tor_free(options->ORBindAddress);
@ -368,7 +368,7 @@ static void init_options(or_options_t *options) {
options->LogLevel = tor_strdup("warn"); options->LogLevel = tor_strdup("warn");
options->ExitNodes = tor_strdup(""); options->ExitNodes = tor_strdup("");
options->EntryNodes = tor_strdup(""); options->EntryNodes = tor_strdup("");
options->ExcludedNodes = tor_strdup(""); options->ExcludeNodes = tor_strdup("");
options->ExitPolicy = tor_strdup(""); options->ExitPolicy = tor_strdup("");
options->SocksBindAddress = tor_strdup("127.0.0.1"); options->SocksBindAddress = tor_strdup("127.0.0.1");
options->ORBindAddress = tor_strdup("0.0.0.0"); options->ORBindAddress = tor_strdup("0.0.0.0");

4
src/or/onion.c
View File

@ -298,7 +298,7 @@ static routerinfo_t *choose_good_exit_server(routerlist_t *dir)
add_nickname_list_to_smartlist(preferredexits,options.ExitNodes); add_nickname_list_to_smartlist(preferredexits,options.ExitNodes);
excludedexits = smartlist_create(MAX_ROUTERS_IN_DIR); 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); 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); state->desired_path_len);
excludednodes = smartlist_create(MAX_ROUTERS_IN_DIR); 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 */ if(cur_len == state->desired_path_len - 1) { /* Picking last node */
log_fn(LOG_DEBUG, "Contemplating last hop: choice already made: %s", log_fn(LOG_DEBUG, "Contemplating last hop: choice already made: %s",

2
src/or/or.h
View File

@ -501,7 +501,7 @@ typedef struct {
char *PidFile; char *PidFile;
char *ExitNodes; char *ExitNodes;
char *EntryNodes; char *EntryNodes;
char *ExcludedNodes; char *ExcludeNodes;
char *ExitPolicy; char *ExitPolicy;
char *SocksBindAddress; char *SocksBindAddress;
char *ORBindAddress; char *ORBindAddress;