void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always output trace info when debugging rules.

Browse source
This commit is contained in:
Adam Ierymenko 2016-08-26 12:21:44 -07:00
parent ded5a53a6c
commit 90f3e94565
1 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
node/Network.cpp
View file

@ -183,31 +183,30 @@ static int _doZtFilter(
} continue; } continue;
case ZT_NETWORK_RULE_ACTION_DEBUG_LOG: case ZT_NETWORK_RULE_ACTION_DEBUG_LOG:
#ifdef ZT_RULES_ENGINE_DEBUGGING #ifdef ZT_RULES_ENGINE_DEBUGGING
if (thisSetMatches) { printf(" _ " ZT_EOL_S);
printf(" _ " ZT_EOL_S); for(std::vector<std::string>::iterator m(dlog.begin());m!=dlog.end();++m)
for(std::vector<std::string>::iterator m(dlog.begin());m!=dlog.end();++m) printf(" | %s" ZT_EOL_S,m->c_str());
printf(" | %s" ZT_EOL_S,m->c_str()); printf(" + %c %s->%s %.2x:%.2x:%.2x:%.2x:%.2x:%.2x->%.2x:%.2x:%.2x:%.2x:%.2x:%.2x inbound=%d noRedirect=%d frameLen=%u etherType=%u" ZT_EOL_S,
printf(" + MATCH %s->%s %.2x:%.2x:%.2x:%.2x:%.2x:%.2x->%.2x:%.2x:%.2x:%.2x:%.2x:%.2x inbound=%d noRedirect=%d frameLen=%u etherType=%u" ZT_EOL_S, ((thisSetMatches) ? 'Y' : 'n'),
ztSource.toString().c_str(), ztSource.toString().c_str(),
ztDest.toString().c_str(), ztDest.toString().c_str(),
(unsigned int)macSource[0], (unsigned int)macSource[0],
(unsigned int)macSource[1], (unsigned int)macSource[1],
(unsigned int)macSource[2], (unsigned int)macSource[2],
(unsigned int)macSource[3], (unsigned int)macSource[3],
(unsigned int)macSource[4], (unsigned int)macSource[4],
(unsigned int)macSource[5], (unsigned int)macSource[5],
(unsigned int)macDest[0], (unsigned int)macDest[0],
(unsigned int)macDest[1], (unsigned int)macDest[1],
(unsigned int)macDest[2], (unsigned int)macDest[2],
(unsigned int)macDest[3], (unsigned int)macDest[3],
(unsigned int)macDest[4], (unsigned int)macDest[4],
(unsigned int)macDest[5], (unsigned int)macDest[5],
(int)inbound, (int)inbound,
(int)noRedirect, (int)noRedirect,
frameLen, frameLen,
etherType etherType
); );
}
dlog.clear(); dlog.clear();
#endif // ZT_RULES_ENGINE_DEBUGGING #endif // ZT_RULES_ENGINE_DEBUGGING
thisSetMatches = 1; // DEBUG_LOG does not terminate evaluation thisSetMatches = 1; // DEBUG_LOG does not terminate evaluation