ipv4/6: fixed crossing link fields from different hash tables.

Signed-off-by: Axel Dörfler <axeld@pinc-software.de>
haiku · Mar 21, 2017 · 19d8e4f · 19d8e4f
1 parent d8ce1a9
commit 19d8e4f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp b/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp
@@ -156,7 +156,7 @@ struct MulticastStateHash {
 	bool CompareValues(ValueType* value1, ValueType* value2) const
 		{ return value1->Interface()->index == value2->Interface()->index
 			&& value1->Address().s_addr == value2->Address().s_addr; }
-	ValueType*& GetLink(ValueType* value) const { return value->HashLink(); }
+	ValueType*& GetLink(ValueType* value) const { return value->MulticastGroupsHashLink(); }
 };
 
 

diff --git a/src/add-ons/kernel/network/protocols/ipv4/multicast.h b/src/add-ons/kernel/network/protocols/ipv4/multicast.h
@@ -179,6 +179,7 @@ class MulticastGroupInterface {
 	};
 
 	MulticastGroupInterface*& HashLink() { return fLink; }
+	MulticastGroupInterface*& MulticastGroupsHashLink() { return fMulticastGroupsLink; }
 
 private:
 	// for g++ 2.95
@@ -190,6 +191,7 @@ class MulticastGroupInterface {
 	FilterMode fFilterMode;
 	AddressSet fAddresses;
 	MulticastGroupInterface* fLink;
+	MulticastGroupInterface* fMulticastGroupsLink;
 };
 
 template<typename Addressing>

diff --git a/src/add-ons/kernel/network/protocols/ipv6/ipv6.cpp b/src/add-ons/kernel/network/protocols/ipv6/ipv6.cpp
@@ -173,7 +173,7 @@ struct MulticastStateHash {
 	bool CompareValues(ValueType* value1, ValueType* value2) const
 		{ return value1->Interface()->index == value2->Interface()->index
 			&& value1->Address() == value2->Address(); }
-	ValueType*& GetLink(ValueType* value) const { return value->HashLink(); }
+	ValueType*& GetLink(ValueType* value) const { return value->MulticastGroupsHashLink(); }
 };
 
 

diff --git a/src/add-ons/kernel/network/protocols/ipv6/multicast.h b/src/add-ons/kernel/network/protocols/ipv6/multicast.h
@@ -188,6 +188,7 @@ class MulticastGroupInterface {
 	};
 
 	MulticastGroupInterface*& HashLink() { return fLink; }
+	MulticastGroupInterface*& MulticastGroupsHashLink() { return fMulticastGroupsLink; }
 
 private:
 	// for g++ 2.95
@@ -199,6 +200,7 @@ class MulticastGroupInterface {
 	FilterMode fFilterMode;
 	AddressSet fAddresses;
 	MulticastGroupInterface* fLink;
+	MulticastGroupInterface* fMulticastGroupsLink;
 };