From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 16 Oct 2007 14:25:13 +0000 (+0000)
Subject:  r15847@catbus:  nickm | 2007-10-16 10:15:07 -0400
X-Git-Tag: tor-0.2.0.9-alpha~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ca262583312bcb63ea269cca54e0dfd5e1f56d5;p=thirdparty%2Ftor.git

 r15847@catbus:  nickm | 2007-10-16 10:15:07 -0400
 Fix the simpler bit of bug 529: update routerinfo_t.is_named from the consensus.


svn:r11983
---

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 57d951325f..89e9231d7c 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1173,6 +1173,7 @@ routers_update_status_from_consensus_networkstatus(smartlist_t *routers,
     }
     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 @@ routers_update_status_from_consensus_networkstatus(smartlist_t *routers,
       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);