From 954f9cbc13ab9cf01f6d3efffb3aa5e8a95c0307 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 22 Sep 2014 13:18:24 -0700 Subject: Yet more WIP on mulitcast algo... --- node/Network.hpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'node/Network.hpp') diff --git a/node/Network.hpp b/node/Network.hpp index 33c3226c..d5ce1efa 100644 --- a/node/Network.hpp +++ b/node/Network.hpp @@ -51,6 +51,7 @@ #include "Identity.hpp" #include "InetAddress.hpp" #include "BandwidthAccount.hpp" +#include "MulticastTopology.hpp" #include "NetworkConfig.hpp" #include "CertificateOfMembership.hpp" #include "Thread.hpp" @@ -445,16 +446,13 @@ private: EthernetTap *volatile _tap; // tap device or NULL if not initialized yet volatile bool _enabled; - std::set _myMulticastGroups; // multicast groups that we belong to including those behind us (updated periodically) - std::map _multicastGroupsBehindMe; // multicast groups bridged to us and when we last saw activity on each + std::set< MulticastGroup > _myMulticastGroups; // multicast groups that we belong to including those behind us (updated periodically) + std::map< MulticastGroup,uint64_t > _multicastGroupsBehindMe; // multicast groups bridged to us and when we last saw activity on each + std::map< MulticastGroup,BandwidthAccount > _multicastRateAccounts; + MulticastTopology _multicastTopology; std::map _remoteBridgeRoutes; // remote addresses where given MACs are reachable - // Deprecated, but will be kept around until P5_MULTICAST_FRAME is gone -- but the - // entry for us is still used by both. Eventually there will only be one BandwidthAccount, - // namely ours. - std::map< std::pair,BandwidthAccount > _multicastRateAccounts; - std::map _membershipCertificates; // Other members' certificates of membership std::map _lastPushedMembershipCertificate; // When did we last push our certificate to each remote member? -- cgit v1.2.3