Parameters => ApplicationParameters
Refs: #4658
Change-Id: I8b69ab5e27612eecf068c6bf0ddb4b434cc29824
diff --git a/tests/dissect-wireshark/README.md b/tests/dissect-wireshark/README.md
index b56e19a..b92fda0 100644
--- a/tests/dissect-wireshark/README.md
+++ b/tests/dissect-wireshark/README.md
@@ -163,7 +163,7 @@
Expected results of the dissection:
- Packet 1 is recognized as "Interest" type, and has `CanBePrefix: Yes`, `MustBeFresh: Yes`,
- `HopLimit: 214`, as well as a "Parameters" field.
+ `HopLimit: 214`, as well as an "ApplicationParameters" field.
- Packet 2 is recognized as "Interest" type, and has `Name: /2=A/7=B/C/252=D/256=E/65535=E/sha256digest=ee357c5791dcaa4494d9b301047b875d8833caa76dada3e95837bbc3eaf7b300`.
- Packet 3 is recognized as "Data" type, and has `Name: /`.
diff --git a/tests/dissect-wireshark/packet03.hex b/tests/dissect-wireshark/packet03.hex
index cae91ba..c6b62d8 100644
--- a/tests/dissect-wireshark/packet03.hex
+++ b/tests/dissect-wireshark/packet03.hex
@@ -15,7 +15,7 @@
000000000000
8624
-## Interest with CanBePrefix, MustBeFresh, HopLimit, Parameters
+## Interest with CanBePrefix, MustBeFresh, HopLimit, ApplicationParameters
0529
0703080149
2100
diff --git a/tools/dissect-wireshark/ndn.lua b/tools/dissect-wireshark/ndn.lua
index e14b5a6..b1a316e 100755
--- a/tools/dissect-wireshark/ndn.lua
+++ b/tools/dissect-wireshark/ndn.lua
@@ -1,4 +1,4 @@
--- Copyright (c) 2015-2018, Regents of the University of California.
+-- Copyright (c) 2015-2019, Regents of the University of California.
--
-- This file is part of ndn-tools (Named Data Networking Essential Tools).
-- See AUTHORS.md for complete list of ndn-tools authors and contributors.
@@ -177,7 +177,7 @@
-----------------------------------------------------
local NDN_DICT = {
- -- Name and NameComponent
+ -- Name and name components
[7] = {name = "Name" , field = ProtoField.string("ndn.name", "Name") , value = getUriFromName},
[1] = {name = "ImplicitSha256DigestComponent", field = ProtoField.string("ndn.implicitsha256", "ImplicitSha256DigestComponent"), value = getUriFromNameComponent},
[8] = {name = "GenericNameComponent" , field = ProtoField.string("ndn.namecomponent", "NameComponent") , value = getUriFromNameComponent},
@@ -189,11 +189,11 @@
-- [30] = {name = "ForwardingHint" , summary = true},
-- ForwardingHint and LinkPreference have the same TLV-TYPE number, so we can't recognize both for now (see #4185).
[31] = {name = "LinkDelegation" , summary = true},
- [30] = {name = "LinkPreference" , field = ProtoField.uint64("ndn.link_preference", "LinkPreference", base.DEC) , value = getNonNegativeInteger},
+ [30] = {name = "LinkPreference" , field = ProtoField.uint64("ndn.linkpreference", "LinkPreference", base.DEC) , value = getNonNegativeInteger},
[10] = {name = "Nonce" , field = ProtoField.uint32("ndn.nonce", "Nonce", base.HEX) , value = getNonce},
[12] = {name = "InterestLifetime" , field = ProtoField.uint64("ndn.interestlifetime", "InterestLifetime", base.DEC) , value = getNonNegativeInteger},
[34] = {name = "HopLimit" , field = ProtoField.uint64("ndn.hoplimit", "HopLimit", base.DEC) , value = getNonNegativeInteger},
- [36] = {name = "Parameters" , field = ProtoField.string("ndn.parameters", "Parameters")},
+ [36] = {name = "ApplicationParameters" , field = ProtoField.string("ndn.applicationparameters", "ApplicationParameters")},
-- Data and its sub-elements in Packet Format v0.3
[6] = {name = "Data" , summary = true},
diff --git a/tools/dissect/ndn-dissect.cpp b/tools/dissect/ndn-dissect.cpp
index 90d3160..c072c69 100644
--- a/tools/dissect/ndn-dissect.cpp
+++ b/tools/dissect/ndn-dissect.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2018, Regents of the University of California.
+ * Copyright (c) 2013-2019, Regents of the University of California.
*
* This file is part of ndn-tools (Named Data Networking Essential Tools).
* See AUTHORS.md for complete list of ndn-tools authors and contributors.
@@ -36,15 +36,13 @@
{tlv::Interest , "Interest"},
{tlv::Data , "Data"},
{tlv::Name , "Name"},
- {tlv::GenericNameComponent , "GenericNameComponent"},
- {tlv::ImplicitSha256DigestComponent, "ImplicitSha256DigestComponent"},
{tlv::CanBePrefix , "CanBePrefix"},
{tlv::MustBeFresh , "MustBeFresh"},
//{tlv::ForwardingHint , "ForwardingHint"},
{tlv::Nonce , "Nonce"},
{tlv::InterestLifetime , "InterestLifetime"},
{tlv::HopLimit , "HopLimit"},
- {tlv::Parameters , "Parameters"},
+ {tlv::ApplicationParameters , "ApplicationParameters"},
{tlv::MetaInfo , "MetaInfo"},
{tlv::Content , "Content"},
{tlv::SignatureInfo , "SignatureInfo"},
@@ -55,6 +53,16 @@
{tlv::SignatureType , "SignatureType"},
{tlv::KeyLocator , "KeyLocator"},
{tlv::KeyDigest , "KeyDigest"},
+ // 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"},
// Deprecated elements
{tlv::Selectors , "Selectors"},
{tlv::MinSuffixComponents , "MinSuffixComponents"},