From be37d025b801865e95e4b616aef31a1645309c58 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 7 Jun 2016 10:46:29 -0700 Subject: Make flags 64-bit in both network request and config. --- node/NetworkConfig.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp index a7ed77b9..056660fa 100644 --- a/node/NetworkConfig.hpp +++ b/node/NetworkConfig.hpp @@ -359,8 +359,8 @@ public: b.append((uint64_t)timestamp); b.append((uint64_t)revision); issuedTo.appendTo(b); + b.append((uint64_t)flags); b.append((uint32_t)multicastLimit); - b.append((uint32_t)flags); b.append((uint8_t)type); unsigned int nl = (unsigned int)strlen(name); @@ -488,8 +488,8 @@ public: timestamp = b.template at(p); p += 8; revision = b.template at(p); p += 8; issuedTo.setTo(b.field(p,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); p += ZT_ADDRESS_LENGTH; + flags = b.template at(p); p += 4; multicastLimit = (unsigned int)b.template at(p); p += 4; - flags = (unsigned int)b.template at(p); p += 4; type = (ZT_VirtualNetworkType)b[p++]; unsigned int nl = (unsigned int)b[p++]; @@ -661,14 +661,14 @@ public: Address issuedTo; /** - * Maximum number of recipients per multicast (not including active bridges) + * Flags (64-bit) */ - unsigned int multicastLimit; + uint64_t flags; /** - * Flags (32-bit) + * Maximum number of recipients per multicast (not including active bridges) */ - unsigned int flags; + unsigned int multicastLimit; /** * Number of specialists -- cgit v1.2.3