From: Linus Nordberg <linus@torproject.org>
Date: Fri, 31 Aug 2012 21:02:19 +0000 (+0200)
Subject: Take microdesc into account when deciding about preferred OR port.
X-Git-Tag: tor-0.2.4.1-alpha~15^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d827a5495a9d05976f5610655f7e4b5b160a2dac;p=thirdparty%2Ftor.git

Take microdesc into account when deciding about preferred OR port.
---

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 25ed6a61ca..e35039bdb8 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -888,9 +888,17 @@ node_get_pref_ipv6_orport(const node_t *node, tor_addr_port_t *ap_out)
   node_assert_ok(node);
   tor_assert(ap_out);
 
+  /* We prefer the microdesc over a potential routerstatus here. They
+     are not being synchronised atm so there might be a chance that
+     they differ at some point, f.ex. when flipping
+     UseMicrodescriptors? -LN */
+
   if (node->ri) {
     tor_addr_copy(&ap_out->addr, &node->ri->ipv6_addr);
     ap_out->port = node->ri->ipv6_orport;
+  } else if (node->md) {
+    tor_addr_copy(&ap_out->addr, &node->md->ipv6_addr);
+    ap_out->port = node->md->ipv6_orport;
   } else if (node->rs) {
     tor_addr_copy(&ap_out->addr, &node->rs->ipv6_addr);
     ap_out->port = node->rs->ipv6_orport;