BOOST_CHECK_EQUAL( listIter->altAction(), 0u);
BOOST_CHECK_EQUAL( listIter->changeFlag(), 0u);
BOOST_CHECK_EQUAL( listIter->optionType(), 5u);
- BOOST_CHECK_EQUAL( listIter->optionLength(), 2u);
+ BOOST_CHECK_EQUAL( listIter->length(), 2u);
++listIter;
BOOST_CHECK_EQUAL( listIter->altAction(), 0u);
BOOST_CHECK_EQUAL( listIter->changeFlag(), 0u);
BOOST_CHECK_EQUAL( listIter->optionType(), 2u);
- BOOST_CHECK_EQUAL( listIter->optionLength(), 0);
+ BOOST_CHECK_EQUAL( listIter->length(), 0);
BOOST_REQUIRE( pHop_extension.next().is<senf::ICMPv6Packet>() );
senf::ICMPv6Packet pICMPv6 (pHop_extension.next().as<senf::ICMPv6Packet>());
BOOST_CHECK_EQUAL( pICMPv6->checksum(), 0x50cc);
}
+
BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create)
{
std::ostringstream oss (std::ostringstream::out);
senf::IPv6HopByHopOptionsPacket pext (senf::IPv6HopByHopOptionsPacket::createAfter(ip) );
pext->nextHeader() = 58u;
- pext->headerLength() = 0u;
{
senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optC(pext->options() );
{
- senf::IPv6GenericOptionTLVParser opt ( optC.push_back_space().init<senf::IPv6GenericOptionTLVParser>());
+ senf::IPv6GenericOptionParser opt (
+ optC.push_back_space().init<senf::IPv6GenericOptionParser>());
opt.altAction() = 0u;
opt.changeFlag() = 0u;
opt.optionType() = 5u;
unsigned char val[] = {0x00, 0x00};
- opt.setPayload(val);
+ opt.value(val);
}
}
eth.data().begin(), eth.data().end() );
}
+
namespace {
- struct IPv6ChecksumOptionTLVParser : public senf::IPv6OptionTLVParser
+ struct IPv6ChecksumOptionParser : public senf::IPv6OptionParser
{
# include SENF_PARSER()
- SENF_PARSER_INHERIT ( IPv6OptionTLVParser );
- SENF_PARSER_FIELD ( slfNetType, senf::UInt8Parser );
- SENF_PARSER_FIELD ( checksum, senf::UInt32Parser );
+ SENF_PARSER_INHERIT ( IPv6OptionParser );
+ SENF_PARSER_FIELD ( extendedType, senf::UInt8Parser );
+ SENF_PARSER_FIELD ( checksum, senf::UInt32Parser );
+ SENF_PARSER_FINALIZE ( IPv6ChecksumOptionParser );
SENF_PARSER_INIT() {
- optionType() = typeCode;
- optionLength() = senf::init_bytes<IPv6ChecksumOptionTLVParser>::value -senf::init_bytes<IPv6OptionTLVParser>::value;
- slfNetType() = SN_typeCode;
+ optionType() = typeId;
+ length() = 5u;
+ extendedType() = extendedTypeId;
}
- SENF_PARSER_FINALIZE ( IPv6ChecksumOptionTLVParser );
- static const boost::uint8_t typeCode = 0x0d;
- static const boost::uint8_t SN_typeCode = 0x4d;
+
+ static const boost::uint8_t typeId = 0x0d;
+ static const boost::uint8_t extendedTypeId = 0x4d;
};
}
-BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create_SN) {
+BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create_SN)
+{
+ senf::IPv6HopByHopOptionsPacket p ( senf::IPv6HopByHopOptionsPacket::create() );
+ p->nextHeader() = 0x3a;
+ {
+ senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optC (p->options() );
+ {
+ IPv6ChecksumOptionParser opt (
+ optC.push_back_space().init<IPv6ChecksumOptionParser>());
+ opt.checksum() = 0x01234567u;
+ }
+ }
+
+ unsigned char data[] = {
+ 0x3a, 0x01, // Hop-By-Hop Header (nextHeader, length)
+ 0x0d, 0x05, // option type, length
+ // option value: extendedType, checksum
+ 0x4d, 0x01, 0x23, 0x45, 0x67,
+ // padding (PadN option: type, length, 0-padding)
+ 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ SENF_CHECK_EQUAL_COLLECTIONS( data, data+sizeof(data),
+ p.data().begin(), p.data().end() );
+}
+
+
+BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse_SN)
+{
unsigned char data[] = {
0x3a, 0x01, // Hop-By-Hop Header (nextHeader, length)
0x0d, 0x05, // option type, length
// option value: slfNetType, checksum
- 0x01, 0x01, 0x23, 0x45, 0x67,
+ 0x4d, 0x01, 0x23, 0x45, 0x67,
// padding (PadN option: type, length, 0-padding)
0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00
};
- senf::IPv6HopByHopOptionsPacket p ( senf::IPv6HopByHopOptionsPacket::create() );
- p->nextHeader() = 0x3a;
+ senf::IPv6HopByHopOptionsPacket p ( senf::IPv6HopByHopOptionsPacket::create(data) );
+ BOOST_CHECK_EQUAL( p->nextHeader(), 0x3a);
+
{
- senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optC(p->options() );
- {
- IPv6ChecksumOptionTLVParser opt (
- optC.push_back_space().init<IPv6ChecksumOptionTLVParser>());
- SENF_CHECK_NO_THROW( opt.slfNetType() = 1u) ;
- opt.checksum() = 0x01234567u;
- }
+ typedef senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optContainer_t;
+ optContainer_t optC (p->options() );
+ optContainer_t::iterator listIter (optC.begin());
+
+ BOOST_CHECK_EQUAL( listIter->optionType(), 0x0d);
+ BOOST_CHECK( listIter->is<IPv6ChecksumOptionParser>());
+ IPv6ChecksumOptionParser opt ( listIter->as<IPv6ChecksumOptionParser>());
+ BOOST_CHECK_EQUAL( opt.extendedType(), 0x4d);
+ BOOST_CHECK_EQUAL( opt.checksum(), 0x01234567);
}
- SENF_CHECK_EQUAL_COLLECTIONS( data, data+sizeof(data),
- p.data().begin(), p.data().end() );
+ std::ostringstream oss (std::ostringstream::out);
+ SENF_CHECK_NO_THROW( p.dump( oss));
}
///////////////////////////////cc.e////////////////////////////////////////