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

Fix MATCH_RANDOM in controller.

Browse source
This commit is contained in:
Adam Ierymenko 2016-12-22 16:57:45 -08:00
parent 2eaff6d484
commit fe530548bb
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
controller/EmbeddedNetworkController.cpp
View file

@ -428,6 +428,7 @@ static bool _parseRule(json &r,ZT_VirtualNetworkRule &rule)
} else if (t == "MATCH_RANDOM") { } else if (t == "MATCH_RANDOM") {
rule.t |= ZT_NETWORK_RULE_MATCH_RANDOM; rule.t |= ZT_NETWORK_RULE_MATCH_RANDOM;
rule.v.randomProbability = (uint32_t)(_jI(r["probability"],0ULL) & 0xffffffffULL); rule.v.randomProbability = (uint32_t)(_jI(r["probability"],0ULL) & 0xffffffffULL);
return true;
} else if (t == "MATCH_TAGS_DIFFERENCE") { } else if (t == "MATCH_TAGS_DIFFERENCE") {
rule.t |= ZT_NETWORK_RULE_MATCH_TAGS_DIFFERENCE; rule.t |= ZT_NETWORK_RULE_MATCH_TAGS_DIFFERENCE;
rule.v.tag.id = (uint32_t)(_jI(r["id"],0ULL) & 0xffffffffULL); rule.v.tag.id = (uint32_t)(_jI(r["id"],0ULL) & 0xffffffffULL);

1
node/Network.cpp
View file

@ -111,6 +111,7 @@ static const void _dumpFilterTrace(const char *ruleName,uint8_t thisSetMatches,b
); );
if (msg) if (msg)
printf(" + (%s)" ZT_EOL_S,msg); printf(" + (%s)" ZT_EOL_S,msg);
fflush(stdout);
} }
#else #else
#define FILTER_TRACE(f,...) {} #define FILTER_TRACE(f,...) {}