summaryrefslogtreecommitdiff
path: root/node/Network.hpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2014-06-26 18:13:48 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2014-06-26 18:13:48 -0700
commit458f6ae7c37c7877a842e7931edc67d9fed201cd (patch)
tree0d397bf16a3a67a9c8aff5ae64393915cb70656d /node/Network.hpp
parent999e9635338dd706b02e6d5f696fb6da87a3e0d6 (diff)
downloadinfinitytier-458f6ae7c37c7877a842e7931edc67d9fed201cd.tar.gz
infinitytier-458f6ae7c37c7877a842e7931edc67d9fed201cd.zip
Only add active bridges to top of MC propagation list if they are alive. Otherwise a dead active bridge might kill multicast for us.
Diffstat (limited to 'node/Network.hpp')
-rw-r--r--node/Network.hpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/node/Network.hpp b/node/Network.hpp
index 170e354f..03b011f3 100644
--- a/node/Network.hpp
+++ b/node/Network.hpp
@@ -401,11 +401,12 @@ public:
* Learn a multicast group that is bridged to our tap device
*
* @param mg Multicast group
+ * @param now Current time
*/
- inline void learnBridgedMulticastGroup(const MulticastGroup &mg)
+ inline void learnBridgedMulticastGroup(const MulticastGroup &mg,uint64_t now)
{
Mutex::Lock _l(_lock);
- _bridgedMulticastGroups[mg] = Utils::now();
+ _bridgedMulticastGroups[mg] = now;
}
/**