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

Add optional function in DB change listener for member online events.

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-04 19:55:52 -07:00
parent 818b7e4a2e
commit a77b4ecddb
5 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
controller/DB.hpp
View file

@ -61,6 +61,7 @@ public:
virtual void onNetworkUpdate(uint64_t networkId,const nlohmann::json &network) {} virtual void onNetworkUpdate(uint64_t networkId,const nlohmann::json &network) {}
virtual void onNetworkMemberUpdate(uint64_t networkId,uint64_t memberId,const nlohmann::json &member) {} virtual void onNetworkMemberUpdate(uint64_t networkId,uint64_t memberId,const nlohmann::json &member) {}
virtual void onNetworkMemberDeauthorize(uint64_t networkId,uint64_t memberId) {} virtual void onNetworkMemberDeauthorize(uint64_t networkId,uint64_t memberId) {}
virtual void onNetworkMemberOnline(uint64_t networkId,uint64_t memberId,const InetAddress &physicalAddress) {}
}; };
struct NetworkSummaryInfo struct NetworkSummaryInfo

15
controller/FileDB.cpp
View file

@ -33,7 +33,6 @@ FileDB::FileDB(const Identity &myId,const char *path) :
DB(myId,path), DB(myId,path),
_networksPath(_path + ZT_PATH_SEPARATOR_S + "network"), _networksPath(_path + ZT_PATH_SEPARATOR_S + "network"),
_tracePath(_path + ZT_PATH_SEPARATOR_S + "trace"), _tracePath(_path + ZT_PATH_SEPARATOR_S + "trace"),
_onlineChanged(false),
_running(true) _running(true)
{ {
OSUtils::mkdir(_path.c_str()); OSUtils::mkdir(_path.c_str());
@ -152,7 +151,6 @@ void FileDB::eraseNetwork(const uint64_t networkId)
_networkChanged(network,nullJson,true); _networkChanged(network,nullJson,true);
std::lock_guard<std::mutex> l(this->_online_l); std::lock_guard<std::mutex> l(this->_online_l);
this->_online.erase(networkId); this->_online.erase(networkId);
this->_onlineChanged = true;
} }
void FileDB::eraseMember(const uint64_t networkId,const uint64_t memberId) void FileDB::eraseMember(const uint64_t networkId,const uint64_t memberId)
@ -166,7 +164,6 @@ void FileDB::eraseMember(const uint64_t networkId,const uint64_t memberId)
_memberChanged(member,nullJson,true); _memberChanged(member,nullJson,true);
std::lock_guard<std::mutex> l(this->_online_l); std::lock_guard<std::mutex> l(this->_online_l);
this->_online[networkId].erase(memberId); this->_online[networkId].erase(memberId);
this->_onlineChanged = true;
} }
void FileDB::nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const InetAddress &physicalAddress) void FileDB::nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const InetAddress &physicalAddress)
@ -174,9 +171,15 @@ void FileDB::nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const
char mid[32],atmp[64]; char mid[32],atmp[64];
OSUtils::ztsnprintf(mid,sizeof(mid),"%.10llx",(unsigned long long)memberId); OSUtils::ztsnprintf(mid,sizeof(mid),"%.10llx",(unsigned long long)memberId);
physicalAddress.toString(atmp); physicalAddress.toString(atmp);
std::lock_guard<std::mutex> l(this->_online_l); {
this->_online[networkId][memberId][OSUtils::now()] = physicalAddress; std::lock_guard<std::mutex> l(this->_online_l);
this->_onlineChanged = true; this->_online[networkId][memberId][OSUtils::now()] = physicalAddress;
}
{
std::lock_guard<std::mutex> l2(_changeListeners_l);
for(auto i=_changeListeners.begin();i!=_changeListeners.end();++i)
(*i)->onNetworkMemberOnline(networkId,memberId,physicalAddress);
}
} }
} // namespace ZeroTier } // namespace ZeroTier

1
controller/FileDB.hpp
View file

@ -51,7 +51,6 @@ protected:
std::thread _onlineUpdateThread; std::thread _onlineUpdateThread;
std::map< uint64_t,std::map<uint64_t,std::map<int64_t,InetAddress> > > _online; std::map< uint64_t,std::map<uint64_t,std::map<int64_t,InetAddress> > > _online;
std::mutex _online_l; std::mutex _online_l;
bool _onlineChanged;
bool _running; bool _running;
}; };

25
controller/LFDB.cpp
View file

@ -384,17 +384,24 @@ void LFDB::eraseMember(const uint64_t networkId,const uint64_t memberId)
void LFDB::nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const InetAddress &physicalAddress) void LFDB::nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const InetAddress &physicalAddress)
{ {
std::lock_guard<std::mutex> l(_state_l); {
auto nw = _state.find(networkId); std::lock_guard<std::mutex> l(_state_l);
if (nw != _state.end()) { auto nw = _state.find(networkId);
auto m = nw->second.members.find(memberId); if (nw != _state.end()) {
if (m != nw->second.members.end()) { auto m = nw->second.members.find(memberId);
m->second.lastOnlineTime = OSUtils::now(); if (m != nw->second.members.end()) {
if (physicalAddress) m->second.lastOnlineTime = OSUtils::now();
m->second.lastOnlineAddress = physicalAddress; if (physicalAddress)
m->second.lastOnlineDirty = true; m->second.lastOnlineAddress = physicalAddress;
m->second.lastOnlineDirty = true;
}
} }
} }
{
std::lock_guard<std::mutex> l2(_changeListeners_l);
for(auto i=_changeListeners.begin();i!=_changeListeners.end();++i)
(*i)->onNetworkMemberOnline(networkId,memberId,physicalAddress);
}
} }
} // namespace ZeroTier } // namespace ZeroTier

17
controller/PostgreSQL.cpp
View file

@ -210,11 +210,18 @@ void PostgreSQL::eraseMember(const uint64_t networkId, const uint64_t memberId)
void PostgreSQL::nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress &physicalAddress) void PostgreSQL::nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress &physicalAddress)
{ {
std::lock_guard<std::mutex> l(_lastOnline_l); {
std::pair<int64_t, InetAddress> &i = _lastOnline[std::pair<uint64_t,uint64_t>(networkId, memberId)]; std::lock_guard<std::mutex> l(_lastOnline_l);
i.first = OSUtils::now(); std::pair<int64_t, InetAddress> &i = _lastOnline[std::pair<uint64_t,uint64_t>(networkId, memberId)];
if (physicalAddress) { i.first = OSUtils::now();
i.second = physicalAddress; if (physicalAddress) {
i.second = physicalAddress;
}
}
{
std::lock_guard<std::mutex> l2(_changeListeners_l);
for(auto i=_changeListeners.begin();i!=_changeListeners.end();++i)
(*i)->onNetworkMemberOnline(networkId,memberId,physicalAddress);
} }
} }