summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-fip.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2009-10-16 21:26:51 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2009-10-16 21:26:51 +0000
commit5ac529f7860259f30758cfb7f81856d7b1a0d849 (patch)
tree0e8266fb990d1719828e1ba65af3f7200ce94d92 /epan/dissectors/packet-fip.c
parentf91657feb9ce9ed2bbe73a385020055539f398b8 (diff)
downloadwireshark-5ac529f7860259f30758cfb7f81856d7b1a0d849.tar.gz
From Joe Eykholt:
The FIP dissector shows the VFID descriptor as a 2-byte string instead of the correct UINT16 type. Also, the name should be changed to just "VFID". The "Fabric Name" field of the Fabric descriptor was incorrectly labeled. Also, some lines grew to longer than 80 columns due to other patches. svn path=/trunk/; revision=30577
Diffstat (limited to 'epan/dissectors/packet-fip.c')
-rw-r--r--epan/dissectors/packet-fip.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c
index 55a1cbd182..8cbba589ff 100644
--- a/epan/dissectors/packet-fip.c
+++ b/epan/dissectors/packet-fip.c
@@ -524,20 +524,22 @@ proto_register_fip(void)
{ &hf_fip_desc_pri,
{"Priority", "fip.pri", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}},
{ &hf_fip_desc_mac,
- {"MAC Address", "fip.mac", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL}},
+ {"MAC Address", "fip.mac", FT_ETHER, BASE_NONE, NULL,
+ 0, NULL, HFILL}},
{ &hf_fip_desc_map,
- {"FC-MAP-OUI", "fip.map", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL}},
+ {"FC-MAP-OUI", "fip.map", FT_STRING, BASE_NONE, NULL,
+ 0, NULL, HFILL}},
{ &hf_fip_desc_name,
{"Switch or Node Name", "fip.name", FT_STRING, BASE_NONE, NULL,
0, NULL, HFILL}},
{ &hf_fip_desc_fab_vfid,
- {"VFID Descriptor", "fip.fab.vfid", FT_STRING, BASE_NONE, NULL,
+ {"VFID", "fip.fab.vfid", FT_UINT16, BASE_DEC, NULL,
0, NULL, HFILL}},
{ &hf_fip_desc_fab_map,
{"FC-MAP", "fip.fab.map", FT_STRING, BASE_NONE, NULL,
0, NULL, HFILL}},
{ &hf_fip_desc_fab_name,
- {"Fabric Descriptor", "fip.fab.name", FT_STRING, BASE_NONE, NULL,
+ {"Fabric Name", "fip.fab.name", FT_STRING, BASE_NONE, NULL,
0, NULL, HFILL}},
{ &hf_fip_desc_fcoe_size,
{"Max FCoE frame size", "fip.fcoe_size", FT_UINT16, BASE_DEC, NULL,
@@ -555,7 +557,8 @@ proto_register_fip(void)
{"FKA_ADV_Period", "fip.fka", FT_UINT32, BASE_DEC, NULL,
0, NULL, HFILL}},
{ &hf_fip_desc_vend,
- {"Vendor-ID", "fip.vendor", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}},
+ {"Vendor-ID", "fip.vendor", FT_BYTES, BASE_NONE, NULL,
+ 0, NULL, HFILL}},
{ &hf_fip_desc_vend_data,
{"Vendor-specific data", "fip.vendor.data", FT_BYTES, BASE_NONE, NULL,
0, NULL, HFILL}},