diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-02-16 03:30:59 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-02-16 03:30:59 +0000 |
| commit | 45f7c0541125a30ba2f673fef09a821699f640e8 (patch) | |
| tree | 817f9fec75d6706b1327cfdfb78adfce4291cd13 /epan/dissectors/packet-extreme.c | |
| parent | feeafce765e85f5673ab52d1f0f0a4054b295c82 (diff) | |
Use tvb_ether_to_str()
svn path=/trunk/; revision=35963
Diffstat (limited to 'epan/dissectors/packet-extreme.c')
| -rw-r--r-- | epan/dissectors/packet-extreme.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 009ad3b6a3..91258283bf 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -687,14 +687,14 @@ dissect_eaps_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length _U_, proto_item *eaps_item; proto_tree *eaps_tree; guint16 ctrlvlanid; - const guint8 *sysmac; + const gchar *sysmac_str; ctrlvlanid = tvb_get_ntohs(tvb, offset + 1 + 1 + 4); - sysmac = tvb_get_ptr(tvb, offset + 12, 6); + sysmac_str = tvb_ether_to_str(tvb, offset + 12); eaps_item = proto_tree_add_protocol_format(tree, hf_edp_eaps, tvb, offset, length, "EAPS: Ctrlvlan %d, Sysmac %s", - ctrlvlanid, ether_to_str(sysmac)); + ctrlvlanid, sysmac_str); eaps_tree = proto_item_add_subtree(eaps_item, ett_edp_eaps); @@ -748,7 +748,7 @@ dissect_eaps_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length _U_, col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAPS"); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, " ID: %d, MAC: %s", - ctrlvlanid, ether_to_str(sysmac)); + ctrlvlanid, sysmac_str); } static void @@ -758,14 +758,14 @@ dissect_esl_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto proto_tree *esl_tree; guint16 ctrlvlanid; guint16 numlinks; - const guint8 *sysmac; + const gchar *sysmac_str; ctrlvlanid = tvb_get_ntohs(tvb, offset + 2 + 4); - sysmac = tvb_get_ptr(tvb, offset + 12, 6); + sysmac_str = tvb_ether_to_str(tvb, offset + 12); esl_item = proto_tree_add_protocol_format(tree, hf_edp_esl, tvb, offset, length, "ESL: Ctrlvlan %d, Sysmac %s", - ctrlvlanid, ether_to_str(sysmac)); + ctrlvlanid, sysmac_str); esl_tree = proto_item_add_subtree(esl_item, ett_edp_esl); @@ -864,7 +864,7 @@ dissect_esl_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESL"); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, " ID: %d, MAC: %s", - ctrlvlanid, ether_to_str(sysmac)); + ctrlvlanid, sysmac_str); } static void |