diff options
| author | Ed Warnicke <hagbard@physics.rutgers.edu> | 2001-11-26 05:13:14 +0000 |
|---|---|---|
| committer | Ed Warnicke <hagbard@physics.rutgers.edu> | 2001-11-26 05:13:14 +0000 |
| commit | 4877553530fc356888edb95332b24eaeaadeee80 (patch) | |
| tree | dece920ad31185cc514f42c162bd238ed5edcd14 /packet-arp.c | |
| parent | fcd5b352af60e034a4b63601272b43b6644029cd (diff) | |
Switched from using CHECK_DISPLAY_AS_DATA to using CHECK_DISPLAY_AS_X
which also takes a handle as an argument and thus doesn't call
dissect_data directly.
svn path=/trunk/; revision=4270
Diffstat (limited to 'packet-arp.c')
| -rw-r--r-- | packet-arp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/packet-arp.c b/packet-arp.c index 62a20d5255..678cc9fe48 100644 --- a/packet-arp.c +++ b/packet-arp.c @@ -1,7 +1,7 @@ /* packet-arp.c * Routines for ARP packet disassembly * - * $Id: packet-arp.c,v 1.44 2001/06/18 02:17:44 guy Exp $ + * $Id: packet-arp.c,v 1.45 2001/11/26 05:13:11 hagbard Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -70,6 +70,8 @@ static gint ett_arp = -1; static gint ett_atmarp_nsap = -1; static gint ett_atmarp_tl = -1; +static dissector_handle_t data_handle; + /* Definitions taken from Linux "linux/if_arp.h" header file, and from http://www.isi.edu/in-notes/iana/assignments/arp-parameters @@ -410,7 +412,7 @@ dissect_atmarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *tl_tree; proto_item *tl; - CHECK_DISPLAY_AS_DATA(proto_arp, tvb, pinfo, tree); + CHECK_DISPLAY_AS_X(data_handle,proto_arp, tvb, pinfo, tree); /* Override the setting to "ARP/RARP". */ pinfo->current_proto = "ATMARP"; @@ -650,7 +652,7 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const guint8 *sha_val, *spa_val, *tha_val, *tpa_val; gchar *sha_str, *spa_str, *tha_str, *tpa_str; - CHECK_DISPLAY_AS_DATA(proto_arp, tvb, pinfo, tree); + CHECK_DISPLAY_AS_X(data_handle,proto_arp, tvb, pinfo, tree); pinfo->current_proto = "ARP"; @@ -943,6 +945,7 @@ proto_register_arp(void) void proto_reg_handoff_arp(void) { + data_handle = find_dissector("data"); dissector_add("ethertype", ETHERTYPE_ARP, dissect_arp, proto_arp); dissector_add("ethertype", ETHERTYPE_REVARP, dissect_arp, proto_arp); } |