diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-06-26 17:44:09 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-06-26 17:44:09 -0700 |
| commit | 9c26d10ea645dc1727813ea72a63f526cf0757d0 (patch) | |
| tree | 25ae8e785f07f93f187a34abe204c423613a009b /node/Network.hpp | |
| parent | bfb152f53f528934583ee76437453a005610a7ea (diff) | |
| parent | 3f71afd0fbb2d87a2c9288166299600da51470dc (diff) | |
| download | infinitytier-9c26d10ea645dc1727813ea72a63f526cf0757d0.tar.gz infinitytier-9c26d10ea645dc1727813ea72a63f526cf0757d0.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/Network.hpp')
| -rw-r--r-- | node/Network.hpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/node/Network.hpp b/node/Network.hpp index 7976d901..daa4554e 100644 --- a/node/Network.hpp +++ b/node/Network.hpp @@ -47,7 +47,6 @@ #include "MulticastGroup.hpp" #include "MAC.hpp" #include "Dictionary.hpp" -#include "BandwidthAccount.hpp" #include "Multicaster.hpp" #include "NetworkConfig.hpp" #include "CertificateOfMembership.hpp" @@ -238,15 +237,6 @@ public: } /** - * Update and check multicast rate balance for a multicast group - * - * @param mg Multicast group - * @param bytes Size of packet - * @return True if packet is within budget - */ - bool updateAndCheckMulticastBalance(const MulticastGroup &mg,unsigned int bytes); - - /** * Get current network config or throw exception * * This version never returns null. Instead it throws a runtime error if @@ -370,7 +360,6 @@ private: std::vector< 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; std::map<MAC,Address> _remoteBridgeRoutes; // remote addresses where given MACs are reachable |