diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-12-24 00:06:35 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-12-28 20:05:29 +0000 |
| commit | 71c02b20eb798569393da09fc6557c314244e3e8 (patch) | |
| tree | 8b5108b3b9892fedf2ee345be60a1657f270fa34 /epan/dissectors/packet-fcip.c | |
| parent | 8965e90a25a79eaa5569e9de6589f7fc5b3ccb3c (diff) | |
Create FT_FCWWN field type.
Also, convert the "string" hf_ entries that used tvb_fcwwn_to_str as a string to use proto_tree_add_item with FT_FCWWN type.
Change-Id: I4ca77870499fd8239584a70874998b5d194a7167
Reviewed-on: https://code.wireshark.org/review/6036
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-fcip.c')
| -rw-r--r-- | epan/dissectors/packet-fcip.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index ecb94f07b4..b0c90bb0c8 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -349,8 +349,7 @@ static void dissect_fcip_sf (tvbuff_t *tvb, proto_tree *tree, gint offset) { if (tree) { - proto_tree_add_string (tree, hf_fcip_src_wwn, tvb, offset, 8, - tvb_fcwwn_to_str (tvb, offset)); + proto_tree_add_item (tree, hf_fcip_src_wwn, tvb, offset, 8, ENC_NA); proto_tree_add_item (tree, hf_fcip_src_entity_id, tvb, offset+8, 8, ENC_NA); proto_tree_add_item (tree, hf_fcip_conn_nonce, tvb, offset+16, 8, @@ -358,8 +357,7 @@ dissect_fcip_sf (tvbuff_t *tvb, proto_tree *tree, gint offset) /* XXX - break out these flags */ proto_tree_add_item (tree, hf_fcip_conn_flags, tvb, offset+24, 1, ENC_BIG_ENDIAN); proto_tree_add_item (tree, hf_fcip_conn_code, tvb, offset+26, 2, ENC_BIG_ENDIAN); - proto_tree_add_string (tree, hf_fcip_dst_wwn, tvb, offset+30, 8, - tvb_fcwwn_to_str (tvb, offset+30)); + proto_tree_add_item (tree, hf_fcip_dst_wwn, tvb, offset+30, 8, ENC_NA); proto_tree_add_item (tree, hf_fcip_katov, tvb, offset+38, 4, ENC_BIG_ENDIAN); } } @@ -595,10 +593,10 @@ proto_register_fcip (void) {"Pflags (1's Complement)", "fcip.pflagsc", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, { &hf_fcip_src_wwn, - {"Source Fabric WWN", "fcip.srcwwn", FT_STRING, BASE_NONE, + {"Source Fabric WWN", "fcip.srcwwn", FT_FCWWN, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fcip_dst_wwn, - {"Destination Fabric WWN", "fcip.dstwwn", FT_STRING, BASE_NONE, + {"Destination Fabric WWN", "fcip.dstwwn", FT_FCWWN, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fcip_src_entity_id, {"FC/FCIP Entity Id", "fcip.srcid", FT_BYTES, BASE_NONE, |