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-tftp.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-tftp.c')
| -rw-r--r-- | packet-tftp.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/packet-tftp.c b/packet-tftp.c index 383558aaf1..b04c937b0e 100644 --- a/packet-tftp.c +++ b/packet-tftp.c @@ -3,7 +3,7 @@ * * Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-tftp.c,v 1.6 1999/11/14 10:32:26 deniel Exp $ + * $Id: packet-tftp.c,v 1.7 1999/11/16 11:43:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -45,6 +45,8 @@ static int proto_tftp = -1; static int hf_tftp_type = -1; static int hf_tftp_error_code = -1; +static gint ett_tftp = -1; + #define RRQ 1 #define WRQ 2 #define DATA 3 @@ -93,7 +95,7 @@ dissect_tftp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_tftp, offset, END_OF_FRAME, NULL); - tftp_tree = proto_item_add_subtree(ti, ETT_TFTP); + tftp_tree = proto_item_add_subtree(ti, ett_tftp); i1 = pntohs(pd+offset); proto_tree_add_item_hidden(tftp_tree, hf_tftp_type, offset, 2, i1); @@ -165,7 +167,11 @@ proto_register_tftp(void) FT_UINT16, BASE_DEC, NULL, 0x0, "Error code in case of TFTP error message" }} }; + static gint *ett[] = { + &ett_tftp, + }; proto_tftp = proto_register_protocol("Trivial File Transfer Protocol", "tftp"); proto_register_field_array(proto_tftp, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); } |