diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-03-20 22:22:45 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-03-20 22:22:45 +0000 |
| commit | a56b23acd8cfefb2f0743c3f1492f15f8b73caa2 (patch) | |
| tree | 34f7520df4d999a7e9b2e65012f9b7f75a1838c1 /packet-tr.c | |
| parent | 12011ce127bd4aad93894a443e68770e5f83f256 (diff) | |
Add fields tr.addr, fddi.addr, and isl.addr that act like eth.addr, matching
either *.src or *.dst
svn path=/trunk/; revision=1732
Diffstat (limited to 'packet-tr.c')
| -rw-r--r-- | packet-tr.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/packet-tr.c b/packet-tr.c index 43020fe06b..99417a145a 100644 --- a/packet-tr.c +++ b/packet-tr.c @@ -2,7 +2,7 @@ * Routines for Token-Ring packet disassembly * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-tr.c,v 1.35 2000/02/15 21:03:19 gram Exp $ + * $Id: packet-tr.c,v 1.36 2000/03/20 22:22:45 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -41,6 +41,7 @@ static int proto_tr = -1; static int hf_tr_dst = -1; static int hf_tr_src = -1; +static int hf_tr_addr = -1; static int hf_tr_sr = -1; static int hf_tr_ac = -1; static int hf_tr_priority = -1; @@ -437,6 +438,8 @@ dissect_tr(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { proto_tree_add_item(bf_tree, hf_tr_fc_pcf, offset + 1, 1, trn_fc); proto_tree_add_item(tr_tree, hf_tr_dst, offset + 2, 6, trn_dhost); proto_tree_add_item(tr_tree, hf_tr_src, offset + 8, 6, trn_shost); + proto_tree_add_item_hidden(tr_tree, hf_tr_addr, offset + 2, 6, trn_dhost); + proto_tree_add_item_hidden(tr_tree, hf_tr_addr, offset + 8, 6, trn_shost); proto_tree_add_item_hidden(tr_tree, hf_tr_sr, offset + 8, 1, source_routed); @@ -585,6 +588,10 @@ proto_register_tr(void) { "Source", "tr.src", FT_ETHER, BASE_NONE, NULL, 0x0, "Source Hardware Address" }}, + { &hf_tr_addr, + { "Source or Destination Address", "tr.addr", FT_ETHER, BASE_NONE, NULL, 0x0, + "Source or Destination Hardware Address" }}, + { &hf_tr_sr, { "Source Routed", "tr.sr", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Source Routed" }}, |