diff --git a/node/Network.cpp b/node/Network.cpp index bd199ca99..b03f4b3d0 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -538,29 +538,19 @@ static _doZtFilterResult _doZtFilter( } // anonymous namespace -std::string nwid_printf(int64_t id) { - char out[32] = {}; - sprintf(out, "%.16llx", id); - return std::string(out); -} - - -prometheus::simpleapi::gauge_family_t multicastGroupsFamily{"network_multicast_groups", "number of joined multicast groups"}; - const ZeroTier::MulticastGroup Network::BROADCAST(ZeroTier::MAC(0xffffffffffffULL),0); -Network::Network(const RuntimeEnvironment *renv,void *tPtr,uint64_t nwid,void *uptr,const NetworkConfig *nconf) - : RR(renv) - , _uPtr(uptr) - , _id(nwid) - , _lastAnnouncedMulticastGroupsUpstream(0) - , _mac(renv->identity.address(),nwid) - , _portInitialized(false) - , _lastConfigUpdate(0) - , _destroyed(false) - , _netconfFailure(NETCONF_FAILURE_NONE) - , _portError(0) - , _multicast_groups_gauge{multicastGroupsFamily.Add({{"networkId", nwid_printf(_id).c_str()}})} +Network::Network(const RuntimeEnvironment *renv,void *tPtr,uint64_t nwid,void *uptr,const NetworkConfig *nconf) : + RR(renv), + _uPtr(uptr), + _id(nwid), + _lastAnnouncedMulticastGroupsUpstream(0), + _mac(renv->identity.address(),nwid), + _portInitialized(false), + _lastConfigUpdate(0), + _destroyed(false), + _netconfFailure(NETCONF_FAILURE_NONE), + _portError(0) { for(int i=0;i::iterator i(std::lower_bound(_myMulticastGroups.begin(),_myMulticastGroups.end(),mg)); - if ( (i != _myMulticastGroups.end()) && (*i == mg) ) { + if ( (i != _myMulticastGroups.end()) && (*i == mg) ) _myMulticastGroups.erase(i); - _multicast_groups_gauge--; - } } uint64_t Network::handleConfigChunk(void *tPtr,const uint64_t packetId,const Address &source,const Buffer &chunk,unsigned int ptr) diff --git a/node/Network.hpp b/node/Network.hpp index 30ec03367..275e82f02 100644 --- a/node/Network.hpp +++ b/node/Network.hpp @@ -38,8 +38,6 @@ #include "NetworkConfig.hpp" #include "CertificateOfMembership.hpp" -#include - #define ZT_NETWORK_MAX_INCOMING_UPDATES 3 #define ZT_NETWORK_MAX_UPDATE_CHUNKS ((ZT_NETWORKCONFIG_DICT_CAPACITY / 1024) + 1) @@ -48,9 +46,6 @@ namespace ZeroTier { class RuntimeEnvironment; class Peer; - - - /** * A virtual LAN */ @@ -479,8 +474,6 @@ private: Mutex _lock; AtomicCounter __refCount; - - prometheus::simpleapi::gauge_metric_t _multicast_groups_gauge; }; } // namespace ZeroTier