X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FMPEGDVBBundle%2FDTCPPacket.hh;fp=senf%2FPackets%2FMPEGDVBBundle%2FDTCPPacket.hh;h=35550a3b8cc90dc841d62562e96f2283d2cbf821;hb=9cb871b939efe93e35dd96808d25089399acfc46;hp=f5bdbe2c80ebc329c799e7df0a35cc2628dedac5;hpb=3a43b572a2c0028b353d47e86fa7546633d6e2cf;p=senf.git diff --git a/senf/Packets/MPEGDVBBundle/DTCPPacket.hh b/senf/Packets/MPEGDVBBundle/DTCPPacket.hh index f5bdbe2..35550a3 100644 --- a/senf/Packets/MPEGDVBBundle/DTCPPacket.hh +++ b/senf/Packets/MPEGDVBBundle/DTCPPacket.hh @@ -40,9 +40,9 @@ namespace senf { # define DTCP_V6_MCADDRESS "FF02:0:0:0:0:0:1:4" # define DTCP_UDP_PORT 652 - struct DTCPIPv4AddressListParser : public PacketParserBase + struct DTCPIPv4AddressListParser : public PacketParserBase { -# include SENF_PARSER() +# include SENF_PARSER() SENF_PARSER_PRIVATE_FIELD( fbipCount_, UInt8Parser ); //pkgdraw: name= - SENF_PARSER_PRIVATE_FIELD ( reserved1_, UInt8Parser ); // must be zero + SENF_PARSER_PRIVATE_FIELD ( reserved1_, UInt8Parser ); // must be zero // Go back to fbipCount so the variant has access to that field SENF_PARSER_GOTO( fbipCount ); SENF_PARSER_VARIANT ( fbipList_, ipVersion, ( ids(na, has_v4fbipList, init_v4fbipList, - key(4, DTCPIPv4AddressListParser)) ) + key(4, DTCPIPv4AddressListParser)) ) ( ids(na, has_v6fbipList, init_v6fbipList, key(6, DTCPIPv6AddressListParser)) ) ); @@ -117,12 +117,12 @@ namespace senf { typedef DTCPIPv6AddressListParser::fbips_t v6fbipList_t; v6fbipList_t v6fbipList() { return fbipList_().get<1>().fbips(); } - + SENF_PARSER_FINALIZE(DTCPHelloPacketParser); }; - + /** \brief DTCP HELLO packet - + \par Packet type (typedef): \ref DTCPHelloPacket @@ -140,14 +140,14 @@ namespace senf { typedef PacketTypeMixin mixin; typedef ConcretePacket packet; typedef DTCPHelloPacketParser parser; - + using mixin::nextPacketRange; using mixin::init; using mixin::initSize; - + static void dump(packet p, std::ostream & os); }; - + /** \brief DTCP packet typedef */ typedef DTCPHelloPacketType::packet DTCPHelloPacket; }