X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FEthernetPacket.test.cc;h=3644b51eaf2a0798c3a8a6ced87ff7d1cd0643bd;hb=fe593b5092295224c1f4334bcc97801d2cf41b89;hp=f96049c3adf744d7cbd77aa0494a5ddf11ec55a0;hpb=edaa268609b73b4f48b28c5a7a577b6ffd4cec3b;p=senf.git

diff --git a/Packets/DefaultBundle/EthernetPacket.test.cc b/Packets/DefaultBundle/EthernetPacket.test.cc
index f96049c..3644b51 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
@@ -27,7 +27,8 @@
 
 // Custom includes
 #include "EthernetPacket.hh"
-#include "IpV4Packet.hh"
+#include "LlcSnapPacket.hh"
+#include "IPv4Packet.hh"
 
 #include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
@@ -86,36 +87,18 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_create)
     BOOST_CHECK_EQUAL(eth->type_length(), 0x8100u);
     BOOST_CHECK_EQUAL(vlan->type(), 0u);
 
-    senf::IpV4Packet ip (senf::IpV4Packet::createAfter(vlan));
+    senf::IPv4Packet ip (senf::IPv4Packet::createAfter(vlan));
     eth.finalize();
     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();
@@ -125,11 +108,11 @@ BOOST_AUTO_UNIT_TEST(llcsnap_create)
     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));
+    senf::IPv4Packet ip (senf::IPv4Packet::createAfter(llcsnap));
     eth.finalize();
-    BOOST_CHECK_EQUAL(llcsnap->type(), 0x0800u);
+    BOOST_CHECK_EQUAL(llcsnap->type_length(), 0x0800u);
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////