diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-09-30 08:38:03 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-09-30 08:38:03 -0700 |
| commit | 8607aa7c3c0a24c3161b605e5195bfd5a7ad1258 (patch) | |
| tree | 574c02d339d04a43e595d2fe38ef8ed82f56284e /node/Node.cpp | |
| parent | ed0ba4950238c74e2b0115410e0e37b49dd5f26a (diff) | |
| download | infinitytier-8607aa7c3c0a24c3161b605e5195bfd5a7ad1258.tar.gz infinitytier-8607aa7c3c0a24c3161b605e5195bfd5a7ad1258.zip | |
Everything in for new multicast except IncomingPacket parsing...
Diffstat (limited to 'node/Node.cpp')
| -rw-r--r-- | node/Node.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/node/Node.cpp b/node/Node.cpp index 726c1022..58373643 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -565,14 +565,9 @@ Node::ReasonForTermination Node::run() if ((now - lastMulticastCheck) >= ZT_MULTICAST_LOCAL_POLL_PERIOD) { lastMulticastCheck = now; try { - std::map< SharedPtr<Network>,std::set<MulticastGroup> > toAnnounce; std::vector< SharedPtr<Network> > networks(RR->nc->networks()); - for(std::vector< SharedPtr<Network> >::const_iterator nw(networks.begin());nw!=networks.end();++nw) { - if ((*nw)->updateMulticastGroups()) - toAnnounce.insert(std::pair< SharedPtr<Network>,std::set<MulticastGroup> >(*nw,(*nw)->multicastGroups())); - } - if (toAnnounce.size()) - RR->sw->announceMulticastGroups(toAnnounce); + for(std::vector< SharedPtr<Network> >::const_iterator nw(networks.begin());nw!=networks.end();++nw) + (*nw)->updateMulticastGroups()); } catch (std::exception &exc) { LOG("unexpected exception announcing multicast groups: %s",exc.what()); } catch ( ... ) { |