ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-02 07:20:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix valgrind warning... not sure if it is an actual issue.

Browse Source
This commit is contained in:
Adam Ierymenko 2019-06-17 15:23:52 -07:00
parent aa831dd843
commit e2900f4f3c
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
node/CertificateOfOwnership.hpp
View File

@ -67,29 +67,18 @@ public:
THING_IPV6_ADDRESS = 3 THING_IPV6_ADDRESS = 3
}; };
CertificateOfOwnership() : CertificateOfOwnership()
_networkId(0),
_ts(0),
_flags(0),
_id(0),
_thingCount(0)
{ {
memset(_thingTypes,0,sizeof(_thingTypes)); memset(reinterpret_cast<void *>(this),0,sizeof(CertificateOfOwnership));
memset(_thingValues,0,sizeof(_thingValues));
memset(_signature.data,0,sizeof(_signature.data));
} }
CertificateOfOwnership(const uint64_t nwid,const int64_t ts,const Address &issuedTo,const uint32_t id) : CertificateOfOwnership(const uint64_t nwid,const int64_t ts,const Address &issuedTo,const uint32_t id)
_networkId(nwid),
_ts(ts),
_flags(0),
_id(id),
_thingCount(0),
_issuedTo(issuedTo)
{ {
memset(_thingTypes,0,sizeof(_thingTypes)); memset(reinterpret_cast<void *>(this),0,sizeof(CertificateOfOwnership));
memset(_thingValues,0,sizeof(_thingValues)); _networkId = nwid;
memset(_signature.data,0,sizeof(_signature.data)); _ts = ts;
_id = id;
_issuedTo = issuedTo;
} }
inline uint64_t networkId() const { return _networkId; } inline uint64_t networkId() const { return _networkId; }

2
node/Network.cpp
View File

@ -1036,7 +1036,7 @@ int Network::setConfiguration(void *tPtr,const NetworkConfig &nconf,bool saveToD
_portError = RR->node->configureVirtualNetworkPort(tPtr,_id,&_uPtr,(oldPortInitialized) ? ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE : ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP,&ctmp); _portError = RR->node->configureVirtualNetworkPort(tPtr,_id,&_uPtr,(oldPortInitialized) ? ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE : ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP,&ctmp);
if (saveToDisk) { if (saveToDisk) {
Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> *d = new Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>(); Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> *const d = new Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>();
try { try {
if (nconf.toDictionary(*d,false)) { if (nconf.toDictionary(*d,false)) {
uint64_t tmp[2]; uint64_t tmp[2];