ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-03-02 21:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build fixes.

Browse Source
This commit is contained in:
Adam Ierymenko 2019-09-11 15:52:18 -07:00
parent d8dae365f6
commit 0723a85ab3
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
9 changed files with 13 additions and 13 deletions

2
controller/EmbeddedNetworkController.cpp

@ -1654,7 +1654,7 @@ void EmbeddedNetworkController::_request(
DB::cleanMember(member); DB::cleanMember(member);
_db.save(member,true); _db.save(member,true);
_sender->ncSendConfig(nwid,requestPacketId,identity.address(),*(nc.get()),metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_VERSION,0) < 6); _sender->ncSendConfig(nwid,requestPacketId,identity.address(),*(nc.get()),false);
} }
void EmbeddedNetworkController::_startThreads() void EmbeddedNetworkController::_startThreads()

1
node/AES.hpp

@ -22,6 +22,7 @@
#include <wmmintrin.h> #include <wmmintrin.h>
#include <emmintrin.h> #include <emmintrin.h>
#include <smmintrin.h> #include <smmintrin.h>
#include <immintrin.h>
#define ZT_AES_AESNI 1 #define ZT_AES_AESNI 1
#endif #endif

6
node/Hashtable.hpp

@ -16,6 +16,8 @@
#include "Constants.hpp" #include "Constants.hpp"
#include <vector>
namespace ZeroTier { namespace ZeroTier {
/** /**
@ -68,8 +70,8 @@ public:
{ {
for(;;) { for(;;) {
if (_b) { if (_b) {
kptr = &(_b->k); kptr = (K *)(&(_b->k));
vptr = &(_b->v); vptr = (V *)(&(_b->v));
_b = _b->next; _b = _b->next;
return true; return true;
} }

2
node/Multicaster.cpp

@ -46,7 +46,7 @@ unsigned int Multicaster::send(
std::vector< std::pair<int64_t,Address> > recipients; std::vector< std::pair<int64_t,Address> > recipients;
const NetworkConfig &config = network->config(); const NetworkConfig &config = network->config();
if (config.multicastLimit == 0) return; // multicast disabled if (config.multicastLimit == 0) return 0; // multicast disabled
Address specialists[ZT_MAX_NETWORK_SPECIALISTS],multicastReplicators[ZT_MAX_NETWORK_SPECIALISTS]; Address specialists[ZT_MAX_NETWORK_SPECIALISTS],multicastReplicators[ZT_MAX_NETWORK_SPECIALISTS];
unsigned int specialistCount = 0,multicastReplicatorCount = 0,bridgeCount = 0; unsigned int specialistCount = 0,multicastReplicatorCount = 0,bridgeCount = 0;

2
node/Multicaster.hpp

@ -178,7 +178,7 @@ public:
} }
} }
std::sort(sortedByTime.begin(),sortedByTime.end()); std::sort(sortedByTime.begin(),sortedByTime.end());
for(std::vector< std::pair<int64_t,Address> >::const_reverse_iterator i(sortedByTime.begin());i!=sortedByTime.end();++i) { for(std::vector< std::pair<int64_t,Address> >::const_reverse_iterator i(sortedByTime.rbegin());i!=sortedByTime.rend();++i) {
if (!func(i->second)) if (!func(i->second))
break; break;
} }

4
node/Network.hpp

@ -404,8 +404,8 @@ public:
{ {
Mutex::Lock ml(_memberships_l); Mutex::Lock ml(_memberships_l);
Hashtable<Address,Membership>::Iterator i(_memberships); Hashtable<Address,Membership>::Iterator i(_memberships);
const Address *a = nullptr; Address *a = nullptr;
const Membership *m = nullptr; Membership *m = nullptr;
while (i.next(a,m)) { while (i.next(a,m)) {
if (!f(*a,*m)) if (!f(*a,*m))
break; break;

4
node/NetworkConfig.hpp

@ -293,7 +293,7 @@ struct NetworkConfig
return false; return false;
} }
ZT_ALWAYS_INLINE Capability *capability(const uint32_t id) const ZT_ALWAYS_INLINE const Capability *capability(const uint32_t id) const
{ {
for(unsigned int i=0;i<capabilityCount;++i) { for(unsigned int i=0;i<capabilityCount;++i) {
if (capabilities[i].id() == id) if (capabilities[i].id() == id)
@ -302,7 +302,7 @@ struct NetworkConfig
return (Capability *)0; return (Capability *)0;
} }
ZT_ALWAYS_INLINE Tag *tag(const uint32_t id) const ZT_ALWAYS_INLINE const Tag *tag(const uint32_t id) const
{ {
for(unsigned int i=0;i<tagCount;++i) { for(unsigned int i=0;i<tagCount;++i) {
if (tags[i].id() == id) if (tags[i].id() == id)

1
osdep/Arp.hpp

@ -17,6 +17,7 @@
#include <stdint.h> #include <stdint.h>
#include <utility> #include <utility>
#include <vector>
#include "../node/Constants.hpp" #include "../node/Constants.hpp"
#include "../node/Hashtable.hpp" #include "../node/Hashtable.hpp"

4
osdep/NeighborDiscovery.hpp

@ -18,14 +18,10 @@
#include "../node/MAC.hpp" #include "../node/MAC.hpp"
#include "../node/InetAddress.hpp" #include "../node/InetAddress.hpp"
#define ZT_ND_QUERY_INTERVAL 2000 #define ZT_ND_QUERY_INTERVAL 2000
#define ZT_ND_QUERY_MAX_TTL 5000 #define ZT_ND_QUERY_MAX_TTL 5000
#define ZT_ND_EXPIRE 600000 #define ZT_ND_EXPIRE 600000
namespace ZeroTier { namespace ZeroTier {
class NeighborDiscovery class NeighborDiscovery