void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some timestamp signedness mismatches.

Browse source
This commit is contained in:
Adam Ierymenko 2020-11-11 11:46:09 -05:00
parent d2f2abe525
commit 9480ff1f37
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
node/Multicaster.cpp
View file

@ -371,7 +371,6 @@ void Multicaster::send(
void Multicaster::clean(int64_t now) void Multicaster::clean(int64_t now)
{ {
{
Mutex::Lock _l(_groups_m); Mutex::Lock _l(_groups_m);
Multicaster::Key *k = (Multicaster::Key *)0; Multicaster::Key *k = (Multicaster::Key *)0;
MulticastGroupStatus *s = (MulticastGroupStatus *)0; MulticastGroupStatus *s = (MulticastGroupStatus *)0;
@ -405,7 +404,6 @@ void Multicaster::clean(int64_t now)
s->members.clear(); s->members.clear();
} }
} }
}
} }
void Multicaster::_add(void *tPtr,int64_t now,uint64_t nwid,const MulticastGroup &mg,MulticastGroupStatus &gs,const Address &member) void Multicaster::_add(void *tPtr,int64_t now,uint64_t nwid,const MulticastGroup &mg,MulticastGroupStatus &gs,const Address &member)

6
node/Multicaster.hpp
View file

@ -138,7 +138,7 @@ public:
unsigned int len); unsigned int len);
/** /**
* Clean up and resort database * Clean database
* *
* @param RR Runtime environment * @param RR Runtime environment
* @param now Current time * @param now Current time
@ -172,14 +172,14 @@ private:
inline bool operator!=(const Address &a) const { return (address != a); } inline bool operator!=(const Address &a) const { return (address != a); }
Address address; Address address;
uint64_t timestamp; // time of last notification int64_t timestamp; // time of last notification
}; };
struct MulticastGroupStatus struct MulticastGroupStatus
{ {
MulticastGroupStatus() : lastExplicitGather(0) {} MulticastGroupStatus() : lastExplicitGather(0) {}
uint64_t lastExplicitGather; int64_t lastExplicitGather;
std::list<OutboundMulticast> txQueue; // pending outbound multicasts std::list<OutboundMulticast> txQueue; // pending outbound multicasts
std::vector<MulticastGroupMember> members; // members of this group std::vector<MulticastGroupMember> members; // members of this group
}; };