summaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-02-06 14:00:49 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-02-06 14:00:49 -0800
commit9ddc2a4331e9dfa9d5aecd1c782d31527cf6e572 (patch)
tree201041f7272a5a38a30c1a3f9ff0cc4210206f06 /node
parent435e4c4695024702a8493e66d802652f116741f8 (diff)
downloadinfinitytier-9ddc2a4331e9dfa9d5aecd1c782d31527cf6e572.tar.gz
infinitytier-9ddc2a4331e9dfa9d5aecd1c782d31527cf6e572.zip
Add a break action to rules engine to make capabilities easier to use.
Diffstat (limited to 'node')
-rw-r--r--node/Network.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/node/Network.cpp b/node/Network.cpp
index c5855418..77810964 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -53,7 +53,7 @@ static const char *_rtn(const ZT_VirtualNetworkRuleType rt)
case ZT_NETWORK_RULE_ACTION_TEE: return "ACTION_TEE";
case ZT_NETWORK_RULE_ACTION_WATCH: return "ACTION_WATCH";
case ZT_NETWORK_RULE_ACTION_REDIRECT: return "ACTION_REDIRECT";
- case ZT_NETWORK_RULE_ACTION_DEBUG_LOG: return "ACTION_DEBUG_LOG";
+ case ZT_NETWORK_RULE_ACTION_BREAK: return "ACTION_BREAK";
case ZT_NETWORK_RULE_MATCH_SOURCE_ZEROTIER_ADDRESS: return "MATCH_SOURCE_ZEROTIER_ADDRESS";
case ZT_NETWORK_RULE_MATCH_DEST_ZEROTIER_ADDRESS: return "MATCH_DEST_ZEROTIER_ADDRESS";
case ZT_NETWORK_RULE_MATCH_VLAN_ID: return "MATCH_VLAN_ID";
@@ -251,13 +251,12 @@ static _doZtFilterResult _doZtFilter(
}
} continue;
- // This is a no-op that exists for use with rules engine tracing and isn't for use in production
- case ZT_NETWORK_RULE_ACTION_DEBUG_LOG: // a no-op target specifically for debugging purposes
+ case ZT_NETWORK_RULE_ACTION_BREAK:
#ifdef ZT_RULES_ENGINE_DEBUGGING
- _dumpFilterTrace("ACTION_DEBUG_LOG",thisSetMatches,inbound,ztSource,ztDest,macSource,macDest,dlog,frameLen,etherType,(const char *)0);
+ _dumpFilterTrace("ACTION_BREAK",thisSetMatches,inbound,ztSource,ztDest,macSource,macDest,dlog,frameLen,etherType,(const char *)0);
dlog.clear();
#endif // ZT_RULES_ENGINE_DEBUGGING
- continue;
+ return DOZTFILTER_NO_MATCH;
// Unrecognized ACTIONs are ignored as no-ops
default: