diff options
| author | Guy Harris <guy@alum.mit.edu> | 1999-11-16 11:44:20 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 1999-11-16 11:44:20 +0000 |
| commit | a7aba0a28890856d2570951c2b0a76c922fdfa72 (patch) | |
| tree | bcc3d6ea4d23e60c7841a408e9b1876ed6a93106 /packet-tr.c | |
| parent | 3a2f7f641a49b5eb9f369dcb29bc8a7cb1c50a91 (diff) | |
Replace the ETT_ "enum" members, declared in "packet.h", with
dynamically-assigned "ett_" integer values, assigned by
"proto_register_subtree_array()"; this:
obviates the need to update "packet.h" whenever you add a new
subtree type - you only have to add a call to
"proto_register_subtree_array()" to a "register" routine and an
array of pointers to "ett_", if they're not already there, and
add a pointer to the new "ett_" variable to the array, if they
are there;
would allow run-time-loaded dissectors to allocate subtree types
when they're loaded.
svn path=/trunk/; revision=1043
Diffstat (limited to 'packet-tr.c')
| -rw-r--r-- | packet-tr.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/packet-tr.c b/packet-tr.c index f29ead77c3..be357ba8cf 100644 --- a/packet-tr.c +++ b/packet-tr.c @@ -2,7 +2,7 @@ * Routines for Token-Ring packet disassembly * Gilbert Ramirez <gram@verdict.uthscsa.edu> * - * $Id: packet-tr.c,v 1.30 1999/10/22 07:17:43 guy Exp $ + * $Id: packet-tr.c,v 1.31 1999/11/16 11:43:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -56,6 +56,10 @@ static int hf_tr_rif = -1; static int hf_tr_rif_ring = -1; static int hf_tr_rif_bridge = -1; +static gint ett_token_ring = -1; +static gint ett_token_ring_ac = -1; +static gint ett_token_ring_fc = -1; + #define TR_MIN_HEADER_LEN 14 #define TR_MAX_HEADER_LEN 32 @@ -414,11 +418,11 @@ dissect_tr(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { if (tree) { /* Create Token-Ring Tree */ ti = proto_tree_add_item(tree, proto_tr, offset, 14 + actual_rif_bytes, NULL); - tr_tree = proto_item_add_subtree(ti, ETT_TOKEN_RING); + tr_tree = proto_item_add_subtree(ti, ett_token_ring); /* Create the Access Control bitfield tree */ ti = proto_tree_add_item(tr_tree, hf_tr_ac, offset, 1, trn_ac); - bf_tree = proto_item_add_subtree(ti, ETT_TOKEN_RING_AC); + bf_tree = proto_item_add_subtree(ti, ett_token_ring_ac); proto_tree_add_item(bf_tree, hf_tr_priority, offset, 1, trn_ac); proto_tree_add_item(bf_tree, hf_tr_frame, offset, 1, trn_ac); @@ -427,7 +431,7 @@ dissect_tr(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { /* Create the Frame Control bitfield tree */ ti = proto_tree_add_item(tr_tree, hf_tr_fc, offset + 1, 1, trn_fc); - bf_tree = proto_item_add_subtree(ti, ETT_TOKEN_RING_FC); + bf_tree = proto_item_add_subtree(ti, ett_token_ring_fc); proto_tree_add_item(bf_tree, hf_tr_fc_type, offset + 1, 1, trn_fc); proto_tree_add_item(bf_tree, hf_tr_fc_pcf, offset + 1, 1, trn_fc); @@ -615,8 +619,14 @@ proto_register_tr(void) { "RIF Bridge", "tr.rif.bridge", FT_UINT8, BASE_HEX, NULL, 0x0, "" }}, }; + static gint *ett[] = { + &ett_token_ring, + &ett_token_ring_ac, + &ett_token_ring_fc, + }; proto_tr = proto_register_protocol("Token-Ring", "tr"); proto_register_field_array(proto_tr, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); } |