X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv6Extensions.test.cc;h=d64adb0ad7ac2597604dd3557dcb133f39c92810;hb=57daeae6f2e924ce3f16f9677c3474f531cba9e5;hp=635fba29b466ef69ffbe8825cf7799fc7523c98c;hpb=3fe2ed38b800bcb57afff676698462e763724245;p=senf.git diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc index 635fba2..d64adb0 100644 --- a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc +++ b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc @@ -39,9 +39,9 @@ #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(ipv6Extensions_fragment) +SENF_AUTO_UNIT_TEST(ipv6Extensions_fragment) { // Just for the fun of it, we test a nice chain: A fragment of a fragmented UDP packet unsigned char Fragment_packetData[] = { @@ -73,9 +73,9 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_fragment) BOOST_CHECK_EQUAL( pFragment_packet->version(), 6u ); BOOST_CHECK_EQUAL( pFragment_packet->length(), 20u ); BOOST_CHECK_EQUAL( pFragment_packet->nextHeader(), 44u ); - BOOST_CHECK_EQUAL( pFragment_packet->source().value(), + BOOST_CHECK_EQUAL( pFragment_packet->source().value(), senf::INet6Address::from_string("2001::1") ); - BOOST_CHECK_EQUAL( pFragment_packet->destination().value(), + BOOST_CHECK_EQUAL( pFragment_packet->destination().value(), senf::INet6Address::from_string("2001::2") ); std::ostringstream oss (std::ostringstream::out); @@ -104,15 +104,15 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_fragment) } -BOOST_AUTO_UNIT_TEST(ipv6Extensions_routing) +SENF_AUTO_UNIT_TEST(ipv6Extensions_routing) { unsigned char Routing_packetData[] = { // IP header - 0x60, 0x30, 0x00, 0x00, + 0x60, 0x30, 0x00, 0x00, 0x00, 0x10, // payload Length 0x2b, // next Header (43 = Routing Header) 0xff, // Hop Limit - 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x02, 0xff, 0xfe, 0x00, 0x02, 0x00, // Src Addr 0x35, 0x55, 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77, 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, // Dest. Addr @@ -128,17 +128,17 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_routing) 0xa3, 0xd3, // checksum (incorrect in wireshark capture file, should be 0xa3c4) 0x00, 0x00, 0x00, 0x00 }; - + senf::IPv6Packet pRouting_packet (senf::IPv6Packet::create(Routing_packetData)); BOOST_CHECK_EQUAL( pRouting_packet->version(), 6u ); BOOST_CHECK_EQUAL( pRouting_packet->length(), 16u ); BOOST_CHECK_EQUAL( pRouting_packet->nextHeader(), 43u ); - BOOST_CHECK_EQUAL( pRouting_packet->source().value(), + BOOST_CHECK_EQUAL( pRouting_packet->source().value(), senf::INet6Address::from_string("fe80::201:2ff:fe00:200") ); - BOOST_CHECK_EQUAL( pRouting_packet->destination().value(), + BOOST_CHECK_EQUAL( pRouting_packet->destination().value(), senf::INet6Address::from_string("3555:5555:6666:6666:7777:7777:8888:8888")); - + std::ostringstream oss (std::ostringstream::out); SENF_CHECK_NO_THROW( pRouting_packet.dump( oss)); @@ -150,7 +150,7 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_routing) BOOST_CHECK_EQUAL( pRouting_extension->headerLength(), 0x00 ); BOOST_CHECK_EQUAL( pRouting_extension->routingType(), 0x00 ); BOOST_CHECK_EQUAL( pRouting_extension->segmentsLeft(), 0x00); - + BOOST_CHECK_EQUAL( pRouting_extension->reserved(), 0u); BOOST_REQUIRE( pRouting_extension.next().is() ); @@ -161,16 +161,16 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_routing) } -BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse) +SENF_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse) { unsigned char HopByHop_packetData[] = { 0x60, 0x00, 0x00, 0x00, // IP version, class, flow label 0x00, 0x24, // payload length 0x00, // next header: IPv6 hop-by-hop option (0) 0x01, // hop limit (1) - 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x19, 0xb9, 0xff, 0xfe, 0xeb, 0xb2, 0x26, // IPv6 Source address - 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, // IPv6 Destination address ff02::16 // HopByHop option 0x3a, // next Header (ICMPv6) @@ -191,7 +191,7 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse) BOOST_CHECK_EQUAL( pHop_packet->version(), 6u ); BOOST_CHECK_EQUAL( pHop_packet->length(), 36u ); BOOST_CHECK_EQUAL( pHop_packet->nextHeader(), 0u ); - BOOST_CHECK_EQUAL( pHop_packet->source().value(), + BOOST_CHECK_EQUAL( pHop_packet->source().value(), senf::INet6Address::from_string("fe80::219:b9ff:feeb:b226") ); BOOST_CHECK_EQUAL( pHop_packet->destination().value(), senf::INet6Address::from_string("ff02::16") ); @@ -209,12 +209,12 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse) 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 pICMPv6 (pHop_extension.next().as()); @@ -223,7 +223,8 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse) BOOST_CHECK_EQUAL( pICMPv6->checksum(), 0x50cc); } -BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create) + +SENF_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create) { std::ostringstream oss (std::ostringstream::out); unsigned char HopByHop_packetData[] = { @@ -236,9 +237,9 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create) 0x00, 0x24, // payload length 0x00, // next header: IPv6 hop-by-hop option (0) 0x01, // hop limit (1) - 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // IPv6 Source address + 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // IPv6 Source address 0x02, 0x19, 0xb9, 0xff, 0xfe, 0xeb, 0xb2, 0x26, // (fe80::219:b9ff:feeb:b226) - 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // IPv6 Destination address + 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // IPv6 Destination address 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, // (ff02::16) // HopByHop option 0x3a, // next Header (ICMPv6) @@ -276,16 +277,16 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create) 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::IPv6GenericOptionParser opt ( + optC.push_back_space().init()); opt.altAction() = 0u; opt.changeFlag() = 0u; opt.optionType() = 5u; unsigned char val[] = {0x00, 0x00}; - opt.setPayload(val); + opt.value(val); } } @@ -306,52 +307,84 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create) 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::value -senf::init_bytes::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) { - 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, - // padding (PadN option: type, length, 0-padding) - 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00 - }; - +SENF_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() ); + senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optC (p->options() ); { - IPv6ChecksumOptionTLVParser opt ( - optC.push_back_space().init()); - SENF_CHECK_NO_THROW( opt.slfNetType() = 1u) ; + IPv6ChecksumOptionParser opt ( + optC.push_back_space().init()); 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() ); + p.data().begin(), p.data().end() ); +} + + +SENF_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 + 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(data) ); + BOOST_CHECK_EQUAL( p->nextHeader(), 0x3a); + + { + 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 opt ( listIter->as()); + BOOST_CHECK_EQUAL( opt.extendedType(), 0x4d); + BOOST_CHECK_EQUAL( opt.checksum(), 0x01234567); + } + + std::ostringstream oss (std::ostringstream::out); + SENF_CHECK_NO_THROW( p.dump( oss)); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_