aboutsummaryrefslogtreecommitdiffstats
path: root/packet-arp.c
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>1999-10-12 06:21:15 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>1999-10-12 06:21:15 +0000
commitbacb9d5bae5e1aa9d9144463cd24d8c5adb9398e (patch)
tree13a576cc1a346d2364a1b13bf493b2efc42a856f /packet-arp.c
parent10c4bab8e129dc0012e8e341fb74fc725e66fee8 (diff)
New proto_tree header_field_info stuff. Header_field_infos now contain
the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
Diffstat (limited to 'packet-arp.c')
-rw-r--r--packet-arp.c37
1 files changed, 27 insertions, 10 deletions
diff --git a/packet-arp.c b/packet-arp.c
index 201b7b9915..c2c8116a09 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.18 1999/10/03 17:12:15 deniel Exp $
+ * $Id: packet-arp.c,v 1.19 1999/10/12 06:20:01 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -297,23 +297,40 @@ proto_register_arp(void)
{
static hf_register_info hf[] = {
{ &hf_arp_hard_type,
- { "Hardware type", "arp.hw.type", FT_UINT16, NULL }},
+ { "Hardware type", "arp.hw.type", FT_UINT16, BASE_HEX, NULL, 0x0,
+ "" }},
+
{ &hf_arp_proto_type,
- { "Protocol type", "arp.proto.type",FT_UINT16, NULL }},
+ { "Protocol type", "arp.proto.type",FT_UINT16, BASE_HEX, NULL, 0x0,
+ "" }},
+
{ &hf_arp_hard_size,
- { "Hardware size", "arp.hw.size", FT_UINT8, NULL }},
+ { "Hardware size", "arp.hw.size", FT_UINT8, BASE_DEC, NULL, 0x0,
+ "" }},
+
{ &hf_arp_proto_size,
- { "Protocol size", "arp.proto.size",FT_UINT8, NULL }},
+ { "Protocol size", "arp.proto.size",FT_UINT8, BASE_DEC, NULL, 0x0,
+ "" }},
+
{ &hf_arp_opcode,
- { "Opcode", "arp.opcode", FT_UINT16, NULL }},
+ { "Opcode", "arp.opcode", FT_UINT16, BASE_HEX, NULL, 0x0,
+ "" }},
+
{ &hf_arp_src_ether,
- { "Sender hardware address", "arp.src.hw", FT_BYTES, NULL }},
+ { "Sender hardware address", "arp.src.hw", FT_BYTES, BASE_NONE, NULL, 0x0,
+ "" }},
+
{ &hf_arp_src_proto,
- { "Sender protocol address", "arp.src.proto", FT_BYTES, NULL }},
+ { "Sender protocol address", "arp.src.proto", FT_BYTES, BASE_NONE, NULL, 0x0,
+ "" }},
+
{ &hf_arp_dst_ether,
- { "Target hardware address", "arp.dst.hw", FT_BYTES, NULL }},
+ { "Target hardware address", "arp.dst.hw", FT_BYTES, BASE_NONE, NULL, 0x0,
+ "" }},
+
{ &hf_arp_dst_proto,
- { "Target protocol address", "arp.dst.proto", FT_BYTES, NULL }}
+ { "Target protocol address", "arp.dst.proto", FT_BYTES, BASE_NONE, NULL, 0x0,
+ "" }}
};
proto_arp = proto_register_protocol("Address Resolution Protocol", "arp");