X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FIpV4Packet.hh;h=94a68239f9dfeaf84c885e5db63e95d0798847e1;hb=d53c168dbfd70ffea9ebad8953193163e113ff3a;hp=94a3a911535de2543e3adbc04a6d60f0493f3096;hpb=9357448dc66bc9acfd3bd8db423deb75bcd6a2c4;p=senf.git diff --git a/Packets/DefaultBundle/IpV4Packet.hh b/Packets/DefaultBundle/IpV4Packet.hh index 94a3a91..94a6823 100644 --- a/Packets/DefaultBundle/IpV4Packet.hh +++ b/Packets/DefaultBundle/IpV4Packet.hh @@ -24,94 +24,131 @@ #define HH_IpV4Packet_ 1 // Custom includes -#include "Packets/Packet.hh" -#include "Packets/ParseInt.hh" -#include "Packets/ParseArray.hh" -#include "Packets/PacketRegistry.hh" +#include "Packets/Packets.hh" //#include "IpV4Packet.mpp" ///////////////////////////////hh.p//////////////////////////////////////// namespace senf { - - template - struct Parse_IpV4 : public ParserBase + /** \brief Parse an IpV4 packet + + Parser implementing the IpV4 header. The fields implemented are: + + + + + + + + + + + + + + + + + +
Field nameParser type
version\ref Parse_Version
ihl\ref Parse_IHL
tos\ref Parse_8bit
length\ref Parse_16bit
identifier\ref Parse_16bit
reserved\ref Parse_R
df\ref Parse_DF
mf\ref Parse_MF
frag\ref Parse_Frag
ttl\ref Parse_8bit
protocol\ref Parse_8bit
crc\ref Parse_16bit
source\ref Parse_32bit
destination\ref Parse_32bit
+ + \see IpV4PacketType \n + RFC 791 + + \todo Implement options + */ + struct Parse_IpV4 : public PacketParserBase { - template - struct rebind { typedef Parse_IpV4 parser; }; - typedef Iterator byte_iterator; - - Parse_IpV4() {} - Parse_IpV4(Iterator const & i) : ParserBase(i) {} - - static unsigned bytes() { return 20; } + SENF_PACKET_PARSER_NO_INIT(Parse_IpV4); /////////////////////////////////////////////////////////////////////////// - typedef Parse_UIntField < 0, 4, Iterator > Parse_Version; - typedef Parse_UIntField < 4, 8, Iterator > Parse_IHL; - typedef Parse_UInt8 < Iterator > Parse_8bit; - typedef Parse_UInt16 < Iterator > Parse_16bit; - typedef Parse_Flag < 0, Iterator > Parse_R; - typedef Parse_Flag < 1, Iterator > Parse_DF; - typedef Parse_Flag < 2, Iterator > Parse_MF; - typedef Parse_UIntField < 3, 16, Iterator > Parse_Frag; - typedef Parse_UInt32 < Iterator > Parse_32bit; - - Parse_Version version() const { return Parse_Version (this->i() ); } - Parse_IHL ihl() const { return Parse_IHL (this->i() ); } - Parse_8bit tos() const { return Parse_8bit (this->i() + 1 ); } - Parse_16bit length() const { return Parse_16bit (this->i() + 2 ); } - Parse_16bit identifier() const { return Parse_16bit (this->i() + 4 ); } - Parse_R reserved() const { return Parse_R (this->i() + 6 ); } - Parse_DF df() const { return Parse_DF (this->i() + 6 ); } - Parse_MF mf() const { return Parse_MF (this->i() + 6 ); } - Parse_Frag frag() const { return Parse_Frag (this->i() + 6 ); } - Parse_8bit ttl() const { return Parse_8bit (this->i() + 8 ); } - Parse_8bit protocol() const { return Parse_8bit (this->i() + 9 ); } - Parse_16bit crc() const { return Parse_16bit (this->i() + 10 ); } - Parse_32bit source() const { return Parse_32bit (this->i() + 12 ); } - Parse_32bit destination() const { return Parse_32bit (this->i() + 16 ); } + typedef Parse_UIntField < 0, 4 > Parse_Version; + typedef Parse_UIntField < 4, 8 > Parse_IHL; + typedef Parse_UInt8 Parse_8bit; + typedef Parse_UInt16 Parse_16bit; + typedef Parse_Flag < 0 > Parse_R; + typedef Parse_Flag < 1 > Parse_DF; + typedef Parse_Flag < 2 > Parse_MF; + typedef Parse_UIntField < 3, 16 > Parse_Frag; + typedef Parse_UInt32 Parse_32bit; + + SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS( + ((OverlayField)( version, Parse_Version )) + ((Field )( ihl, Parse_IHL )) + ((Field )( tos, Parse_8bit )) + ((Field )( length, Parse_16bit )) + ((Field )( identifier, Parse_16bit )) + ((OverlayField)( reserved, Parse_R )) + ((OverlayField)( df, Parse_DF )) + ((OverlayField)( mf, Parse_MF )) + ((Field )( frag, Parse_Frag )) + ((Field )( ttl, Parse_8bit )) + ((Field )( protocol, Parse_8bit )) + ((Field )( crc, Parse_16bit )) + ((Field )( source, Parse_32bit )) + ((Field )( destination, Parse_32bit )) ); + + void init() { + version() = 4; + } }; + /** \brief IP protocol number registry + + This registeres packets with their IP protocol number. + + \see Protocol numbers + PacketRegistry + */ struct IpTypes { - // See http://www.iana.org/assignments/protocol-numbers - // Also used by IPv6 typedef boost::uint16_t key_t; }; - class IpV4Packet - : public Packet, - public Parse_IpV4, - public PacketRegistryMixin - { - using PacketRegistryMixin::registerInterpreter; - public: - /////////////////////////////////////////////////////////////////////////// - // Types + /** \brief IpV4 packet + + \par Packet type (typedef): + \ref IpV4Packet - typedef ptr_t::ptr ptr; + \par Fields: + \ref Parse_IpV4 - /////////////////////////////////////////////////////////////////////////// + \par Associated registries: + \ref IpTypes - private: - template - IpV4Packet(Arg const & arg); + \ingroup protocolbundle_default + */ + struct IpV4PacketType + : public PacketTypeBase, + public PacketTypeMixin + { + typedef PacketTypeMixin mixin; + typedef ConcretePacket packet; + typedef Parse_IpV4 parser; - virtual void v_nextInterpreter() const; - virtual void v_finalize(); - virtual void v_dump(std::ostream & os) const; + using mixin::nextPacketRange; + using mixin::nextPacketType; + using mixin::initSize; + using mixin::init; - friend class Packet; + static registry_key_t nextPacketKey(packet p) + { return p->protocol(); } + + static void dump(packet p, std::ostream & os); }; + + /** \brief IpV4 packet typedef */ + typedef IpV4PacketType::packet IpV4Packet; } ///////////////////////////////hh.e//////////////////////////////////////// +#endif +#ifndef SENF_PACKETS_DECL_ONLY //#include IpV4Packet.cci" //#include "IpV4Packet.ct" -#include "IpV4Packet.cti" +//#include "IpV4Packet.cti" #endif @@ -121,4 +158,6 @@ namespace senf { // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: