Merge branch 'dev' into edge

osdep/EthernetTap.cpp

@@ -119,4 +119,13 @@ std::shared_ptr<EthernetTap> EthernetTap::newInstance(
 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

osdep/EthernetTap.hpp

@@ -45,7 +45,7 @@ public:
 	virtual void setEnabled(bool en) = 0;
 	virtual bool enabled() const = 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 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;