X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHPacket.test.cc;h=d777bd3759ad7eacd7eba25aa5e766bbd80b2e26;hb=34700cdc907e04dbe026df9e86d0509990706a31;hp=1ba5e0edda1bc5aea40cbf2d0f5f964d884eab9a;hpb=482523171f06cf239fd7e8c991f81711c02cf0ba;p=senf.git diff --git a/senf/Packets/80221Bundle/MIHPacket.test.cc b/senf/Packets/80221Bundle/MIHPacket.test.cc index 1ba5e0e..d777bd3 100644 --- a/senf/Packets/80221Bundle/MIHPacket.test.cc +++ b/senf/Packets/80221Bundle/MIHPacket.test.cc @@ -37,27 +37,16 @@ ///////////////////////////////cc.p//////////////////////////////////////// using namespace senf; -BOOST_AUTO_UNIT_TEST(MIHPacket_MIHFId) -{ - MIHFId id ( MACAddress::from_string("01:02:03:04:05:06")); - BOOST_CHECK_EQUAL( id.type(), MIHFId::MACAddress); - BOOST_CHECK_EQUAL( id, MIHFId( MACAddress::from_string("01:02:03:04:05:06"))); - BOOST_CHECK( id != MIHFId( MACAddress::from_string("01:02:03:04:05:07"))); - BOOST_CHECK( id != MIHFId( INet4Address::from_string("128.129.130.131"))); - BOOST_CHECK( id < MIHFId( MACAddress::from_string("01:02:03:04:05:07"))); - BOOST_CHECK( id < MIHFId( INet4Address::from_string("128.129.130.131"))); -} - -BOOST_AUTO_UNIT_TEST(MIHPacket_msgId) +SENF_AUTO_UNIT_TEST(MIHPacket_msgId) { MIHPacket mihPacket (MIHPacket::create()); mihPacket->sid() = 4; mihPacket->opcode() = 3; mihPacket->aid() = 42; - BOOST_CHECK_EQUAL( mihPacket->messageId(), 0x4c2a ); + BOOST_CHECK_EQUAL( mihPacket->messageId(), 0x4c2a ); } -BOOST_AUTO_UNIT_TEST(MIHPacket_create_eth) +SENF_AUTO_UNIT_TEST(MIHPacket_create_eth) { EthernetPacket eth (EthernetPacket::create()); MIHPacket mihPacket (MIHPacket::createAfter(eth)); @@ -67,132 +56,158 @@ BOOST_AUTO_UNIT_TEST(MIHPacket_create_eth) SENF_CHECK_NO_THROW( eth.dump( oss)); } -BOOST_AUTO_UNIT_TEST(MIHPacket_create_string) +SENF_AUTO_UNIT_TEST(MIHPacket_create_string) { MIHPacket mihPacket (MIHPacket::create()); // set some fields mihPacket->fragmentNr() = 42; mihPacket->transactionId() = 21; - mihPacket->src_mihfId().setString( "senf@berlios.de"); - mihPacket->dst_mihfId().setString( "test"); + mihPacket->src_mihfId().value( "senf@berlios.de"); + mihPacket->dst_mihfId().value( "test"); mihPacket.finalizeThis(); unsigned char data[] = { // MIH header - 0x10, 0x54, 0x00, 0x00, 0x00, 0x15, 0x00, 0x17, + 0x10, 0x54, 0x00, 0x00, 0x00, 0x15, 0x00, 0x19, // source MIHF_ID TLV: - 0x01, 0x0f, // type, length + 0x01, 0x10, // type, length + 0x0f, // value-length 0x73, 0x65, 0x6e, 0x66, 0x40, 0x62, 0x65, 0x72, 0x6c, 0x69, 0x6f, 0x73, 0x2e, 0x64, 0x65, // value // destination MIHF_ID TLV: - 0x02, 0x04, 0x74, 0x65, 0x73, 0x74 + 0x02, 0x05, 0x04, 0x74, 0x65, 0x73, 0x74 }; - BOOST_CHECK(equal( mihPacket.data().begin(), mihPacket.data().end(), data )); - BOOST_CHECK_EQUAL( mihPacket->src_mihfId().asString(), "senf@berlios.de"); - BOOST_CHECK_EQUAL( mihPacket->dst_mihfId().asString(), "test"); + SENF_CHECK_EQUAL_COLLECTIONS( data, data+sizeof(data), + mihPacket.data().begin(), mihPacket.data().end() ); + BOOST_CHECK_EQUAL( mihPacket->src_mihfId().valueAsString(), "senf@berlios.de"); + BOOST_CHECK_EQUAL( mihPacket->dst_mihfId().valueAsString(), "test"); // the maximum length of a MIHF_ID is 253 octets - BOOST_CHECK_THROW( mihPacket->dst_mihfId().setString( std::string(254, 'x')), std::length_error); - + BOOST_CHECK_THROW( mihPacket->dst_mihfId().value( std::string(254, 'x')), std::length_error); // now expand a MIHF_ID - mihPacket->dst_mihfId().maxLengthValue(253); - mihPacket->dst_mihfId().setString( std::string(200, 'x')); + // first the tricky one: when setting the maximum id length to 128 the TLV length field + // is set to 129 and therefore expanded to 2 bytes; the id-length field is still 1 byte long + mihPacket->dst_mihfId().maxIdLength(128); + mihPacket->dst_mihfId().value( std::string(128, 'x')); mihPacket.finalizeThis(); - - BOOST_CHECK_EQUAL( mihPacket.size(), unsigned(8 + 17 + 203)); - BOOST_CHECK_EQUAL( mihPacket->payloadLength(), 17 + 203); - BOOST_CHECK_EQUAL( mihPacket->dst_mihfId().length(), 200u); - BOOST_CHECK_EQUAL( senf::bytes(mihPacket->dst_mihfId()), 203u); + // packet size is now MIH header (8 bytes) + src MIHIFId TLV (18 bytes) + + // dst MIHIFId TLV (1 byte type + 2 byte TLV length + 1 byte id length + 128 id value) + BOOST_CHECK_EQUAL( mihPacket.size(), unsigned(8 + 18 + 1+2+1+128)); + BOOST_CHECK_EQUAL( mihPacket->payloadLength(), 18 + 1+2+1+128); + BOOST_CHECK_EQUAL( mihPacket->dst_mihfId().length(), 1+128); + BOOST_CHECK_EQUAL( senf::bytes(mihPacket->dst_mihfId()), 1+2+1+128); + // now we extend the dst id to 129 bytes; than we have 2 bytes tlv length and 2 bytes + // id-length field + mihPacket->dst_mihfId().maxIdLength(129); + mihPacket->dst_mihfId().value( std::string(129, 'x')); + mihPacket.finalizeThis(); + // packet size is now MIH header (8 bytes) + src MIHIFId TLV (18 bytes) + + // dst MIHIFId TLV (1 byte type + 2 byte TLV length + 2 byte id length + 128 id value) + BOOST_CHECK_EQUAL( mihPacket.size(), unsigned(8 + 18 + 1+2+2+129)); + BOOST_CHECK_EQUAL( mihPacket->payloadLength(), 18 + 1+2+2+129); + BOOST_CHECK_EQUAL( mihPacket->dst_mihfId().length(), 2+129); + BOOST_CHECK_EQUAL( senf::bytes(mihPacket->dst_mihfId()), 1+2+2+129); + // finally we shrink to dst id field + mihPacket->dst_mihfId().value( "test"); + mihPacket.finalizeThis(); + SENF_CHECK_EQUAL_COLLECTIONS( data, data+sizeof(data), + mihPacket.data().begin(), mihPacket.data().end() ); std::ostringstream oss (std::ostringstream::out); SENF_CHECK_NO_THROW( mihPacket.dump( oss)); } -BOOST_AUTO_UNIT_TEST(MIHPacket_create_mac) +SENF_AUTO_UNIT_TEST(MIHPacket_create_mac) { + MACAddress srcMac ( MACAddress::from_string("01:02:03:04:05:06")); + MACAddress dstMac ( MACAddress::from_string("07:08:09:0a:0b:0c")); MIHPacket mihPacket (MIHPacket::create()); // set some fields mihPacket->fragmentNr() = 42; mihPacket->transactionId() = 21; - mihPacket->src_mihfId().setMACAddress( MACAddress::from_string("01:02:03:04:05:06")); - mihPacket->dst_mihfId().setMACAddress( MACAddress::from_string("07:08:09:0a:0b:0c")); + mihPacket->src_mihfId().value( srcMac); + mihPacket->dst_mihfId().value( dstMac); mihPacket.finalizeThis(); unsigned char data[] = { // MIH header - 0x10, 0x54, 0x00, 0x00, 0x00, 0x15, 0x00, 0x1c, + 0x10, 0x54, 0x00, 0x00, 0x00, 0x15, 0x00, 0x1e, // source MIHF_ID TLV: - 0x01, 0x0c, // type, length + 0x01, 0x0d, // type, length + 0x0c, // value-length 0x5c, 0x01, 0x5c, 0x02, 0x5c, 0x03, 0x5c, 0x04, 0x5c, 0x05, 0x5c, 0x06, // value (nai-encoded) // destination MIHF_ID TLV: - 0x02, 0x0c, // type, length + 0x02, 0x0d, // type, length + 0x0c, // value-length 0x5c, 0x07, 0x5c, 0x08, 0x5c, 0x09, 0x5c, 0x0a, 0x5c, 0x0b, 0x5c, 0x0c // value (nai-encoded) }; SENF_CHECK_EQUAL_COLLECTIONS( data, data+sizeof(data), mihPacket.data().begin(), mihPacket.data().end() ); - BOOST_CHECK_EQUAL( - mihPacket->src_mihfId().asMACAddress(), - MACAddress::from_string("01:02:03:04:05:06")); - BOOST_CHECK_EQUAL( - mihPacket->dst_mihfId().asMACAddress(), - MACAddress::from_string("07:08:09:0a:0b:0c")); + BOOST_CHECK_EQUAL( mihPacket->src_mihfId().valueAsMACAddress(), srcMac); + BOOST_CHECK_EQUAL( mihPacket->dst_mihfId().valueAsMACAddress(), dstMac); + BOOST_CHECK_EQUAL( mihPacket->dst_mihfId().valueAs( MIHFId::MACAddress), MIHFId(dstMac) ); + BOOST_CHECK( mihPacket->src_mihfId().valueEquals(srcMac)); } -BOOST_AUTO_UNIT_TEST(MIHPacket_create_inet4) +SENF_AUTO_UNIT_TEST(MIHPacket_create_inet4) { MIHPacket mihPacket (MIHPacket::create()); // set some fields mihPacket->fragmentNr() = 42; mihPacket->transactionId() = 21; - mihPacket->src_mihfId().setINet4Address( INet4Address::from_string("128.129.130.131")); - mihPacket->dst_mihfId().setINet4Address( INet4Address::from_string("132.133.134.135")); + mihPacket->src_mihfId().value( INet4Address::from_string("128.129.130.131")); + mihPacket->dst_mihfId().value( INet4Address::from_string("132.133.134.135")); mihPacket.finalizeThis(); unsigned char data[] = { // MIH header - 0x10, 0x54, 0x00, 0x00, 0x00, 0x15, 0x00, 0x14, + 0x10, 0x54, 0x00, 0x00, 0x00, 0x15, 0x00, 0x16, // source MIHF_ID TLV: - 0x01, 0x08, // type, length + 0x01, 0x09, // type, length + 0x08, // value-length 0x5c, 0x80, 0x5c, 0x81, 0x5c, 0x82, 0x5c, 0x83, // value (nai-encoded) // destination MIHF_ID TLV: - 0x02, 0x08, // type, length + 0x02, 0x09, // type, length + 0x08, // value-length 0x5c, 0x84, 0x5c, 0x85, 0x5c, 0x86, 0x5c, 0x87 // value (nai-encoded) }; SENF_CHECK_EQUAL_COLLECTIONS( data, data+sizeof(data), mihPacket.data().begin(), mihPacket.data().end() ); BOOST_CHECK_EQUAL( - mihPacket->src_mihfId().asINet4Address(), + mihPacket->src_mihfId().valueAsINet4Address(), INet4Address::from_string("128.129.130.131")); BOOST_CHECK_EQUAL( - mihPacket->dst_mihfId().asINet4Address(), + mihPacket->dst_mihfId().valueAsINet4Address(), INet4Address::from_string("132.133.134.135")); } -BOOST_AUTO_UNIT_TEST(MIHPacket_create_inet6) +SENF_AUTO_UNIT_TEST(MIHPacket_create_inet6) { MIHPacket mihPacket (MIHPacket::create()); // set some fields mihPacket->fragmentNr() = 42; mihPacket->transactionId() = 21; - mihPacket->src_mihfId().setINet6Address( INet6Address::from_string("::ffff:1.2.3.4")); - mihPacket->dst_mihfId().setINet6Address( INet6Address::from_string("::ffff:5.6.7.8")); + mihPacket->src_mihfId().value( INet6Address::from_string("::ffff:1.2.3.4")); + mihPacket->dst_mihfId().value( INet6Address::from_string("::ffff:5.6.7.8")); mihPacket.finalizeThis(); unsigned char data[] = { // MIH header - 0x10, 0x54, 0x00, 0x00, 0x00, 0x15, 0x00, 0x44, + 0x10, 0x54, 0x00, 0x00, 0x00, 0x15, 0x00, 0x46, // source MIHF_ID TLV: - 0x01, 0x20, // type, length + 0x01, 0x21, // type, length + 0x20, // value-length // value (nai-encoded): 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0xff, 0x5c, 0xff, 0x5c, 0x01, 0x5c, 0x02, 0x5c, 0x03, 0x5c, 0x04, // destination MIHF_ID TLV: - 0x02, 0x20, // type, length + 0x02, 0x21, // type, length + 0x20, // value-length // value (nai-encoded): 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, 0x5c, 0x00, @@ -202,40 +217,41 @@ BOOST_AUTO_UNIT_TEST(MIHPacket_create_inet6) SENF_CHECK_EQUAL_COLLECTIONS( data, data+sizeof(data), mihPacket.data().begin(), mihPacket.data().end() ); BOOST_CHECK_EQUAL( - mihPacket->src_mihfId().asINet6Address(), + mihPacket->src_mihfId().valueAsINet6Address(), INet6Address::from_string("::ffff:1.2.3.4")); BOOST_CHECK_EQUAL( - mihPacket->dst_mihfId().asINet6Address(), + mihPacket->dst_mihfId().valueAsINet6Address(), INet6Address::from_string("::ffff:5.6.7.8") ); } -BOOST_AUTO_UNIT_TEST(MIHPayload_parse) +SENF_AUTO_UNIT_TEST(MIHPayload_parse) { unsigned char data[] = { // MIH header 0x10, 0x54, 0x00, 0x00, 0x00, 0x15, // variable payload length: - 0x00, 0x2a, + 0x00, 0x29, // source MIHF_ID TLV: - 0x01, 0x0f, // type, length + 0x01, 0x10, // type, length + 0x0f, // value-length 0x73, 0x65, 0x6e, 0x66, 0x40, 0x62, 0x65, 0x72, 0x6c, - 0x69, 0x6f, 0x73, 0x2e, 0x64, 0x65, // value ("senf@berlios.de") + 0x69, 0x6f, 0x73, 0x2e, 0x64, 0x65, // value // destination MIHF_ID TLV: - 0x02, 0x04, 0x74, 0x65, 0x73, 0x74, // type, length, value ("test") + 0x02, 0x05, 0x04, 0x74, 0x65, 0x73, 0x74, // MIH Payload (two test tlvs) // first test tlv 0x42, // type 0x0a, // first bit not set, length=10 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, // value // second test tlv - 0x43, // type - 0x05, // first bit not set, length=5 - 0x1a, 0x2b, 0x3c, 0x4d, 0x5e // value + 0x0c, // type + 0x04, // first bit not set, length=4 + 0x1a, 0x2b, 0x3c, 0x4d // value }; MIHPacket mihPacket (MIHPacket::create(data)); - BOOST_CHECK_EQUAL( mihPacket->payloadLength(), 42u); + BOOST_CHECK_EQUAL( mihPacket->payloadLength(), 41u); BOOST_REQUIRE( mihPacket.next().is() ); MIHGenericPayloadPacket mihPayload (mihPacket.next().as()); @@ -250,27 +266,27 @@ BOOST_AUTO_UNIT_TEST(MIHPayload_parse) BOOST_CHECK_EQUAL( tlv1.value().size(), 0x0a); MIHGenericTLVParser tlv2 = *boost::next(tlvListContainer.begin()); - BOOST_CHECK_EQUAL( tlv2.type(), 0x43); - BOOST_CHECK_EQUAL( tlv2.length(), 0x05u); - BOOST_CHECK_EQUAL( tlv2.value().size(), 0x05); - + BOOST_CHECK_EQUAL( tlv2.type(), 0x0c); + BOOST_CHECK_EQUAL( tlv2.length(), 0x04u); + BOOST_CHECK_EQUAL( tlv2.value().size(), 0x04); + std::ostringstream oss (std::ostringstream::out); SENF_CHECK_NO_THROW( mihPayload.dump( oss)); } -BOOST_AUTO_UNIT_TEST(MIHPayload_create) +SENF_AUTO_UNIT_TEST(MIHPayload_create) { MIHPacket mihPacket (MIHPacket::create()); mihPacket->fragmentNr() = 42; mihPacket->transactionId() = 21; - mihPacket->src_mihfId().setString( "senf@berlios.de"); - mihPacket->dst_mihfId().setString( "test"); + mihPacket->src_mihfId().value( "senf@berlios.de"); + mihPacket->dst_mihfId().value( "test"); MIHGenericPayloadPacket mihPayload (MIHGenericPayloadPacket::createAfter(mihPacket)); MIHGenericPayloadPacket::Parser::tlvList_t::container tlvListContainer ( mihPayload->tlvList() ); - + unsigned char tlv1_value[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 }; MIHGenericTLVParser tlv1 ( tlvListContainer.push_back_space()); @@ -278,7 +294,7 @@ BOOST_AUTO_UNIT_TEST(MIHPayload_create) tlv1.value( tlv1_value); unsigned char tlv2_value[] = { - 0x1a, 0x2b, 0x3c, 0x4d, 0x5e }; + 0x1a, 0x2b, 0x3c, 0x4d }; MIHGenericTLVParser tlv2 ( tlvListContainer.push_back_space()); tlv2.type() = 0x43; tlv2.value( tlv2_value); @@ -289,13 +305,14 @@ BOOST_AUTO_UNIT_TEST(MIHPayload_create) // MIH header 0x10, 0x54, 0x00, 0x00, 0x00, 0x15, // variable payload length: - 0x00, 0x2a, + 0x00, 0x2b, // source MIHF_ID TLV: - 0x01, 0x0f, // type, length + 0x01, 0x10, // type, length + 0x0f, // value-length 0x73, 0x65, 0x6e, 0x66, 0x40, 0x62, 0x65, 0x72, 0x6c, - 0x69, 0x6f, 0x73, 0x2e, 0x64, 0x65, // value ("senf@berlios.de") + 0x69, 0x6f, 0x73, 0x2e, 0x64, 0x65, // value // destination MIHF_ID TLV: - 0x02, 0x04, 0x74, 0x65, 0x73, 0x74, // type, length, value ("test") + 0x02, 0x05, 0x04, 0x74, 0x65, 0x73, 0x74, // MIH Payload (two test tlvs) // first test tlv 0x42, // type @@ -303,13 +320,28 @@ BOOST_AUTO_UNIT_TEST(MIHPayload_create) 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, // value // second test tlv 0x43, // type - 0x05, // first bit not set, length=5 - 0x1a, 0x2b, 0x3c, 0x4d, 0x5e // value + 0x04, // first bit not set, length=4 + 0x1a, 0x2b, 0x3c, 0x4d // value }; SENF_CHECK_EQUAL_COLLECTIONS( data, data+sizeof(data), - mihPacket.data().begin(), mihPacket.data().end() ); + mihPacket.data().begin(), mihPacket.data().end() ); } +SENF_AUTO_UNIT_TEST(Test_MIHFIdTLV) +{ + unsigned char data[] = { + // MIH header + 0x10, 0x54, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, + // source MIHF_ID TLV: + 0x01, 0x00, // type, length + // destination MIHF_ID TLV: + 0x02, 0x00, // type, length + 0x0c // value-length + }; + + MIHPacket mihPacket (MIHPacket::create(data)); + BOOST_CHECK( mihPacket->src_mihfId().valueEquals( MIHFId::Multicast) ); +} ///////////////////////////////cc.e//////////////////////////////////////// #undef prefix_