diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-21 02:48:55 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-21 02:48:55 +0000 |
| commit | 6e0fcb7ab5d1e24abfdd80eb51e4537b5b2dd191 (patch) | |
| tree | b0e59e8026e85564d0963662dbd4e08a5738bea0 /epan/dissectors/packet-ismp.c | |
| parent | 03066d08202df49fab3daaa84287dea16cdd3510 (diff) | |
Introduce, and start using, tvb_eth_to_str().
Export tvb_*_to_str() and put them in alphabetical order.
svn path=/trunk/; revision=35602
Diffstat (limited to 'epan/dissectors/packet-ismp.c')
| -rw-r--r-- | epan/dissectors/packet-ismp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 4fbe4b5090..da82c80f37 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -260,7 +260,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp col_add_fstr(pinfo->cinfo, COL_INFO, "MIP %s, MMAC %s, ifIdx %d", tvb_ip_to_str(tvb, offset+2), - ether_to_str(tvb_get_ptr(tvb, offset+6, 6)), + tvb_ether_to_str(tvb, offset+6), tvb_get_ntohl(tvb, offset+12)); proto_tree_add_item(edp_tree, hf_ismp_edp_version, tvb, offset, 2, FALSE); |