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/router.c | |
| parent | d87a91b82241ff81d9d5fcfaae5cf95a5c931cb9 (diff) | |
| download | tor-034524f4b779c0e1258cd02123b8f7184b97d071.tar.gz tor-034524f4b779c0e1258cd02123b8f7184b97d071.zip | |
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/router.c')
| -rw-r--r-- | src/or/router.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c index 57625fadb6..5358ccdf91 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -485,7 +485,7 @@ init_keys(void) return -1; } if (mydesc) { - ri = router_parse_entry_from_string(mydesc, NULL, 1); + ri = router_parse_entry_from_string(mydesc, NULL, 1, 0); if (!ri) { log_err(LD_GENERAL,"Generated a routerinfo we couldn't parse."); return -1; @@ -1632,7 +1632,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, const char *cp; routerinfo_t *ri_tmp; cp = s_dup = tor_strdup(s); - ri_tmp = router_parse_entry_from_string(cp, NULL, 1); + ri_tmp = router_parse_entry_from_string(cp, NULL, 1, 0); if (!ri_tmp) { log_err(LD_BUG, "We just generated a router descriptor we can't parse."); |