[or-cvs] r10161: Backport r10087: Include micro-versions in network-status do (in tor/branches/tor-0_1_2-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-05-10 15:29:46 -0400 (Thu, 10 May 2007)
New Revision: 10161

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/dirserv.c
Log:
 r12720 at catbus:  nickm | 2007-05-10 15:29:24 -0400
 Backport r10087: Include micro-versions in network-status documents.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r12720] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-05-10 19:29:39 UTC (rev 10160)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-05-10 19:29:46 UTC (rev 10161)
@@ -13,7 +13,12 @@
     - Actually set the purpose correctly for descriptors inserted with
       purpose=controller.
 
+  o Minor features:
+    - When routers publish SVN revisions in their router descriptors,
+      authorities now include those versions correctly in networkstatus
+      documents.
 
+
 Changes in version 0.1.2.13 - 2007-04-24
   o Minor fixes:
     - Fix a memory leak when we ask for "all" networkstatuses and we

Modified: tor/branches/tor-0_1_2-patches/src/or/dirserv.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/dirserv.c	2007-05-10 19:29:39 UTC (rev 10160)
+++ tor/branches/tor-0_1_2-patches/src/or/dirserv.c	2007-05-10 19:29:46 UTC (rev 10161)
@@ -1679,6 +1679,8 @@
       outp += strlen(outp);
       if (ri->platform && !strcmpstart(ri->platform, "Tor ")) {
         const char *eos = find_whitespace(ri->platform+4);
+        if (eos && !strcmpstart(eos, " (r"))
+          eos = find_whitespace(eos+1);
         if (eos) {
           char *platform = tor_strndup(ri->platform, eos-(ri->platform));
           if (tor_snprintf(outp, endp-outp,