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-fcsp.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-fcsp.c')
| -rw-r--r-- | epan/dissectors/packet-fcsp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c index 72487b5566..28a5e44506 100644 --- a/epan/dissectors/packet-fcsp.c +++ b/epan/dissectors/packet-fcsp.c @@ -233,8 +233,8 @@ static void dissect_fcsp_dhchap_challenge(tvbuff_t *tvb, proto_tree *tree) name_len = tvb_get_ntohs(tvb, offset+2); if (name_type == FC_AUTH_NAME_TYPE_WWN) { - proto_tree_add_string(tree, hf_auth_responder_wwn, tvb, offset+4, - 8, tvb_fcwwn_to_str(tvb, offset+4)); + proto_tree_add_item(tree, hf_auth_responder_wwn, tvb, offset+4, + 8, ENC_NA); } else { proto_tree_add_item(tree, hf_auth_responder_name, tvb, offset+4, @@ -322,8 +322,7 @@ static void dissect_fcsp_auth_negotiate(tvbuff_t *tvb, proto_tree *tree) name_len = tvb_get_ntohs(tvb, offset+2); if (name_type == FC_AUTH_NAME_TYPE_WWN) { - proto_tree_add_string(tree, hf_auth_initiator_wwn, tvb, offset+4, 8, - tvb_fcwwn_to_str(tvb, offset+4)); + proto_tree_add_item(tree, hf_auth_initiator_wwn, tvb, offset+4, 8, ENC_NA); } else { proto_tree_add_item(tree, hf_auth_initiator_name, tvb, offset+4, @@ -464,7 +463,7 @@ proto_register_fcsp(void) { &hf_auth_initiator_wwn, { "Initiator Name (WWN)", "fcsp.initwwn", - FT_STRING, BASE_NONE, NULL, 0x0, + FT_FCWWN, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_auth_initiator_name, @@ -499,7 +498,7 @@ proto_register_fcsp(void) { &hf_auth_responder_wwn, { "Responder Name (WWN)", "fcsp.rspwwn", - FT_STRING, BASE_NONE, NULL, 0x0, + FT_FCWWN, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_auth_responder_name, |