diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-09-27 16:08:10 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-09-27 16:08:10 +0000 |
| commit | 28946069eef5cb980a7a14b4893ee531c9ebd6cb (patch) | |
| tree | 4d93909fc27230092b6b9258c73a702a0de9e30d /src/or/router.c | |
| parent | ea47287575534eb58c4f3cae6c59b1095af3b92e (diff) | |
| download | tor-28946069eef5cb980a7a14b4893ee531c9ebd6cb.tar.gz tor-28946069eef5cb980a7a14b4893ee531c9ebd6cb.zip | |
r15412@catbus: nickm | 2007-09-27 12:04:24 -0400
More annotated-store work: handle annotations in lists correctly. Add ability to prepend annotations to a routerdesc (and to every rtouredesc in a list), while verifying that the routerdesc is not already annotated.
svn:r11665
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 5358ccdf91..f3aa25299e 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, 0); + ri = router_parse_entry_from_string(mydesc, NULL, 1, 0, NULL); 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, 0); + ri_tmp = router_parse_entry_from_string(cp, NULL, 1, 0, NULL); if (!ri_tmp) { log_err(LD_BUG, "We just generated a router descriptor we can't parse."); |