summaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-03-01 15:12:26 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-03-01 15:12:26 -0800
commitce0c87f8ff3f30c79c9e81afbf3e7454c1bbf500 (patch)
tree73871f7378a71e07ba25b6f8b1d8174e6ba79778 /node
parentd79585d44d54256ee3ddbec264174f9b6e008bed (diff)
parent592b628523029b0a821952998dc10f1c7462dd3e (diff)
downloadinfinitytier-ce0c87f8ff3f30c79c9e81afbf3e7454c1bbf500.tar.gz
infinitytier-ce0c87f8ff3f30c79c9e81afbf3e7454c1bbf500.zip
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'node')
-rw-r--r--node/Network.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/node/Network.cpp b/node/Network.cpp
index e4b91bb6..51528150 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -647,7 +647,7 @@ static _doZtFilterResult _doZtFilter(
const Tag *const localTag = std::lower_bound(&(nconf.tags[0]),&(nconf.tags[nconf.tagCount]),rules[rn].v.tag.id,Tag::IdComparePredicate());
if ((localTag != &(nconf.tags[nconf.tagCount]))&&(localTag->id() == rules[rn].v.tag.id)) {
thisRuleMatches = (uint8_t)(localTag->value() == rules[rn].v.tag.value);
- FILTER_TRACE("%u %s %c TAG %u %.8x == %.8x -> %u",rn,_rtn(rt),(((rules[rn].t & 0x80) != 0) ? '!' : '='),(unsigned int)rules[rn].v.tag.id,remoteTag->value(),(unsigned int)rules[rn].v.tag.value,(unsigned int)thisRuleMatches);
+ // FILTER_TRACE("%u %s %c TAG %u %.8x == %.8x -> %u",rn,_rtn(rt),(((rules[rn].t & 0x80) != 0) ? '!' : '='),(unsigned int)rules[rn].v.tag.id,remoteTag->value(),(unsigned int)rules[rn].v.tag.value,(unsigned int)thisRuleMatches);
} else {
thisRuleMatches = 0;
FILTER_TRACE("%u %s %c local tag %u not found -> 0",rn,_rtn(rt),(((rules[rn].t & 0x80) != 0) ? '!' : '='),(unsigned int)rules[rn].v.tag.id);