summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-12-22 16:57:45 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-12-22 16:57:45 -0800
commitfe530548bbc8d4d0e274f814718fad579a012812 (patch)
tree354db571db10a8d5df2efd51cbed71ba0515c178
parent2eaff6d4843f420ff63c1b7b42e86028fa162f80 (diff)
downloadinfinitytier-fe530548bbc8d4d0e274f814718fad579a012812.tar.gz
infinitytier-fe530548bbc8d4d0e274f814718fad579a012812.zip
Fix MATCH_RANDOM in controller.
-rw-r--r--controller/EmbeddedNetworkController.cpp1
-rw-r--r--node/Network.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp
index df20d4ce..01a7152c 100644
--- a/controller/EmbeddedNetworkController.cpp
+++ b/controller/EmbeddedNetworkController.cpp
@@ -428,6 +428,7 @@ static bool _parseRule(json &r,ZT_VirtualNetworkRule &rule)
} else if (t == "MATCH_RANDOM") {
rule.t |= ZT_NETWORK_RULE_MATCH_RANDOM;
rule.v.randomProbability = (uint32_t)(_jI(r["probability"],0ULL) & 0xffffffffULL);
+ return true;
} else if (t == "MATCH_TAGS_DIFFERENCE") {
rule.t |= ZT_NETWORK_RULE_MATCH_TAGS_DIFFERENCE;
rule.v.tag.id = (uint32_t)(_jI(r["id"],0ULL) & 0xffffffffULL);
diff --git a/node/Network.cpp b/node/Network.cpp
index e8b103ba..2488bea2 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -111,6 +111,7 @@ static const void _dumpFilterTrace(const char *ruleName,uint8_t thisSetMatches,b
);
if (msg)
printf(" + (%s)" ZT_EOL_S,msg);
+ fflush(stdout);
}
#else
#define FILTER_TRACE(f,...) {}