ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-22 06:17:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into edge

Browse Source
This commit is contained in:
Adam Ierymenko 2019-08-28 07:43:36 -07:00
commit 6f9d1fc14c
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;