diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-07-07 22:52:57 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-07-07 22:52:57 +0000 |
| commit | 07f42b5b31f9523deeb147226521f77a2c8dd797 (patch) | |
| tree | c720d2a42f11c9d14ac1a161eb785b438c2c4b14 /packet-aarp.c | |
| parent | fba49cfe85d4b23ebbffa97fae126a379e913ecd (diff) | |
Created a new protocol tree implementation and a new display filter
mechanism that is built into ethereal. Wiretap is now used to read all
file formats. Libpcap is used only for capturing.
svn path=/trunk/; revision=342
Diffstat (limited to 'packet-aarp.c')
| -rw-r--r-- | packet-aarp.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/packet-aarp.c b/packet-aarp.c index ba53ade473..053ab0b3ba 100644 --- a/packet-aarp.c +++ b/packet-aarp.c @@ -96,29 +96,28 @@ dissect_aarp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { if (tree) { if ((op_str = match_strval(ea.op, op_vals))) - ti = proto_tree_add_item(tree, offset, 28, op_str); + ti = proto_tree_add_text(tree, offset, 28, op_str); else - ti = proto_tree_add_item(tree, offset, 28, + ti = proto_tree_add_text(tree, offset, 28, "Unknown AARP (opcode 0x%04x)", ea.op); - aarp_tree = proto_tree_new(); - proto_item_add_subtree(ti, aarp_tree, ETT_AARP); - proto_tree_add_item(aarp_tree, offset, 2, + aarp_tree = proto_item_add_subtree(ti, ETT_AARP); + proto_tree_add_text(aarp_tree, offset, 2, "Hardware type: 0x%04x", ea.htype); - proto_tree_add_item(aarp_tree, offset + 2, 2, + proto_tree_add_text(aarp_tree, offset + 2, 2, "Protocol type: 0x%04x", ea.ptype); - proto_tree_add_item(aarp_tree, offset + 4, 1, + proto_tree_add_text(aarp_tree, offset + 4, 1, "Hardware size: 0x%02x", ea.halen); - proto_tree_add_item(aarp_tree, offset + 5, 1, + proto_tree_add_text(aarp_tree, offset + 5, 1, "Protocol size: 0x%02x", ea.palen); - proto_tree_add_item(aarp_tree, offset + 6, 2, + proto_tree_add_text(aarp_tree, offset + 6, 2, "Opcode: 0x%04x (%s)", ea.op, op_str ? op_str : "Unknown"); - proto_tree_add_item(aarp_tree, offset + 8, 6, + proto_tree_add_text(aarp_tree, offset + 8, 6, "Sender ether: %s", ether_to_str((guint8 *) ea.hsaddr)); - proto_tree_add_item(aarp_tree, offset + 14, 4, + proto_tree_add_text(aarp_tree, offset + 14, 4, "Sender ID: %s", atalkid_to_str((guint8 *) ea.psaddr)); - proto_tree_add_item(aarp_tree, offset + 18, 6, + proto_tree_add_text(aarp_tree, offset + 18, 6, "Target ether: %s", ether_to_str((guint8 *) ea.hdaddr)); - proto_tree_add_item(aarp_tree, offset + 24, 4, + proto_tree_add_text(aarp_tree, offset + 24, 4, "Target ID: %s", atalkid_to_str((guint8 *) ea.pdaddr)); } |