osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

style improvements in ARP dissector proto tree, added todo items 

svn path=/trunk/; revision=1237
This commit is contained in:
Nathan Neulinger 1999-12-07 15:38:20 +00:00
parent b01c9d20d4
commit 612448c2e1
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TODO
View File

@ -1,4 +1,4 @@
$Id: TODO,v 1.2 1999/12/04 06:15:31 gram Exp $
$Id: TODO,v 1.3 1999/12/07 15:38:19 nneul Exp $
Things to do:
=============
@ -47,3 +47,10 @@ it under?)
15. Display filters: add regexes to strings and byte ranges
16. Atalk NBP dissector - see netatalk sources for structure defs (nneul)
17. Krb dissector - standard krb4 - from tcpdump (nneul)
18. Krb5 dissector - from scratch, need to use ASN.1 code (nneul)
19. IRC dissector

35
packet-arp.c
View File

@ -1,7 +1,7 @@
/* packet-arp.c
* Routines for ARP packet disassembly
*
* $Id: packet-arp.c,v 1.24 1999/11/27 04:48:12 guy Exp $
* $Id: packet-arp.c,v 1.25 1999/12/07 15:38:20 nneul Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -123,20 +123,20 @@ static gint ett_atmarp_nsap = -1;
#endif
static const value_string op_vals[] = {
{ARPOP_REQUEST, "ARP request" },
{ARPOP_REPLY, "ARP reply" },
{ARPOP_RREQUEST, "RARP request"},
{ARPOP_RREPLY, "RARP reply" },
{ARPOP_IREQUEST, "Inverse ARP request"},
{ARPOP_IREPLY, "Inverse ARP reply" },
{ARPOP_REQUEST, "request" },
{ARPOP_REPLY, "reply" },
{ARPOP_RREQUEST, "reverse request"},
{ARPOP_RREPLY, "reverse reply" },
{ARPOP_IREQUEST, "inverse request"},
{ARPOP_IREPLY, "inverse reply" },
{0, NULL } };
static const value_string atmop_vals[] = {
{ARPOP_REQUEST, "ATMARP request" },
{ARPOP_REPLY, "ATMARP reply" },
{ARPOP_IREQUEST, "Inverse ATMARP request"},
{ARPOP_IREPLY, "Inverse ATMARP reply" },
{ATMARPOP_NAK, "ATMARP NAK" },
{ARPOP_REQUEST, "request" },
{ARPOP_REPLY, "reply" },
{ARPOP_IREQUEST, "inverse request"},
{ARPOP_IREPLY, "inverse reply" },
{ATMARPOP_NAK, "nak" },
{0, NULL } };
#define ATMARP_IS_E164 0x40 /* bit in shtl/thtl for E.164 format */
@ -497,11 +497,13 @@ dissect_atmarp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
if (tree) {
if ((op_str = match_strval(ar_op, atmop_vals)))
ti = proto_tree_add_item_format(tree, proto_arp, offset, tot_len,
NULL, op_str);
NULL,
"ATM Address Resolution Protocol (%s)",
op_str);
else
ti = proto_tree_add_item_format(tree, proto_arp, offset, tot_len,
NULL,
"Unknown ATMARP (opcode 0x%04x)", ar_op);
"ATM Address Resolution Protocol (opcode 0x%04x)", ar_op);
arp_tree = proto_item_add_subtree(ti, ett_arp);
proto_tree_add_item(arp_tree, hf_arp_hard_type, offset + ATM_AR_HRD, 2,
ar_hrd);
@ -640,11 +642,12 @@ dissect_arp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
if (tree) {
if ((op_str = match_strval(ar_op, op_vals)))
ti = proto_tree_add_item_format(tree, proto_arp, offset, tot_len,
NULL, op_str);
NULL,
"Address Resolution Protocol (%s)", op_str);
else
ti = proto_tree_add_item_format(tree, proto_arp, offset, tot_len,
NULL,
"Unknown ARP (opcode 0x%04x)", ar_op);
"Address Resolution Protocol (opcode 0x%04x)", ar_op);
arp_tree = proto_item_add_subtree(ti, ett_arp);
proto_tree_add_item(arp_tree, hf_arp_hard_type, offset + AR_HRD, 2,
ar_hrd);