From 458f6ae7c37c7877a842e7931edc67d9fed201cd Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 26 Jun 2014 18:13:48 -0700 Subject: Only add active bridges to top of MC propagation list if they are alive. Otherwise a dead active bridge might kill multicast for us. --- node/Network.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'node/Network.hpp') 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; } /** -- cgit v1.2.3