diff options
| author | Ed Warnicke <hagbard@physics.rutgers.edu> | 2001-11-26 04:52:51 +0000 |
|---|---|---|
| committer | Ed Warnicke <hagbard@physics.rutgers.edu> | 2001-11-26 04:52:51 +0000 |
| commit | fcd5b352af60e034a4b63601272b43b6644029cd (patch) | |
| tree | b423f343624fa9219216fac49dd6a23b2c4d5586 /packet-dsi.c | |
| parent | 7537283cc691e6370db67fd5b0e393583074bf7f (diff) | |
| download | wireshark-fcd5b352af60e034a4b63601272b43b6644029cd.tar.gz wireshark-fcd5b352af60e034a4b63601272b43b6644029cd.tar.bz2 wireshark-fcd5b352af60e034a4b63601272b43b6644029cd.zip | |
Moved from using dissect_data() to using call_dissector()
svn path=/trunk/; revision=4269
Diffstat (limited to 'packet-dsi.c')
| -rw-r--r-- | packet-dsi.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/packet-dsi.c b/packet-dsi.c index 2ef73a826e..7ef81a6dc5 100644 --- a/packet-dsi.c +++ b/packet-dsi.c @@ -2,7 +2,7 @@ * Routines for dsi packet dissection * Copyright 2001, Randy McEoin <rmceoin@pe.com> * - * $Id: packet-dsi.c,v 1.3 2001/09/03 10:33:05 guy Exp $ + * $Id: packet-dsi.c,v 1.4 2001/11/26 04:52:49 hagbard Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -75,6 +75,8 @@ static int hf_dsi_reserved = -1; static gint ett_dsi = -1; +static dissector_handle_t data_handle; + #define TCP_PORT_DSI 548 /* DSI flags */ @@ -383,7 +385,7 @@ dissect_dsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_uint(dsi_tree, hf_dsi_requestid, tvb, 0, 0, dsi_requestid); - dissect_data(tvb, 0, pinfo, dsi_tree); + call_dissector(data_handle,tvb, pinfo, dsi_tree); }else { proto_tree_add_uint(dsi_tree, hf_dsi_flags, tvb, @@ -399,7 +401,7 @@ dissect_dsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Length: %d bytes", dsi_length); proto_tree_add_uint(dsi_tree, hf_dsi_reserved, tvb, offset+12, 4, dsi_reserved); - dissect_data(tvb, 16, pinfo, dsi_tree); + call_dissector(data_handle,tvb_new_subset(tvb, 16,-1,tvb_reported_length_remaining(tvb,16)), pinfo, dsi_tree); } } @@ -486,5 +488,6 @@ proto_register_dsi(void) void proto_reg_handoff_dsi(void) { + data_handle = find_dissector("data"); dissector_add("tcp.port", TCP_PORT_DSI, dissect_dsi, proto_dsi); } |