Browse Source

Would you believe that the software_versions field of routerlist_t was never actually used for anything?

svn:r5064
Nick Mathewson 20 years ago
parent
commit
27bbfe9dcf
3 changed files with 2 additions and 7 deletions
  1. 2 2
      src/or/or.h
  2. 0 4
      src/or/routerlist.c
  3. 0 1
      src/or/routerparse.c

+ 2 - 2
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;

+ 0 - 4
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);

+ 0 - 1
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));