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

dissect-wireshark: recognize ForwardingHint

Browse Source 
Refs: #4185
Change-Id: I42619aaedf7aa4dbb32d204c46c67a8df541a272
This commit is contained in:
Davide Pesavento
2021-11-27 23:01:04 -05:00
parent 38dca3952a
commit 84eb4873c8
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/dissect-wireshark/README.md
+5 -5
View File
@@ -162,10 +162,10 @@ Trace summary: Handcrafted packets in NDN Packet Format v0.3
All packets are valid and do not contain unrecognized TLV elements.
Expected results of the dissection:
- Packet 1 is recognized as "Interest" type, and has `CanBePrefix: Yes`, `MustBeFresh: Yes`,
`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: /`.
- Packet 1 is recognized as "Interest" and contains `CanBePrefix: Yes`, `MustBeFresh: Yes`,
`HopLimit: 214`, as well as a "ForwardingHint" and an "ApplicationParameters" field.
- Packet 2 is recognized as "Interest" and has `Name: /params-sha256=41/7=B/C/252=D/256=E/65535=E/sha256digest=ee357c5791dcaa4494d9b301047b875d8833caa76dada3e95837bbc3eaf7b300`.
- Packet 3 is recognized as "Data" and has `Name: /`.
### 12. URI Scheme
@@ -175,7 +175,7 @@ Trace summary: Handcrafted packet for testing URI encoding in Name and FinalBloc
(`xxd -p -r < nameuri.hex > nameuri.pcap`).
Expected results of the dissection:
- Packet 1 is recognized as "Data" type.
- Packet 1 is recognized as "Data".
- Its name has eight components.
- First name component is `NameComponent: ...`.
- Second name component is `NameComponent: ....`.
tools/dissect-wireshark/ndn.lua
+1 -4
View File
@@ -205,10 +205,7 @@ local NDN_DICT = {
[5] = {name = "Interest" , summary = true},
[33] = {name = "CanBePrefix" , field = ProtoField.string("ndn.canbeprefix", "CanBePrefix") , value = getTrue},
[18] = {name = "MustBeFresh" , field = ProtoField.string("ndn.mustbefresh", "MustBeFresh") , value = getTrue},
-- [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.linkpreference", "LinkPreference", base.DEC) , value = getNonNegativeInteger},
[30] = {name = "ForwardingHint" , summary = true},
[10] = {name = "Nonce" , field = ProtoField.uint32("ndn.nonce", "Nonce", base.HEX) , value = getNonce},
[12] = {name = "InterestLifetime" , field = ProtoField.uint64("ndn.lifetime", "InterestLifetime", base.DEC) , value = getNonNegativeInteger},
[34] = {name = "HopLimit" , field = ProtoField.uint8("ndn.hoplimit", "HopLimit", base.DEC) , value = getHopLimit},