SunnyQjm/ndn-tools
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dissect: add signed Interest fields and more name component types

Browse Source 
Change-Id: Id009dbf254e17e7fc497385ca6868ae085abb82f
This commit is contained in:
Davide Pesavento committed 2021-11-24 21:07:36 -05:00
1 parent 2c8ec07ae5
commit 79482ec462
1 file changed
+19 -10
Download Patch File Download Diff File Expand all files Collapse all files
tools/dissect/dissector.cpp
+19 -10
View File
@@ -78,13 +78,17 @@ static const std::map<uint32_t, const char*> TLV_DICT = {
{tlv::Interest , "Interest"},
{tlv::Data , "Data"},
{tlv::Name , "Name"},
// Interest packet
{tlv::CanBePrefix , "CanBePrefix"},
{tlv::MustBeFresh , "MustBeFresh"},
//{tlv::ForwardingHint , "ForwardingHint"},
{tlv::ForwardingHint , "ForwardingHint"},
{tlv::Nonce , "Nonce"},
{tlv::InterestLifetime , "InterestLifetime"},
{tlv::HopLimit , "HopLimit"},
{tlv::ApplicationParameters , "ApplicationParameters"},
{tlv::InterestSignatureInfo , "InterestSignatureInfo"},
{tlv::InterestSignatureValue , "InterestSignatureValue"},
// Data packet
{tlv::MetaInfo , "MetaInfo"},
{tlv::Content , "Content"},
{tlv::SignatureInfo , "SignatureInfo"},
@@ -92,19 +96,23 @@ static const std::map<uint32_t, const char*> TLV_DICT = {
{tlv::ContentType , "ContentType"},
{tlv::FreshnessPeriod , "FreshnessPeriod"},
{tlv::FinalBlockId , "FinalBlockId"},
// (Interest)SignatureInfo elements
{tlv::SignatureType , "SignatureType"},
{tlv::KeyLocator , "KeyLocator"},
{tlv::KeyDigest , "KeyDigest"},
{tlv::SignatureNonce , "SignatureNonce"},
{tlv::SignatureTime , "SignatureTime"},
{tlv::SignatureSeqNum , "SignatureSeqNum"},
// Name components
{tlv::GenericNameComponent , "GenericNameComponent"},
{tlv::ImplicitSha256DigestComponent , "ImplicitSha256DigestComponent"},
{tlv::ParametersSha256DigestComponent, "ParametersSha256DigestComponent"},
{tlv::KeywordNameComponent , "KeywordNameComponent"},
//{tlv::SegmentNameComponent , "SegmentNameComponent"},
//{tlv::ByteOffsetNameComponent , "ByteOffsetNameComponent"},
//{tlv::VersionNameComponent , "VersionNameComponent"},
//{tlv::TimestampNameComponent , "TimestampNameComponent"},
//{tlv::SequenceNumNameComponent , "SequenceNumNameComponent"},
{tlv::GenericNameComponent , "GenericNameComponent"},
{tlv::ImplicitSha256DigestComponent , "ImplicitSha256DigestComponent"},
{tlv::ParametersSha256DigestComponent , "ParametersSha256DigestComponent"},
{tlv::KeywordNameComponent , "KeywordNameComponent"},
{tlv::SegmentNameComponent , "SegmentNameComponent"},
{tlv::ByteOffsetNameComponent , "ByteOffsetNameComponent"},
{tlv::VersionNameComponent , "VersionNameComponent"},
{tlv::TimestampNameComponent , "TimestampNameComponent"},
{tlv::SequenceNumNameComponent , "SequenceNumNameComponent"},
// Deprecated elements
{tlv::Selectors , "Selectors"},
{tlv::MinSuffixComponents , "MinSuffixComponents"},
@@ -149,6 +157,7 @@ Dissector::printBlock(const Block& block)
try {
if (block.type() != tlv::SignatureValue &&
block.type() != tlv::InterestSignatureValue &&
(block.type() != tlv::Content || m_options.dissectContent)) {
block.parse();
}