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-fc.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-fc.c')
| -rw-r--r-- | epan/dissectors/packet-fc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 45efa6ab2b..2423620d46 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -1048,10 +1048,8 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean if (df_ctl & FC_DFCTL_NH) { /* Yes - dissect it. */ if (tree) { - proto_tree_add_string (fc_tree, hf_fc_nh_da, tvb, next_offset, 8, - fcwwn_to_str (tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 8, ENC_ASCII))); - proto_tree_add_string (fc_tree, hf_fc_nh_sa, tvb, offset+8, 8, - fcwwn_to_str (tvb_get_string_enc(wmem_packet_scope(), tvb, offset+8, 8, ENC_ASCII))); + proto_tree_add_item(fc_tree, hf_fc_nh_da, tvb, next_offset, 8, ENC_NA); + proto_tree_add_item(fc_tree, hf_fc_nh_sa, tvb, next_offset+8, 8, ENC_NA); } next_offset += 16; } @@ -1455,10 +1453,10 @@ proto_register_fc(void) {"Reassembled Frame", "fc.reassembled", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fc_nh_da, - {"Network DA", "fc.nethdr.da", FT_STRING, BASE_NONE, NULL, + {"Network DA", "fc.nethdr.da", FT_FCWWN, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_fc_nh_sa, - {"Network SA", "fc.nethdr.sa", FT_STRING, BASE_NONE, NULL, + {"Network SA", "fc.nethdr.sa", FT_FCWWN, BASE_NONE, NULL, 0x0, NULL, HFILL}}, /* Basic Link Svc field definitions */ |