diff options
| author | Ed Warnicke <hagbard@physics.rutgers.edu> | 2001-11-25 22:51:14 +0000 |
|---|---|---|
| committer | Ed Warnicke <hagbard@physics.rutgers.edu> | 2001-11-25 22:51:14 +0000 |
| commit | 34dbc86e65d64bf747d948051ba8d4d3e967d6d1 (patch) | |
| tree | 20244c5cfd8f43e50e4dccd78b8a9ce386894d49 /packet-lpd.c | |
| parent | a810a01338337a3802ff19ef9d952999181458c3 (diff) | |
Moved from using dissect_data to using call_dissector()
svn path=/trunk/; revision=4264
Diffstat (limited to 'packet-lpd.c')
| -rw-r--r-- | packet-lpd.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packet-lpd.c b/packet-lpd.c index 7c2a5532aa..f3cc388515 100644 --- a/packet-lpd.c +++ b/packet-lpd.c @@ -2,7 +2,7 @@ * Routines for LPR and LPRng packet disassembly * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-lpd.c,v 1.29 2001/11/13 23:55:30 gram Exp $ + * $Id: packet-lpd.c,v 1.30 2001/11/25 22:51:13 hagbard Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -49,6 +49,8 @@ enum lpr_type { request, response, unknown }; static gint find_printer_string(tvbuff_t *tvb, int offset); +static dissector_handle_t data_handle; + static void dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -132,7 +134,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_format_text(tvb, 1, printer_len)); } else { - dissect_data(tvb, 0, pinfo, tree); + call_dissector(data_handle,tvb, pinfo, tree); } } else if (lpr_packet_type == response) { @@ -141,11 +143,11 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Response: %s", lpd_server_code[code]); } else { - dissect_data(tvb, 0, pinfo, tree); + call_dissector(data_handle,tvb, pinfo, tree); } } else { - dissect_data(tvb, 0, pinfo, tree); + call_dissector(data_handle,tvb, pinfo, tree); } } } @@ -193,4 +195,5 @@ void proto_reg_handoff_lpd(void) { dissector_add("tcp.port", TCP_PORT_PRINTER, &dissect_lpd, proto_lpd); + data_handle = find_dissector("data"); } |