[or-cvs] r11983: Fix the simpler bit of bug 529: update routerinfo_t.is_named (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-16 10:25:13 -0400 (Tue, 16 Oct 2007)
New Revision: 11983

Modified:
   tor/trunk/
   tor/trunk/src/or/networkstatus.c
Log:
 r15847 at catbus:  nickm | 2007-10-16 10:15:07 -0400
 Fix the simpler bit of bug 529: update routerinfo_t.is_named from the consensus.



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

Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2007-10-16 13:59:37 UTC (rev 11982)
+++ tor/trunk/src/or/networkstatus.c	2007-10-16 14:25:13 UTC (rev 11983)
@@ -1173,6 +1173,7 @@
     }
     if (r>0) {
       /* We have no routerstatus for this router. Skip it. */
+      router->is_named = 0;
       continue;
     }
     tor_assert(r==0);
@@ -1191,6 +1192,10 @@
       router->is_possible_guard = rs->is_possible_guard;
       router->is_exit = rs->is_exit;
       router->is_bad_exit = rs->is_bad_exit;
+      if (rs->is_named && !strcasecmp(router->nickname, rs->nickname))
+        router->is_named = 1;
+      else
+        router->is_named = 0;
     }
     if (router->is_running && ds) {
       download_status_reset(&ds->v2_ns_dl_status);