X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FEthernetPacket.hh;h=b38edfc0ffd79676ffc6dfc13187f200e83a6464;hb=9cb871b939efe93e35dd96808d25089399acfc46;hp=8eed2ecdd3df79854aeddf016f5b7da440ee55d2;hpb=3a43b572a2c0028b353d47e86fa7546633d6e2cf;p=senf.git diff --git a/senf/Packets/DefaultBundle/EthernetPacket.hh b/senf/Packets/DefaultBundle/EthernetPacket.hh index 8eed2ec..b38edfc 100644 --- a/senf/Packets/DefaultBundle/EthernetPacket.hh +++ b/senf/Packets/DefaultBundle/EthernetPacket.hh @@ -36,7 +36,7 @@ namespace senf { - /** \brief Parse an Ethernet MAC address + /** \brief Parse an Ethernet MAC address The ethernet MAC is returned by value as a 6-byte sequence @@ -46,7 +46,7 @@ namespace senf { struct MACAddressParser : public PacketParserBase { MACAddressParser(data_iterator i, state_type s) : PacketParserBase(i,s,fixed_bytes) {} - + /////////////////////////////////////////////////////////////////////////// typedef MACAddress value_type; @@ -59,7 +59,7 @@ namespace senf { MACAddressParser const & operator= (value_type const & other) { value(other); return *this; } }; - + /** \brief Parse an Ethernet packet Parser implementing an ethernet header. @@ -80,7 +80,7 @@ namespace senf { /** \brief EtherType registry This registry registers packet types with their EtherType number. - + \see Ethernet numbers \n \ref PacketRegistry */ @@ -121,7 +121,7 @@ namespace senf { static factory_t nextPacketType(packet p); /// Dump given EthernetPacket in readable form to given output stream - static void dump(packet p, std::ostream & os); + static void dump(packet p, std::ostream & os); static void finalize(packet p); }; @@ -130,9 +130,9 @@ namespace senf { */ typedef ConcretePacket EthernetPacket; - + /** \brief Parse an ethernet VLAN tag - + Parser interpreting the ethernet VLAN tag. Fields are \see EthVLanPacketType @@ -158,7 +158,7 @@ namespace senf { \par Fields: \ref EthVLanPacketParser \image html EthVLanPacket.png - + \par Associated registries: \ref EtherTypes @@ -168,7 +168,7 @@ namespace senf { \ingroup protocolbundle_default */ struct EthVLanPacketType - : public PacketTypeBase, + : public PacketTypeBase, public PacketTypeMixin { #ifndef DOXYGEN @@ -184,7 +184,7 @@ namespace senf { /** \todo Add LLC/SNAP support -> only use the registry for type() values >=1536, otherwise expect an LLC header */ - static key_t nextPacketKey(packet p) + static key_t nextPacketKey(packet p) { return p->type(); } /// Dump given EthVLanPacket in readable form to given output stream