diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-09-26 16:19:44 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-09-26 16:19:44 +0000 |
| commit | 034524f4b779c0e1258cd02123b8f7184b97d071 (patch) | |
| tree | 02d5576191b0a21e73f51325ffb8fb0f54bd4674 /src/or/dirserv.c | |
| parent | d87a91b82241ff81d9d5fcfaae5cf95a5c931cb9 (diff) | |
| download | tor-034524f4b779c0e1258cd02123b8f7184b97d071.tar tor-034524f4b779c0e1258cd02123b8f7184b97d071.tar.gz | |
r15400@catbus: nickm | 2007-09-26 12:13:12 -0400
Backend for descriptor annotations: parse annotations as keywords; only allow them to appear in the cache; do not serve them as part of the descriptor if we are a dirserver. Still need mechanism to set annotations. Still need to rename cache file.
svn:r11654
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index b0bc210f1..c55e8cd34 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -536,7 +536,7 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose, s = desc; list = smartlist_create(); - if (!router_parse_list_from_string(&s, NULL, list, SAVED_NOWHERE, 0)) { + if (!router_parse_list_from_string(&s, NULL, list, SAVED_NOWHERE, 0, 0)) { SMARTLIST_FOREACH(list, routerinfo_t *, ri, { msg_out = NULL; @@ -561,7 +561,7 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose, smartlist_clear(list); s = desc; - if (!router_parse_list_from_string(&s, NULL, list, SAVED_NOWHERE, 1)) { + if (!router_parse_list_from_string(&s, NULL, list, SAVED_NOWHERE, 1, 0)) { SMARTLIST_FOREACH(list, extrainfo_t *, ei, { msg_out = NULL; |