ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-21 10:01:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cache getifaddrs - mac

Browse Source
This commit is contained in:
travis laduke 2023-05-16 16:16:12 -07:00 committed by Travis LaDuke
parent 54decda7a4
commit 4192f6a6d9
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osdep/MacEthernetTap.cpp
View File

@ -90,7 +90,8 @@ MacEthernetTap::MacEthernetTap(
_agentStdout2(-1), _agentStdout2(-1),
_agentStderr2(-1), _agentStderr2(-1),
_agentPid(-1), _agentPid(-1),
_enabled(true) _enabled(true),
_lastIfAddrsUpdate(0)
{ {
char ethaddr[64],mtustr[16],devnostr[16],devstr[16],metricstr[16]; char ethaddr[64],mtustr[16],devnostr[16],devstr[16],metricstr[16];
OSUtils::ztsnprintf(ethaddr,sizeof(ethaddr),"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",(int)mac[0],(int)mac[1],(int)mac[2],(int)mac[3],(int)mac[4],(int)mac[5]); OSUtils::ztsnprintf(ethaddr,sizeof(ethaddr),"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",(int)mac[0],(int)mac[1],(int)mac[2],(int)mac[3],(int)mac[4],(int)mac[5]);
@ -341,8 +342,16 @@ bool MacEthernetTap::removeIp(const InetAddress &ip)
std::vector<InetAddress> MacEthernetTap::ips() const std::vector<InetAddress> MacEthernetTap::ips() const
{ {
uint64_t now = OSUtils::now();
if ((now - _lastIfAddrsUpdate) <= GETIFADDRS_CACHE_TIME) {
return _ifaddrs;
}
_lastIfAddrsUpdate = now;
struct ifaddrs *ifa = (struct ifaddrs *)0; struct ifaddrs *ifa = (struct ifaddrs *)0;
std::vector<InetAddress> r; std::vector<InetAddress> r;
if (!getifaddrs(&ifa)) { if (!getifaddrs(&ifa)) {
struct ifaddrs *p = ifa; struct ifaddrs *p = ifa;
while (p) { while (p) {
@ -368,6 +377,9 @@ std::vector<InetAddress> MacEthernetTap::ips() const
} }
std::sort(r.begin(),r.end()); std::sort(r.begin(),r.end());
r.erase(std::unique(r.begin(),r.end()),r.end()); r.erase(std::unique(r.begin(),r.end()),r.end());
_ifaddrs = r;
return r; return r;
} }

3
osdep/MacEthernetTap.hpp
View File

@ -77,6 +77,9 @@ private:
int _agentStdin,_agentStdout,_agentStderr,_agentStdin2,_agentStdout2,_agentStderr2; int _agentStdin,_agentStdout,_agentStderr,_agentStdin2,_agentStdout2,_agentStderr2;
long _agentPid; long _agentPid;
volatile bool _enabled; volatile bool _enabled;
mutable std::vector<InetAddress> _ifaddrs;
mutable uint64_t _lastIfAddrsUpdate;
}; };
} // namespace ZeroTier } // namespace ZeroTier