commit 79482ec4620ea5adacfa5c6e7476aea335003618
author Davide Pesavento <davidepesa@gmail.com> Wed Nov 24 21:07:36 2021 -0500
committer Davide Pesavento <davidepesa@gmail.com> Wed Nov 24 21:07:36 2021 -0500
tree 400028e3a8cee16d5267cd009273e5040b979a93
parent 2c8ec07ae58e542cfbb92c39104780ece971f909

dissect: add signed Interest fields and more name component types

Change-Id: Id009dbf254e17e7fc497385ca6868ae085abb82f

tools/dissect/dissector.cpp

diff --git a/tools/dissect/dissector.cpp b/tools/dissect/dissector.cpp
index 3c0ca5c..dfc5c98 100644
--- a/tools/dissect/dissector.cpp
+++ b/tools/dissect/dissector.cpp
@@ -78,13 +78,17 @@
   {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 @@
   {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 @@
 
   try {
     if (block.type() != tlv::SignatureValue &&
+        block.type() != tlv::InterestSignatureValue &&
         (block.type() != tlv::Content || m_options.dissectContent)) {
       block.parse();
     }