Support for TPKT being used for its original purpose (TCP port > 102,

containing OSI transport layer PDUs).

Enable the Q.931-inside-TPKT code (but not the H.225 stuff, as that
requires Andreas Sikkema's H.225 dissector).  Update it to match his
current modified Q.931 dissector.

svn path=/trunk/; revision=3199

1 files changed, 17 insertions, 3 deletions

diff --git a/packet-tpkt.h b/packet-tpkt.h
index 2697a20196..fa0e0cf551 100644
--- a/packet-tpkt.h
+++ b/packet-tpkt.h
@@ -25,6 +25,20 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-int is_tpkt( tvbuff_t *tvb, unsigned int* offset );
-int dissect_tpkt( tvbuff_t *tvb, unsigned int* offset, packet_info *pinfo, proto_tree *tree );
-void proto_register_tpkt( void );
+/*
+ * Check whether this could be a TPKT-encapsulated PDU.
+ */
+gboolean is_tpkt( tvbuff_t *tvb, unsigned 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 we didn't dissect it as a TPKT header, otherwise returns
+ * the PDU length from the TPKT header.
+ *
+ * Sets "*offset" to the offset following the TPKT header.
+ */
+int dissect_tpkt_header( tvbuff_t *tvb, unsigned int* offset,
+    packet_info *pinfo, proto_tree *tree );