X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FEthernetPacket.test.cc;h=f3dca00835558172349035d5bfeee65c22fa0f4b;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=176eef344598c26e78924b9f6d066453ff4697c6;hpb=67608d39cb73231d6deaae285aa5477762246e50;p=senf.git

diff --git a/Packets/DefaultBundle/EthernetPacket.test.cc b/Packets/DefaultBundle/EthernetPacket.test.cc
index 176eef3..f3dca00 100644
--- a/Packets/DefaultBundle/EthernetPacket.test.cc
+++ b/Packets/DefaultBundle/EthernetPacket.test.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// 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
 // it under the terms of the GNU General Public License as published by
@@ -20,13 +20,15 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief EthernetPacket unit tests */
 
 //#include "EthernetPacket.test.hh"
 //#include "EthernetPacket.test.ih"
 
 // Custom includes
 #include "EthernetPacket.hh"
+#include "LlcSnapPacket.hh"
 #include "IPv4Packet.hh"
 
 #include "../../Utils/auto_unit_test.hh"
@@ -37,16 +39,19 @@
 
 BOOST_AUTO_UNIT_TEST(ethernetPacket_parse)
 {
-    senf::PacketData::byte data[] = { 
+    senf::PacketData::byte data[] = {
         0x01, 0x02, 0x03, 0x04, 0x05, 0x06,  // destination MAC
         0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,  // source MAC
-        0x10, 0x11 
+        0x10, 0x11
     };                        // EtherType
     senf::EthernetPacket p (senf::EthernetPacket::create(data));
 
     BOOST_CHECK_EQUAL( p->destination()[3], 0x04 );
     BOOST_CHECK_EQUAL( p->source()[0], 0x07 );
     BOOST_CHECK_EQUAL( p->type_length(), 0x1011 );
+
+    std::ostringstream oss (std::ostringstream::out);
+    SENF_CHECK_NO_THROW( p.dump( oss));
 }
 
 BOOST_AUTO_UNIT_TEST(ethernetPacket_parse_chain)
@@ -57,7 +62,7 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_parse_chain)
         0x81, 0x00,                          // EtherType: VLan
         0x92, 0x34,                          // VLAN prio, cfi, id
         0xab, 0xcd,                          // EtherType
-        0xf0, 0xf1, 0xf2, 0xf3, 0xf4 
+        0xf0, 0xf1, 0xf2, 0xf3, 0xf4
     };      // Payload
     senf::EthernetPacket p (senf::EthernetPacket::create(data));
 
@@ -76,66 +81,48 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_create)
     senf::EthernetPacket eth (senf::EthernetPacket::create());
     eth->source() = senf::MACAddress::from_string("01:02:03:04:05:06");
     eth->destination() = senf::MACAddress::from_string("07:08:09:0a:0b:0c");
-    
+
     senf::EthVLanPacket vlan (senf::EthVLanPacket::createAfter(eth));
     vlan->priority() = 9u;
     vlan->cfi() = true;
     vlan->vlanId() = 0x234u;
 
-    eth.finalize();
+    eth.finalizeAll();
     BOOST_CHECK_EQUAL(eth->type_length(), 0x8100u);
     BOOST_CHECK_EQUAL(vlan->type(), 0u);
 
     senf::IPv4Packet ip (senf::IPv4Packet::createAfter(vlan));
-    eth.finalize();
+    eth.finalizeAll();
     BOOST_CHECK_EQUAL(vlan->type(), 0x0800u);
 }
 
-BOOST_AUTO_UNIT_TEST(llcsnap_parse)
-{
-    senf::PacketData::byte data[] = {
-        0xaa,             // DSAP
-        0xaa,             // SSAP
-        0x03,             // ctrl
-        0x00, 0x00, 0x00, // Protocol Identification Field
-        0x10, 0x11        // EtherType 
-    };
-    senf::EthLlcSnapPacket p (senf::EthLlcSnapPacket::create(data));
-
-    BOOST_CHECK_EQUAL( p->dsap(), 0xaa );
-    BOOST_CHECK_EQUAL( p->ssap(), 0xaa );
-    BOOST_CHECK_EQUAL( p->ctrl(), 0x03 );
-    BOOST_CHECK_EQUAL( p->protocolId(), 0x000000u );
-    BOOST_CHECK_EQUAL( p->type(), 0x1011 );
-}
-
-BOOST_AUTO_UNIT_TEST(llcsnap_create)
+BOOST_AUTO_UNIT_TEST(ethernetPacket_llcsnap)
 {
     senf::EthernetPacket eth (senf::EthernetPacket::create());
     eth->source() = senf::MACAddress::from_string("01:02:03:04:05:06");
     eth->destination() = senf::MACAddress::from_string("07:08:09:0a:0b:0c");
-    
-    senf::EthLlcSnapPacket llcsnap (senf::EthLlcSnapPacket::createAfter(eth));
+
+    senf::LlcSnapPacket llcsnap (senf::LlcSnapPacket::createAfter(eth));
     senf::DataPacket payload  (senf::DataPacket::createAfter(
             llcsnap, std::string("Hello, world!")));
-    eth.finalize();
-    
+    eth.finalizeAll();
+
     BOOST_CHECK_EQUAL( eth->type_length(), 8u + 13u);
     BOOST_CHECK_EQUAL( llcsnap->dsap(), 0xaa );
     BOOST_CHECK_EQUAL( llcsnap->ssap(), 0xaa );
     BOOST_CHECK_EQUAL( llcsnap->ctrl(), 0x03 );
     BOOST_CHECK_EQUAL( llcsnap->protocolId(), 0x000000u );
-    BOOST_CHECK_EQUAL( llcsnap->type(), 0u);
+    BOOST_CHECK_EQUAL( llcsnap->type_length(), 0u);
 
     senf::IPv4Packet ip (senf::IPv4Packet::createAfter(llcsnap));
-    eth.finalize();
-    BOOST_CHECK_EQUAL(llcsnap->type(), 0x0800u);
+    eth.finalizeAll();
+    BOOST_CHECK_EQUAL(llcsnap->type_length(), 0x0800u);
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 
-
+
 // Local Variables:
 // mode: c++
 // fill-column: 100