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-yhoo.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-yhoo.c')
-rw-r--r-- | packet-yhoo.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/packet-yhoo.c b/packet-yhoo.c index acc146cc6e..5b5f0b23df 100644 --- a/packet-yhoo.c +++ b/packet-yhoo.c @@ -2,7 +2,7 @@ * Routines for yahoo messenger packet dissection * Copyright 1999, Nathan Neulinger <nneul@umr.edu> * - * $Id: packet-yhoo.c,v 1.3 1999/10/20 16:36:07 gram Exp $ + * $Id: packet-yhoo.c,v 1.4 1999/11/16 11:43:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -56,6 +56,8 @@ static int hf_yhoo_nick1 = -1; static int hf_yhoo_nick2 = -1; static int hf_yhoo_content = -1; +static gint ett_yhoo = -1; + static const value_string yhoo_service_vals[] = { {YAHOO_SERVICE_LOGON, "Pager Logon"}, {YAHOO_SERVICE_LOGOFF, "Pager Logoff"}, @@ -125,7 +127,7 @@ dissect_yhoo(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_yhoo, offset, END_OF_FRAME, NULL); - yhoo_tree = proto_item_add_subtree(ti, ETT_YHOO); + yhoo_tree = proto_item_add_subtree(ti, ett_yhoo); proto_tree_add_item(yhoo_tree, hf_yhoo_version, offset, 8, pkt->version); @@ -185,8 +187,13 @@ proto_register_yhoo(void) "Version", "yhoo.version", FT_STRING, 0, NULL, 0, "Packet version identifier" }}, }; + static gint *ett[] = { + &ett_yhoo, + }; proto_yhoo = proto_register_protocol("Yahoo Messenger Protocol", "yhoo"); proto_register_field_array(proto_yhoo, hf, array_length(hf)); + + proto_register_subtree_array(ett, array_length(ett)); } |