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

Add default addIps() implementation to EthernetTap base class to fix build on systems that do not need addIps().

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-28 07:43:18 -07:00
parent 1cf953c046
commit 1b6b38e395
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
osdep/EthernetTap.cpp
View file

@ -119,4 +119,13 @@ std::shared_ptr<EthernetTap> EthernetTap::newInstance(
EthernetTap::EthernetTap() {} EthernetTap::EthernetTap() {}
EthernetTap::~EthernetTap() {} EthernetTap::~EthernetTap() {}
bool EthernetTap::addIps(std::vector<InetAddress> ips)
{
for(std::vector<InetAddress>::const_iterator i(ips.begin());i!=ips.end();++i) {
if (!addIp(*i))
return false;
}
return true;
}
} // namespace ZeroTier } // namespace ZeroTier

2
osdep/EthernetTap.hpp
View file

@ -45,7 +45,7 @@ public:
virtual void setEnabled(bool en) = 0; virtual void setEnabled(bool en) = 0;
virtual bool enabled() const = 0; virtual bool enabled() const = 0;
virtual bool addIp(const InetAddress &ip) = 0; virtual bool addIp(const InetAddress &ip) = 0;
virtual bool addIps(std::vector<InetAddress> ips) = 0; virtual bool addIps(std::vector<InetAddress> ips); // uses addIp() unless overridden
virtual bool removeIp(const InetAddress &ip) = 0; virtual bool removeIp(const InetAddress &ip) = 0;
virtual std::vector<InetAddress> ips() const = 0; virtual std::vector<InetAddress> ips() const = 0;
virtual void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len) = 0; virtual void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len) = 0;