X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FEthernetPacket.hh;h=51a2389e2774e8b18397f248746025871897c285;hb=8674fb1d184e7d620eb7c604957b5b4203df37a6;hp=bac25549d60345e9e30f995a2cf1595d7b3ef6b1;hpb=412024ed31a4ab4eaea7a4165a434f8efebee325;p=senf.git diff --git a/Packets/DefaultBundle/EthernetPacket.hh b/Packets/DefaultBundle/EthernetPacket.hh index bac2554..51a2389 100644 --- a/Packets/DefaultBundle/EthernetPacket.hh +++ b/Packets/DefaultBundle/EthernetPacket.hh @@ -85,7 +85,6 @@ namespace senf { \ref PacketRegistry */ struct EtherTypes { - // See typedef boost::uint16_t key_t; }; @@ -96,6 +95,7 @@ namespace senf { \par Fields: \ref EthernetPacketParser + \image html EthernetPacket.png \par Associated registries: \ref EtherTypes @@ -111,15 +111,17 @@ namespace senf { { #ifndef DOXYGEN typedef PacketTypeMixin mixin; +#endif typedef ConcretePacket packet; typedef EthernetPacketParser parser; -#endif + using mixin::nextPacketRange; using mixin::initSize; using mixin::init; static factory_t nextPacketType(packet p); - static void dump(packet p, std::ostream & os); + /// Dump given EthernetPacket in readable form to given output stream + static void dump(packet p, std::ostream & os); static void finalize(packet p); }; @@ -152,7 +154,8 @@ namespace senf { \par Fields: \ref EthVLanPacketParser - + \image html EthVLanPacket.png + \par Associated registries: \ref EtherTypes @@ -167,9 +170,10 @@ namespace senf { { #ifndef DOXYGEN typedef PacketTypeMixin mixin; +#endif typedef ConcretePacket packet; typedef EthVLanPacketParser parser; -#endif + using mixin::nextPacketRange; using mixin::nextPacketType; using mixin::initSize; @@ -180,6 +184,7 @@ namespace senf { static key_t nextPacketKey(packet p) { return p->type(); } + /// Dump given EthVLanPacket in readable form to given output stream static void dump(packet p, std::ostream & os); static void finalize(packet p); }; @@ -190,8 +195,6 @@ namespace senf { } ///////////////////////////////hh.e//////////////////////////////////////// -#endif -#ifndef SENF_PACKETS_DECL_ONLY //#include "EthernetPacket.cci" //#include "EthernetPacket.ct" //#include "EthernetPacket.cti"