github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-20 13:24:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Linux bug fixes, small controller fix.

Browse source
This commit is contained in:
Adam Ierymenko 2016-06-17 00:21:58 +00:00
commit 37afa876a7
6 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
osdep/LinuxEthernetTap.cpp
View file

@ -97,10 +97,10 @@ LinuxEthernetTap::LinuxEthernetTap(
std::string devmapbuf;
Dictionary devmap;
if (OSUtils::readFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmapbuf)) {
devmap.fromString(devmapbuf);
std::string desiredDevice(devmap.get(nwids,""));
if (desiredDevice.length() > 2) {
Utils::scopy(ifr.ifr_name,sizeof(ifr.ifr_name),desiredDevice.c_str());
devmap.load(devmapbuf.c_str());
char desiredDevice[128];
if (devmap.get(nwids,desiredDevice,sizeof(desiredDevice)) > 0) {
Utils::scopy(ifr.ifr_name,sizeof(ifr.ifr_name),desiredDevice);
Utils::snprintf(procpath,sizeof(procpath),"/proc/sys/net/ipv4/conf/%s",ifr.ifr_name);
recalledDevice = (stat(procpath,&sbuf) != 0);
}
@ -174,8 +174,9 @@ LinuxEthernetTap::LinuxEthernetTap(
(void)::pipe(_shutdownSignalPipe);
devmap[nwids] = _dev;
OSUtils::writeFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmap.toString());
devmap.erase(nwids);
devmap.add(nwids,_dev.c_str());
OSUtils::writeFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),(const void *)devmap.data(),devmap.sizeBytes());
_thread = Thread::start(this);
}

4
osdep/ManagedRoute.hpp
View file

@ -32,6 +32,7 @@ public:
ManagedRoute(const ManagedRoute &r)
{
_applied = false;
*this = r;
}
@ -40,7 +41,8 @@ public:
if ((!_applied)&&(!r._applied)) {
memcpy(this,&r,sizeof(ManagedRoute)); // InetAddress is memcpy'able
} else {
throw std::runtime_error("Applied ManagedRoute is non-copyable!");
fprintf(stderr,"Applied ManagedRoute isn't copyable!\n");
abort();
}
return *this;
}

2
osdep/Phy.hpp
View file

@ -871,7 +871,7 @@ public:
#if defined(_WIN32) || defined(_WIN64)
::recv(_whackReceiveSocket,tmp,16,0);
#else
(void)(::read(_whackReceiveSocket,tmp,16));
::read(_whackReceiveSocket,tmp,16);
#endif
}