diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-08 15:42:23 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-08 15:42:23 -0700 |
| commit | 7529d050c7fac805a3209281320262b4d4d3a428 (patch) | |
| tree | a28f8a6c06a6162393f25eb7b9cd76b43a11eb09 | |
| parent | bf2ff964e14c022aa4c10849cb4421ee9a710d40 (diff) | |
| download | infinitytier-7529d050c7fac805a3209281320262b4d4d3a428.tar.gz infinitytier-7529d050c7fac805a3209281320262b4d4d3a428.zip | |
All of node/ now compiles again!
| -rw-r--r-- | node/Defaults.cpp | 4 | ||||
| -rw-r--r-- | node/NetworkConfig.cpp | 6 | ||||
| -rw-r--r-- | node/OutboundMulticast.cpp | 5 | ||||
| -rw-r--r-- | objects.mk | 1 |
4 files changed, 8 insertions, 8 deletions
diff --git a/node/Defaults.cpp b/node/Defaults.cpp index 4cd7973c..c235ef2c 100644 --- a/node/Defaults.cpp +++ b/node/Defaults.cpp @@ -29,6 +29,8 @@ #include <stdlib.h> #include <string.h> +#include "../include/ZeroTierOne.h" + #include "Constants.hpp" #include "Defaults.hpp" #include "Utils.hpp" @@ -158,7 +160,7 @@ Defaults::Defaults() : rootTopologyAuthorities(_mkRootTopologyAuth()), updateAuthorities(_mkUpdateAuth()), updateLatestNfoURL(_mkUpdateUrl()), - v4Broadcast(((uint32_t)0xffffffff),ZT_DEFAULT_UDP_PORT) + v4Broadcast(((uint32_t)0xffffffff),ZT1_DEFAULT_PORT) { } diff --git a/node/NetworkConfig.cpp b/node/NetworkConfig.cpp index 3aefba4c..a034b15f 100644 --- a/node/NetworkConfig.cpp +++ b/node/NetworkConfig.cpp @@ -144,12 +144,12 @@ void NetworkConfig::_fromDictionary(const Dictionary &d) std::vector<std::string> ipAddrsSplit(Utils::split(ipAddrs.c_str(),",","","")); for(std::vector<std::string>::const_iterator ipstr(ipAddrsSplit.begin());ipstr!=ipAddrsSplit.end();++ipstr) { InetAddress addr(*ipstr); - switch(addr.type()) { - case InetAddress::TYPE_IPV4: + switch(addr.ss_family) { + case AF_INET: if ((!addr.netmaskBits())||(addr.netmaskBits() > 32)) continue; break; - case InetAddress::TYPE_IPV6: + case AF_INET6: if ((!addr.netmaskBits())||(addr.netmaskBits() > 128)) continue; break; diff --git a/node/OutboundMulticast.cpp b/node/OutboundMulticast.cpp index 7caa27a7..a939082c 100644 --- a/node/OutboundMulticast.cpp +++ b/node/OutboundMulticast.cpp @@ -29,10 +29,9 @@ #include "RuntimeEnvironment.hpp" #include "OutboundMulticast.hpp" #include "Switch.hpp" -#include "NodeConfig.hpp" #include "Network.hpp" #include "CertificateOfMembership.hpp" -#include "Utils.hpp" +#include "Node.hpp" #include "Logger.hpp" namespace ZeroTier { @@ -105,7 +104,7 @@ void OutboundMulticast::init( void OutboundMulticast::sendOnly(const RuntimeEnvironment *RR,const Address &toAddr) { if (_haveCom) { - SharedPtr<Network> network(RR->nc->network(_nwid)); + SharedPtr<Network> network(RR->node->network(_nwid)); if (network->peerNeedsOurMembershipCertificate(toAddr,RR->node->now())) { _packetWithCom.newInitializationVector(); _packetWithCom.setDestination(toAddr); @@ -18,7 +18,6 @@ OBJS=\ node/Peer.o \ node/Poly1305.o \ node/Salsa20.o \ - node/SoftwareUpdater.o \ node/SHA512.o \ node/Switch.o \ node/Topology.o \ |