summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-11-27 21:32:51 -0500
committerNick Mathewson <nickm@torproject.org>2011-11-27 21:32:51 -0500
commit73436a1d6fdbe411a0ee869ee570f4a1239cfa81 (patch)
tree71992d0c37ac4ea6b11dabb695d01a3d61b9946e /src/or/or.h
parent9ce5801e22790e4df702b4a56555404c75ac8058 (diff)
downloadtor-73436a1d6fdbe411a0ee869ee570f4a1239cfa81.tar.gz
tor-73436a1d6fdbe411a0ee869ee570f4a1239cfa81.zip
Add the ability to append and clear linelist options from cmdline
This will be important for getting stuff to work right across zones.
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h
index b3fd082cb6..c0963b0eec 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2841,6 +2841,8 @@ typedef struct port_cfg_t {
/** Appends to previous configuration for the same option, even if we
* would ordinary replace it. */
#define CONFIG_LINE_APPEND 1
+/* Removes all previous configuration for an option. */
+#define CONFIG_LINE_CLEAR 2
/** A linked list of lines in a config file. */
typedef struct config_line_t {
@@ -2848,7 +2850,7 @@ typedef struct config_line_t {
char *value;
struct config_line_t *next;
/** What special treatment (if any) does this line require? */
- unsigned int command:1;
+ unsigned int command:2;
/** If true, subsequent assignments to this linelist should replace
* it, not extend it. Set only on the first item in a linelist in an
* or_options_t. */