diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-07 10:06:05 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-07 10:06:05 -0700 |
| commit | 41fc08b3308be6ac57d737b225a58d41854bd695 (patch) | |
| tree | ec89b4df1986e294d8aeeb447412f4a5dc653e4c /node | |
| parent | 07ea4fd4f92d7d5aa8573525b11bf7821b9acb19 (diff) | |
| download | infinitytier-41fc08b3308be6ac57d737b225a58d41854bd695.tar.gz infinitytier-41fc08b3308be6ac57d737b225a58d41854bd695.zip | |
etherTypeName() is only used in Switch and only with ZT_TRACE
Diffstat (limited to 'node')
| -rw-r--r-- | node/Switch.cpp | 33 | ||||
| -rw-r--r-- | node/Switch.hpp | 7 |
2 files changed, 17 insertions, 23 deletions
diff --git a/node/Switch.cpp b/node/Switch.cpp index 13070be1..62fa02cd 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -48,6 +48,23 @@ namespace ZeroTier { +#ifdef ZT_TRACE +static const char *etherTypeName(const unsigned int etherType) +{ + switch(etherType) { + case ZT_ETHERTYPE_IPV4: return "IPV4"; + case ZT_ETHERTYPE_ARP: return "ARP"; + case ZT_ETHERTYPE_RARP: return "RARP"; + case ZT_ETHERTYPE_ATALK: return "ATALK"; + case ZT_ETHERTYPE_AARP: return "AARP"; + case ZT_ETHERTYPE_IPX_A: return "IPX_A"; + case ZT_ETHERTYPE_IPX_B: return "IPX_B"; + case ZT_ETHERTYPE_IPV6: return "IPV6"; + } + return "UNKNOWN"; +} +#endif // ZT_TRACE + Switch::Switch(const RuntimeEnvironment *renv) : RR(renv) { @@ -519,22 +536,6 @@ unsigned long Switch::doTimerTasks(uint64_t now) return nextDelay; } -const char *Switch::etherTypeName(const unsigned int etherType) - throw() -{ - switch(etherType) { - case ZT_ETHERTYPE_IPV4: return "IPV4"; - case ZT_ETHERTYPE_ARP: return "ARP"; - case ZT_ETHERTYPE_RARP: return "RARP"; - case ZT_ETHERTYPE_ATALK: return "ATALK"; - case ZT_ETHERTYPE_AARP: return "AARP"; - case ZT_ETHERTYPE_IPX_A: return "IPX_A"; - case ZT_ETHERTYPE_IPX_B: return "IPX_B"; - case ZT_ETHERTYPE_IPV6: return "IPV6"; - } - return "UNKNOWN"; -} - void Switch::_handleRemotePacketFragment(const InetAddress &fromAddr,const void *data,unsigned int len) { Packet::Fragment fragment(data,len); diff --git a/node/Switch.hpp b/node/Switch.hpp index 1b29d050..89c9a56b 100644 --- a/node/Switch.hpp +++ b/node/Switch.hpp @@ -177,13 +177,6 @@ public: */ unsigned long doTimerTasks(uint64_t now); - /** - * @param etherType Ethernet type ID - * @return Human-readable name - */ - static const char *etherTypeName(const unsigned int etherType) - throw(); - private: void _handleRemotePacketFragment(const InetAddress &fromAddr,const void *data,unsigned int len); void _handleRemotePacketHead(const InetAddress &fromAddr,const void *data,unsigned int len); |