diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-02-22 08:56:48 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-02-22 08:56:48 +0000 |
commit | 1969ffcc15cf128c1b2e51344fef4e385787a3bd (patch) | |
tree | 22e81a4bb0f52d77136bcefccfacdee0d743da32 /packet-tpkt.h | |
parent | 319611573b420690d812d797706b9d6fd41283cc (diff) |
Handle TPKT packets split across segment boundaries, and multiple TPKT
packets per segment.
Instead of having a routine for dissectors such as the Q.931 dissector
to call to dissect the TPKT header, have a routine that does all the
reassembly and multiple-packets-per-segment work, and have the Q.931
dissector call it. Export "is_tpkt()", and the new routine, to plugins.
Add preferences for TPKT and Q.931 reassembly.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4778 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-tpkt.h')
-rw-r--r-- | packet-tpkt.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/packet-tpkt.h b/packet-tpkt.h index 9afc02a01a..780a4febad 100644 --- a/packet-tpkt.h +++ b/packet-tpkt.h @@ -5,7 +5,7 @@ * Copyright 2000, Philips Electronics N.V. * Andreas Sikkema <andreas.sikkema@philips.com> * - * $Id: packet-tpkt.h,v 1.5 2002/02/02 02:51:20 guy Exp $ + * $Id: packet-tpkt.h,v 1.6 2002/02/22 08:56:46 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -32,15 +32,11 @@ * Sets "*offset" to the offset of the first byte past the TPKT header, * and returns the length from the TPKT header, if it is. */ -int is_tpkt( tvbuff_t *tvb, int *offset ); - +extern int is_tpkt(tvbuff_t *tvb, int *offset); /* - * Dissect the TPKT header; called from the TPKT dissector, as well as - * from dissectors such as the dissector for Q.931-over-TCP. - * - * Returns -1 if TPKT isn't enabled, otherwise returns the PDU length - * from the TPKT header. + * Dissect TPKT-encapsulated data in a TCP stream. */ -int dissect_tpkt_header( tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree ); +extern void dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, + proto_tree *tree, gboolean desegment, + dissector_handle_t subdissector_handle); |