ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-14 13:18:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
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());
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) {
nc.rules[k].t = ZT_NETWORK_RULE_MATCH_ETHERTYPE;
nc.rules[k].v.etherType = (uint16_t)allowedEtherTypes[i];
++k;
nc.rules[nc.ruleCount].t = ZT_NETWORK_RULE_MATCH_ETHERTYPE;
nc.rules[nc.ruleCount].v.etherType = (uint16_t)allowedEtherTypes[i];
++nc.ruleCount;
}
nc.rules[k++].t = ZT_NETWORK_RULE_ACTION_ACCEPT;
nc.rules[nc.ruleCount++].t = ZT_NETWORK_RULE_ACTION_ACCEPT;
}
/*