From: tho Date: Thu, 24 Sep 2009 09:14:11 +0000 (+0000) Subject: Packets/80221Bundle/MIHPacket: fixed EtherType registration X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=8dbb3db32c2a258edcbd70e3f1b526e7e3b97b49;hp=d9143facc7806e2c03ee357fd9697ea9a1277377;p=senf.git Packets/80221Bundle/MIHPacket: fixed EtherType registration Packets: added extra-test with AllBundles to find duplicated registrations git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1439 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/senf/Packets/80221Bundle/MIHPacket.cc b/senf/Packets/80221Bundle/MIHPacket.cc index 748bec4..cf7fb41 100644 --- a/senf/Packets/80221Bundle/MIHPacket.cc +++ b/senf/Packets/80221Bundle/MIHPacket.cc @@ -36,7 +36,7 @@ ///////////////////////////////cc.p//////////////////////////////////////// namespace { - SENF_PACKET_REGISTRY_REGISTER( senf::EtherTypes, 0x86dd, senf::MIHPacket); + SENF_PACKET_REGISTRY_REGISTER( senf::EtherTypes, 0x8917, senf::MIHPacket); } /////////////////////////////////////////////////////////////////////////// diff --git a/senf/Packets/extra-tests/AllBundles.test.cc b/senf/Packets/extra-tests/AllBundles.test.cc new file mode 100644 index 0000000..27553a4 --- /dev/null +++ b/senf/Packets/extra-tests/AllBundles.test.cc @@ -0,0 +1,76 @@ +// $Id$ +// +// Copyright (C) 2009 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Thorsten Horstmann +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the +// Free Software Foundation, Inc., +// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +/** \file + \brief AllBundles unit tests */ + +//#include "PacketLink.test.hh" +//#include "PacketLink.test.ih" + +// Custom includes +#include +#include + +#include +#include + +#define prefix_ +///////////////////////////////cc.p//////////////////////////////////////// + +BOOST_AUTO_UNIT_TEST(packetLink) +{ + // This test shall test, if there is now duplicated packet registration in AllBundles. + // The test will fail at the start with an assertion error in this case. + + boost::uint8_t data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, // source mac + 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, // target mac + 0x86, 0xdd, // ethertype + + 0x60, 0x00, 0x00, 0x00, // IP version, class, + // flow label + 0x00, 0x00, // payload length + 0x3B, // no next header + 0x10, // hop limit + 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // source ip + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, + 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // target ip + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 }; + + senf::EthernetPacket p (senf::EthernetPacket::create(data)); + + BOOST_REQUIRE( p.next() ); + BOOST_CHECK( p.next().is() ); +} + +///////////////////////////////cc.e//////////////////////////////////////// +#undef prefix_ + + +// Local Variables: +// mode: c++ +// fill-column: 100 +// comment-column: 40 +// c-file-style: "senf" +// indent-tabs-mode: nil +// ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// End: diff --git a/senf/Packets/extra-tests/SConscript b/senf/Packets/extra-tests/SConscript new file mode 100644 index 0000000..3a65f61 --- /dev/null +++ b/senf/Packets/extra-tests/SConscript @@ -0,0 +1,10 @@ +# -*- python -*- + +Import('env') +import SENFSCons + +########################################################################### + +sources, tests, includes = SENFSCons.Glob(env) + +env.BoostUnitTest('test', tests + ['${LOCALLIBDIR}/AllBundles${OBJADDSUFFIX}${OBJSUFFIX}']) diff --git a/senf/Packets/extra-tests/main.test.cc b/senf/Packets/extra-tests/main.test.cc new file mode 100644 index 0000000..9f91d17 --- /dev/null +++ b/senf/Packets/extra-tests/main.test.cc @@ -0,0 +1,53 @@ +// $Id$ +// +// Copyright (C) 2006 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Stefan Bund +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the +// Free Software Foundation, Inc., +// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +// Definition of non-inline non-template functions + +//#include "test.hh" +//#include "test.ih" + +// Custom includes +#define BOOST_AUTO_TEST_MAIN +#include +#include + +#define prefix_ +///////////////////////////////cc.p//////////////////////////////////////// + +BOOST_AUTO_UNIT_TEST(testMain) +{ + BOOST_CHECK( true ); +} + +///////////////////////////////cc.e//////////////////////////////////////// +#undef prefix_ + + +// Local Variables: +// mode: c++ +// fill-column: 100 +// c-file-style: "senf" +// indent-tabs-mode: nil +// ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 +// End: