summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2014-05-23 17:35:35 -0400
committerAdam Ierymenko <adam.ierymenko@gmail.com>2014-05-23 17:35:35 -0400
commit317995b921c96ce62ce17adb90b94e84c6e5e9d3 (patch)
tree073f165289a68edaaf6c4c346531aaffc0916b2e
parentbeb7b5bbe578035efdf8ebbb521065b15e40f9b0 (diff)
downloadinfinitytier-317995b921c96ce62ce17adb90b94e84c6e5e9d3.tar.gz
infinitytier-317995b921c96ce62ce17adb90b94e84c6e5e9d3.zip
Fixed for Linux tap for GitHub Issue #69
-rw-r--r--node/UnixEthernetTap.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/node/UnixEthernetTap.cpp b/node/UnixEthernetTap.cpp
index aea4f00e..4f9291ac 100644
--- a/node/UnixEthernetTap.cpp
+++ b/node/UnixEthernetTap.cpp
@@ -272,7 +272,7 @@ UnixEthernetTap::UnixEthernetTap(
// Set MAC address
ifr.ifr_ifru.ifru_hwaddr.sa_family = ARPHRD_ETHER;
- memcpy(ifr.ifr_ifru.ifru_hwaddr.sa_data,mac.data,6);
+ mac.copyTo(ifr.ifr_ifru.ifru_hwaddr.sa_data,6);
if (ioctl(sock,SIOCSIFHWADDR,(void *)&ifr) < 0) {
::close(_fd);
::close(sock);
@@ -696,7 +696,7 @@ bool UnixEthernetTap::updateMulticastGroups(std::set<MulticastGroup> &groups)
++fno;
}
if ((devname)&&(!strcmp(devname,_dev.c_str()))&&(mcastmac)&&(Utils::unhex(mcastmac,mac,6) == 6))
- newGroups.insert(MulticastGroup(MAC(mac),0));
+ newGroups.insert(MulticastGroup(MAC(mac,6),0));
}
}
::close(fd);