[tor-commits] [vidalia/master] Append router status information if Tor is using microdescriptors

[chiiph at torproject.org]

commit 579b685ed19957d63989c0bf3a35b8f228f5e052
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Fri Jul 6 17:55:29 2012 -0300

    Append router status information if Tor is using microdescriptors
---
 changes/appendRouterStatus        |    1 +
 src/vidalia/network/NetViewer.cpp |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/changes/appendRouterStatus b/changes/appendRouterStatus
new file mode 100644
index 0000000..7a579d7
--- /dev/null
+++ b/changes/appendRouterStatus
@@ -0,0 +1 @@
+  o Append router status information if Tor is using microdescriptors.
diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp
index 535c127..1d48b96 100644
--- a/src/vidalia/network/NetViewer.cpp
+++ b/src/vidalia/network/NetViewer.cpp
@@ -313,11 +313,16 @@ NetViewer::loadNetworkStatus()
 {
   NetworkStatus networkStatus = _torControl->getNetworkStatus();
 
+  bool usingMicrodescriptors = _torControl->useMicrodescriptors();
+
   foreach(RouterStatus rs, networkStatus) {
     if (!rs.isRunning())
       continue;
 
     RouterDescriptor rd = _torControl->getRouterDescriptor(rs.id());
+    if(usingMicrodescriptors) {
+      rd.appendRouterStatusInfo(rs);
+    }
     if (!rd.isEmpty())
       addRouter(rd);