X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FMPESection.test.cc;h=3833a8357770aad4975ec164a83ce61ee819b4ca;hb=84df23442e79b04a5c4e55a93f46a26b8abe4728;hp=f62a8289caf9181bf0479bccca48f2b5cad6608c;hpb=e59da064ee0ae6cc18c7e1173eedb920d5023021;p=senf.git

diff --git a/Packets/MPEGDVBBundle/MPESection.test.cc b/Packets/MPEGDVBBundle/MPESection.test.cc
index f62a828..3833a83 100644
--- a/Packets/MPEGDVBBundle/MPESection.test.cc
+++ b/Packets/MPEGDVBBundle/MPESection.test.cc
@@ -83,19 +83,23 @@ BOOST_AUTO_UNIT_TEST(MPESection_parse_chain)
     BOOST_CHECK      (   sec->curr_next_indicator()                  );
     BOOST_CHECK_EQUAL(   sec->section_num(),             0x0u        );
     BOOST_CHECK_EQUAL(   sec->last_section_num(),        0x0u        );
-    BOOST_CHECK_EQUAL(   sec->real_time_parameters().delta_t(),        0x4du   );
+    BOOST_CHECK_EQUAL(   sec->real_time_parameters().delta_t(),        0x04du  );
     BOOST_CHECK_EQUAL(   sec->real_time_parameters().table_boundary(), 1       );
     BOOST_CHECK_EQUAL(   sec->real_time_parameters().frame_boundary(), 0       );
     BOOST_CHECK_EQUAL(   sec->real_time_parameters().address(),        0x120cu );
     BOOST_CHECK_EQUAL(   sec->crc(), 3044494396u                     );
+    BOOST_CHECK_EQUAL(   sec->crc(), sec->calcCrc()                  );
     
     BOOST_REQUIRE( sec.next().is<senf::LlcSnapPacket>() );
     senf::LlcSnapPacket llcsnap (sec.next().as<senf::LlcSnapPacket>());
 
-    BOOST_CHECK_EQUAL( llcsnap->dsap(), 0xaau        );
-    BOOST_CHECK_EQUAL( llcsnap->ssap(), 0xaau        );
-    BOOST_CHECK_EQUAL( llcsnap->ctrl(), 0x3u         );
-    BOOST_CHECK_EQUAL( llcsnap->protocolId(), 0u     );
+    BOOST_CHECK_EQUAL( llcsnap->dsap(),        0xaau );
+    BOOST_CHECK_EQUAL( llcsnap->ssap(),        0xaau );
+    BOOST_CHECK_EQUAL( llcsnap->ctrl(),        0x3u  );
+    BOOST_CHECK_EQUAL( llcsnap->protocolId(),  0x0u  );
+    // in the captured section the llcsnap type/length field was set to the 
+    // length of the following ethernet packet; the ethertype 0x6558 (Trans
+    // Ether Bridging [RFC1701]) would be possible as well (see next test)
     BOOST_CHECK_EQUAL( llcsnap->type_length(), 0x62u );
 
     BOOST_REQUIRE( llcsnap.next().is<senf::EthernetPacket>() );
@@ -127,38 +131,60 @@ BOOST_AUTO_UNIT_TEST(MPESection_parse_chain)
 BOOST_AUTO_UNIT_TEST(MPESection_create)
 {
     senf::MPESection sec (senf::MPESection::create());
-    sec->real_time_parameters().delta_t()        = 0x4du;
+    sec->real_time_parameters().delta_t()        = 0x027u;
     sec->real_time_parameters().table_boundary() = 1;
     sec->real_time_parameters().frame_boundary() = 0;
-    sec->real_time_parameters().address()        = 0x120cu;
+    sec->real_time_parameters().address()        = 0xfffffu;
     
+    // the type/length field will be set to the ethertype 0x6558 (Trans
+    // Ether Bridging [RFC1701]) on finalize() 
     senf::LlcSnapPacket llcsnap (senf::LlcSnapPacket::createAfter(sec));
     
     senf::EthernetPacket eth (senf::EthernetPacket::createAfter(llcsnap));
     eth->destination() = senf::MACAddress::from_string("01:00:5e:01:02:03");
-    eth->source()      = senf::MACAddress::from_string("12:b0:43:61:5d:99");
+    eth->source()      = senf::MACAddress::from_string("92:4c:a2:1c:da:81");
     
     senf::IPv4Packet ip (senf::IPv4Packet::createAfter(eth));
     ip->df()          = 1;
     ip->ttl()         = 1;
     ip->protocol()    = 1;
-    ip->source()      = senf::INet4Address::from_string("192.168.1.1");
+    ip->source()      = senf::INet4Address::from_string("10.1.2.2");
     ip->destination() = senf::INet4Address::from_string("239.1.2.3");
     
     unsigned char payload_data[] = { 
             // Payload (ICMP)
-            0x08, 0x00, 0x0e, 0xa3, 0xf2, 0x72, 0x55, 0xea, 
-            0xa2, 0xae, 0x56, 0x47, 0xbb, 0x06, 0x02, 0x00, 
+            0x08, 0x00, 0x52, 0x73, 0x0e, 0x02, 0x00, 0x20,
+            0xa4, 0x3a, 0xb4, 0x47, 0x4f, 0xe5, 0x04, 0x00,
             0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-            0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 
-            0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 
-            0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 
-            0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 
+            0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+            0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+            0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+            0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
             0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37
     };
     senf::DataPacket payload (senf::DataPacket::createAfter(ip, payload_data));
     
     sec.finalize();
+    
+    unsigned char sec_data[] = {
+            0x3e, 0xb0, 0x77, 0x00, 0x00, 0xc3, 0x00, 0x00,
+            0x02, 0x7b, 0xff, 0xff, 0xaa, 0xaa, 0x03, 0x00,
+            0x00, 0x00, 0x65, 0x58, 0x01, 0x00, 0x5e, 0x01,
+            0x02, 0x03, 0x92, 0x4c, 0xa2, 0x1c, 0xda, 0x81,
+            0x08, 0x00, 0x45, 0x00, 0x00, 0x54, 0x00, 0x00,
+            0x40, 0x00, 0x01, 0x01, 0x7c, 0xa2, 0x0a, 0x01,
+            0x02, 0x02, 0xef, 0x01, 0x02, 0x03, 0x08, 0x00,
+            0x52, 0x73, 0x0e, 0x02, 0x00, 0x20, 0xa4, 0x3a,
+            0xb4, 0x47, 0x4f, 0xe5, 0x04, 0x00, 0x08, 0x09,
+            0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11,
+            0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
+            0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21,
+            0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29,
+            0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31,
+            0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x52, 0xdf,
+            0x6a, 0x1d
+    };    
+    BOOST_CHECK( equal( sec.data().begin(), sec.data().end(), sec_data ));    
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////