[or-cvs] rename ExcludedNodes config option to ExcludeNodes

[arma@seul.org (Roger Dingledine)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	config.c onion.c or.h 
Log Message:
rename ExcludedNodes config option to ExcludeNodes


Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- config.c	26 Feb 2004 22:56:36 -0000	1.84
+++ config.c	28 Feb 2004 05:09:37 -0000	1.85
@@ -165,7 +165,7 @@
     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 @@
   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 @@
   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");

Index: onion.c
===================================================================
RCS file: /home/or/cvsroot/src/or/onion.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- onion.c	17 Feb 2004 08:42:25 -0000	1.125
+++ onion.c	28 Feb 2004 05:09:37 -0000	1.126
@@ -298,7 +298,7 @@
   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 @@
          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",

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- or.h	28 Feb 2004 04:11:53 -0000	1.233
+++ or.h	28 Feb 2004 05:09:37 -0000	1.234
@@ -501,7 +501,7 @@
   char *PidFile;
   char *ExitNodes;
   char *EntryNodes;
-  char *ExcludedNodes;
+  char *ExcludeNodes;
   char *ExitPolicy;
   char *SocksBindAddress;
   char *ORBindAddress;