From 8a13cfdacee72a4af90336a329aaecb0ed38c33d Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 20 Apr 2015 17:14:16 -0700 Subject: Add per-network relays to NetworkConfig. --- node/NetworkConfig.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'node/NetworkConfig.cpp') diff --git a/node/NetworkConfig.cpp b/node/NetworkConfig.cpp index 6cab4b41..491c9493 100644 --- a/node/NetworkConfig.cpp +++ b/node/NetworkConfig.cpp @@ -181,6 +181,18 @@ void NetworkConfig::_fromDictionary(const Dictionary &d) _multicastRates[MulticastGroup(i->first)] = MulticastRate(Utils::hexStrToUInt(params[0].c_str()),Utils::hexStrToUInt(params[1].c_str()),Utils::hexStrToUInt(params[2].c_str())); } + std::vector relaysSplit(Utils::split(d.get(ZT_NETWORKCONFIG_DICT_KEY_RELAYS,"").c_str(),",","","")); + for(std::vector::const_iterator r(relaysSplit.begin());r!=relaysSplit.end();++r) { + std::size_t semi(r->find(';')); // address;ip/port,... + if ((semi == ZT_ADDRESS_LENGTH)&&(r->length() > (ZT_ADDRESS_LENGTH + 1))) { + std::pair relay(Address(r->substr(0,semi)),InetAddress(r->substr(semi+1))); + if ((relay.first)&&(relay.second)) + _relays.push_back(relay); + } + } + std::sort(_relays.begin(),_relays.end()); + std::unique(_relays.begin(),_relays.end()); + _com.fromString(d.get(ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATE_OF_MEMBERSHIP,std::string())); } -- cgit v1.2.3