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

Mutex cleanup.

Browse source
This commit is contained in:
Adam Ierymenko 2015-10-01 11:44:09 -07:00
parent 9405150b11
commit 64bf3ffe6c
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
node/Peer.hpp
View file

@ -193,6 +193,7 @@ public:
inline std::vector<RemotePath> paths() const inline std::vector<RemotePath> paths() const
{ {
std::vector<RemotePath> pp; std::vector<RemotePath> pp;
Mutex::Lock _l(_lock);
for(unsigned int p=0,np=_numPaths;p<np;++p) for(unsigned int p=0,np=_numPaths;p<np;++p)
pp.push_back(_paths[p]); pp.push_back(_paths[p]);
return pp; return pp;
@ -204,6 +205,7 @@ public:
inline uint64_t lastDirectReceive() const inline uint64_t lastDirectReceive() const
throw() throw()
{ {
Mutex::Lock _l(_lock);
uint64_t x = 0; uint64_t x = 0;
for(unsigned int p=0,np=_numPaths;p<np;++p) for(unsigned int p=0,np=_numPaths;p<np;++p)
x = std::max(x,_paths[p].lastReceived()); x = std::max(x,_paths[p].lastReceived());
@ -216,6 +218,7 @@ public:
inline uint64_t lastDirectSend() const inline uint64_t lastDirectSend() const
throw() throw()
{ {
Mutex::Lock _l(_lock);
uint64_t x = 0; uint64_t x = 0;
for(unsigned int p=0,np=_numPaths;p<np;++p) for(unsigned int p=0,np=_numPaths;p<np;++p)
x = std::max(x,_paths[p].lastSend()); x = std::max(x,_paths[p].lastSend());
@ -288,6 +291,7 @@ public:
inline bool hasActiveDirectPath(uint64_t now) const inline bool hasActiveDirectPath(uint64_t now) const
throw() throw()
{ {
Mutex::Lock _l(_lock);
for(unsigned int p=0,np=_numPaths;p<np;++p) { for(unsigned int p=0,np=_numPaths;p<np;++p) {
if (_paths[p].active(now)) if (_paths[p].active(now))
return true; return true;
@ -338,6 +342,7 @@ public:
*/ */
inline void setRemoteVersion(unsigned int vproto,unsigned int vmaj,unsigned int vmin,unsigned int vrev) inline void setRemoteVersion(unsigned int vproto,unsigned int vmaj,unsigned int vmin,unsigned int vrev)
{ {
Mutex::Lock _l(_lock);
_vProto = (uint16_t)vproto; _vProto = (uint16_t)vproto;
_vMajor = (uint16_t)vmaj; _vMajor = (uint16_t)vmaj;
_vMinor = (uint16_t)vmin; _vMinor = (uint16_t)vmin;
@ -361,6 +366,7 @@ public:
inline bool atLeastVersion(unsigned int major,unsigned int minor,unsigned int rev) inline bool atLeastVersion(unsigned int major,unsigned int minor,unsigned int rev)
throw() throw()
{ {
Mutex::Lock _l(_lock);
if ((_vMajor > 0)||(_vMinor > 0)||(_vRevision > 0)) { if ((_vMajor > 0)||(_vMinor > 0)||(_vRevision > 0)) {
if (_vMajor > major) if (_vMajor > major)
return true; return true;