summaryrefslogtreecommitdiff
path: root/node/Network.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-10-05 12:54:46 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-10-05 12:54:46 -0700
commitadeb7e7da0e5d1e267c272a4f1d1c9b731e291d9 (patch)
treeaa2612cfc32b82a43fdb1c977396fd61ffcc5e94 /node/Network.cpp
parentf1c8706485bf0c6b63b677c79109e93bb769824a (diff)
downloadinfinitytier-adeb7e7da0e5d1e267c272a4f1d1c9b731e291d9.tar.gz
infinitytier-adeb7e7da0e5d1e267c272a4f1d1c9b731e291d9.zip
Make capability flags match more user-friendly and appropriate since "match any flag" is generally what we want.
Diffstat (limited to 'node/Network.cpp')
-rw-r--r--node/Network.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/node/Network.cpp b/node/Network.cpp
index fe899dcc..8b9f6e3d 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -497,7 +497,7 @@ static _doZtFilterResult _doZtFilter(
}
}
}
- thisRuleMatches = (uint8_t)((cf & rules[rn].v.characteristics[0]) == rules[rn].v.characteristics[1]);
+ thisRuleMatches = (uint8_t)((cf | rules[rn].v.characteristics) != 0);
FILTER_TRACE("%u %s %c (%.16llx & %.16llx)==%.16llx -> %u",rn,_rtn(rt),(((rules[rn].t & 0x80) != 0) ? '!' : '='),cf,rules[rn].v.characteristics[0],rules[rn].v.characteristics[1],(unsigned int)thisRuleMatches);
} break;
case ZT_NETWORK_RULE_MATCH_FRAME_SIZE_RANGE: