X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FEthernetPacket.hh;h=3dcddc6f4fef53ea4743c80dbe54b5e7162342d5;hb=6a3a31fb7b2d2a5e8ae6d67d50797700274fb34e;hp=7cd5347ec3f79613e02c8e22ed0bc90d74e112a1;hpb=1f3b4447179d0cd771037d02b9a5671eeaaaec8d;p=senf.git diff --git a/Packets/DefaultBundle/EthernetPacket.hh b/Packets/DefaultBundle/EthernetPacket.hh index 7cd5347..3dcddc6 100644 --- a/Packets/DefaultBundle/EthernetPacket.hh +++ b/Packets/DefaultBundle/EthernetPacket.hh @@ -28,31 +28,14 @@ // Custom includes #include -#include -#include "Packets/Packets.hh" +#include "../../Socket/Protocols/Raw/MACAddress.hh" +#include "../../Packets/Packets.hh" //#include "EthernetPacket.mpp" ///////////////////////////////hh.p//////////////////////////////////////// namespace senf { - /** \brief Ethernet MAC address - - The Ethernet MAC is modelled as a fixed-size container/sequence of 6 bytes. - - \todo Move to someplace else when implementing the addressing classes - */ - struct MACAddress - : boost::array - { - MACAddress(std::string addr); - template - MACAddress(InputIterator i); - - struct SyntaxException : public std::exception - { virtual char const * what() const throw() { return "invalid mac address syntax"; } }; - }; - /** \brief Parse an Ethernet MAC address The ethernet MAC is returned by value as a 6-byte sequence @@ -69,7 +52,7 @@ namespace senf { typedef MACAddress value_type; static const size_type fixed_bytes = 6u; - value_type value() const { return MACAddress(i()); } + value_type value() const { return MACAddress::from_data(i()); } void value(value_type const & v) { std::copy(v.begin(), v.end(), i()); } operator value_type () { return value(); } byte & operator[](size_type index) { return *boost::next(i(),index); } @@ -85,24 +68,13 @@ namespace senf { */ struct Parse_Ethernet : public PacketParserBase { - typedef Parse_UInt16 Parse_Type; - -# ifndef DOXYGEN +# include SENF_FIXED_PARSER() - SENF_PACKET_PARSER_INIT(Parse_Ethernet); + SENF_PARSER_FIELD( destination, Parse_MAC ); + SENF_PARSER_FIELD( source, Parse_MAC ); + SENF_PARSER_FIELD( type_length, Parse_UInt16 ); - SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS( - ((Field)( destination, Parse_MAC )) - ((Field)( source, Parse_MAC )) - ((Field)( type, Parse_Type )) ); - -# else - - Parse_MAC destination(); - Parse_MAC source(); - Parse_Type type(); - -# endif + SENF_PARSER_FINALIZE(Parse_Ethernet); }; /** \brief EtherType registry @@ -128,31 +100,32 @@ namespace senf { \par Associated registries: \ref EtherTypes + \par Finalize action: + Set \a type from type of next packet if found in \ref EtherTypes + \ingroup protocolbundle_default */ struct EthernetPacketType : public PacketTypeBase, public PacketTypeMixin { +#ifndef DOXYGEN typedef PacketTypeMixin mixin; typedef ConcretePacket packet; typedef Parse_Ethernet parser; - +#endif using mixin::nextPacketRange; - using mixin::nextPacketType; + // using mixin::nextPacketType; using mixin::initSize; using mixin::init; - /** \todo Add LLC/SNAP support -> only use the registry - for type() values >=1536, otherwise expect an LLC header */ - static registry_key_t nextPacketKey(packet p) - { return p->type(); } - + static factory_t nextPacketType(packet p); static void dump(packet p, std::ostream & os); + static void finalize(packet p); }; /** \brief Ethernet packet typedef */ - typedef EthernetPacketType::packet EthernetPacket; + typedef ConcretePacket EthernetPacket; /** \brief Parse an ethernet VLAN tag @@ -162,29 +135,15 @@ namespace senf { */ struct Parse_EthVLan : public PacketParserBase { - typedef Parse_UIntField < 0, 3 > Parse_Priority; - typedef Parse_Flag < 3 > Parse_CFI; - typedef Parse_UIntField < 4, 16 > Parse_VLanId; - typedef Parse_UInt16 Parse_Type; +# include SENF_FIXED_PARSER() -# ifndef DOXYGEN + SENF_PARSER_BITFIELD( priority, 3, unsigned ); + SENF_PARSER_BITFIELD( cfi, 1, bool ); + SENF_PARSER_BITFIELD( vlanId, 12, unsigned ); - SENF_PACKET_PARSER_INIT(Parse_EthVLan); + SENF_PARSER_FIELD( type, Parse_UInt16 ); - SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS( - ((OverlayField)( priority, Parse_Priority )) - ((OverlayField)( cfi, Parse_CFI )) - ((Field )( vlanId, Parse_VLanId )) - ((Field )( type, Parse_Type )) ); - -# else - - Parse_Priority priority(); - Parse_CFI cfi(); - Parse_VLanId vlanId(); - Parse_Type type(); - -# endif + SENF_PARSER_FINALIZE(Parse_EthVLan); }; /** \brief Ethernet VLAN tag @@ -198,16 +157,20 @@ namespace senf { \par Associated registries: \ref EtherTypes + \par Finalize action: + Set \a type from type of next packet if found in \ref EtherTypes + \ingroup protocolbundle_default */ struct EthVLanPacketType : public PacketTypeBase, public PacketTypeMixin { +#ifndef DOXYGEN typedef PacketTypeMixin mixin; typedef ConcretePacket packet; typedef Parse_EthVLan parser; - +#endif using mixin::nextPacketRange; using mixin::nextPacketType; using mixin::initSize; @@ -219,10 +182,74 @@ namespace senf { { return p->type(); } static void dump(packet p, std::ostream & os); + static void finalize(packet p); + }; + + /** \brief Ethernet VLAN tag typedef */ + typedef ConcretePacket EthVLanPacket; + + + /** \brief Parse an ethernet LLC/SNAP header + + \todo document me + + \see EthVLanPacketType + */ + struct Parse_EthLlcSnapPacket : public PacketParserBase + { +# include SENF_FIXED_PARSER() + + SENF_PARSER_FIELD( dsap, Parse_UInt8 ); + SENF_PARSER_FIELD( ssap, Parse_UInt8 ); + SENF_PARSER_FIELD( ctrl, Parse_UInt8 ); + + SENF_PARSER_FIELD( protocolId, Parse_UInt24 ); + SENF_PARSER_FIELD( type, Parse_UInt24 ); + + SENF_PARSER_FINALIZE(Parse_EthLlcSnapPacket); + }; + + /** \brief Ethernet LLC/SNAP header + + \todo document me + + \par Packet type (typedef): + \ref EthLlcSnapPacketType + + \par Fields: + \ref Parse_EthLlcSnapPacket + + \par Associated registries: + \ref EtherTypes + + \par Finalize action: + XXXX + + \ingroup protocolbundle_default + */ + struct EthLlcSnapPacketType + : public PacketTypeBase, + public PacketTypeMixin + { +#ifndef DOXYGEN + typedef PacketTypeMixin mixin; + typedef ConcretePacket packet; + typedef Parse_EthLlcSnapPacket parser; +#endif + using mixin::nextPacketRange; + using mixin::nextPacketType; + using mixin::initSize; + using mixin::init; + + static registry_key_t nextPacketKey(packet p) + { return p->type(); } + + static void dump(packet p, std::ostream & os); + static void finalize(packet p); }; /** \brief Ethernet VLAN tag typedef */ - typedef EthVLanPacketType::packet EthVLanPacket; + typedef ConcretePacket EthLlcSnapPacket; } @@ -230,7 +257,7 @@ namespace senf { #endif #ifndef SENF_PACKETS_DECL_ONLY //#include "EthernetPacket.cci" -#include "EthernetPacket.ct" +//#include "EthernetPacket.ct" //#include "EthernetPacket.cti" #endif