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-ripng.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-ripng.c')
| -rw-r--r-- | packet-ripng.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/packet-ripng.c b/packet-ripng.c index 6f44d8b0a1..e328f2ce4d 100644 --- a/packet-ripng.c +++ b/packet-ripng.c @@ -3,7 +3,7 @@ * (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org> * derived from packet-rip.c * - * $Id: packet-ripng.c,v 1.5 1999/10/18 00:37:35 itojun Exp $ + * $Id: packet-ripng.c,v 1.6 1999/11/16 11:42:51 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -48,6 +48,9 @@ static int proto_ripng = -1; static int hf_ripng_cmd = -1; static int hf_ripng_version = -1; +static gint ett_ripng = -1; +static gint ett_ripng_addr = -1; + void dissect_ripng(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { struct rip6 rip6; @@ -74,7 +77,7 @@ dissect_ripng(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { if (tree) { ti = proto_tree_add_item(tree, proto_ripng, offset, END_OF_FRAME, NULL); - ripng_tree = proto_item_add_subtree(ti, ETT_RIPNG); + ripng_tree = proto_item_add_subtree(ti, ett_ripng); proto_tree_add_item_format(ripng_tree, hf_ripng_cmd, offset, 1, rip6.rip6_cmd, @@ -99,7 +102,7 @@ dissect_ripng(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { ni6.rip6_plen, ni6.rip6_metric); } - subtree = proto_item_add_subtree(ti, ETT_RIPNG_ADDR); + subtree = proto_item_add_subtree(ti, ett_ripng_addr); proto_tree_add_text(subtree, offset + offsetof(struct netinfo6, rip6_dest), sizeof(ni6.rip6_dest), "IP Address: %s", @@ -133,7 +136,12 @@ proto_register_ripng(void) { "Version", "ripng.version", FT_UINT8, BASE_DEC, NULL, 0x0, "" }}, }; + static gint *ett[] = { + &ett_ripng, + &ett_ripng_addr, + }; proto_ripng = proto_register_protocol("RIPng", "ripng"); proto_register_field_array(proto_ripng, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); } |