From 31ddc49da2e8c8aa9345616af28c9643968a8393 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 23 May 2014 15:13:34 -0700
Subject: GitHub issue #67

---
 node/UnixEthernetTap.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'node/UnixEthernetTap.cpp')

diff --git a/node/UnixEthernetTap.cpp b/node/UnixEthernetTap.cpp
index 4f9291ac..36bb7442 100644
--- a/node/UnixEthernetTap.cpp
+++ b/node/UnixEthernetTap.cpp
@@ -710,8 +710,6 @@ bool UnixEthernetTap::updateMulticastGroups(std::set<MulticastGroup> &groups)
 
 	bool changed = false;
 
-	newGroups.insert(_blindWildcardMulticastGroup); // always join this
-
 	for(std::set<MulticastGroup>::iterator mg(newGroups.begin());mg!=newGroups.end();++mg) {
 		if (!groups.count(*mg)) {
 			groups.insert(*mg);
@@ -719,7 +717,7 @@ bool UnixEthernetTap::updateMulticastGroups(std::set<MulticastGroup> &groups)
 		}
 	}
 	for(std::set<MulticastGroup>::iterator mg(groups.begin());mg!=groups.end();) {
-		if (!newGroups.count(*mg)) {
+		if ((!newGroups.count(*mg))&&(*mg != _blindWildcardMulticastGroup)) {
 			groups.erase(mg++);
 			changed = true;
 		} else ++mg;
@@ -934,8 +932,6 @@ bool UnixEthernetTap::updateMulticastGroups(std::set<MulticastGroup> &groups)
 
 	bool changed = false;
 
-	newGroups.insert(_blindWildcardMulticastGroup); // always join this
-
 	for(std::set<MulticastGroup>::iterator mg(newGroups.begin());mg!=newGroups.end();++mg) {
 		if (!groups.count(*mg)) {
 			groups.insert(*mg);
@@ -943,7 +939,7 @@ bool UnixEthernetTap::updateMulticastGroups(std::set<MulticastGroup> &groups)
 		}
 	}
 	for(std::set<MulticastGroup>::iterator mg(groups.begin());mg!=groups.end();) {
-		if (!newGroups.count(*mg)) {
+		if ((!newGroups.count(*mg))&&(*mg != _blindWildcardMulticastGroup)) {
 			groups.erase(mg++);
 			changed = true;
 		} else ++mg;
-- 
cgit v1.2.3