From 58538500f26d6e362bac0275c11628222fdcac02 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 2 Oct 2013 16:12:10 -0400 Subject: Clean up some routine stuff like pings, and stop keeping links open forever even if there are no frames passing between them. --- node/PacketDecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'node/PacketDecoder.cpp') diff --git a/node/PacketDecoder.cpp b/node/PacketDecoder.cpp index be7acf8d..c8d33a43 100644 --- a/node/PacketDecoder.cpp +++ b/node/PacketDecoder.cpp @@ -524,7 +524,7 @@ bool PacketDecoder::_doMULTICAST_FRAME(const RuntimeEnvironment *_r,const Shared // for the same frame would not be fair. SharedPtr network(_r->nc->network(nwid)); if (network) { - maxDepth = network->multicastDepth(); // pull from network config if available + maxDepth = std::min((unsigned int)ZT_MULTICAST_GLOBAL_MAX_DEPTH,network->multicastDepth()); if (!network->isAllowed(origin)) { TRACE("didn't inject MULTICAST_FRAME from %s(%s) into %.16llx: sender %s not allowed or we don't have a certificate",source().toString().c_str(),nwid,_remoteAddress.toString().c_str(),origin.toString().c_str()); -- cgit v1.2.3