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-pptp.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-pptp.c')
| -rw-r--r-- | packet-pptp.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/packet-pptp.c b/packet-pptp.c index 5ffe972ced..c2a766d3e7 100644 --- a/packet-pptp.c +++ b/packet-pptp.c @@ -2,7 +2,7 @@ * Routines for the Point-to-Point Tunnelling Protocol (PPTP) * Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * - * $Id: packet-pptp.c,v 1.5 1999/09/17 05:56:55 guy Exp $ + * $Id: packet-pptp.c,v 1.6 1999/11/16 11:42:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -41,6 +41,8 @@ #include <glib.h> #include "packet.h" +static gint ett_pptp = -1; + #define NUM_MSG_TYPES 3 #define msgtype2str(t) \ ((t < NUM_MSG_TYPES) ? msgtypestr[t] : "UNKNOWN-MESSAGES-TYPE") @@ -396,7 +398,7 @@ dissect_pptp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { proto_tree * pptp_tree; ti = proto_tree_add_text(tree, offset, len, "PPTP Control Channel"); - pptp_tree = proto_item_add_subtree(ti, ETT_PPTP); + pptp_tree = proto_item_add_subtree(ti, ett_pptp); proto_tree_add_text(pptp_tree, offset, sizeof(hdr->len), "Length: %u", len); @@ -885,3 +887,13 @@ dissect_set_link(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) "Recv ACCM: %#08x", hdr->recv_acm); offset += sizeof(hdr->recv_acm); } + +void +proto_register_pptp(void) +{ + static gint *ett[] = { + &ett_pptp, + }; + + proto_register_subtree_array(ett, array_length(ett)); +} |