// Custom includes
#include "TLVPacket.hh"
#include <senf/Packets.hh>
+#include "../DefaultBundle/EthernetPacket.hh"
+#include <senf/Utils/hexdump.hh>
#include "../../Utils/auto_unit_test.hh"
#include <boost/test/test_tools.hpp>
-#include <vector>
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
using namespace senf;
+namespace {
-void check_TLVPacket(GenericTLVPacket &tlvPacket, boost::uint32_t type, boost::uint32_t length)
+void check_TLVPacket(GenericTLVPacket &tlvPacket, boost::uint8_t type, boost::uint32_t length)
{
- BOOST_CHECK_EQUAL( tlvPacket->type(), type );
- BOOST_CHECK_EQUAL( tlvPacket->length(), length );
-
- BOOST_CHECK_EQUAL( tlvPacket->value().size(), length);
- for (int i=0, j=tlvPacket->value().size(); i<j; i++)
- BOOST_CHECK_EQUAL( tlvPacket->value()[i], i );
+ BOOST_CHECK_EQUAL( tlvPacket->type(), type );
+ BOOST_CHECK_EQUAL( tlvPacket->length(), length );
+ BOOST_CHECK_EQUAL( tlvPacket->value().size(), int(length) );
+ senf::PacketData::iterator dataIterator (tlvPacket->value().begin());
+ for (unsigned i=0; i<length; i++) {
+ BOOST_CHECK_EQUAL( *dataIterator, i );
+ dataIterator++;
+ }
}
-
-
-BOOST_AUTO_UNIT_TEST(GenericTLVPacket_static)
-{
- // check static values:
- // number of bytes to allocate for a new GenericTLVPacket should be 2
- BOOST_CHECK_EQUAL( GenericTLVPacket::type::initSize(), 2u );
}
check_TLVPacket( tlvPacket, 0x01, 0x0Au );
}
+
BOOST_AUTO_UNIT_TEST(GenericTLVPacket_parse_packet_with_extended_length)
{
unsigned char data[] = {
BOOST_AUTO_UNIT_TEST(GenericTLVPacket_create_packet_with_simple_length)
{
+ unsigned char value[] = {
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09
+ };
GenericTLVPacket tlvPacket (GenericTLVPacket::create());
tlvPacket->type() = 42u;
- for (uint8_t i=0; i<10; i++)
- tlvPacket->value().push_back( i);
- tlvPacket.finalizeAll();
+ tlvPacket->value( value);
+ tlvPacket.finalizeThis();
check_TLVPacket( tlvPacket, 42u, 0x0Au );
+
+ unsigned char data[] = {
+ 0x2a, // type
+ 0x0A, // first bit not set, length=10
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 // value
+ };
+ BOOST_CHECK( equal( tlvPacket.data().begin(), tlvPacket.data().end(), data ));
}
-/**
-BOOST_AUTO_UNIT_TEST(TLVPacket_create_packet_with_extended_length)
+
+BOOST_AUTO_UNIT_TEST(GenericTLVPacket_create_packet_with_extended_length)
{
+ unsigned char value[255];
+ for (unsigned i=0; i<sizeof(value); i++)
+ value[i] = i;
GenericTLVPacket tlvPacket (GenericTLVPacket::create());
tlvPacket->type() = 42u;
- for (uint8_t i=0; i<129; i++)
- tlvPacket->value().push_back( i);
- tlvPacket.finalizeAll();
-
- check_TLVPacket( tlvPacket, 42u, 129u );
-}
+ tlvPacket->value( value);
+ tlvPacket.finalizeThis();
-
-BOOST_AUTO_UNIT_TEST(TLVPacket_create_invalid_packet)
-{
+ check_TLVPacket( tlvPacket, 42u, sizeof(value) );
+ unsigned char data[] = {
+ 0x2a, // type
+ 0x81, // first and last bit set => one byte length following
+ 0xff, // length (255 bytes value)
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 // first bytes of value
+ };
+ BOOST_CHECK( equal(
+ tlvPacket.data().begin(),
+ boost::next( tlvPacket.data().begin(), sizeof(data)),
+ data ));
}
-BOOST_AUTO_UNIT_TEST(TLVFixPacket_static)
+BOOST_AUTO_UNIT_TEST(GenericTLVPacket_create_invalid_packet)
{
- // check static values:
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt8Parser> > TestTLVPacket8;
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt24Parser> > TestTLVPacket24;
+ GenericTLVPacket tlvPacket (GenericTLVPacket::create());
+ tlvPacket->type() = 42u;
+ tlvPacket.finalizeThis();
- BOOST_CHECK_EQUAL( TestTLVPacket8::type::initSize(), 4+1u );
- BOOST_CHECK_EQUAL( TestTLVPacket24::type::initSize(), 4+3u );
-}
-
-
-template <class TLVFixPacketType>
-void test_TLVFixPacket_parsing(unsigned lengthParser_size)
-{
- std::vector<char> data;
- data.push_back(0x01); data.push_back(0x23); data.push_back(0x45); data.push_back(0x67); // type
- data.insert(data.end(), lengthParser_size-1, 0x00);
- data.push_back(0x0A); // length
- for( int i=0; i < 10; i++ ) {
- data.push_back(i); // payload
- }
- TLVFixPacketType tlvPacket (TLVFixPacketType::create(
- boost::make_iterator_range(data.begin(), data.end())));
- check_TLVPacket( tlvPacket, 0x01234567u, 0x0Au );
-}
-
-BOOST_AUTO_UNIT_TEST(TLVFixPacket_parse_packet)
-{
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt8Parser> > TestTLVPacket8;
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt16Parser> > TestTLVPacket16;
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt24Parser> > TestTLVPacket24;
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt32Parser> > TestTLVPacket32;
+ unsigned char value[255];
+ for (unsigned i=0; i<sizeof(value); i++)
+ value[i] = i;
- test_TLVFixPacket_parsing<TestTLVPacket8>( UInt8Parser::fixed_bytes);
- test_TLVFixPacket_parsing<TestTLVPacket16>( UInt16Parser::fixed_bytes);
- test_TLVFixPacket_parsing<TestTLVPacket24>( UInt24Parser::fixed_bytes);
- test_TLVFixPacket_parsing<TestTLVPacket32>( UInt32Parser::fixed_bytes);
+ BOOST_CHECK_THROW( tlvPacket->value( value), TLVLengthException);
+ tlvPacket->maxLengthValue( sizeof(value));
+ tlvPacket->value( value);
+ tlvPacket.finalizeThis();
+ check_TLVPacket( tlvPacket, 42u, sizeof(value) );
}
-template <class TLVFixPacketType>
-void test_TLVFixPacket_creating()
-{
- std::string payload ("Hello, world!");
- TLVFixPacketType tlvPacket (TLVFixPacketType::create());
- tlvPacket->type() = 42u;
- DataPacket::createAfter( tlvPacket, payload );
- tlvPacket.finalizeAll();
-
- BOOST_CHECK_EQUAL( tlvPacket->type(), 42u);
- BOOST_CHECK_EQUAL( tlvPacket->length(), 13u);
-
- PacketData & tlvPacket_value (tlvPacket.next().data());
- BOOST_CHECK( equal( tlvPacket_value.begin(), tlvPacket_value.end(), payload.begin() ));
-}
+namespace {
-BOOST_AUTO_UNIT_TEST(TLVFixPacket_create_packet)
-{
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt8Parser> > TestTLVPacket8;
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt16Parser> > TestTLVPacket16;
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt24Parser> > TestTLVPacket24;
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt32Parser> > TestTLVPacket32;
+ struct TestMacAddressTLVPacketParser : public BaseTLVPacketParser
+ {
+ # include SENF_PARSER()
+ SENF_PARSER_INHERIT ( BaseTLVPacketParser );
+ SENF_PARSER_VECTOR ( value, bytes(length), senf::MACAddressParser );
+ SENF_PARSER_FINALIZE( TestMacAddressTLVPacketParser );
+ };
- test_TLVFixPacket_creating<TestTLVPacket8>();
- test_TLVFixPacket_creating<TestTLVPacket16>();
- test_TLVFixPacket_creating<TestTLVPacket24>();
- test_TLVFixPacket_creating<TestTLVPacket32>();
-}
-
-
-template <class TLVFixPacketType>
-void test_invalid_TLVFixPacket_creating(boost::uint32_t max_value)
-{
- TLVFixPacketType tlvPacket (TLVFixPacketType::create());
- tlvPacket->type() = 42u;
- DataPacket payload (DataPacket::createAfter( tlvPacket, max_value+1));
- //DataPacket::createAfter( payload, 1); // this is one byte to much.
- BOOST_CHECK_THROW( tlvPacket.finalizeAll(), UnsuportedTLVPacketException);
+ struct TestMacAddressTLVPacketType
+ : public PacketTypeBase,
+ public PacketTypeMixin<TestMacAddressTLVPacketType>
+ {
+ typedef PacketTypeMixin<TestMacAddressTLVPacketType> mixin;
+ typedef TestMacAddressTLVPacketParser parser;
+
+ using mixin::nextPacketRange;
+ using mixin::init;
+ using mixin::initSize;
+
+ static void finalize(ConcretePacket<TestMacAddressTLVPacketType> p) {
+ p->shrinkLength();
+ }
+ };
+ typedef ConcretePacket<TestMacAddressTLVPacketType> TestMacAddressTLVPacket;
}
-BOOST_AUTO_UNIT_TEST(TLVFixPacket_create_invalid_packet)
+BOOST_AUTO_UNIT_TEST(TestMacAddressTLVPacket_create)
{
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt8Parser> > TestTLVPacket8;
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt16Parser> > TestTLVPacket16;
- typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt24Parser> > TestTLVPacket24;
+ TestMacAddressTLVPacket tlvPacket (TestMacAddressTLVPacket::create());
+ tlvPacket->type() = 42;
+ tlvPacket->value().push_back( senf::MACAddress::from_string("01:23:45:67:89:ab") );
+ tlvPacket->value().push_back( senf::MACAddress::from_string("cd:ef:01:23:45:67") );
+ tlvPacket.finalizeThis();
- test_invalid_TLVFixPacket_creating<TestTLVPacket8> ( UInt8Parser::max_value);
- test_invalid_TLVFixPacket_creating<TestTLVPacket16>( UInt16Parser::max_value);
- test_invalid_TLVFixPacket_creating<TestTLVPacket24>( UInt24Parser::max_value);
+ unsigned char data[] = {
+ 0x2a, // type
+ 0x0c, // length
+ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x01, 0x23, 0x45, 0x67 // value
+ };
+ BOOST_CHECK( equal( tlvPacket.data().begin(), tlvPacket.data().end(), data ));
}
-*/
-
///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_
projects / senf.git / blobdiff