dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify a bunch of NetworkConfig stuff by eliminating accessors, also makes network controller easier to refactor.

Browse source
This commit is contained in:
Adam Ierymenko 2016-05-06 16:13:11 -07:00
parent 529515d1d1
commit 8b9519f0af
12 changed files with 379 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

27
node/NetworkConfigRequestMetaData.hpp
View file

@ -29,11 +29,6 @@
#include "../version.h"
#ifdef ZT_SUPPORT_OLD_STYLE_NETCONF
#include <string>
#include "Dictionary.hpp"
#endif
namespace ZeroTier {
/**
@ -42,7 +37,20 @@ namespace ZeroTier {
class NetworkConfigRequestMetaData
{
public:
NetworkConfigRequestMetaData()
NetworkConfigRequestMetaData() :
buildId(0),
flags(0),
vendor(ZT_VENDOR_ZEROTIER),
platform(ZT_PLATFORM_UNSPECIFIED),
architecture(ZT_ARCHITECTURE_UNSPECIFIED),
majorVersion(ZEROTIER_ONE_VERSION_MAJOR),
minorVersion(ZEROTIER_ONE_VERSION_MINOR),
revision(ZEROTIER_ONE_VERSION_REVISION)
{
memset(auth,0,sizeof(auth));
}
NetworkConfigRequestMetaData(bool foo)
{
memset(this,0,sizeof(NetworkConfigRequestMetaData));
}
@ -67,7 +75,7 @@ public:
b.append((uint16_t)minorVersion);
b.append((uint16_t)revision);
unsigned int tl = (unsigned int)strlen(_auth);
unsigned int tl = (unsigned int)strlen(auth);
if (tl > 255) tl = 255; // sanity check
b.append((uint8_t)tl);
b.append((const void *)auth,tl);
@ -108,6 +116,11 @@ public:
return (p - startAt);
}
inline void clear()
{
memset(this,0,sizeof(NetworkConfigRequestMetaData));
}
/**
* Build ID (currently unused, must be 0)
*/