diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-10-02 16:12:10 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-10-02 16:12:10 -0400 |
| commit | 58538500f26d6e362bac0275c11628222fdcac02 (patch) | |
| tree | d0e03d06167049f40402575280ed42cba66e2056 /node/PacketDecoder.cpp | |
| parent | b8a9b429931eedce28990571df1294b48e75edc2 (diff) | |
| download | infinitytier-58538500f26d6e362bac0275c11628222fdcac02.tar.gz infinitytier-58538500f26d6e362bac0275c11628222fdcac02.zip | |
Clean up some routine stuff like pings, and stop keeping links open forever even if there are no frames passing between them.
Diffstat (limited to 'node/PacketDecoder.cpp')
| -rw-r--r-- | node/PacketDecoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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> 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()); |