瀏覽代碼

remove ZT_NO_METRIC ifdef

travisladuke 2 年之前
父節點
當前提交
50ede37a58
共有 2 個文件被更改,包括 0 次插入8 次删除
  1. 0 4
      osdep/Phy.hpp
  2. 0 4
      tcp-proxy/tcp-proxy.cpp

+ 0 - 4
osdep/Phy.hpp

@@ -50,9 +50,7 @@
 #include <netinet/in.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp.h>
 
 
-#ifndef ZT_NO_METRICS
 #include "../node/Metrics.hpp"
 #include "../node/Metrics.hpp"
-#endif
 
 
 #if defined(__linux__) || defined(linux) || defined(__LINUX__) || defined(__linux)
 #if defined(__linux__) || defined(linux) || defined(__LINUX__) || defined(__linux)
 #ifndef IPV6_DONTFRAG
 #ifndef IPV6_DONTFRAG
@@ -478,9 +476,7 @@ public:
 				 	sizeof(struct sockaddr_in)) == (long)len);
 				 	sizeof(struct sockaddr_in)) == (long)len);
 #endif
 #endif
 		if (sent) {
 		if (sent) {
-#ifndef ZT_NO_METRICS
 			Metrics::udp_send += len;
 			Metrics::udp_send += len;
-#endif
 		}
 		}
 
 
 		return sent;
 		return sent;

+ 0 - 4
tcp-proxy/tcp-proxy.cpp

@@ -41,13 +41,9 @@
 #include <algorithm>
 #include <algorithm>
 #include <vector>
 #include <vector>
 
 
-#define ZT_NO_METRICS 1
-
 #include "../osdep/Phy.hpp"
 #include "../osdep/Phy.hpp"
 
 
-#ifndef ZT_NO_METRICS
 #include "../node/Metrics.hpp"
 #include "../node/Metrics.hpp"
-#endif
 
 
 #define ZT_TCP_PROXY_CONNECTION_TIMEOUT_SECONDS 300
 #define ZT_TCP_PROXY_CONNECTION_TIMEOUT_SECONDS 300
 #define ZT_TCP_PROXY_TCP_PORT 443
 #define ZT_TCP_PROXY_TCP_PORT 443