Start remembering *where* we are storing routerdescs. This will make us easier to move from a RAM-mirrors-disk model to a RAM-caches-disk model, and save maybe around 10MB on a directory server.

svn:r6427

1 files changed, 8 insertions, 2 deletions

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index bb30d1c0a4..ab1a2ca3bf 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -637,15 +637,17 @@ check_directory_signature(const char *digest,
  * are not complete. Returns 0 on success and -1 on failure.
  */
 int
-router_parse_list_from_string(const char **s, smartlist_t *dest)
+router_parse_list_from_string(const char **s, smartlist_t *dest,
+                              int from_cache)
 {
   routerinfo_t *router;
-  const char *end, *cp;
+  const char *end, *cp, *start;
 
   tor_assert(s);
   tor_assert(*s);
   tor_assert(dest);
 
+  start = *s;
   while (1) {
     *s = eat_whitespace(*s);
     /* Don't start parsing the rest of *s unless it contains a router. */
@@ -683,6 +685,10 @@ router_parse_list_from_string(const char **s, smartlist_t *dest)
       log_warn(LD_DIR, "Error reading router; skipping");
       continue;
     }
+    if (from_cache) {
+      router->cache_info.saved_location = SAVED_IN_CACHE;
+      router->cache_info.saved_offset = *s - start;
+    }
     smartlist_add(dest, router);
   }