From be6b61b1bc7e207144faf99a2aeda874ff3a0055 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Thu, 14 Aug 2014 18:06:18 -0400
Subject: Accept supernode dictionaries in Topology, also fix (unused) field
 name in one of these.

---
 node/Topology.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'node/Topology.cpp')

diff --git a/node/Topology.cpp b/node/Topology.cpp
index d74179fe..4fae1372 100644
--- a/node/Topology.cpp
+++ b/node/Topology.cpp
@@ -30,6 +30,7 @@
 #include "Topology.hpp"
 #include "NodeConfig.hpp"
 #include "CMWC4096.hpp"
+#include "Dictionary.hpp"
 
 #define ZT_PEER_WRITE_BUF_SIZE 131072
 
@@ -75,6 +76,27 @@ void Topology::setSupernodes(const std::map< Identity,std::vector< std::pair<Ine
 	_amSupernode = (_supernodes.find(_r->identity) != _supernodes.end());
 }
 
+void Topology::setSupernodes(const Dictionary &sn)
+{
+	std::map< Identity,std::vector< std::pair<InetAddress,bool> > > m;
+	for(Dictionary::const_iterator d(sn.begin());d!=sn.end();++d) {
+		if ((d->first.length() == ZT_ADDRESS_LENGTH_HEX)&&(d->second.length() > 0)) {
+			try {
+				Dictionary snspec(d->second);
+				std::vector< std::pair<InetAddress,bool> > &a = m[Identity(snspec.get("id"))];
+				std::string udp(snspec.get("udp",std::string()));
+				if (udp.length() > 0)
+					a.push_back(std::pair<InetAddress,bool>(InetAddress(udp),false));
+				std::string tcp(snspec.get("tcp",std::string()));
+					a.push_back(std::pair<InetAddress,bool>(InetAddress(tcp),true));
+			} catch ( ... ) {
+				LOG("supernode list contained invalid entry for: %s",d->first.c_str());
+			}
+		}
+	}
+	this->setSupernodes(m);
+}
+
 SharedPtr<Peer> Topology::addPeer(const SharedPtr<Peer> &peer)
 {
 	if (peer->address() == _r->identity.address()) {
-- 
cgit v1.2.3