ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-28 23:10:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of not used and maybe never to be used Filter code.

Browse Source
This commit is contained in:
Adam Ierymenko 2013-10-17 13:07:53 -04:00
parent ce14ba9004
commit 797bba04dd
6 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
node/Filter.cpp → attic/Filter.cpp
View File

0
node/Filter.hpp → attic/Filter.hpp
View File

1
node/PacketDecoder.cpp
View File

@ -39,7 +39,6 @@
#include "Switch.hpp" #include "Switch.hpp"
#include "Peer.hpp" #include "Peer.hpp"
#include "NodeConfig.hpp" #include "NodeConfig.hpp"
#include "Filter.hpp"
#include "Service.hpp" #include "Service.hpp"
#include "Demarc.hpp" #include "Demarc.hpp"

25
node/Switch.cpp
View File

@ -48,7 +48,6 @@
#include "Peer.hpp" #include "Peer.hpp"
#include "NodeConfig.hpp" #include "NodeConfig.hpp"
#include "Demarc.hpp" #include "Demarc.hpp"
#include "Filter.hpp"
#include "CMWC4096.hpp" #include "CMWC4096.hpp"
#include "../version.h" #include "../version.h"
@ -89,12 +88,12 @@ void Switch::onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,c
} }
if (from != network->tap().mac()) { if (from != network->tap().mac()) {
LOG("ignored tap: %s -> %s %s (bridging not supported)",from.toString().c_str(),to.toString().c_str(),Filter::etherTypeName(etherType)); LOG("ignored tap: %s -> %s %s (bridging not supported)",from.toString().c_str(),to.toString().c_str(),etherTypeName(etherType));
return; return;
} }
if (!network->permitsEtherType(etherType)) { if (!network->permitsEtherType(etherType)) {
LOG("ignored tap: %s -> %s: ethertype %s not allowed on network %.16llx",from.toString().c_str(),to.toString().c_str(),Filter::etherTypeName(etherType),(unsigned long long)network->id()); LOG("ignored tap: %s -> %s: ethertype %s not allowed on network %.16llx",from.toString().c_str(),to.toString().c_str(),etherTypeName(etherType),(unsigned long long)network->id());
return; return;
} }
@ -177,10 +176,10 @@ void Switch::onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,c
outp.compress(); outp.compress();
send(outp,true); send(outp,true);
} else { } else {
TRACE("UNICAST: %s -> %s %s (dropped, destination not a member of closed network %llu)",from.toString().c_str(),to.toString().c_str(),Filter::etherTypeName(etherType),network->id()); TRACE("UNICAST: %s -> %s %s (dropped, destination not a member of closed network %llu)",from.toString().c_str(),to.toString().c_str(),etherTypeName(etherType),network->id());
} }
} else { } else {
TRACE("UNICAST: %s -> %s %s (dropped, destination MAC not ZeroTier)",from.toString().c_str(),to.toString().c_str(),Filter::etherTypeName(etherType)); TRACE("UNICAST: %s -> %s %s (dropped, destination MAC not ZeroTier)",from.toString().c_str(),to.toString().c_str(),etherTypeName(etherType));
} }
} }
@ -501,6 +500,22 @@ void Switch::doAnythingWaitingForPeer(const SharedPtr<Peer> &peer)
} }
} }
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(Demarc::Port localPort,const InetAddress &fromAddr,const Buffer<4096> &data) void Switch::_handleRemotePacketFragment(Demarc::Port localPort,const InetAddress &fromAddr,const Buffer<4096> &data)
{ {
Packet::Fragment fragment(data); Packet::Fragment fragment(data);

17
node/Switch.hpp
View File

@ -48,6 +48,16 @@
#include "Multicaster.hpp" #include "Multicaster.hpp"
#include "PacketDecoder.hpp" #include "PacketDecoder.hpp"
/* Ethernet frame types that might be relevant to us */
#define ZT_ETHERTYPE_IPV4 0x0800
#define ZT_ETHERTYPE_ARP 0x0806
#define ZT_ETHERTYPE_RARP 0x8035
#define ZT_ETHERTYPE_ATALK 0x809b
#define ZT_ETHERTYPE_AARP 0x80f3
#define ZT_ETHERTYPE_IPX_A 0x8137
#define ZT_ETHERTYPE_IPX_B 0x8138
#define ZT_ETHERTYPE_IPV6 0x86dd
namespace ZeroTier { namespace ZeroTier {
class RuntimeEnvironment; class RuntimeEnvironment;
@ -195,6 +205,13 @@ public:
*/ */
void doAnythingWaitingForPeer(const SharedPtr<Peer> &peer); void doAnythingWaitingForPeer(const SharedPtr<Peer> &peer);
/**
* @param etherType Ethernet type ID
* @return Human-readable name
*/
static const char *etherTypeName(const unsigned int etherType)
throw();
private: private:
void _handleRemotePacketFragment( void _handleRemotePacketFragment(
Demarc::Port localPort, Demarc::Port localPort,

1
objects.mk
View File

@ -7,7 +7,6 @@ OBJS=\
node/Defaults.o \ node/Defaults.o \
node/Demarc.o \ node/Demarc.o \
node/EthernetTap.o \ node/EthernetTap.o \
node/Filter.o \
node/Identity.o \ node/Identity.o \
node/InetAddress.o \ node/InetAddress.o \
node/Logger.o \ node/Logger.o \