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-http.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-http.c')
| -rw-r--r-- | packet-http.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packet-http.c b/packet-http.c index 38c686613e..ac2d5dc388 100644 --- a/packet-http.c +++ b/packet-http.c @@ -3,7 +3,7 @@ * * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-http.c,v 1.40 2001/11/18 02:28:15 hagbard Exp $ + * $Id: packet-http.c,v 1.41 2001/11/26 04:52:50 hagbard Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -58,6 +58,8 @@ static int hf_http_request = -1; static gint ett_http = -1; +static dissector_handle_t data_handle; + #define TCP_PORT_HTTP 80 #define TCP_PORT_PROXY_HTTP 3128 #define TCP_PORT_PROXY_ADMIN_HTTP 3132 @@ -281,7 +283,7 @@ dissect_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (ti != NULL) proto_item_set_len(ti, offset); } else - dissect_data(tvb, offset, pinfo, http_tree); + call_dissector(data_handle,tvb_new_subset(tvb, offset,-1,tvb_reported_length_remaining(tvb,offset)), pinfo, http_tree); } } @@ -446,6 +448,7 @@ http_dissector_add(guint32 port, dissector_t dissector, int proto) void proto_reg_handoff_http(void) { + data_handle = find_dissector("data"); dissector_add("tcp.port", TCP_PORT_HTTP, dissect_http, proto_http); dissector_add("tcp.port", TCP_ALT_PORT_HTTP, dissect_http, proto_http); dissector_add("tcp.port", TCP_PORT_PROXY_HTTP, dissect_http, |