diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-12-21 13:51:20 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-12-24 18:59:14 +0000 |
| commit | e03ffe25833216694a0d1a543f180b2969ef339e (patch) | |
| tree | bd73e09fe8e0922377ff5d1f9cdd4b70f6f95fc2 /epan/dissectors/packet-fc.c | |
| parent | d3888ff69fffd3a0a0fe809a4608757b5c78da06 (diff) | |
Replace fc_to_str with address_to_str or tvb_fc_to_str.
Change-Id: I69bf25f5abb9d6ad325f922fab73b6f0cf8ca2ea
Reviewed-on: https://code.wireshark.org/review/6035
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-fc.c')
| -rw-r--r-- | epan/dissectors/packet-fc.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 4fc32a8f5c..45efa6ab2b 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -742,6 +742,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean guint32 frag_id, frag_size; guint8 df_ctl, seq_id; guint32 f_ctl; + address addr; guint32 param, exchange_key; guint16 real_seqcnt; @@ -954,19 +955,21 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean PROTO_ITEM_SET_HIDDEN(hidden_item); /* XXX - use "fc_wka_vals[]" on this? */ + SET_ADDRESS(&addr, AT_FC, 3, fchdr.d_id.data); proto_tree_add_string (fc_tree, hf_fc_did, tvb, offset+1, 3, - fc_to_str ((const guint8 *)fchdr.d_id.data)); + address_to_str(wmem_packet_scope(), &addr)); hidden_item = proto_tree_add_string (fc_tree, hf_fc_id, tvb, offset+1, 3, - fc_to_str ((const guint8 *)fchdr.d_id.data)); + address_to_str(wmem_packet_scope(), &addr)); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_uint (fc_tree, hf_fc_csctl, tvb, offset+4, 1, fchdr.cs_ctl); /* XXX - use "fc_wka_vals[]" on this? */ + SET_ADDRESS(&addr, AT_FC, 3, fchdr.s_id.data); proto_tree_add_string (fc_tree, hf_fc_sid, tvb, offset+5, 3, - fc_to_str ((const guint8 *)fchdr.s_id.data)); + address_to_str(wmem_packet_scope(), &addr)); hidden_item = proto_tree_add_string (fc_tree, hf_fc_id, tvb, offset+5, 3, - fc_to_str ((const guint8 *)fchdr.s_id.data)); + address_to_str(wmem_packet_scope(), &addr)); PROTO_ITEM_SET_HIDDEN(hidden_item); if (ftype == FC_FTYPE_LINKCTL) { |