diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-09-22 13:18:24 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-09-22 13:18:24 -0700 |
| commit | 954f9cbc13ab9cf01f6d3efffb3aa5e8a95c0307 (patch) | |
| tree | c9a897ab3244aa553e4067785b9e17ae5ca9522b /node/Network.hpp | |
| parent | d9abd4d9be7b160b531a995a20c91d430768fc72 (diff) | |
| download | infinitytier-954f9cbc13ab9cf01f6d3efffb3aa5e8a95c0307.tar.gz infinitytier-954f9cbc13ab9cf01f6d3efffb3aa5e8a95c0307.zip | |
Yet more WIP on mulitcast algo...
Diffstat (limited to 'node/Network.hpp')
| -rw-r--r-- | node/Network.hpp | 12 |
1 files changed, 5 insertions, 7 deletions
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<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::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<MAC,Address> _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<Address,MulticastGroup>,BandwidthAccount > _multicastRateAccounts; - std::map<Address,CertificateOfMembership> _membershipCertificates; // Other members' certificates of membership std::map<Address,uint64_t> _lastPushedMembershipCertificate; // When did we last push our certificate to each remote member? |