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

proto tree style fixes 

svn path=/trunk/; revision=1243
This commit is contained in:
Nathan Neulinger 1999-12-08 18:12:06 +00:00
parent f476cf176a
commit a6b214ced8
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packet-aarp.c
View File

@ -1,7 +1,7 @@
/* packet-aarp.c
* Routines for Appletalk ARP packet disassembly
*
* $Id: packet-aarp.c,v 1.14 1999/11/16 11:42:23 guy Exp $
* $Id: packet-aarp.c,v 1.15 1999/12/08 18:12:06 nneul Exp $
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
@ -57,9 +57,9 @@ static gint ett_aarp = -1;
#endif
static const value_string op_vals[] = {
{AARP_REQUEST, "AARP request" },
{AARP_REPLY, "AARP reply" },
{AARP_PROBE, "AARP probe" },
{AARP_REQUEST, "request" },
{AARP_REPLY, "reply" },
{AARP_PROBE, "probe" },
{0, NULL } };
/* AARP protocol HARDWARE identifiers. */
@ -181,12 +181,12 @@ dissect_aarp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
if ((op_str = match_strval(ar_op, op_vals)))
ti = proto_tree_add_item_format(tree, proto_aarp, offset,
MIN_AARP_HEADER_SIZE + 2*ar_hln +
2*ar_pln, NULL, op_str);
2*ar_pln, NULL, "AppleTalk Address Resolution Protocol (%s)", op_str);
else
ti = proto_tree_add_item_format(tree, proto_aarp, offset,
MIN_AARP_HEADER_SIZE + 2*ar_hln +
2*ar_pln, NULL,
"Unknown AARP (opcode 0x%04x)", ar_op);
"AppleTalk Address Resolution Protocol (opcode 0x%04x)", ar_op);
aarp_tree = proto_item_add_subtree(ti, ett_aarp);
proto_tree_add_item(aarp_tree, hf_aarp_hard_type, offset + AR_HRD, 2,
ar_hrd);

7
packet-rx.c
View File

@ -4,7 +4,7 @@
* Based on routines from tcpdump patches by
* Ken Hornstein <kenh@cmf.nrl.navy.mil>
*
* $Id: packet-rx.c,v 1.4 1999/11/16 11:42:53 guy Exp $
* $Id: packet-rx.c,v 1.5 1999/12/08 18:12:06 nneul Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@ -109,8 +109,9 @@ dissect_rx(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
if (tree) {
ti = proto_tree_add_item(tree, proto_rx, offset,
sizeof(struct rx_header), NULL);
ti = proto_tree_add_item_format(tree, proto_rx, offset,
sizeof(struct rx_header), NULL, "RX Protocol (%s)",
val_to_str(rxh->type,rx_types,"unknown (%d)"));
rx_tree = proto_item_add_subtree(ti, ett_rx);
proto_tree_add_item(rx_tree, hf_rx_epoch,