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-portmap.c | |
| parent | 3a2f7f641a49b5eb9f369dcb29bc8a7cb1c50a91 (diff) | |
| download | wireshark-a7aba0a28890856d2570951c2b0a76c922fdfa72.tar.gz wireshark-a7aba0a28890856d2570951c2b0a76c922fdfa72.tar.bz2 wireshark-a7aba0a28890856d2570951c2b0a76c922fdfa72.zip | |
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-portmap.c')
| -rw-r--r-- | packet-portmap.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/packet-portmap.c b/packet-portmap.c index 9091e469ff..88d59bb917 100644 --- a/packet-portmap.c +++ b/packet-portmap.c @@ -1,7 +1,7 @@ /* packet-portmap.c * Routines for portmap dissection * - * $Id: packet-portmap.c,v 1.6 1999/11/15 14:17:19 nneul Exp $ + * $Id: packet-portmap.c,v 1.7 1999/11/16 11:42:47 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -45,6 +45,8 @@ static int hf_portmap_version = -1; static int hf_portmap_port = -1; static int hf_portmap_answer = -1; +static gint ett_portmap = -1; + /* Dissect a getport call */ int dissect_getport_call(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) @@ -266,16 +268,19 @@ proto_register_portmap(void) "Answer", "portmap.answer", FT_BOOLEAN, BASE_DEC, NULL, 0, "Answer" }}, }; + static gint *ett[] = { + &ett_portmap, + }; proto_portmap = proto_register_protocol("Portmap", "portmap"); proto_register_field_array(proto_portmap, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); /* Register the protocol as RPC */ - rpc_init_prog(proto_portmap, PORTMAP_PROGRAM, ETT_PORTMAP); + rpc_init_prog(proto_portmap, PORTMAP_PROGRAM, ett_portmap); /* Register the procedure tables */ rpc_init_proc_table(PORTMAP_PROGRAM, 1, portmap1_proc); rpc_init_proc_table(PORTMAP_PROGRAM, 2, portmap2_proc); rpc_init_proc_table(PORTMAP_PROGRAM, 3, portmap3_proc); rpc_init_proc_table(PORTMAP_PROGRAM, 4, portmap4_proc); } - |