Dead code removal, fix for cleanup GitHub issue #28

node/Address.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_ADDRESS_HPP
-#define _ZT_ADDRESS_HPP
+#ifndef ZT_ADDRESS_HPP
+#define ZT_ADDRESS_HPP
 
 #include <stdio.h>
 #include <stdlib.h>

node/Array.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_ARRAY_HPP
-#define _ZT_ARRAY_HPP
+#ifndef ZT_ARRAY_HPP
+#define ZT_ARRAY_HPP
 
 #include <string>
 #include <algorithm>

node/AtomicCounter.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_ATOMICCOUNTER_HPP
-#define _ZT_ATOMICCOUNTER_HPP
+#ifndef ZT_ATOMICCOUNTER_HPP
+#define ZT_ATOMICCOUNTER_HPP
 
 #include "Mutex.hpp"
 #include "NonCopyable.hpp"

node/BandwidthAccount.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_BWACCOUNT_HPP
-#define _ZT_BWACCOUNT_HPP
+#ifndef ZT_BWACCOUNT_HPP
+#define ZT_BWACCOUNT_HPP
 
 #include <stdint.h>
 #include <math.h>

node/Buffer.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_BUFFER_HPP
-#define _ZT_BUFFER_HPP
+#ifndef ZT_BUFFER_HPP
+#define ZT_BUFFER_HPP
 
 #include <string.h>
 #include <stdint.h>

node/C25519.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_C25519_HPP
-#define _ZT_C25519_HPP
+#ifndef ZT_C25519_HPP
+#define ZT_C25519_HPP
 
 #include "Array.hpp"
 #include "Utils.hpp"

node/CMWC4096.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_CMWC4096_HPP
-#define _ZT_CMWC4096_HPP
+#ifndef ZT_CMWC4096_HPP
+#define ZT_CMWC4096_HPP
 
 #include <stdint.h>
 #include "Utils.hpp"

node/CertificateOfMembership.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_CERTIFICATEOFMEMBERSHIP_HPP
-#define _ZT_CERTIFICATEOFMEMBERSHIP_HPP
+#ifndef ZT_CERTIFICATEOFMEMBERSHIP_HPP
+#define ZT_CERTIFICATEOFMEMBERSHIP_HPP
 
 #include <stdint.h>
 #include <string.h>

node/Condition.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_CONDITION_HPP
-#define _ZT_CONDITION_HPP
+#ifndef ZT_CONDITION_HPP
+#define ZT_CONDITION_HPP
 
 #include "Constants.hpp"
 #include "NonCopyable.hpp"

node/Constants.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_CONSTANTS_HPP
-#define _ZT_CONSTANTS_HPP
+#ifndef ZT_CONSTANTS_HPP
+#define ZT_CONSTANTS_HPP
 
 //
 // This include file also auto-detects and canonicalizes some environment

node/Defaults.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_DEFAULTS_HPP
-#define _ZT_DEFAULTS_HPP
+#ifndef ZT_DEFAULTS_HPP
+#define ZT_DEFAULTS_HPP
 
 #include <stdexcept>
 #include <string>

node/Demarc.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_DEMARC_HPP
-#define _ZT_DEMARC_HPP
+#ifndef ZT_DEMARC_HPP
+#define ZT_DEMARC_HPP
 
 #include <stdlib.h>
 #include <stdint.h>

node/Dictionary.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_DICTIONARY_HPP
-#define _ZT_DICTIONARY_HPP
+#ifndef ZT_DICTIONARY_HPP
+#define ZT_DICTIONARY_HPP
 
 #include <string>
 #include <map>

node/EthernetTap.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_ETHERNETTAP_HPP
-#define _ZT_ETHERNETTAP_HPP
+#ifndef ZT_ETHERNETTAP_HPP
+#define ZT_ETHERNETTAP_HPP
 
 #include <stdio.h>
 #include <stdlib.h>

node/Identity.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_IDENTITY_HPP
-#define _ZT_IDENTITY_HPP
+#ifndef ZT_IDENTITY_HPP
+#define ZT_IDENTITY_HPP
 
 #include <stdio.h>
 #include <stdlib.h>

node/InetAddress.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_INETADDRESS_HPP
-#define _ZT_INETADDRESS_HPP
+#ifndef ZT_INETADDRESS_HPP
+#define ZT_INETADDRESS_HPP
 
 #include <stdlib.h>
 #include <string.h>

node/Logger.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_LOGGER_HPP
-#define _ZT_LOGGER_HPP
+#ifndef ZT_LOGGER_HPP
+#define ZT_LOGGER_HPP
 
 #include <stdio.h>
 

node/MAC.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_MAC_HPP
-#define _ZT_MAC_HPP
+#ifndef ZT_MAC_HPP
+#define ZT_MAC_HPP
 
 #include <stdio.h>
 #include <stdlib.h>

node/MulticastGroup.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_MULTICASTGROUP_HPP
-#define _ZT_MULTICASTGROUP_HPP
+#ifndef ZT_MULTICASTGROUP_HPP
+#define ZT_MULTICASTGROUP_HPP
 
 #include <stdint.h>
 

node/Multicaster.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_MULTICASTER_HPP
-#define _ZT_MULTICASTER_HPP
+#ifndef ZT_MULTICASTER_HPP
+#define ZT_MULTICASTER_HPP
 
 #include <stdint.h>
 #include <string.h>

node/Mutex.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_MUTEX_HPP
-#define _ZT_MUTEX_HPP
+#ifndef ZT_MUTEX_HPP
+#define ZT_MUTEX_HPP
 
 #include "Constants.hpp"
 #include "NonCopyable.hpp"

node/Network.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_NETWORK_HPP
-#define _ZT_NETWORK_HPP
+#ifndef ZT_NETWORK_HPP
+#define ZT_NETWORK_HPP
 
 #include <stdint.h>
 

node/NetworkConfig.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_NETWORKCONFIG_HPP
-#define _ZT_NETWORKCONFIG_HPP
+#ifndef ZT_NETWORKCONFIG_HPP
+#define ZT_NETWORKCONFIG_HPP
 
 #include <stdint.h>
 

node/Node.cpp

@@ -623,15 +623,6 @@ unsigned int Node::versionMajor() throw() { return ZEROTIER_ONE_VERSION_MAJOR; }
 unsigned int Node::versionMinor() throw() { return ZEROTIER_ONE_VERSION_MINOR; }
 unsigned int Node::versionRevision() throw() { return ZEROTIER_ONE_VERSION_REVISION; }
 
-// Scanned for by loader and/or updater to determine a binary's version
-const unsigned char EMBEDDED_VERSION_STAMP[20] = {
-	0x6d,0xfe,0xff,0x01,0x90,0xfa,0x89,0x57,0x88,0xa1,0xaa,0xdc,0xdd,0xde,0xb0,0x33,
-	ZEROTIER_ONE_VERSION_MAJOR,
-	ZEROTIER_ONE_VERSION_MINOR,
-	(unsigned char)(((unsigned int)ZEROTIER_ONE_VERSION_REVISION) & 0xff), /* little-endian */
-	(unsigned char)((((unsigned int)ZEROTIER_ONE_VERSION_REVISION) >> 8) & 0xff)
-};
-
 } // namespace ZeroTier
 
 extern "C" {

node/Node.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_NODE_HPP
-#define _ZT_NODE_HPP
+#ifndef ZT_NODE_HPP
+#define ZT_NODE_HPP
 
 #include <string>
 #include <vector>
@@ -171,14 +171,6 @@ private:
 	void *const _impl; // private implementation
 };
 
-/**
- * An embedded version code that can be searched for in the binary
- *
- * This shouldn't be used by users, but is exported to make certain that
- * the linker actually includes it in the image.
- */
-extern const unsigned char EMBEDDED_VERSION_STAMP[20];
-
 } // namespace ZeroTier
 
 extern "C" {

node/NodeConfig.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_NODECONFIG_HPP
-#define _ZT_NODECONFIG_HPP
+#ifndef ZT_NODECONFIG_HPP
+#define ZT_NODECONFIG_HPP
 
 #include <stdint.h>
 

node/NonCopyable.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _NONCOPYABLE_HPP__
-#define _NONCOPYABLE_HPP__
+#ifndef ZT_NONCOPYABLE_HPP__
+#define ZT_NONCOPYABLE_HPP__
 
 namespace ZeroTier {
 

node/Packet.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_N_PACKET_HPP
-#define _ZT_N_PACKET_HPP
+#ifndef ZT_N_PACKET_HPP
+#define ZT_N_PACKET_HPP
 
 #include <stdint.h>
 #include <string.h>

node/PacketDecoder.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_PACKETDECODER_HPP
-#define _ZT_PACKETDECODER_HPP
+#ifndef ZT_PACKETDECODER_HPP
+#define ZT_PACKETDECODER_HPP
 
 #include <stdexcept>
 

node/Peer.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_PEER_HPP
-#define _ZT_PEER_HPP
+#ifndef ZT_PEER_HPP
+#define ZT_PEER_HPP
 
 #include <stdint.h>
 

node/Poly1305.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_POLY1305_HPP
-#define _ZT_POLY1305_HPP
+#ifndef ZT_POLY1305_HPP
+#define ZT_POLY1305_HPP
 
 namespace ZeroTier {
 

node/RuntimeEnvironment.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_RUNTIMEENVIRONMENT_HPP
-#define _ZT_RUNTIMEENVIRONMENT_HPP
+#ifndef ZT_RUNTIMEENVIRONMENT_HPP
+#define ZT_RUNTIMEENVIRONMENT_HPP
 
 #include <string>
 

node/SHA512.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_SHA512_HPP
-#define _ZT_SHA512_HPP
+#ifndef ZT_SHA512_HPP
+#define ZT_SHA512_HPP
 
 #define ZT_SHA512_DIGEST_LEN 64
 

node/Salsa20.hpp

@@ -4,8 +4,8 @@
  * This therefore is public domain.
  */
 
-#ifndef _ZT_SALSA20_HPP
-#define _ZT_SALSA20_HPP
+#ifndef ZT_SALSA20_HPP
+#define ZT_SALSA20_HPP
 
 #include <stdint.h>
 

node/Service.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_SERVICE_HPP
-#define _ZT_SERVICE_HPP
+#ifndef ZT_SERVICE_HPP
+#define ZT_SERVICE_HPP
 
 #include <string>
 #include <stdexcept>

node/SharedPtr.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_SHAREDPTR_HPP
-#define _ZT_SHAREDPTR_HPP
+#ifndef ZT_SHAREDPTR_HPP
+#define ZT_SHAREDPTR_HPP
 
 #include "Mutex.hpp"
 #include "AtomicCounter.hpp"

node/Switch.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_N_SWITCH_HPP
-#define _ZT_N_SWITCH_HPP
+#ifndef ZT_N_SWITCH_HPP
+#define ZT_N_SWITCH_HPP
 
 #include <map>
 #include <set>

node/SysEnv.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_SYSENV_HPP
-#define _ZT_SYSENV_HPP
+#ifndef ZT_SYSENV_HPP
+#define ZT_SYSENV_HPP
 
 #include <stdint.h>
 

node/Thread.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_THREAD_HPP
-#define _ZT_THREAD_HPP
+#ifndef ZT_THREAD_HPP
+#define ZT_THREAD_HPP
 
 #include <stdexcept>
 

node/Topology.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_TOPOLOGY_HPP
-#define _ZT_TOPOLOGY_HPP
+#ifndef ZT_TOPOLOGY_HPP
+#define ZT_TOPOLOGY_HPP
 
 #include <stdio.h>
 #include <string.h>

node/UdpSocket.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_UDPSOCKET_HPP
-#define _ZT_UDPSOCKET_HPP
+#ifndef ZT_UDPSOCKET_HPP
+#define ZT_UDPSOCKET_HPP
 
 #include <stdexcept>
 

node/Utils.hpp

@@ -25,8 +25,8 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-#ifndef _ZT_UTILS_HPP
-#define _ZT_UTILS_HPP
+#ifndef ZT_UTILS_HPP
+#define ZT_UTILS_HPP
 
 #include <stdio.h>
 #include <stdlib.h>