diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-04-16 21:37:21 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-04-16 21:37:21 +0000 |
| commit | 362fbc79d276864c4b2b68ed9cf3bb8ba534985e (patch) | |
| tree | de554cefaa860c8e384a5cbe955641ec2a7a77fc /src/or/dirserv.c | |
| parent | 97e1b68e43d728b3210889d75b9855d34f5147bf (diff) | |
| download | tor-362fbc79d276864c4b2b68ed9cf3bb8ba534985e.tar tor-362fbc79d276864c4b2b68ed9cf3bb8ba534985e.tar.gz | |
r12414@catbus: nickm | 2007-04-16 17:37:17 -0400
More proposal-104 stuff: actually remember extra-info stuff.
svn:r9975
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index e8811c0d0..415810ebf 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -562,9 +562,7 @@ dirserv_add_descriptor(const char *desc, const char **msg) extrainfo_free(ei); return -1; } - /* XXXX020 Eventually, we should store this. For now, we'll just - * discard it. */ - extrainfo_free(ei); + router_add_extrainfo_to_routerlist(ei, msg, 0, 0); return 2; } @@ -2115,11 +2113,11 @@ connection_dirserv_add_servers_to_outbuf(dir_connection_t *conn) routerinfo_t *ri = router_get_by_digest(fp); if (ri && ri->cache_info.published_on > publish_cutoff) { - if (extra) { - sd = extrainfo_get_by_descriptor_digest(ri->extra_info_digest); - } else { + if (extra) + sd = extrainfo_get_by_descriptor_digest( + ri->cache_info.extra_info_digest); + else sd = &ri->cache_info; - } } } } else { |