void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make flags 64-bit in both network request and config.

Browse source
This commit is contained in:
Adam Ierymenko 2016-06-07 10:46:29 -07:00
parent 4342b71d7a
commit be37d025b8
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
node/NetworkConfig.hpp
View file

@ -359,8 +359,8 @@ public:
b.append((uint64_t)timestamp); b.append((uint64_t)timestamp);
b.append((uint64_t)revision); b.append((uint64_t)revision);
issuedTo.appendTo(b); issuedTo.appendTo(b);
b.append((uint64_t)flags);
b.append((uint32_t)multicastLimit); b.append((uint32_t)multicastLimit);
b.append((uint32_t)flags);
b.append((uint8_t)type); b.append((uint8_t)type);
unsigned int nl = (unsigned int)strlen(name); unsigned int nl = (unsigned int)strlen(name);
@ -488,8 +488,8 @@ public:
timestamp = b.template at<uint64_t>(p); p += 8; timestamp = b.template at<uint64_t>(p); p += 8;
revision = b.template at<uint64_t>(p); p += 8; revision = b.template at<uint64_t>(p); p += 8;
issuedTo.setTo(b.field(p,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); p += ZT_ADDRESS_LENGTH; issuedTo.setTo(b.field(p,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); p += ZT_ADDRESS_LENGTH;
flags = b.template at<uint64_t>(p); p += 4;
multicastLimit = (unsigned int)b.template at<uint32_t>(p); p += 4; multicastLimit = (unsigned int)b.template at<uint32_t>(p); p += 4;
flags = (unsigned int)b.template at<uint32_t>(p); p += 4;
type = (ZT_VirtualNetworkType)b[p++]; type = (ZT_VirtualNetworkType)b[p++];
unsigned int nl = (unsigned int)b[p++]; unsigned int nl = (unsigned int)b[p++];
@ -660,16 +660,16 @@ public:
*/ */
Address issuedTo; Address issuedTo;
/**
* Flags (64-bit)
*/
uint64_t flags;
/** /**
* Maximum number of recipients per multicast (not including active bridges) * Maximum number of recipients per multicast (not including active bridges)
*/ */
unsigned int multicastLimit; unsigned int multicastLimit;
/**
* Flags (32-bit)
*/
unsigned int flags;
/** /**
* Number of specialists * Number of specialists
*/ */