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-udp.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-udp.c')
| -rw-r--r-- | packet-udp.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/packet-udp.c b/packet-udp.c index c7a90df5af..21b18e37c2 100644 --- a/packet-udp.c +++ b/packet-udp.c @@ -1,7 +1,7 @@ /* packet-udp.c * Routines for UDP packet disassembly * - * $Id: packet-udp.c,v 1.34 1999/11/14 20:44:51 guy Exp $ + * $Id: packet-udp.c,v 1.35 1999/11/16 11:43:01 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -44,12 +44,14 @@ #include "packet.h" #include "resolv.h" -int proto_udp = -1; -int hf_udp_srcport = -1; -int hf_udp_dstport = -1; -int hf_udp_port = -1; -int hf_udp_length = -1; -int hf_udp_checksum = -1; +static int proto_udp = -1; +static int hf_udp_srcport = -1; +static int hf_udp_dstport = -1; +static int hf_udp_port = -1; +static int hf_udp_length = -1; +static int hf_udp_checksum = -1; + +static gint ett_udp = -1; /* UDP structs and definitions */ @@ -200,7 +202,7 @@ dissect_udp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { if (tree) { ti = proto_tree_add_item(tree, proto_udp, offset, 8); - udp_tree = proto_item_add_subtree(ti, ETT_UDP); + udp_tree = proto_item_add_subtree(ti, ett_udp); proto_tree_add_item_format(udp_tree, hf_udp_srcport, offset, 2, uh_sport, "Source port: %s (%u)", get_udp_port(uh_sport), uh_sport); @@ -324,8 +326,11 @@ proto_register_udp(void) { "Checksum", "udp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0, "" }}, }; + static gint *ett[] = { + &ett_udp, + }; proto_udp = proto_register_protocol("User Datagram Protocol", "udp"); proto_register_field_array(proto_udp, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); } - |