[or-cvs] r10535: Make versions get added to networkstatuses correctly again. (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-06-08 14:41:14 -0400 (Fri, 08 Jun 2007)
New Revision: 10535

Modified:
   tor/trunk/
   tor/trunk/src/or/dirserv.c
Log:
 r13315@catbus:  nickm | 2007-06-08 14:33:24 -0400
 Make versions get added to networkstatuses correctly again.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13315] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-06-08 18:41:12 UTC (rev 10534)
+++ tor/trunk/src/or/dirserv.c	2007-06-08 18:41:14 UTC (rev 10535)
@@ -1583,13 +1583,12 @@
  * DOCDOC new arguments */
 int
 routerstatus_format_entry(char *buf, size_t buf_len,
-                          routerstatus_t *rs, const char *platform,
+                          routerstatus_t *rs, const char *version,
                           int first_line_only)
 {
   int r;
   struct in_addr in;
   char *cp;
-  char *v;
 
   int f_authority;
   char published[ISO_TIME_LEN+1];
@@ -1639,13 +1638,11 @@
     return -1;
   }
 
-  if (platform && (v = version_from_platform(platform))) {
-    if (tor_snprintf(buf, buf_len, "opt v %s\n", v)<0) {
-      tor_free(v);
+  if (version) {
+    if (tor_snprintf(buf, buf_len, "opt v %s\n", version)<0) {
       log_warn(LD_BUG, "Unable to print router version.");
       return -1;
     }
-    tor_free(v);
   }
 
   return 0;
@@ -1956,7 +1953,6 @@
 
   SMARTLIST_FOREACH(v3_ns->routerstatus_list, vote_routerstatus_t *, vrs,
   {
-    /* XXXX020 ri->platform!!!.  Also, version-from-platform. */
     if (routerstatus_format_entry(outp, endp-outp, &vrs->status,
                                   vrs->version, 0) < 0) {
       log_warn(LD_BUG, "Unable to print router status.");
@@ -2165,18 +2161,19 @@
 
   SMARTLIST_FOREACH(routers, routerinfo_t *, ri, {
     if (ri->cache_info.published_on >= cutoff) {
-
       routerstatus_t rs;
+      char *version = version_from_platform(ri->platform);
 
       set_routerstatus_from_routerinfo(&rs, ri, now,
                                        naming, exits_can_be_guards,
                                        listbadexits);
 
-      if (routerstatus_format_entry(outp, endp-outp, &rs,
-                                    ri->platform, 0) < 0) {
+      if (routerstatus_format_entry(outp, endp-outp, &rs, version, 0)) {
         log_warn(LD_BUG, "Unable to print router status.");
+        tor_free(version);
         goto done;
       }
+      tor_free(version);
       outp += strlen(outp);
     }
   });