void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Linux bug fixes, small controller fix.

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

12
controller/SqliteNetworkController.cpp
View file

@ -1769,13 +1769,15 @@ NetworkController::ResultCode SqliteNetworkController::_doNetworkConfigRequest(c
std::sort(allowedEtherTypes.begin(),allowedEtherTypes.end()); std::sort(allowedEtherTypes.begin(),allowedEtherTypes.end());
allowedEtherTypes.erase(std::unique(allowedEtherTypes.begin(),allowedEtherTypes.end()),allowedEtherTypes.end()); allowedEtherTypes.erase(std::unique(allowedEtherTypes.begin(),allowedEtherTypes.end()),allowedEtherTypes.end());
for(long i=0,k=0;((i<(long)allowedEtherTypes.size())&&(k<ZT_MAX_NETWORK_RULES));++i) { for(long i=0;i<(long)allowedEtherTypes.size();++i) {
if ((nc.ruleCount + 2) > ZT_MAX_NETWORK_RULES)
break;
if (allowedEtherTypes[i] > 0) { if (allowedEtherTypes[i] > 0) {
nc.rules[k].t = ZT_NETWORK_RULE_MATCH_ETHERTYPE; nc.rules[nc.ruleCount].t = ZT_NETWORK_RULE_MATCH_ETHERTYPE;
nc.rules[k].v.etherType = (uint16_t)allowedEtherTypes[i]; nc.rules[nc.ruleCount].v.etherType = (uint16_t)allowedEtherTypes[i];
++k; ++nc.ruleCount;
} }
nc.rules[k++].t = ZT_NETWORK_RULE_ACTION_ACCEPT; nc.rules[nc.ruleCount++].t = ZT_NETWORK_RULE_ACTION_ACCEPT;
} }
/* /*

2
make-linux.mk
View file

@ -107,7 +107,7 @@ else
CFLAGS?=-O3 -fstack-protector-strong CFLAGS?=-O3 -fstack-protector-strong
CFLAGS+=-Wall -fPIE -fvisibility=hidden -pthread $(INCLUDES) -DNDEBUG $(DEFS) CFLAGS+=-Wall -fPIE -fvisibility=hidden -pthread $(INCLUDES) -DNDEBUG $(DEFS)
CXXFLAGS?=-O3 -fstack-protector-strong CXXFLAGS?=-O3 -fstack-protector-strong
CXXFLAGS+=-Wall -Wreorder -fPIE -fvisibility=hidden -fno-rtti -pthread $(INCLUDES) -DNDEBUG $(DEFS) CXXFLAGS+=-Wall -Wno-unused-result -Wreorder -fPIE -fvisibility=hidden -fno-rtti -pthread $(INCLUDES) -DNDEBUG $(DEFS)
LDFLAGS=-pie -Wl,-z,relro,-z,now LDFLAGS=-pie -Wl,-z,relro,-z,now
STRIP?=strip STRIP?=strip
STRIP+=--strip-all STRIP+=--strip-all

8
node/NetworkConfig.cpp
View file

@ -476,11 +476,9 @@ bool NetworkConfig::fromDictionary(const Dictionary &d)
} }
} }
/* //printf("~~~\n%s\n~~~\n",d.data());
printf("~~~\n%s\n~~~\n",d.data()); //dump();
dump(); //printf("~~~\n");
printf("~~~\n");
*/
return true; return true;
} catch ( ... ) { } catch ( ... ) {

13
osdep/LinuxEthernetTap.cpp
View file

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

4
osdep/ManagedRoute.hpp
View file

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

2
osdep/Phy.hpp
View file

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