diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-12-03 02:10:31 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-12-03 02:10:31 +0000 |
| commit | 852e3fffe59feb20f92a5bd48cc931192f5eae5d (patch) | |
| tree | a35fa071eda554214fcf891bcdd085b87014d457 /packet-wtp.c | |
| parent | 44a02e37c6b25d8c5bc3ec147f91a6f5b7fb910e (diff) | |
As you set a conversation dissector by supplying a dissector handle
rather than a function pointer, "dissect_wtp_fromudp()" no longer needs
to be global; make it static, register it by name, and have the WSP
dissector get the handle by calling "find_dissector()" rather than by
constructing its own handle for it.
Fix up some attributions.
svn path=/trunk/; revision=4306
Diffstat (limited to 'packet-wtp.c')
| -rw-r--r-- | packet-wtp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packet-wtp.c b/packet-wtp.c index 73391d3f63..39efdd3090 100644 --- a/packet-wtp.c +++ b/packet-wtp.c @@ -2,11 +2,11 @@ * * Routines to dissect WTP component of WAP traffic. * - * $Id: packet-wtp.c,v 1.20 2001/10/07 08:37:28 guy Exp $ + * $Id: packet-wtp.c,v 1.21 2001/12/03 02:10:31 guy Exp $ * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> - * Copyright 1998 Didier Jorand + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs * * WAP dissector based on original work by Ben Fowler * Updated by Neil Hunter <neil.hunter@energis-squared.com> @@ -481,7 +481,7 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Called directly from UDP. * Put "WTP+WSP" into the "Protocol" column. */ -void +static void dissect_wtp_fromudp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (check_col(pinfo->fd, COL_PROTOCOL)) @@ -719,6 +719,7 @@ proto_register_wtp(void) proto_register_subtree_array(ett, array_length(ett)); register_dissector("wtp", dissect_wtp_fromwap, proto_wtp); + register_dissector("wtp-udp", dissect_wtp_fromudp, proto_wtp); }; void |