-// Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// $Id$
+//
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
// Stefan Bund <g0dil@berlios.de>
//
// This program is free software; you can redistribute it and/or modify
// Custom includes
#include "Packets.hh"
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
#include <boost/test/test_tools.hpp>
#define prefix_
struct SimpleParser : public senf::PacketParserBase
{
- SENF_PACKET_PARSER_INIT(SimpleParser);
+# include SENF_FIXED_PARSER()
+ SENF_PARSER_FINALIZE(SimpleParser);
using senf::PacketParserBase::check;
using senf::PacketParserBase::validate;
struct FooParser : public senf::PacketParserBase
{
- SENF_PACKET_PARSER_INIT(FooParser);
+# include SENF_FIXED_PARSER()
+
+ SENF_PARSER_FIELD( name, senf::UInt16Parser );
+ SENF_PARSER_FIELD( id, senf::Int32Parser );
- SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS(
- ((Field)( name, senf::Parse_UInt16 ))
- ((Field)( id, senf::Parse_Int32 )) );
+ SENF_PARSER_FINALIZE(FooParser);
};
struct BarParser : public senf::PacketParserBase
{
- SENF_PACKET_PARSER_INIT(BarParser);
+# include SENF_PARSER()
+
+ SENF_PARSER_FIELD( name, senf::UInt16Parser );
+ SENF_PARSER_FIELD( id, senf::Int32Parser );
- SENF_PACKET_PARSER_DEFINE_FIELDS(
- ((Field)( name, senf::Parse_UInt16 ))
- ((Field)( id, senf::Parse_Int32 )) );
+ SENF_PARSER_FINALIZE(BarParser);
};
}
// otherwise ...
BOOST_CHECK_EQUAL( FooParser::fixed_bytes+0, 6u );
BOOST_CHECK_EQUAL( BarParser(pi->data().begin(),&pi->data()).bytes(), 6u );
- BOOST_CHECK_EQUAL( senf::bytes(senf::Parse_UInt16(pi->data().begin(),&pi->data())), 2u );
+ BOOST_CHECK_EQUAL( senf::bytes(senf::UInt16Parser(pi->data().begin(),&pi->data())), 2u );
BOOST_CHECK_EQUAL( senf::bytes(FooParser(pi->data().begin(),&pi->data())), 6u );
BOOST_CHECK_EQUAL( senf::bytes(BarParser(pi->data().begin(),&pi->data())), 6u );
BOOST_AUTO_UNIT_TEST(safePacketParser)
{
senf::PacketInterpreter<VoidPacket>::ptr pi (senf::PacketInterpreter<VoidPacket>::create(6u));
- senf::SafePacketParser<senf::Parse_UInt16> p;
+ senf::SafePacketParserWrapper<senf::UInt16Parser> p;
BOOST_CHECK( !p );
- p = senf::Parse_UInt16(pi->data().begin(),&pi->data());
+ p = senf::UInt16Parser(pi->data().begin(),&pi->data());
BOOST_CHECK( p );
(*p) = 0x1234u;