From 22271f2a490a1f3c2ade184d758cadfe0e461544 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 1 Sep 2016 13:36:41 -0700 Subject: [PATCH] Cleanup. --- node/Network.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/node/Network.cpp b/node/Network.cpp index 7aaf69338..4dc8aa303 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -40,6 +40,8 @@ namespace ZeroTier { +namespace { + #ifdef ZT_RULES_ENGINE_DEBUGGING #define FILTER_TRACE(f,...) { Utils::snprintf(dpbuf,sizeof(dpbuf),f,##__VA_ARGS__); dlog.push_back(std::string(dpbuf)); } static const char *_rtn(const ZT_VirtualNetworkRuleType rt) @@ -144,11 +146,11 @@ static bool _ipv6GetPayload(const uint8_t *frameData,unsigned int frameLen,unsig enum _doZtFilterResult { - DOZTFILTER_NO_MATCH = 0, - DOZTFILTER_DROP = 1, - DOZTFILTER_REDIRECT = 2, - DOZTFILTER_ACCEPT = 3, - DOZTFILTER_SUPER_ACCEPT = 4 + DOZTFILTER_NO_MATCH, + DOZTFILTER_DROP, + DOZTFILTER_REDIRECT, + DOZTFILTER_ACCEPT, + DOZTFILTER_SUPER_ACCEPT }; static _doZtFilterResult _doZtFilter( const RuntimeEnvironment *RR, @@ -567,6 +569,8 @@ static _doZtFilterResult _doZtFilter( return DOZTFILTER_NO_MATCH; } +} // anonymous namespace + const ZeroTier::MulticastGroup Network::BROADCAST(ZeroTier::MAC(0xffffffffffffULL),0); Network::Network(const RuntimeEnvironment *renv,uint64_t nwid,void *uptr) :