summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-09-30 18:25:25 -0400
committerNick Mathewson <nickm@torproject.org>2010-10-01 18:14:27 -0400
commitf9ea242acabcaec0ab0fbd0de5e9999dfcdb0193 (patch)
treee57665d063579cf465b6f6be48c5b699c09bd8b2 /src/or/or.h
parent45f1e4d5ee7b6e2308655628d18a67d330d9b624 (diff)
downloadtor-f9ea242acabcaec0ab0fbd0de5e9999dfcdb0193.tar.gz
tor-f9ea242acabcaec0ab0fbd0de5e9999dfcdb0193.zip
Implement node-based router family code
Also, make the NodeFamily option into a list of routersets. This lets us git rid of router_in_nickname_list (or whatever it was called) without porting it to work with nodes, and also lets people specify country codes and IP ranges in NodeFamily
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 670cf7dd40..ac9634748e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2725,7 +2725,8 @@ typedef struct {
char *MyFamily; /**< Declared family for this OR. */
config_line_t *NodeFamilies; /**< List of config lines for
- * node families */
+ * node families */
+ smartlist_t *NodeFamilySets; /**< List of parsed NodeFamilies values. */
config_line_t *AuthDirBadDir; /**< Address policy for descriptors to
* mark as bad dir mirrors. */
config_line_t *AuthDirBadExit; /**< Address policy for descriptors to