From 1315fe5d2989774bd8cc2bf66561add5f7ed6e84 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Mon, 26 Jul 2010 13:04:10 +0000 Subject: [PATCH] From John Sucaet: The committed changes in 33624 did not include all fixes of the previous patch file - Please add the fix for the field description of the 8-bit Deep Hops Left field Attached file contains this fix (+as well as small correction to the field descriptions of V and F flags, according to the terminology of RFC 4944) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5047 svn path=/trunk/; revision=33630 --- epan/dissectors/packet-6lowpan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 15fa9c7ae9..a62a89b11b 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -2319,11 +2319,13 @@ proto_register_6lowpan(void) /* Mesh header fields. */ { &hf_6lowpan_mesh_v, - { "V", "6lowpan.mesh.v", FT_BOOLEAN, 8, NULL, LOWPAN_MESH_HEADER_V, "shortened originator address present", HFILL }}, + { "V", "6lowpan.mesh.v", FT_BOOLEAN, 8, NULL, LOWPAN_MESH_HEADER_V, "short originator address present", HFILL }}, { &hf_6lowpan_mesh_f, - { "D", "6lowpan.mesh.f", FT_BOOLEAN, 8, NULL, LOWPAN_MESH_HEADER_F, "shortened destination address present", HFILL }}, + { "D", "6lowpan.mesh.f", FT_BOOLEAN, 8, NULL, LOWPAN_MESH_HEADER_F, "short destination address present", HFILL }}, { &hf_6lowpan_mesh_hops, { "Hops left", "6lowpan.mesh.hops", FT_UINT8, BASE_DEC, NULL, LOWPAN_MESH_HEADER_HOPS, NULL, HFILL }}, + { &hf_6lowpan_mesh_hops8, + { "Deep Hops left (Flags.Hops left == 15)", "6lowpan.mesh.hops8", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_6lowpan_mesh_orig16, { "Originator", "6lowpan.mesh.orig16", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_6lowpan_mesh_orig64,