hrev51033 adds 1 changeset to branch 'master'
old head: d8ce1a9fad39bd68f03d7fc78b3012e73c382f5a
new head: 19d8e4f73cff0862a80d4d7954a3e0c4da9e40b8
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=19d8e4f73cff+%5Ed8ce1a9fad39
----------------------------------------------------------------------------
19d8e4f73cff: ipv4/6: fixed crossing link fields from different hash tables.
Signed-off-by: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
[ Alexander Andreev <carzil@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51033
Commit: 19d8e4f73cff0862a80d4d7954a3e0c4da9e40b8
URL: http://cgit.haiku-os.org/haiku/commit/?id=19d8e4f73cff
Author: Alexander Andreev <carzil@xxxxxxxxx>
Date: Sun Mar 19 11:29:14 2017 UTC
Committer: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Commit-Date: Tue Mar 21 11:38:55 2017 UTC
----------------------------------------------------------------------------
4 files changed, 6 insertions(+), 2 deletions(-)
src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp | 2 +-
src/add-ons/kernel/network/protocols/ipv4/multicast.h | 2 ++
src/add-ons/kernel/network/protocols/ipv6/ipv6.cpp | 2 +-
src/add-ons/kernel/network/protocols/ipv6/multicast.h | 2 ++
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp
b/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp
index 15011da..2223ae8 100644
--- 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
index 2cdf15f..1c395be 100644
--- a/src/add-ons/kernel/network/protocols/ipv4/multicast.h
+++ b/src/add-ons/kernel/network/protocols/ipv4/multicast.h
@@ -179,6 +179,7 @@ public:
};
MulticastGroupInterface*& HashLink() { return fLink; }
+ MulticastGroupInterface*& MulticastGroupsHashLink() { return
fMulticastGroupsLink; }
private:
// for g++ 2.95
@@ -190,6 +191,7 @@ private:
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
index cc06ae8..37964ac 100644
--- 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
index 4583d20..c6cbe5d 100644
--- a/src/add-ons/kernel/network/protocols/ipv6/multicast.h
+++ b/src/add-ons/kernel/network/protocols/ipv6/multicast.h
@@ -188,6 +188,7 @@ public:
};
MulticastGroupInterface*& HashLink() { return fLink; }
+ MulticastGroupInterface*& MulticastGroupsHashLink() { return
fMulticastGroupsLink; }
private:
// for g++ 2.95
@@ -199,6 +200,7 @@ private:
FilterMode fFilterMode;
AddressSet fAddresses;
MulticastGroupInterface* fLink;
+ MulticastGroupInterface* fMulticastGroupsLink;
};