gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced ZT_FAST_MEMCPY with memcpy in Service.cpp

Browse Source
This commit is contained in:
Joseph Henry
2019-05-03 12:07:01 -07:00
parent a7c2496dfc
commit e727dfefb2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Service.cpp
View File

@@ -41,7 +41,6 @@
#include "version.h" #include "version.h"
#include "ZeroTierOne.h" #include "ZeroTierOne.h"
#include "OSUtils.hpp"
#include "Constants.hpp" #include "Constants.hpp"
#include "Mutex.hpp" #include "Mutex.hpp"
#include "Node.hpp" #include "Node.hpp"
@@ -772,7 +771,7 @@ public:
// After setting up tap, fall through to CONFIG_UPDATE since we also want to do this... // After setting up tap, fall through to CONFIG_UPDATE since we also want to do this...
case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE: case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE:
ZT_FAST_MEMCPY(&(n.config),nwc,sizeof(ZT_VirtualNetworkConfig)); memcpy(&(n.config),nwc,sizeof(ZT_VirtualNetworkConfig));
if (n.tap) { // sanity check if (n.tap) { // sanity check
syncManagedStuff(n); syncManagedStuff(n);
n.tap->setMtu(nwc->mtu); n.tap->setMtu(nwc->mtu);
@@ -1158,7 +1157,7 @@ public:
else return 0; else return 0;
const std::vector<InetAddress> *l = lh->get(ztaddr); const std::vector<InetAddress> *l = lh->get(ztaddr);
if ((l)&&(l->size() > 0)) { if ((l)&&(l->size() > 0)) {
ZT_FAST_MEMCPY(result,&((*l)[(unsigned long)_node->prng() % l->size()]),sizeof(struct sockaddr_storage)); memcpy(result,&((*l)[(unsigned long)_node->prng() % l->size()]),sizeof(struct sockaddr_storage));
return 1; return 1;
} else return 0; } else return 0;
} }