ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-11 13:35:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Comment out debug traces in Rules Engine

Browse Source
This commit is contained in:
Joseph Henry 2024-03-04 16:38:10 -08:00 committed by GitHub
parent 5d8bd674cd
commit 41cb6fb0d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
node/Network.cpp
View File

@ -114,14 +114,14 @@ static _doZtFilterResult _doZtFilter(
// uncomment for easier debugging fprintf // uncomment for easier debugging fprintf
// if (!ztDest) { return DOZTFILTER_ACCEPT; } // if (!ztDest) { return DOZTFILTER_ACCEPT; }
#ifdef ZT_TRACE #ifdef ZT_TRACE
char buf[40], buf2[40]; //char buf[40], buf2[40];
fprintf(stderr, "\nsrc %s dest %s inbound: %d ethertype %u", ztSource.toString(buf), ztDest.toString(buf2), inbound, etherType); //fprintf(stderr, "\nsrc %s dest %s inbound: %d ethertype %u", ztSource.toString(buf), ztDest.toString(buf2), inbound, etherType);
#endif #endif
for(unsigned int rn=0;rn<ruleCount;++rn) { for(unsigned int rn=0;rn<ruleCount;++rn) {
const ZT_VirtualNetworkRuleType rt = (ZT_VirtualNetworkRuleType)(rules[rn].t & 0x3f); const ZT_VirtualNetworkRuleType rt = (ZT_VirtualNetworkRuleType)(rules[rn].t & 0x3f);
#ifdef ZT_TRACE #ifdef ZT_TRACE
fprintf(stderr, "\n%02u %02d", rn, rt); //fprintf(stderr, "\n%02u %02d", rn, rt);
#endif #endif
// First check if this is an ACTION // First check if this is an ACTION
@ -135,19 +135,19 @@ static _doZtFilterResult _doZtFilter(
case ZT_NETWORK_RULE_ACTION_DROP: { case ZT_NETWORK_RULE_ACTION_DROP: {
if (!!skipDrop) { if (!!skipDrop) {
#ifdef ZT_TRACE #ifdef ZT_TRACE
fprintf(stderr, "\tskip Drop"); //fprintf(stderr, "\tskip Drop");
#endif #endif
skipDrop = 0; continue; skipDrop = 0; continue;
} }
#ifdef ZT_TRACE #ifdef ZT_TRACE
fprintf(stderr, "\tDrop\n"); //fprintf(stderr, "\tDrop\n");
#endif #endif
return DOZTFILTER_DROP; return DOZTFILTER_DROP;
} }
case ZT_NETWORK_RULE_ACTION_ACCEPT: { case ZT_NETWORK_RULE_ACTION_ACCEPT: {
#ifdef ZT_TRACE #ifdef ZT_TRACE
fprintf(stderr, "\tAccept\n"); //fprintf(stderr, "\tAccept\n");
#endif #endif
return (superAccept ? DOZTFILTER_SUPER_ACCEPT : DOZTFILTER_ACCEPT); // match, accept packet return (superAccept ? DOZTFILTER_SUPER_ACCEPT : DOZTFILTER_ACCEPT); // match, accept packet
} }
@ -473,12 +473,12 @@ static _doZtFilterResult _doZtFilter(
if ((localTag != &(nconf.tags[nconf.tagCount]))&&(localTag->id() == rules[rn].v.tag.id)) { if ((localTag != &(nconf.tags[nconf.tagCount]))&&(localTag->id() == rules[rn].v.tag.id)) {
const Tag *const remoteTag = ((membership) ? membership->getTag(nconf,rules[rn].v.tag.id) : (const Tag *)0); const Tag *const remoteTag = ((membership) ? membership->getTag(nconf,rules[rn].v.tag.id) : (const Tag *)0);
#ifdef ZT_TRACE #ifdef ZT_TRACE
fprintf(stderr, "\tlocal tag [%u: %u] remote tag [%u: %u] match [%u]", /*fprintf(stderr, "\tlocal tag [%u: %u] remote tag [%u: %u] match [%u]",
!!localTag ? localTag->id() : 0, !!localTag ? localTag->id() : 0,
!!localTag ? localTag->value() : 0, !!localTag ? localTag->value() : 0,
!!remoteTag ? remoteTag->id() : 0, !!remoteTag ? remoteTag->id() : 0,
!!remoteTag ? remoteTag->value() : 0, !!remoteTag ? remoteTag->value() : 0,
thisRuleMatches); thisRuleMatches);*/
#endif #endif
if (remoteTag) { if (remoteTag) {
const uint32_t ltv = localTag->value(); const uint32_t ltv = localTag->value();
@ -501,7 +501,7 @@ static _doZtFilterResult _doZtFilter(
if ((inbound)&&(!superAccept)) { if ((inbound)&&(!superAccept)) {
thisRuleMatches = hardNo; thisRuleMatches = hardNo;
#ifdef ZT_TRACE #ifdef ZT_TRACE
fprintf(stderr, "\tinbound "); //fprintf(stderr, "\tinbound ");
#endif #endif
} else { } else {
// Outbound side is not strict since if we have to match both tags and // Outbound side is not strict since if we have to match both tags and
@ -512,7 +512,7 @@ static _doZtFilterResult _doZtFilter(
skipDrop = 1; skipDrop = 1;
thisRuleMatches = hardYes; thisRuleMatches = hardYes;
#ifdef ZT_TRACE #ifdef ZT_TRACE
fprintf(stderr, "\toutbound "); //fprintf(stderr, "\toutbound ");
#endif #endif
} }
} }
@ -524,13 +524,13 @@ static _doZtFilterResult _doZtFilter(
case ZT_NETWORK_RULE_MATCH_TAG_RECEIVER: { case ZT_NETWORK_RULE_MATCH_TAG_RECEIVER: {
const Tag *const localTag = std::lower_bound(&(nconf.tags[0]),&(nconf.tags[nconf.tagCount]),rules[rn].v.tag.id,Tag::IdComparePredicate()); const Tag *const localTag = std::lower_bound(&(nconf.tags[0]),&(nconf.tags[nconf.tagCount]),rules[rn].v.tag.id,Tag::IdComparePredicate());
#ifdef ZT_TRACE #ifdef ZT_TRACE
const Tag *const remoteTag = ((membership) ? membership->getTag(nconf,rules[rn].v.tag.id) : (const Tag *)0); /*const Tag *const remoteTag = ((membership) ? membership->getTag(nconf,rules[rn].v.tag.id) : (const Tag *)0);
fprintf(stderr, "\tlocal tag [%u: %u] remote tag [%u: %u] match [%u]", fprintf(stderr, "\tlocal tag [%u: %u] remote tag [%u: %u] match [%u]",
!!localTag ? localTag->id() : 0, !!localTag ? localTag->id() : 0,
!!localTag ? localTag->value() : 0, !!localTag ? localTag->value() : 0,
!!remoteTag ? remoteTag->id() : 0, !!remoteTag ? remoteTag->id() : 0,
!!remoteTag ? remoteTag->value() : 0, !!remoteTag ? remoteTag->value() : 0,
thisRuleMatches); thisRuleMatches);*/
#endif #endif
if (superAccept) { if (superAccept) {
skipDrop = 1; skipDrop = 1;