diff options
author | Nick Mathewson <nickm@torproject.org> | 2005-09-14 21:38:05 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2005-09-14 21:38:05 +0000 |
commit | 27bbfe9dcf9d44e2c4a363af2f1775e3ae442d15 (patch) | |
tree | 5b2351b8e9cb6ec0664433d96fc79659fa985066 /src | |
parent | e3adcbdb953fa132d0658cf18a8b91f42b139640 (diff) | |
download | tor-27bbfe9dcf9d44e2c4a363af2f1775e3ae442d15.tar tor-27bbfe9dcf9d44e2c4a363af2f1775e3ae442d15.tar.gz |
Would you believe that the software_versions field of routerlist_t was never actually used for anything?
svn:r5064
Diffstat (limited to 'src')
-rw-r--r-- | src/or/or.h | 4 | ||||
-rw-r--r-- | src/or/routerlist.c | 4 | ||||
-rw-r--r-- | src/or/routerparse.c | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/or/or.h b/src/or/or.h index f5f6af2a8..ec9cf57fe 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -845,12 +845,12 @@ typedef struct networkstatus_t { typedef struct { /** List of routerinfo_t. */ smartlist_t *routers; - /** Which versions of tor are recommended by this directory? */ - char *software_versions; /** When was the most recent directory that contributed to this list * published? */ time_t published_on; #if 0 + /** Which versions of tor are recommended by this directory? */ + char *software_versions; time_t running_routers_updated_on; /** What is the most recently received running_routers structure? */ running_routers_t *running_routers; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f9a41d4c1..fbcf713e2 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -980,7 +980,6 @@ routerlist_free(routerlist_t *rl) SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r, routerinfo_free(r)); smartlist_free(rl->routers); - tor_free(rl->software_versions); tor_free(rl); } @@ -1305,9 +1304,6 @@ router_load_routerlist_from_directory(const char *s, }); smartlist_clear(new_list->routers); routerlist->published_on = new_list->published_on; - tor_free(routerlist->software_versions); - routerlist->software_versions = new_list->software_versions; - new_list->software_versions = NULL; routerlist_free(new_list); control_event_descriptors_changed(changed); smartlist_free(changed); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index e9f551d47..47808d914 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -539,7 +539,6 @@ router_parse_routerlist_from_directory(const char *str, goto err; } - new_dir->software_versions = versions; versions = NULL; new_dir->published_on = published_on; SMARTLIST_FOREACH(tokens, directory_token_t *, tok, token_free(tok)); |