X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FEthernetPacket.test.cc;h=397f6f5f1ad9942231aeb5a6ff82e11108306cf0;hb=a18d131c38ffe7178ea4736ed3f584125e9903ae;hp=b8c5be9f846d59dd2c995d4d3c048be873284252;hpb=9357448dc66bc9acfd3bd8db423deb75bcd6a2c4;p=senf.git

diff --git a/Packets/DefaultBundle/EthernetPacket.test.cc b/Packets/DefaultBundle/EthernetPacket.test.cc
index b8c5be9..397f6f5 100644
--- a/Packets/DefaultBundle/EthernetPacket.test.cc
+++ b/Packets/DefaultBundle/EthernetPacket.test.cc
@@ -27,6 +27,7 @@
 
 // Custom includes
 #include "EthernetPacket.hh"
+#include "IpV4Packet.hh"
 
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/test_tools.hpp>
@@ -34,34 +35,17 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-using namespace senf;
-
-BOOST_AUTO_UNIT_TEST(ethernetPacket_parser)
-{
-    unsigned char data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,  // destination MAC
-                             0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,  // source MAC
-                             0x10, 0x11 };                        // EtherType
-    typedef unsigned char * iterator;
-    Parse_Ethernet<iterator> p(data);
-
-    BOOST_CHECK_EQUAL( p.destination()[2], 0x03 );
-    BOOST_CHECK_EQUAL( p.source()[3], 0x0A );
-    BOOST_CHECK_EQUAL( p.type(), 0x1011 );
-}
-
 BOOST_AUTO_UNIT_TEST(ethernetPacket_packet)
 {
-    unsigned char data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,  // destination MAC
-                             0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,  // source MAC
-                             0x10, 0x11 };                        // EtherType
-    EthernetPacket::ptr p (Packet::create<EthernetPacket>(data, data+sizeof(data)));
+    senf::PacketData::byte data[] = 
+        { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,  // destination MAC
+          0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,  // source MAC
+          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(), 0x1011 );
-
-    BOOST_CHECK_THROW( Packet::create<EthernetPacket>(data, data+sizeof(data)-1),
-                       TruncatedPacketException );
 }
 
 BOOST_AUTO_UNIT_TEST(ethernetPacket_chain)
@@ -73,16 +57,36 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_chain)
                              0xab, 0xcd,                          // EtherType
                              0xf0, 0xf1, 0xf2, 0xf3, 0xf4 };      // Payload
 
-    EthernetPacket::ptr p (Packet::create<EthernetPacket>(data, data+sizeof(data)));
+    senf::EthernetPacket p (senf::EthernetPacket::create(data));
 
-    BOOST_CHECK( p->next()->is<EthVLanPacket>() );
-    EthVLanPacket::ptr v (p->next()->as<EthVLanPacket>());
+    BOOST_REQUIRE( p.next().is<senf::EthVLanPacket>() );
+    senf::EthVLanPacket v (p.next().as<senf::EthVLanPacket>());
     BOOST_CHECK_EQUAL( v->priority(), 4u );
     BOOST_CHECK( v->cfi() );
     BOOST_CHECK_EQUAL( v->vlanId(), 0x234u );
     BOOST_CHECK_EQUAL( v->type(), 0xabcd );
-    BOOST_CHECK( v->next()->is<DataPacket>() );
-    BOOST_CHECK_EQUAL( *v->next()->begin(), 0xf0 );
+    BOOST_CHECK( v.next().is<senf::DataPacket>() );
+    BOOST_CHECK_EQUAL( *v.next().data().begin(), 0xf0 );
+}
+
+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();
+    BOOST_CHECK_EQUAL(eth->type(), 0x8100u);
+    BOOST_CHECK_EQUAL(vlan->type(), 0u);
+
+    senf::IpV4Packet ip (senf::IpV4Packet::createAfter(vlan));
+    eth.finalize();
+    BOOST_CHECK_EQUAL(vlan->type(), 0x0800u);
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////
@@ -95,4 +99,6 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_chain)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: