X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FMPEGDVBBundle%2FGREPacket.hh;h=e3efe734a2fdad6369dc40e1c71149b0d23911a7;hb=4d90b955bf3590e215488395d1c9cec827476e07;hp=99434a29dd8f8937ed5a5ad6b586e74105a60c3a;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Packets/MPEGDVBBundle/GREPacket.hh b/senf/Packets/MPEGDVBBundle/GREPacket.hh index 99434a2..e3efe73 100644 --- a/senf/Packets/MPEGDVBBundle/GREPacket.hh +++ b/senf/Packets/MPEGDVBBundle/GREPacket.hh @@ -39,11 +39,11 @@ namespace senf { /** \brief Parse a GRE packet Parser implementing the header of a General Routing Encapsulation (GRE, RFC 2784) Packet - + \see GREPacketType */ struct GREChecksumParser : public PacketParserBase { -# include SENF_PARSER() +# include SENF_PARSER() SENF_PARSER_FIELD ( checksum1_, UInt16Parser ); SENF_PARSER_PRIVATE_FIELD ( reserved1_, UInt16Parser ); SENF_PARSER_FINALIZE(GREChecksumParser); @@ -59,16 +59,16 @@ namespace senf { SENF_PARSER_FIELD ( protocol_type, UInt16Parser ); SENF_PARSER_PRIVATE_VARIANT ( checksum_, checksum_present, (VoidPacketParser) (GREChecksumParser) ); - + SENF_PARSER_FINALIZE( GREPacketParser ); - private: + private: UInt16Parser checksum() const /// only defined if checksum_present() == \c true { return checksum_().get<1>().checksum1_(); } }; - + /** \brief GRE packet - + \par Packet type (typedef): \ref GREPacket @@ -85,12 +85,12 @@ namespace senf { typedef PacketTypeMixin mixin; typedef ConcretePacket packet; typedef GREPacketParser parser; - + using mixin::nextPacketRange; using mixin::nextPacketType; using mixin::init; using mixin::initSize; - + static void dump(packet p, std::ostream & os); static EtherTypes::key_t nextPacketKey(packet p) { return p->protocol_type(); @@ -99,18 +99,18 @@ namespace senf { p->protocol_type() << key(p.next(nothrow)); p->version_number() = 0; // as per RFC2784, 2.3.1 - if (p->checksum_present()) { + if (p->checksum_present()) { // compute checksum } else { // ??? } } }; - + /** \brief GRE packet typedef */ typedef GREPacketType::packet GREPacket; - - + + }