summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2014-01-23 16:25:51 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2014-01-23 16:25:51 -0800
commiteb554a504d8dc4d71ef61a1198cdb641a0c46b03 (patch)
treeb1ead75aeb97bd716098438ffb44476d70d3f58c
parent87714181701fa92016c37937f786bbf5434ef182 (diff)
downloadinfinitytier-eb554a504d8dc4d71ef61a1198cdb641a0c46b03.tar.gz
infinitytier-eb554a504d8dc4d71ef61a1198cdb641a0c46b03.zip
Fix for allIps -> ips in EthernetTap on Unix.
-rw-r--r--node/EthernetTap.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/node/EthernetTap.cpp b/node/EthernetTap.cpp
index 81cf5c4f..87482537 100644
--- a/node/EthernetTap.cpp
+++ b/node/EthernetTap.cpp
@@ -536,10 +536,10 @@ bool EthernetTap::removeIP(const InetAddress &ip)
return false;
}
-std::set<InetAddress> EthernetTap::allIps() const
+std::set<InetAddress> EthernetTap::ips() const
{
- // TODO
- return ips();
+ Mutex::Lock _l(_ips_m);
+ return _ips;
}
void EthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)