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-ipp.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-ipp.c')
| -rw-r--r-- | packet-ipp.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/packet-ipp.c b/packet-ipp.c index 54d6857d1c..18311ea484 100644 --- a/packet-ipp.c +++ b/packet-ipp.c @@ -3,7 +3,7 @@ * * Guy Harris <guy@netapp.com> * - * $Id: packet-ipp.c,v 1.2 1999/09/17 06:25:41 guy Exp $ + * $Id: packet-ipp.c,v 1.3 1999/11/16 11:42:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -43,6 +43,10 @@ static int proto_ipp = -1; +static gint ett_ipp = -1; +static gint ett_ipp_as = -1; +static gint ett_ipp_attr = -1; + #define PRINT_JOB 0x0002 #define PRINT_URI 0x0003 #define VALIDATE_JOB 0x0004 @@ -173,7 +177,7 @@ void dissect_ipp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_ipp, offset, END_OF_FRAME, NULL); - ipp_tree = proto_item_add_subtree(ti, ETT_IPP); + ipp_tree = proto_item_add_subtree(ti, ett_ipp); proto_tree_add_text(ipp_tree, offset, 2, "Version: %u.%u", pd[offset], pd[offset + 1]); @@ -387,7 +391,7 @@ parse_attributes(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) * a tree. */ as_tree = proto_item_add_subtree(tas, - ETT_IPP_AS); + ett_ipp_as); attr_tree = as_tree; } @@ -466,7 +470,7 @@ add_integer_tree(proto_tree *tree, const u_char *pd, int offset, name_length, &pd[offset + 1 + 2], pntohl(&pd[1 + 2 + name_length + 2])); } - return proto_item_add_subtree(ti, ETT_IPP_ATTR); + return proto_item_add_subtree(ti, ett_ipp_attr); } static void @@ -493,7 +497,7 @@ add_octetstring_tree(proto_tree *tree, const u_char *pd, int offset, name_length, &pd[offset + 1 + 2]); bytes_to_str(&pd[offset + 1 + 2 + name_length + 2], value_length); - return proto_item_add_subtree(ti, ETT_IPP_ATTR); + return proto_item_add_subtree(ti, ett_ipp_attr); } static void @@ -517,7 +521,7 @@ add_charstring_tree(proto_tree *tree, const u_char *pd, int offset, "%.*s: %.*s", name_length, &pd[offset + 1 + 2], value_length, &pd[offset + 1 + 2 + name_length + 2]); - return proto_item_add_subtree(ti, ETT_IPP_ATTR); + return proto_item_add_subtree(ti, ett_ipp_attr); } static void @@ -557,7 +561,13 @@ proto_register_ipp(void) { &variable, { "Name", "ipp.abbreviation", TYPE, VALS_POINTER }}, };*/ + static gint *ett[] = { + &ett_ipp, + &ett_ipp_as, + &ett_ipp_attr, + }; proto_ipp = proto_register_protocol("Internet Printing Protocol", "ipp"); /* proto_register_field_array(proto_ipp, hf, array_length(hf));*/ + proto_register_subtree_array(ett, array_length(ett)); } |