generate T.38 dissector from ASN.1 source

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21676 f5534014-38df-0310-8fa8-9805f1628bb7

15 files changed, 1980 insertions, 688 deletions

diff --git a/asn1/Makefile.am b/asn1/Makefile.am
index a9368b188d..7662db775b 100644
--- a/asn1/Makefile.am
+++ b/asn1/Makefile.am
@@ -376,6 +376,12 @@ EXTRA_DIST = \
 	spnego/packet-spnego-template.h	\
 	spnego/spnego.asn	\
 	spnego/spnego.cnf	\
+	t38/t38.cnf	\
+	t38/T38(2002).asn 	\
+	t38/Makefile	\
+	t38/Makefile.nmake	\
+	t38/packet-t38-template.c	\
+	t38/packet-t38-template.h	\
 	tcap/Makefile	\
 	tcap/Makefile.nmake	\
 	tcap/packet-tcap-template.c	\
diff --git a/asn1/Makefile.nmake b/asn1/Makefile.nmake
index 6df43fc5dd..fcafaa5010 100644
--- a/asn1/Makefile.nmake
+++ b/asn1/Makefile.nmake
@@ -67,6 +67,7 @@ per: \
 	ranap	\
 	rnsap	\
 	rrlp	\
+	t38	\
 	ulp		\
 	umts_rrc	\
 	umts_rrc_ies	\
@@ -226,6 +227,9 @@ clean:
 	cd spnego
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ..
+	cd t38
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+	cd ..
 	cd tcap
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ..
@@ -521,6 +525,11 @@ spnego::
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
 	cd ..
 
+t38::
+	cd t38
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
+	cd ..
+
 tcap::
 	cd tcap
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
diff --git a/asn1/t38/Makefile b/asn1/t38/Makefile
new file mode 100644
index 0000000000..a64f77deb4
--- /dev/null
+++ b/asn1/t38/Makefile
@@ -0,0 +1,16 @@
+# $Id$
+
+DISSECTOR_FILES=packet-t38.c packet-t38.h
+
+all: generate_dissector
+
+generate_dissector: $(DISSECTOR_FILES)
+
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py packet-t38-template.c packet-t38-template.h t38.cnf
+	python ../../tools/asn2wrs.py -p t38 -c t38.cnf -s packet-t38-template T38(2002).asn
+
+clean:
+	rm -f parsetab.py $(DISSECTOR_FILES)
+
+copy_files: generate_dissector
+	cp $(DISSECTOR_FILES) ../../epan/dissectors
diff --git a/asn1/t38/Makefile.nmake b/asn1/t38/Makefile.nmake
new file mode 100644
index 0000000000..ee234c2ab5
--- /dev/null
+++ b/asn1/t38/Makefile.nmake
@@ -0,0 +1,46 @@
+## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
+#
+# $Id$
+
+include ../../config.nmake
+
+UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
+
+PROTOCOL_NAME=t38
+DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
+T38_ASN=T38(2002).asn
+
+all: generate_dissector
+
+generate_dissector: $(DISSECTOR_FILES)
+
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(T38_ASN) packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf
+!IFDEF PYTHON
+	$(PYTHON) "../../tools/asn2wrs.py" -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(T38_ASN)
+!ELSE
+	@echo Error: You need Python to use asn2wrs.py
+	@exit 1
+!ENDIF
+
+clean:
+	rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES)
+
+distclean: clean
+
+maintainer-clean: distclean
+
+# Fix EOL in generated dissectors. Cygwin's python generates files with 
+# mixed EOL styles, which can't be commited to the SVN repository.
+# Stuff included from template and "cnf" files has "\r\n" on windows, while 
+# the generated stuff has "\n".
+
+fix_eol: generate_dissector
+	move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp
+	move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp
+	$(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c
+	$(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h
+	del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
+
+copy_files: generate_dissector fix_eol
+	xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+	xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/t38/T38(1998).asn b/asn1/t38/T38(1998).asn
new file mode 100644
index 0000000000..64113f9099
--- /dev/null
+++ b/asn1/t38/T38(1998).asn
@@ -0,0 +1,57 @@
+-- T38(1998).asn
+--
+-- Taken from ITU ASN.1 database
+-- http://www.itu.int/ITU-T/asn1/database/itu-t/t/t38/2005/T38(1998).asn
+--
+-- $Id$
+--
+-- it is not used for dissector generation
+-- it is here only for information to see difference of the "Pre-Corrigendum" version
+--
+
+-- Module T38(1998) (T.38:09/2005)
+T38 DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+
+IFPPacket ::= SEQUENCE {
+  type-of-msg  Type-of-msg,
+  data-field   Data-Field OPTIONAL
+}
+
+Type-of-msg ::= CHOICE {
+  t30-indicator
+    ENUMERATED {no-signal, cng, ced, v21-preamble, v27-2400-training,
+                v27-4800-training, v29-7200-training, v29-9600-training,
+                v17-7200-short-training, v17-7200-long-training,
+                v17-9600-short-training, v17-9600-long-training,
+                v17-12000-short-training, v17-12000-long-training,
+                v17-14400-short-training, v17-14400-long-training, ...
+                },
+  data
+    ENUMERATED {v21, v27-2400, v27-4800, v29-7200, v29-9600, v17-7200,
+                v17-9600, v17-12000, v17-14400, ...
+                }
+}
+
+Data-Field ::=
+  SEQUENCE OF
+    SEQUENCE {field-type
+                ENUMERATED {hdlc-data, hdlc-sig-end, hdlc-fcs-OK, hdlc-fcs-BAD,
+                            hdlc-fcs-OK-sig-end, hdlc-fcs-BAD-sig-end,
+                            t4-non-ecm-data, t4-non-ecm-sig-end},
+              field-data  OCTET STRING(SIZE (1..65535)) OPTIONAL}
+
+UDPTLPacket ::= SEQUENCE {
+  seq-number          INTEGER(0..65535),
+  primary-ifp-packet  TYPE-IDENTIFIER.&Type(IFPPacket),
+  error-recovery
+    CHOICE {secondary-ifp-packets  SEQUENCE OF TYPE-IDENTIFIER.&Type(IFPPacket),
+            fec-info
+              SEQUENCE {fec-npackets  INTEGER,
+                        fec-data      SEQUENCE OF OCTET STRING}}
+}
+
+END
+
+-- Generated by Asnp, the ASN.1 pretty-printer of France Telecom R&D
+
diff --git a/asn1/t38/T38(2002).asn b/asn1/t38/T38(2002).asn
new file mode 100644
index 0000000000..9fe81266f8
--- /dev/null
+++ b/asn1/t38/T38(2002).asn
@@ -0,0 +1,56 @@
+-- T38(2002).asn
+--
+-- Taken from ITU ASN.1 database
+-- http://www.itu.int/ITU-T/asn1/database/itu-t/t/t38/2005/T38(2002).asn
+--
+-- $Id$
+--
+
+-- Module T38(2002) (T.38:09/2005)
+T38 DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+
+IFPPacket ::= SEQUENCE {
+  type-of-msg  Type-of-msg,
+  data-field   Data-Field OPTIONAL
+}
+
+Type-of-msg ::= CHOICE {
+  t30-indicator
+    ENUMERATED {no-signal, cng, ced, v21-preamble, v27-2400-training,
+                v27-4800-training, v29-7200-training, v29-9600-training,
+                v17-7200-short-training, v17-7200-long-training,
+                v17-9600-short-training, v17-9600-long-training,
+                v17-12000-short-training, v17-12000-long-training,
+                v17-14400-short-training, v17-14400-long-training, ..., 
+                v8-ansam, v8-signal, v34-cntl-channel-1200, v34-pri-channel,
+                v34-CC-retrain, v33-12000-training, v33-14400-training},
+  t30-data
+    ENUMERATED {v21, v27-2400, v27-4800, v29-7200, v29-9600, v17-7200,
+                v17-9600, v17-12000, v17-14400, ..., 
+                v8, v34-pri-rate, v34-CC-1200, v34-pri-ch, v33-12000, v33-14400}
+}
+
+Data-Field ::=
+  SEQUENCE OF
+    SEQUENCE {field-type
+                ENUMERATED {hdlc-data, hdlc-sig-end, hdlc-fcs-OK, hdlc-fcs-BAD,
+                            hdlc-fcs-OK-sig-end, hdlc-fcs-BAD-sig-end,
+                            t4-non-ecm-data, t4-non-ecm-sig-end, ..., 
+                            cm-message, jm-message, ci-message, v34rate},
+              field-data  OCTET STRING(SIZE (1..65535)) OPTIONAL}
+
+UDPTLPacket ::= SEQUENCE {
+  seq-number          INTEGER(0..65535),
+  primary-ifp-packet  TYPE-IDENTIFIER.&Type(IFPPacket),
+  error-recovery
+    CHOICE {secondary-ifp-packets  SEQUENCE OF TYPE-IDENTIFIER.&Type(IFPPacket),
+            fec-info
+              SEQUENCE {fec-npackets  INTEGER,
+                        fec-data      SEQUENCE OF OCTET STRING}}
+}
+
+END
+
+-- Generated by Asnp, the ASN.1 pretty-printer of France Telecom R&D
+
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c
new file mode 100644
index 0000000000..61fe14404c
--- /dev/null
+++ b/asn1/t38/packet-t38-template.c
@@ -0,0 +1,819 @@
+/* packet-t38.c
+ * Routines for T.38 packet dissection
+ * 2003  Hans Viens
+ * 2004  Alejandro Vaquero, add support Conversations for SDP
+ * 2006  Alejandro Vaquero, add T30 reassemble and dissection
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+/* Depending on what ASN.1 specification is used you may have to change
+ * the preference setting regarding Pre-Corrigendum ASN.1 specification:
+ * http://www.itu.int/ITU-T/asn1/database/itu-t/t/t38/1998/T38.html  (Pre-Corrigendum=TRUE)
+ * http://www.itu.int/ITU-T/asn1/database/itu-t/t/t38/2003/T38(1998).html (Pre-Corrigendum=TRUE)
+ *
+ * http://www.itu.int/ITU-T/asn1/database/itu-t/t/t38/2003/T38(2002).html (Pre-Corrigendum=FALSE)
+ * http://www.itu.int/ITU-T/asn1/database/itu-t/t/t38/2002/t38.html  (Pre-Corrigendum=FALSE)
+ * http://www.itu.int/ITU-T/asn1/database/itu-t/t/t38/2002-Amd1/T38.html (Pre-Corrigendum=FALSE)
+ */
+
+/* TO DO:  
+ * - TCP desegmentation is currently not supported for T.38 IFP directly over TCP. 
+ * - H.245 dissectors should be updated to start conversations for T.38 similar to RTP.
+ * - Sometimes the last octet is not high-lighted when selecting something in the tree. Bug in PER dissector? 
+ * - Add support for RTP payload audio/t38 (draft-jones-avt-audio-t38-03.txt), i.e. T38 in RTP packets.
+ */
+
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <glib.h>
+#include <epan/packet.h>
+#include <epan/reassemble.h>
+#include <epan/conversation.h>
+#include <epan/tap.h>
+#include <epan/expert.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include "packet-t38.h"
+#include <epan/prefs.h>
+#include <epan/ipproto.h>
+#include <epan/asn1.h>
+#include "packet-per.h"
+#include "packet-tpkt.h"
+#include <epan/emem.h>
+
+#define PORT_T38 6004  
+static guint global_t38_tcp_port = PORT_T38;
+static guint global_t38_udp_port = PORT_T38;
+
+static int t38_tap = -1;
+
+/*
+* Variables to allow for proper deletion of dissector registration when
+* the user changes port from the gui.
+*/
+static guint tcp_port = 0;
+static guint udp_port = 0;
+
+/* dissect using the Pre Corrigendum T.38 ASN.1 specification (1998) */
+static gboolean use_pre_corrigendum_asn1_specification = TRUE;
+
+/* dissect packets that looks like RTP version 2 packets as RTP     */
+/* instead of as T.38. This may result in that some T.38 UPTL       */
+/* packets with sequence number values higher than 32767 may be     */
+/* shown as RTP packets.                                            */ 
+static gboolean dissect_possible_rtpv2_packets_as_rtp = FALSE;
+
+
+/* Reassembly of T.38 PDUs over TPKT over TCP */
+static gboolean t38_tpkt_reassembly = TRUE;
+
+/* Preference setting whether TPKT header is used when sending T.38 over TCP.
+ * The default setting is Maybe where the dissector will look on the first
+ * bytes to try to determine whether TPKT header is used or not. This may not
+ * work so well in some cases. You may want to change the setting to Always or
+ * Newer.
+ */
+#define T38_TPKT_NEVER 0   /* Assume that there is never a TPKT header    */
+#define T38_TPKT_ALWAYS 1  /* Assume that there is always a TPKT header   */
+#define T38_TPKT_MAYBE 2   /* Assume TPKT if first octets are 03-00-xx-xx */
+static gint t38_tpkt_usage = T38_TPKT_MAYBE;
+
+static const enum_val_t t38_tpkt_options[] = {
+  {"never", "Never", T38_TPKT_NEVER},
+  {"always", "Always", T38_TPKT_ALWAYS},
+  {"maybe", "Maybe", T38_TPKT_MAYBE},
+  {NULL, NULL, -1}
+};
+
+
+
+/* T38 */
+static dissector_handle_t t38_udp_handle;
+static dissector_handle_t t38_tcp_handle;
+static dissector_handle_t t38_tcp_pdu_handle;
+static dissector_handle_t rtp_handle;
+static dissector_handle_t t30_hdlc_handle;
+static dissector_handle_t data_handle;
+
+static guint32 Type_of_msg_value;
+static guint32 Data_Field_field_type_value;
+static guint32 Data_value;
+static guint32 T30ind_value;
+static guint32 Data_Field_item_num;
+
+static int proto_t38 = -1;
+#include "packet-t38-hf.c"
+
+/* T38 setup fields */
+static int hf_t38_setup        = -1;
+static int hf_t38_setup_frame  = -1;
+static int hf_t38_setup_method = -1;
+
+/* T38 Data reassemble fields */
+static int hf_data_fragments = -1;
+static int hf_data_fragment = -1;
+static int hf_data_fragment_overlap = -1;
+static int hf_data_fragment_overlap_conflicts = -1;
+static int hf_data_fragment_multiple_tails = -1;
+static int hf_data_fragment_too_long_fragment = -1;
+static int hf_data_fragment_error = -1;
+static int hf_data_reassembled_in = -1;
+
+static gint ett_t38 = -1;
+#include "packet-t38-ett.c"
+static gint ett_t38_setup = -1;
+
+static gint ett_data_fragment = -1;
+static gint ett_data_fragments = -1;
+
+static gboolean primary_part = TRUE;
+static guint32 seq_number = 0;
+
+/* Tables for reassembly of Data fragments. */
+static GHashTable *data_fragment_table = NULL;
+static GHashTable *data_reassembled_table = NULL;
+
+static const fragment_items data_frag_items = {
+	/* Fragment subtrees */
+	&ett_data_fragment,
+	&ett_data_fragments,
+	/* Fragment fields */
+	&hf_data_fragments,
+	&hf_data_fragment,
+	&hf_data_fragment_overlap,
+	&hf_data_fragment_overlap_conflicts,
+	&hf_data_fragment_multiple_tails,
+	&hf_data_fragment_too_long_fragment,
+	&hf_data_fragment_error,
+	/* Reassembled in field */
+	&hf_data_reassembled_in,
+	/* Tag */
+	"Data fragments"
+};
+
+typedef struct _fragment_key {
+	address src;
+	address dst;
+	guint32	id;
+} fragment_key;
+
+static conversation_t *p_conv= NULL;
+static t38_conv *p_t38_conv = NULL;
+static t38_conv *p_t38_packet_conv = NULL;
+static t38_conv_info *p_t38_conv_info = NULL;
+static t38_conv_info *p_t38_packet_conv_info = NULL;
+
+/* RTP Version is the first 2 bits of the first octet in the UDP payload*/
+#define RTP_VERSION(octet)	((octet) >> 6)
+
+void proto_reg_handoff_t38(void);
+
+static void show_setup_info(tvbuff_t *tvb, proto_tree *tree, t38_conv *p_t38_conv);
+/* Preferences bool to control whether or not setup info should be shown */
+static gboolean global_t38_show_setup_info = TRUE;
+
+/* Can tap up to 4 T38 packets within same packet */
+/* We only tap the primary part, not the redundancy */
+#define MAX_T38_MESSAGES_IN_PACKET 4
+static t38_packet_info t38_info_arr[MAX_T38_MESSAGES_IN_PACKET];
+static int t38_info_current=0;
+static t38_packet_info *t38_info=NULL;
+
+static void t38_defragment_init(void)
+{
+	/* Init reassemble tables */
+	fragment_table_init(&data_fragment_table);
+	reassembled_table_init(&data_reassembled_table);
+}
+
+
+/* Set up an T38 conversation */
+void t38_add_address(packet_info *pinfo,
+                     address *addr, int port,
+                     int other_port,
+                     const gchar *setup_method, guint32 setup_frame_number)
+{
+        address null_addr;
+        conversation_t* p_conv;
+        t38_conv* p_conv_data = NULL;
+
+        /*
+         * If this isn't the first time this packet has been processed,
+         * we've already done this work, so we don't need to do it
+         * again.
+         */
+        if (pinfo->fd->flags.visited)
+        {
+                return;
+        }
+
+        SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
+
+        /*
+         * Check if the ip address and port combination is not
+         * already registered as a conversation.
+         */
+        p_conv = find_conversation( setup_frame_number, addr, &null_addr, PT_UDP, port, other_port,
+                                NO_ADDR_B | (!other_port ? NO_PORT_B : 0));
+
+        /*
+         * If not, create a new conversation.
+         */
+        if ( !p_conv || p_conv->setup_frame != setup_frame_number) {
+                p_conv = conversation_new( setup_frame_number, addr, &null_addr, PT_UDP,
+                                           (guint32)port, (guint32)other_port,
+                                                                   NO_ADDR2 | (!other_port ? NO_PORT2 : 0));
+        }
+
+        /* Set dissector */
+        conversation_set_dissector(p_conv, t38_udp_handle);
+
+        /*
+         * Check if the conversation has data associated with it.
+         */
+        p_conv_data = conversation_get_proto_data(p_conv, proto_t38);
+
+        /*
+         * If not, add a new data item.
+         */
+        if ( ! p_conv_data ) {
+                /* Create conversation data */
+                p_conv_data = se_alloc(sizeof(t38_conv));
+
+                conversation_add_proto_data(p_conv, proto_t38, p_conv_data);
+        }
+
+        /*
+         * Update the conversation data.
+         */
+        strncpy(p_conv_data->setup_method, setup_method, MAX_T38_SETUP_METHOD_SIZE);
+        p_conv_data->setup_method[MAX_T38_SETUP_METHOD_SIZE] = '\0';
+        p_conv_data->setup_frame_number = setup_frame_number;
+		p_conv_data->src_t38_info.reass_ID = 0;
+		p_conv_data->src_t38_info.reass_start_seqnum = -1;
+		p_conv_data->src_t38_info.reass_data_type = 0;
+		p_conv_data->src_t38_info.last_seqnum = -1;
+		p_conv_data->src_t38_info.packet_lost = 0;
+		p_conv_data->src_t38_info.burst_lost = 0;
+		p_conv_data->src_t38_info.time_first_t4_data = 0;
+
+
+		p_conv_data->dst_t38_info.reass_ID = 0;
+		p_conv_data->dst_t38_info.reass_start_seqnum = -1;
+		p_conv_data->dst_t38_info.reass_data_type = 0;
+		p_conv_data->dst_t38_info.last_seqnum = -1;
+		p_conv_data->dst_t38_info.packet_lost = 0;
+		p_conv_data->dst_t38_info.burst_lost = 0;
+		p_conv_data->dst_t38_info.time_first_t4_data = 0;
+}
+
+
+fragment_data *
+force_reassemble_seq(packet_info *pinfo, guint32 id,
+	     GHashTable *fragment_table)
+{
+	fragment_key key;
+	fragment_data *fd_head;
+	fragment_data *fd_i;
+	fragment_data *last_fd;
+	guint32 dfpos, size, packet_lost, burst_lost, seq_num;
+
+	/* create key to search hash with */
+	key.src = pinfo->src;
+	key.dst = pinfo->dst;
+	key.id  = id;
+
+	fd_head = g_hash_table_lookup(fragment_table, &key);
+
+	/* have we already seen this frame ?*/
+	if (pinfo->fd->flags.visited) {
+		if (fd_head != NULL && fd_head->flags & FD_DEFRAGMENTED) {
+			return fd_head;
+		} else {
+			return NULL;
+		}
+	}
+
+	if (fd_head==NULL){
+		/* we must have it to continue */
+		return NULL;
+	}
+
+	/* check for packet lost and count the burst of packet lost */
+	packet_lost = 0;
+	burst_lost = 0;
+	seq_num = 0;
+	for(fd_i=fd_head->next;fd_i;fd_i=fd_i->next) {
+		if (seq_num != fd_i->offset) {
+			packet_lost += fd_i->offset - seq_num;
+			if ( (fd_i->offset - seq_num) > burst_lost ) {
+				burst_lost = fd_i->offset - seq_num;
+			}
+		}
+		seq_num = fd_i->offset + 1;
+	}
+
+	/* we have received an entire packet, defragment it and
+     * free all fragments
+     */
+	size=0;
+	last_fd=NULL;
+	for(fd_i=fd_head->next;fd_i;fd_i=fd_i->next) {
+	  if(!last_fd || last_fd->offset!=fd_i->offset){
+	    size+=fd_i->len;
+	  }
+	  last_fd=fd_i;
+	}
+	fd_head->data = g_malloc(size);
+	fd_head->len = size;		/* record size for caller	*/
+
+	/* add all data fragments */
+	dfpos = 0;
+	last_fd=NULL;
+	for (fd_i=fd_head->next;fd_i && fd_i->len + dfpos <= size;fd_i=fd_i->next) {
+	  if (fd_i->len) {
+	    if(!last_fd || last_fd->offset!=fd_i->offset){
+	      memcpy(fd_head->data+dfpos,fd_i->data,fd_i->len);
+	      dfpos += fd_i->len;
+	    } else {
+	      /* duplicate/retransmission/overlap */
+	      fd_i->flags    |= FD_OVERLAP;
+	      fd_head->flags |= FD_OVERLAP;
+	      if( (last_fd->len!=fd_i->datalen)
+		  || memcmp(last_fd->data, fd_i->data, last_fd->len) ){
+			fd_i->flags    |= FD_OVERLAPCONFLICT;
+			fd_head->flags |= FD_OVERLAPCONFLICT;
+	      }
+	    }
+	  }
+	  last_fd=fd_i;
+	}
+
+	/* we have defragmented the pdu, now free all fragments*/
+	for (fd_i=fd_head->next;fd_i;fd_i=fd_i->next) {
+	  if(fd_i->data){
+	    g_free(fd_i->data);
+	    fd_i->data=NULL;
+	  }
+	}
+
+	/* mark this packet as defragmented */
+	fd_head->flags |= FD_DEFRAGMENTED;
+	fd_head->reassembled_in=pinfo->fd->num;
+
+	if (check_col(pinfo->cinfo, COL_INFO))
+			col_append_fstr(pinfo->cinfo, COL_INFO, " (t4-data Reassembled: %d pack lost, %d pack burst lost)", packet_lost, burst_lost);
+	
+	p_t38_packet_conv_info->packet_lost = packet_lost;
+	p_t38_packet_conv_info->burst_lost = burst_lost;
+
+	return fd_head;
+}
+
+/* T38 Routines */
+#include "packet-t38-fn.c"
+
+/* initialize the tap t38_info and the conversation */
+static void
+init_t38_info_conv(packet_info *pinfo)
+{
+	/* tap info */
+	t38_info_current++;
+	if (t38_info_current==MAX_T38_MESSAGES_IN_PACKET) {
+		t38_info_current=0;
+	}
+	t38_info = &t38_info_arr[t38_info_current];
+
+	t38_info->seq_num = 0;
+	t38_info->type_msg = 0;
+	t38_info->data_value = 0;
+	t38_info->t30ind_value =0;
+	t38_info->setup_frame_number = 0;
+	t38_info->Data_Field_field_type_value = 0;
+	t38_info->desc[0] = '\0';
+	t38_info->desc_comment[0] = '\0';
+	t38_info->time_first_t4_data = 0;
+	t38_info->frame_num_first_t4_data = 0;
+
+
+	/* 
+		p_t38_packet_conv hold the conversation info in each of the packets.
+		p_t38_conv hold the conversation info used to reassemble the HDLC packets, and also the Setup info (e.g SDP)
+		If we already have p_t38_packet_conv in the packet, it means we already reassembled the HDLC packets, so we don't 
+		need to use p_t38_conv 
+	*/
+	p_t38_packet_conv = NULL;
+	p_t38_conv = NULL;
+
+	/* Use existing packet info if available */
+	 p_t38_packet_conv = p_get_proto_data(pinfo->fd, proto_t38);
+
+
+	/* find the conversation used for Reassemble and Setup Info */
+	p_conv = find_conversation(pinfo->fd->num, &pinfo->net_src, &pinfo->net_dst,
+                                   pinfo->ptype,
+                                   pinfo->srcport, pinfo->destport, NO_ADDR_B | NO_PORT_B);
+
+	/* create a conv if it doen't exist */
+	if (!p_conv) {
+		p_conv = conversation_new(pinfo->fd->num, &pinfo->net_src, &pinfo->net_dst,
+			      pinfo->ptype, pinfo->srcport, pinfo->destport, NO_ADDR_B | NO_PORT_B);
+
+		/* Set dissector */
+		conversation_set_dissector(p_conv, t38_udp_handle);
+	}
+
+	if (!p_t38_packet_conv) {
+		p_t38_conv = conversation_get_proto_data(p_conv, proto_t38);
+
+		/* create the conversation if it doen't exist */
+		if (!p_t38_conv) {
+			p_t38_conv = se_alloc(sizeof(t38_conv));
+			p_t38_conv->setup_method[0] = '\0';
+			p_t38_conv->setup_frame_number = 0;
+
+			p_t38_conv->src_t38_info.reass_ID = 0;
+			p_t38_conv->src_t38_info.reass_start_seqnum = -1;
+			p_t38_conv->src_t38_info.reass_data_type = 0;
+			p_t38_conv->src_t38_info.last_seqnum = -1;
+			p_t38_conv->src_t38_info.packet_lost = 0;
+			p_t38_conv->src_t38_info.burst_lost = 0;
+			p_t38_conv->src_t38_info.time_first_t4_data = 0;
+
+			p_t38_conv->dst_t38_info.reass_ID = 0;
+			p_t38_conv->dst_t38_info.reass_start_seqnum = -1;
+			p_t38_conv->dst_t38_info.reass_data_type = 0;
+			p_t38_conv->dst_t38_info.last_seqnum = -1;
+			p_t38_conv->dst_t38_info.packet_lost = 0;
+			p_t38_conv->dst_t38_info.burst_lost = 0;
+			p_t38_conv->dst_t38_info.time_first_t4_data = 0;
+
+			conversation_add_proto_data(p_conv, proto_t38, p_t38_conv);
+		}
+
+		/* copy the t38 conversation info to the packet t38 conversation */
+		p_t38_packet_conv = se_alloc(sizeof(t38_conv));
+		strcpy(p_t38_packet_conv->setup_method, p_t38_conv->setup_method);
+		p_t38_packet_conv->setup_frame_number = p_t38_conv->setup_frame_number;
+
+		memcpy(&(p_t38_packet_conv->src_t38_info), &(p_t38_conv->src_t38_info), sizeof(t38_conv_info));
+		memcpy(&(p_t38_packet_conv->dst_t38_info), &(p_t38_conv->dst_t38_info), sizeof(t38_conv_info));
+
+		p_add_proto_data(pinfo->fd, proto_t38, p_t38_packet_conv);
+	}
+
+	if (ADDRESSES_EQUAL(&p_conv->key_ptr->addr1, &pinfo->net_src)) {
+		p_t38_conv_info = &(p_t38_conv->src_t38_info);
+		p_t38_packet_conv_info = &(p_t38_packet_conv->src_t38_info);
+	} else {
+		p_t38_conv_info = &(p_t38_conv->dst_t38_info);
+		p_t38_packet_conv_info = &(p_t38_packet_conv->dst_t38_info);
+	}
+
+	/* update t38_info */
+	t38_info->setup_frame_number = p_t38_packet_conv->setup_frame_number;
+}
+
+/* Entry point for dissection */
+static void
+dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	guint8 octet1;
+	proto_item *it;
+	proto_tree *tr;
+	guint32 offset=0;
+
+	/*
+	 * XXX - heuristic to check for misidentified packets.
+	 */
+	if (dissect_possible_rtpv2_packets_as_rtp){
+		octet1 = tvb_get_guint8(tvb, offset);
+		if (RTP_VERSION(octet1) == 2){
+			call_dissector(rtp_handle,tvb,pinfo,tree);
+			return;
+		}
+	}
+
+	if (check_col(pinfo->cinfo, COL_PROTOCOL)){
+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
+	}
+	if (check_col(pinfo->cinfo, COL_INFO)){
+		col_clear(pinfo->cinfo, COL_INFO);
+	}
+
+	primary_part = TRUE;
+
+	/* This indicate the item number in the primary part of the T38 message, it is used for the reassemble of T30 packets */
+	Data_Field_item_num = 0;
+
+	it=proto_tree_add_protocol_format(tree, proto_t38, tvb, 0, -1, "ITU-T Recommendation T.38");
+	tr=proto_item_add_subtree(it, ett_t38);
+
+	/* init tap and conv info */
+	init_t38_info_conv(pinfo);
+
+	/* Show Conversation setup info if exists*/
+	if (global_t38_show_setup_info) {
+		show_setup_info(tvb, tr, p_t38_packet_conv);
+	}
+
+	if (check_col(pinfo->cinfo, COL_INFO)){
+		col_append_fstr(pinfo->cinfo, COL_INFO, "UDP: UDPTLPacket ");
+	}
+
+	offset = dissect_UDPTLPacket_PDU(tvb, pinfo, tr);
+
+	if (tvb_length_remaining(tvb,offset)>0){
+		if (tr){
+			proto_tree_add_text(tr, tvb, offset, tvb_reported_length_remaining(tvb, offset),
+				"[MALFORMED PACKET or wrong preference settings]");
+		}
+		if (check_col(pinfo->cinfo, COL_INFO)){
+			col_append_fstr(pinfo->cinfo, COL_INFO, " [Malformed?]");
+		}
+	}
+}
+
+static void
+dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	proto_item *it;
+	proto_tree *tr;
+	guint32 offset=0;
+    tvbuff_t *next_tvb;
+	guint16 ifp_packet_number=1;
+
+	if (check_col(pinfo->cinfo, COL_PROTOCOL)){
+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
+	}
+	if (check_col(pinfo->cinfo, COL_INFO)){
+		col_clear(pinfo->cinfo, COL_INFO);
+	}
+
+	primary_part = TRUE;
+
+	/* This indicate the item number in the primary part of the T38 message, it is used for the reassemble of T30 packets */
+	Data_Field_item_num = 0;
+
+	it=proto_tree_add_protocol_format(tree, proto_t38, tvb, 0, -1, "ITU-T Recommendation T.38");
+	tr=proto_item_add_subtree(it, ett_t38);
+
+	/* init tap and conv info */
+	init_t38_info_conv(pinfo);
+
+	/* Show Conversation setup info if exists*/
+	if (global_t38_show_setup_info) {
+		show_setup_info(tvb, tr, p_t38_packet_conv);
+	}
+
+	if (check_col(pinfo->cinfo, COL_INFO)){
+		col_append_fstr(pinfo->cinfo, COL_INFO, "TCP: IFPPacket");
+	}
+
+	while(tvb_length_remaining(tvb,offset)>0)
+	{
+		next_tvb = tvb_new_subset(tvb, offset, -1, -1);
+		offset += dissect_IFPPacket_PDU(next_tvb, pinfo, tr);
+		ifp_packet_number++;
+
+		if(tvb_length_remaining(tvb,offset)>0){
+			if(t38_tpkt_usage == T38_TPKT_ALWAYS){
+				if(tr){
+					proto_tree_add_text(tr, tvb, offset, tvb_reported_length_remaining(tvb, offset),
+						"[MALFORMED PACKET or wrong preference settings]");
+				}
+				if (check_col(pinfo->cinfo, COL_INFO)){
+					col_append_fstr(pinfo->cinfo, COL_INFO, " [Malformed?]");
+				}
+				break;
+			} 
+			else {
+				if (check_col(pinfo->cinfo, COL_INFO)){
+					col_append_fstr(pinfo->cinfo, COL_INFO, " IFPPacket#%u",ifp_packet_number);
+				}
+			}
+		}
+	}
+
+}
+
+static void
+dissect_t38_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	primary_part = TRUE;
+
+	if(t38_tpkt_usage == T38_TPKT_ALWAYS){
+		dissect_tpkt_encap(tvb,pinfo,tree,t38_tpkt_reassembly,t38_tcp_pdu_handle);
+	} 
+	else if((t38_tpkt_usage == T38_TPKT_NEVER) || (is_tpkt(tvb,1) == -1)){
+		dissect_t38_tcp_pdu(tvb, pinfo, tree);
+	} 
+	else {
+		dissect_tpkt_encap(tvb,pinfo,tree,t38_tpkt_reassembly,t38_tcp_pdu_handle);
+	}
+}
+
+static void
+dissect_t38(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	if(pinfo->ipproto == IP_PROTO_TCP)
+	{
+		dissect_t38_tcp(tvb, pinfo, tree);
+	}
+	else if(pinfo->ipproto == IP_PROTO_UDP)
+	{   
+		dissect_t38_udp(tvb, pinfo, tree);
+	}
+}
+
+/* Look for conversation info and display any setup info found */
+void 
+show_setup_info(tvbuff_t *tvb, proto_tree *tree, t38_conv *p_t38_conv)
+{
+	proto_tree *t38_setup_tree;
+	proto_item *ti;
+
+	if (!p_t38_conv || p_t38_conv->setup_frame_number == 0) {
+		/* there is no Setup info */
+		return;
+	}
+
+	ti =  proto_tree_add_string_format(tree, hf_t38_setup, tvb, 0, 0,
+                      "",
+                      "Stream setup by %s (frame %u)",
+                      p_t38_conv->setup_method,
+                      p_t38_conv->setup_frame_number);
+    PROTO_ITEM_SET_GENERATED(ti);
+    t38_setup_tree = proto_item_add_subtree(ti, ett_t38_setup);
+    if (t38_setup_tree)
+    {
+		/* Add details into subtree */
+		proto_item* item = proto_tree_add_uint(t38_setup_tree, hf_t38_setup_frame,
+                                                               tvb, 0, 0, p_t38_conv->setup_frame_number);
+		PROTO_ITEM_SET_GENERATED(item);
+		item = proto_tree_add_string(t38_setup_tree, hf_t38_setup_method,
+                                                     tvb, 0, 0, p_t38_conv->setup_method);
+		PROTO_ITEM_SET_GENERATED(item);
+    }
+}
+
+
+
+/* Wireshark Protocol Registration */
+void
+proto_register_t38(void)
+{
+	static hf_register_info hf[] =
+	{
+#include "packet-t38-hfarr.c"
+		{   &hf_t38_setup,
+		    { "Stream setup", "t38.setup", FT_STRING, BASE_NONE,
+		    NULL, 0x0, "Stream setup, method and frame number", HFILL }},
+		{   &hf_t38_setup_frame,
+            { "Stream frame", "t38.setup-frame", FT_FRAMENUM, BASE_NONE,
+            NULL, 0x0, "Frame that set up this stream", HFILL }},
+        {   &hf_t38_setup_method,
+            { "Stream Method", "t38.setup-method", FT_STRING, BASE_NONE,
+            NULL, 0x0, "Method used to set up this stream", HFILL }},
+		{&hf_data_fragments,
+			{"Message fragments", "data.fragments",
+			FT_NONE, BASE_NONE, NULL, 0x00,	NULL, HFILL } },
+		{&hf_data_fragment,
+			{"Message fragment", "data.fragment",
+			FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+		{&hf_data_fragment_overlap,
+			{"Message fragment overlap", "data.fragment.overlap",
+			FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+		{&hf_data_fragment_overlap_conflicts,
+			{"Message fragment overlapping with conflicting data",
+			"data.fragment.overlap.conflicts",
+			FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+		{&hf_data_fragment_multiple_tails,
+			{"Message has multiple tail fragments",
+			"data.fragment.multiple_tails", 
+			FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+		{&hf_data_fragment_too_long_fragment,
+			{"Message fragment too long", "data.fragment.too_long_fragment",
+			FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+		{&hf_data_fragment_error,
+			{"Message defragmentation error", "data.fragment.error",
+			FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+		{&hf_data_reassembled_in,
+			{"Reassembled in", "data.reassembled.in",
+			FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+	};
+
+	static gint *ett[] =
+	{
+		&ett_t38,
+#include "packet-t38-ettarr.c"
+		&ett_t38_setup,
+		&ett_data_fragment,
+		&ett_data_fragments
+	};
+
+	module_t *t38_module;
+
+	proto_t38 = proto_register_protocol("T.38", "T.38", "t38");
+	proto_register_field_array(proto_t38, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+	register_dissector("t38", dissect_t38, proto_t38);
+
+	/* Init reassemble tables for HDLC */
+    register_init_routine(t38_defragment_init);
+
+	t38_tap = register_tap("t38");
+
+	t38_module = prefs_register_protocol(proto_t38, proto_reg_handoff_t38);
+	prefs_register_bool_preference(t38_module, "use_pre_corrigendum_asn1_specification",
+	    "Use the Pre-Corrigendum ASN.1 specification",
+	    "Whether the T.38 dissector should decode using the Pre-Corrigendum T.38 "
+		"ASN.1 specification (1998).",
+	    &use_pre_corrigendum_asn1_specification);
+	prefs_register_bool_preference(t38_module, "dissect_possible_rtpv2_packets_as_rtp",
+	    "Dissect possible RTP version 2 packets with RTP dissector",
+	    "Whether a UDP packet that looks like RTP version 2 packet will "
+		"be dissected as RTP packet or T.38 packet. If enabled there is a risk that T.38 UDPTL "
+		"packets with sequence number higher than 32767 may be dissected as RTP.",
+	    &dissect_possible_rtpv2_packets_as_rtp);
+	prefs_register_uint_preference(t38_module, "tcp.port",
+		"T.38 TCP Port",
+		"Set the TCP port for T.38 messages",
+		10, &global_t38_tcp_port);
+	prefs_register_uint_preference(t38_module, "udp.port",
+		"T.38 UDP Port",
+		"Set the UDP port for T.38 messages",
+		10, &global_t38_udp_port);	
+	prefs_register_bool_preference(t38_module, "reassembly",
+		"Reassemble T.38 PDUs over TPKT over TCP",
+		"Whether the dissector should reassemble T.38 PDUs spanning multiple TCP segments "
+		"when TPKT is used over TCP. "
+        "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
+		&t38_tpkt_reassembly);
+	prefs_register_enum_preference(t38_module, "tpkt_usage",
+		"TPKT used over TCP",
+		"Whether T.38 is used with TPKT for TCP",
+		(gint *)&t38_tpkt_usage,t38_tpkt_options,FALSE);
+
+	prefs_register_bool_preference(t38_module, "show_setup_info",
+                "Show stream setup information",
+                "Where available, show which protocol and frame caused "
+                "this T.38 stream to be created",
+                &global_t38_show_setup_info);
+
+}
+
+void
+proto_reg_handoff_t38(void)
+{
+	static int t38_prefs_initialized = FALSE;
+
+	if (!t38_prefs_initialized) {
+		t38_udp_handle=create_dissector_handle(dissect_t38_udp, proto_t38);
+		t38_tcp_handle=create_dissector_handle(dissect_t38_tcp, proto_t38);
+		t38_tcp_pdu_handle=create_dissector_handle(dissect_t38_tcp_pdu, proto_t38);
+		t38_prefs_initialized = TRUE;
+	}
+	else {
+		dissector_delete("tcp.port", tcp_port, t38_tcp_handle);
+		dissector_delete("udp.port", udp_port, t38_udp_handle);
+	}
+	tcp_port = global_t38_tcp_port;
+	udp_port = global_t38_udp_port;
+
+	dissector_add("tcp.port", tcp_port, t38_tcp_handle);
+	dissector_add("udp.port", udp_port, t38_udp_handle);
+
+	rtp_handle = find_dissector("rtp");
+	t30_hdlc_handle = find_dissector("t30.hdlc");
+	data_handle = find_dissector("data");
+}
+
+
+
+
diff --git a/asn1/t38/packet-t38-template.h b/asn1/t38/packet-t38-template.h
new file mode 100644
index 0000000000..1ebbb72416
--- /dev/null
+++ b/asn1/t38/packet-t38-template.h
@@ -0,0 +1,80 @@
+/* packet-t38.h
+ *
+ * Routines for T38 dissection
+ * 2003 Hans Viens
+ * 2004 Alejandro Vaquero, add support to conversation
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#define MAX_T38_DATA_ITEMS 4
+#define MAX_T38_DESC 128
+
+typedef struct _t38_packet_info {
+	guint16 seq_num;	/* UDPTLPacket sequence number */
+	guint32 type_msg;	/* 0=t30-indicator    1=data */
+	guint32 t30ind_value;
+	guint32 data_value;	/* standard and speed */
+	guint32 setup_frame_number;
+	guint32 Data_Field_field_type_value;
+	guint8	t30_Facsimile_Control;
+	gchar   desc[MAX_T38_DESC]; /* Description used to be displayed in the frame label Graph Anlaysis */
+	gchar   desc_comment[MAX_T38_DESC]; /* Description used to be displayed in the Comment Graph Anlaysis */
+	double time_first_t4_data; 
+	guint32 frame_num_first_t4_data;
+} t38_packet_info;
+
+
+#define MAX_T38_SETUP_METHOD_SIZE 7
+
+
+/* Info to save the State to reassemble Data (e.g. HDLC) and the Setup (e.g. SDP) in T38 conversations */
+typedef struct _t38_conv_info
+{
+	guint32 reass_ID;
+	int reass_start_seqnum;
+	guint32 reass_data_type;
+	gint32 last_seqnum; /* used to avoid duplicated seq num shown in the Graph Analysis */
+	guint32 packet_lost;
+	guint32 burst_lost;
+	double time_first_t4_data; 
+} t38_conv_info;
+
+/* Info to save the State to reassemble Data (e.g. HDLC) and the Setup (e.g. SDP) in T38 conversations */
+typedef struct _t38_conv
+{
+	gchar   setup_method[MAX_T38_SETUP_METHOD_SIZE + 1];
+	guint32 setup_frame_number;
+	t38_conv_info src_t38_info;
+	t38_conv_info dst_t38_info;
+} t38_conv;
+
+/* Add an T38 conversation with the given details */
+void t38_add_address(packet_info *pinfo,
+                     address *addr, int port,
+                     int other_port,
+                     const gchar *setup_method, guint32 setup_frame_number);
+
+
+#include "packet-t38-exp.h"
+
+
+
diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf
new file mode 100644
index 0000000000..9b53052f3f
--- /dev/null
+++ b/asn1/t38/t38.cnf
@@ -0,0 +1,255 @@
+# t38.cnf
+# T.38 conformation file
+# 2007  Tomas Kukosa
+
+# $Id$
+
+#.EXPORTS ONLY_VALS WS_VAR
+Type-of-msg/t30-indicator
+Type-of-msg/t30-data
+#.END
+
+#.TYPE_RENAME
+Type-of-msg/t30-indicator  T30_indicator
+Type-of-msg/t30-data       T30_data
+#.END
+
+#.PDU_NEW
+IFPPacket
+UDPTLPacket
+#.END
+
+#.FN_PARS Type-of-msg  VAL_PTR=&Type_of_msg_value
+#.FN_FTR Type-of-msg
+  /* info for tap */
+  if (primary_part)
+    t38_info->type_msg = Type_of_msg_value;
+#.END
+
+#.FN_PARS Type-of-msg/t30-indicator  VAL_PTR=&T30ind_value
+#.FN_FTR Type-of-msg/t30-indicator
+    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+        col_append_fstr(actx->pinfo->cinfo, COL_INFO, " t30ind: %s",
+         val_to_str(T30ind_value,t38_T30_indicator_vals,"<unknown>"));
+    }
+
+    /* info for tap */
+    if (primary_part)
+        t38_info->t30ind_value = T30ind_value;
+#.END
+
+#.FN_PARS Type-of-msg/t30-data  VAL_PTR=&Data_value
+#.FN_FTR Type-of-msg/t30-data
+    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+        col_append_fstr(actx->pinfo->cinfo, COL_INFO, " data:%s:",
+         val_to_str(Data_value,t38_T30_data_vals,"<unknown>"));
+    }
+
+    
+    /* info for tap */
+    if (primary_part)
+        t38_info->data_value = Data_value;
+#.END
+
+#.FN_FTR Data-Field/_item
+    if (primary_part) Data_Field_item_num++;
+#.END
+
+#.FN_PARS Data-Field/_item/field-type  
+EXT=(use_pre_corrigendum_asn1_specification)?FALSE:TRUE
+EXT_NUM=(use_pre_corrigendum_asn1_specification)?0:4
+VAL_PTR=&Data_Field_field_type_value
+#.FN_FTR Data-Field/_item/field-type
+    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+        col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s",
+         val_to_str(Data_Field_field_type_value,t38_T_field_type_vals,"<unknown>"));
+    }
+
+    /* We only reassmeble packets in the Primary part and in the first two Items.                       */
+    /* There maybe be t38 packets with more than two Items, but reassemble those packets is not easy    */
+    /* using the current ressaemble functions.                                                          */
+    /* TODO: reassemble all the Items in one frame */
+    if (primary_part && (Data_Field_item_num<2)) {
+        if (Data_Field_field_type_value == 2 || Data_Field_field_type_value == 4 || Data_Field_field_type_value == 7) {/* hdlc-fcs-OK or hdlc-fcs-OK-sig-end or t4-non-ecm-sig-end*/
+            fragment_data *frag_msg = NULL;
+            tvbuff_t* new_tvb = NULL;
+            gboolean save_fragmented = actx->pinfo->fragmented;
+
+            actx->pinfo->fragmented = TRUE;
+
+            /* if reass_start_seqnum=-1 it means we have received the end of the fragmente, without received any fragment data */
+            if (p_t38_packet_conv_info->reass_start_seqnum != -1) {
+                frag_msg = fragment_add_seq(tvb, offset, actx->pinfo,
+                    p_t38_packet_conv_info->reass_ID, /* ID for fragments belonging together */
+                    data_fragment_table, /* list of message fragments */
+                    seq_number + Data_Field_item_num - (guint32)p_t38_packet_conv_info->reass_start_seqnum,  /* fragment sequence number */
+                    /*0,*/
+                    0, /* fragment length */
+                    FALSE); /* More fragments */
+                if ( Data_Field_field_type_value == 7 ) {
+                    /* if there was packet lost or other errors during the defrag then frag_msg is NULL. This could also means
+                     * there are out of order packets (e.g, got the tail frame t4-non-ecm-sig-end before the last fragment), 
+                     * but we will assume there was packet lost instead, which is more usual. So, we are going to reassemble the packet
+                     * and get some stat, like packet lost and burst number of packet lost
+                    */
+                    if (!frag_msg) {
+                        force_reassemble_seq(actx->pinfo,
+                            p_t38_packet_conv_info->reass_ID, /* ID for fragments belonging together */
+                            data_fragment_table /* list of message fragments */
+                        );
+                    } else {
+                        if (check_col(actx->pinfo->cinfo, COL_INFO))
+                            col_append_str(actx->pinfo->cinfo, COL_INFO, " (t4-data Reassembled: No packet lost)"); 
+                        
+                        g_snprintf(t38_info->desc_comment, MAX_T38_DESC, "No packet lost");
+                    }
+
+                    
+                    if (p_t38_packet_conv_info->packet_lost) {
+                        g_snprintf(t38_info->desc_comment, MAX_T38_DESC, " Pack lost: %d, Pack burst lost: %d", p_t38_packet_conv_info->packet_lost, p_t38_packet_conv_info->burst_lost);
+                    } else {
+                        g_snprintf(t38_info->desc_comment, MAX_T38_DESC, "No packet lost");
+                    }
+
+                    new_tvb = process_reassembled_data(tvb, offset, actx->pinfo,
+                                "Reassembled Message", frag_msg, &data_frag_items, NULL, tree);
+
+                    /* Now reset fragmentation information in pinfo */
+                    actx->pinfo->fragmented = save_fragmented;
+
+                    t38_info->time_first_t4_data = p_t38_packet_conv_info->time_first_t4_data; 
+                    t38_info->frame_num_first_t4_data = p_t38_packet_conv_info->reass_ID; /* The reass_ID is the Frame number of the first t4 fragment */
+
+                } else {
+                    new_tvb = process_reassembled_data(tvb, offset, actx->pinfo,
+                                "Reassembled Message", frag_msg, &data_frag_items, NULL, tree);
+
+                    /* Now reset fragmentation information in pinfo */
+                    actx->pinfo->fragmented = save_fragmented;
+                    actx->pinfo->private_data = t38_info;
+
+                    if (new_tvb) call_dissector((t30_hdlc_handle) ? t30_hdlc_handle : data_handle, new_tvb, actx->pinfo, tree);
+                }
+            } else {
+                if(tree){
+                    proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset),
+                        "[RECEIVED END OF FRAGMENT W/OUT ANY FRAGMENT DATA]");
+                }
+                if (check_col(actx->pinfo->cinfo, COL_INFO)){
+                    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Malformed?]");
+                }
+                actx->pinfo->fragmented = save_fragmented;
+            }
+        }
+
+        /* reset the reassemble ID and the start seq number if it is not HDLC data */
+        if ( p_t38_conv && ( ((Data_Field_field_type_value >0) && (Data_Field_field_type_value <6)) || (Data_Field_field_type_value == 7) ) ){
+            p_t38_conv_info->reass_ID = 0;
+            p_t38_conv_info->reass_start_seqnum = -1;
+        }
+        t38_info->Data_Field_field_type_value = Data_Field_field_type_value;
+    }
+#.END
+
+#.FN_BODY Data-Field/_item/field-data  VAL_PTR=&value_tvb
+    tvbuff_t *value_tvb = NULL;
+    guint32 value_len;
+
+%(DEFAULT_BODY)s
+    value_len = tvb_length(value_tvb);
+
+#.FN_FTR Data-Field/_item/field-data
+    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+        if(value_len < 8){
+            col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s]",
+               tvb_bytes_to_str(value_tvb,0,value_len));
+        }
+        else {
+            col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s...]",
+               tvb_bytes_to_str(value_tvb,0,7));
+        }
+    }
+
+    /* We only reassmeble packets in the Primary part and in the first two Items.                       */
+    /* There maybe be t38 packets with more than two Items, but reassemble those packets is not easy    */
+    /* using the current ressaemble functions.                                                          */
+    /* TODO: reassemble all the Items in one frame */
+    if (primary_part && (Data_Field_item_num<2)) {
+        tvbuff_t* new_tvb = NULL;
+        fragment_data *frag_msg = NULL;
+    
+        /* HDLC Data or t4-non-ecm-data */
+        if (Data_Field_field_type_value == 0 || Data_Field_field_type_value == 6) { /* 0=HDLC Data or 6=t4-non-ecm-data*/
+            gboolean save_fragmented = actx->pinfo->fragmented;
+
+            actx->pinfo->fragmented = TRUE;
+
+            /* if we have not reassembled this packet and it is the first fragment, reset the reassemble ID and the start seq number*/
+            if (p_t38_packet_conv && p_t38_conv && (p_t38_packet_conv_info->reass_ID == 0)) {
+                /* we use the first fragment's frame_number as fragment ID because the protocol doesn't provide it */
+                    p_t38_conv_info->reass_ID = actx->pinfo->fd->num;
+                    p_t38_conv_info->reass_start_seqnum = seq_number;
+                    p_t38_conv_info->time_first_t4_data = nstime_to_sec(&actx->pinfo->fd->rel_ts);
+                    p_t38_packet_conv_info->reass_ID = p_t38_conv_info->reass_ID;
+                    p_t38_packet_conv_info->reass_start_seqnum = p_t38_conv_info->reass_start_seqnum;
+                    p_t38_packet_conv_info->time_first_t4_data = p_t38_conv_info->time_first_t4_data;
+            }
+
+            frag_msg = fragment_add_seq(value_tvb, 0, actx->pinfo,
+                p_t38_packet_conv_info->reass_ID, /* ID for fragments belonging together */
+                data_fragment_table, /* list of message fragments */
+                seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum, /* fragment sequence number */
+                value_len, /* fragment length */
+                TRUE); /* More fragments */
+
+            new_tvb = process_reassembled_data(tvb, offset, actx->pinfo,
+                        "Reassembled Message", frag_msg, &data_frag_items, NULL, tree);
+
+            if (!frag_msg) { /* Not last packet of reassembled */
+                if (Data_Field_field_type_value == 0) {
+                    if (check_col(actx->pinfo->cinfo, COL_INFO))
+                        col_append_fstr(actx->pinfo->cinfo, COL_INFO," (HDLC fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
+                } else {
+                    if (check_col(actx->pinfo->cinfo, COL_INFO))
+                        col_append_fstr(actx->pinfo->cinfo, COL_INFO," (t4-data fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
+                }
+            }
+
+            /* Now reset fragmentation information in pinfo */
+            actx->pinfo->fragmented = save_fragmented;
+        }
+    }
+#.END
+
+
+#.FN_HDR UDPTLPacket
+    /* Initialize to something else than data type */
+    Data_Field_field_type_value = 1;
+#.END
+
+#.FN_PARS UDPTLPacket/seq-number  VAL_PTR=&seq_number
+#.FN_FTR UDPTLPacket/seq-number
+    /* info for tap */
+    if (primary_part)
+        t38_info->seq_num = seq_number;
+
+      if (check_col(actx->pinfo->cinfo, COL_INFO)){
+        col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Seq=%05u ",seq_number);
+    }
+#.END
+
+#.FN_HDR UDPTLPacket/primary-ifp-packet
+    primary_part = TRUE;
+#.FN_FTR UDPTLPacket/primary-ifp-packet
+    /* if is a valid t38 packet, add to tap */
+    if (p_t38_packet_conv && (!actx->pinfo->in_error_pkt) && ((gint32) seq_number != p_t38_packet_conv_info->last_seqnum))
+        tap_queue_packet(t38_tap, actx->pinfo, t38_info);
+
+    if (p_t38_conv) p_t38_conv_info->last_seqnum = (gint32) seq_number;
+#.END
+
+#.FN_HDR UDPTLPacket/error-recovery
+    primary_part = FALSE;
+#.FN_FTR UDPTLPacket/error-recovery
+    primary_part = TRUE;
+#.END
diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c
index e06642e380..4b42223c81 100644
--- a/epan/dissectors/packet-t30.c
+++ b/epan/dissectors/packet-t30.c
@@ -37,6 +37,8 @@
 #include <epan/prefs.h>
 #include <epan/emem.h>
 
+#include "packet-t30.h"
+
 /* T30 */
 static int proto_t30 = -1;
 static int hf_t30_Address = -1;
diff --git a/epan/dissectors/packet-t30.h b/epan/dissectors/packet-t30.h
new file mode 100644
index 0000000000..f3df313e0c
--- /dev/null
+++ b/epan/dissectors/packet-t30.h
@@ -0,0 +1,29 @@
+/* packet-t30.h
+ *
+ * Routines for T38 dissection
+ * 2003 Hans Viens
+ * 2004 Alejandro Vaquero, add support to conversation
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+WS_VAR_IMPORT const value_string t30_facsimile_control_field_vals[];
+WS_VAR_IMPORT const value_string t30_facsimile_control_field_vals_short[];
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 7fb90c85f4..9bf33f812b 100644
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -1,3 +1,11 @@
+/* Do not modify this file.                                                   */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
+/* .\packet-t38.c                                                             */
+/* ../../tools/asn2wrs.py -p t38 -c t38.cnf -s packet-t38-template T38(2002).asn */
+
+/* Input file: packet-t38-template.c */
+
+#line 1 "packet-t38-template.c"
 /* packet-t38.c
  * Routines for T.38 packet dissection
  * 2003  Hans Viens
@@ -127,28 +135,30 @@ static guint32 T30ind_value;
 static guint32 Data_Field_item_num;
 
 static int proto_t38 = -1;
-static int hf_t38_null = -1;
-static int hf_t38_dummy = -1;
-static int hf_t38_IFPPacket = -1;
-static int hf_t38_Type_of_msg = -1;
-static int hf_t38_t30_indicator = -1;
-static int hf_t38_data = -1;
-static int hf_t38_Data_Field = -1;
-static int hf_t38_Data_Field_item = -1;
-static int hf_t38_Data_Field_field_type = -1;
-static int hf_t38_Data_Field_field_data = -1;
-static int hf_t38_UDPTLPacket = -1;
-static int hf_t38_seq_number = -1;
-static int hf_t38_primary_ifp_packet = -1;
-static int hf_t38_primary_ifp_packet_length = -1;
-static int hf_t38_error_recovery = -1;
-static int hf_t38_secondary_ifp_packets = -1;
-static int hf_t38_secondary_ifp_packets_item = -1;
-static int hf_t38_secondary_ifp_packets_item_length = -1;
-static int hf_t38_fec_info = -1;
-static int hf_t38_fec_npackets = -1;
-static int hf_t38_fec_data = -1;
-static int hf_t38_fec_data_item = -1;
+
+/*--- Included file: packet-t38-hf.c ---*/
+#line 1 "packet-t38-hf.c"
+static int hf_t38_IFPPacket_PDU = -1;             /* IFPPacket */
+static int hf_t38_UDPTLPacket_PDU = -1;           /* UDPTLPacket */
+static int hf_t38_type_of_msg = -1;               /* Type_of_msg */
+static int hf_t38_data_field = -1;                /* Data_Field */
+static int hf_t38_t30_indicator = -1;             /* T30_indicator */
+static int hf_t38_t30_data = -1;                  /* T30_data */
+static int hf_t38_Data_Field_item = -1;           /* Data_Field_item */
+static int hf_t38_field_type = -1;                /* T_field_type */
+static int hf_t38_field_data = -1;                /* T_field_data */
+static int hf_t38_seq_number = -1;                /* T_seq_number */
+static int hf_t38_primary_ifp_packet = -1;        /* T_primary_ifp_packet */
+static int hf_t38_error_recovery = -1;            /* T_error_recovery */
+static int hf_t38_secondary_ifp_packets = -1;     /* T_secondary_ifp_packets */
+static int hf_t38_secondary_ifp_packets_item = -1;  /* OpenType_IFPPacket */
+static int hf_t38_fec_info = -1;                  /* T_fec_info */
+static int hf_t38_fec_npackets = -1;              /* INTEGER */
+static int hf_t38_fec_data = -1;                  /* T_fec_data */
+static int hf_t38_fec_data_item = -1;             /* OCTET_STRING */
+
+/*--- End of included file: packet-t38-hf.c ---*/
+#line 131 "packet-t38-template.c"
 
 /* T38 setup fields */
 static int hf_t38_setup        = -1;
@@ -166,18 +176,21 @@ static int hf_data_fragment_error = -1;
 static int hf_data_reassembled_in = -1;
 
 static gint ett_t38 = -1;
+
+/*--- Included file: packet-t38-ett.c ---*/
+#line 1 "packet-t38-ett.c"
 static gint ett_t38_IFPPacket = -1;
 static gint ett_t38_Type_of_msg = -1;
-static gint ett_t38_t30_indicator = -1;
-static gint ett_t38_data = -1;
 static gint ett_t38_Data_Field = -1;
 static gint ett_t38_Data_Field_item = -1;
-static gint ett_t38_Data_Field_field_type = -1;
 static gint ett_t38_UDPTLPacket = -1;
-static gint ett_t38_error_recovery = -1;
-static gint ett_t38_secondary_ifp_packets = -1;
-static gint ett_t38_fec_info = -1;
-static gint ett_t38_fec_data = -1;
+static gint ett_t38_T_error_recovery = -1;
+static gint ett_t38_T_secondary_ifp_packets = -1;
+static gint ett_t38_T_fec_info = -1;
+static gint ett_t38_T_fec_data = -1;
+
+/*--- End of included file: packet-t38-ett.c ---*/
+#line 149 "packet-t38-template.c"
 static gint ett_t38_setup = -1;
 
 static gint ett_data_fragment = -1;
@@ -325,276 +338,6 @@ void t38_add_address(packet_info *pinfo,
 }
 
 
-
-/* T38 Routines */
-
-static int
-dissect_t38_NULL(tvbuff_t *tvb _U_, int offset, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_)
-{
-	return offset;
-}
-
-static const per_choice_t t30_indicator_choice[] = {
-	{ 0, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 1, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 2, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 3, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 4, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 5, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 6, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 7, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 8, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 9, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 10, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 11, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 12, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 13, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 14, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 15, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 16, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 17, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 18, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 19, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 20, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 21, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 22, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 0, NULL, 0, NULL }
-};
-
-const value_string t30_indicator_vals[] = {
-	{ 0, "no-signal" },
-	{ 1, "cng" },
-	{ 2, "ced" },
-	{ 3, "v21-preamble" },
-	{ 4, "v27-2400-training" },
-	{ 5, "v27-4800-training" },
-	{ 6, "v29-7200-training" },
-	{ 7, "v29-9600-training" },
-	{ 8, "v17-7200-short-training" },
-	{ 9, "v17-7200-long-training" },
-	{ 10, "v17-9600-short-training" },
-	{ 11, "v17-9600-long-training" },
-	{ 12, "v17-12000-short-training" },
-	{ 13, "v17-12000-long-training" },
-	{ 14, "v17-14400-short-training" },
-	{ 15, "v17-14400-long-training" },
-    { 16, "v8-ansam" },
-    { 17, "v8-signal" },
-    { 18, "v34-cntl-channel-1200" },
-    { 19, "v34-pri-channel" },
-    { 20, "v34-CC-retrain" },
-    { 21, "v33-12000-training" },
-    { 22, "v33-14400-training" },
-	{ 0, NULL },
-};
-
-static int
-dissect_t38_T30_Indicator(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
-{
-    offset=dissect_per_choice(tvb, offset, actx,
-        tree, hf_index, ett_t38_t30_indicator,
-        t30_indicator_choice, &T30ind_value);
-
-	if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
-        col_append_fstr(actx->pinfo->cinfo, COL_INFO, " t30ind: %s",
-         val_to_str(T30ind_value,t30_indicator_vals,"<unknown>"));
-	}
-
-	/* info for tap */
-	if (primary_part)
-		t38_info->t30ind_value = T30ind_value;
-
-	return offset;
-}
-
-static const per_choice_t data_choice[] = {
-	{ 0, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 1, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 2, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 3, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 4, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 5, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 6, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 7, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 8, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 9, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 10, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 11, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 12, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 13, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 14, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 0, NULL, 0, NULL }
-};
-
-const value_string t30_data_vals[] = {
-	{ 0, "v21" },
-	{ 1, "v27-2400" },
-	{ 2, "v27-4800" },
-	{ 3, "v29-7200" },
-	{ 4, "v29-9600" },
-	{ 5, "v17-7200" },
-	{ 6, "v17-9600" },
-	{ 7, "v17-12000" },
-	{ 8, "v17-14400" },
-	{ 9, "v8" },
-	{ 10, "v34-pri-rate" },
-	{ 11, "v34-CC-1200" },
-	{ 12, "v34-pri-ch" },
-	{ 13, "v33-12000" },
-	{ 14, "v33-14400" },
-	{ 0, NULL },
-};
-
-static int
-dissect_t38_Data(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
-{
-    offset=dissect_per_choice(tvb, offset, actx,
-        tree, hf_index, ett_t38_data,
-        data_choice, &Data_value);
-
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
-        col_append_fstr(actx->pinfo->cinfo, COL_INFO, " data:%s:",
-         val_to_str(Data_value,t30_data_vals,"<unknown>"));
-	}
-
-	
-	/* info for tap */
-	if (primary_part)
-		t38_info->data_value = Data_value;
-
-	return offset;
-}
-
-static const per_choice_t Type_of_msg_choice[] = {
-	{ 0, &hf_t38_t30_indicator, ASN1_NO_EXTENSIONS,
-		dissect_t38_T30_Indicator},
-	{ 1, &hf_t38_data, ASN1_NO_EXTENSIONS,
-		dissect_t38_Data},
-	{ 0, NULL, 0, NULL }
-};
-
-static const value_string Type_of_msg_vals[] = {
-	{ 0, "t30-indicator" },
-	{ 1, "data" },
-    { 0, NULL}
-};
-static int
-dissect_t38_Type_of_msg(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
-                              ett_t38_Type_of_msg, Type_of_msg_choice,
-                              &Type_of_msg_value);
-
-  /* info for tap */
-  if (primary_part)
-    t38_info->type_msg = Type_of_msg_value;
-
-  return offset;
-}
-
-static const per_choice_t Data_Field_field_type_PreCorrigendum_choice[] = {
-	{ 0, &hf_t38_null, ASN1_NO_EXTENSIONS,
-		dissect_t38_NULL},
-	{ 1, &hf_t38_null, ASN1_NO_EXTENSIONS,
-		dissect_t38_NULL},
-	{ 2, &hf_t38_null, ASN1_NO_EXTENSIONS,
-		dissect_t38_NULL},
-	{ 3, &hf_t38_null, ASN1_NO_EXTENSIONS,
-		dissect_t38_NULL},
-	{ 4, &hf_t38_null, ASN1_NO_EXTENSIONS,
-		dissect_t38_NULL},
-	{ 5, &hf_t38_null, ASN1_NO_EXTENSIONS,
-		dissect_t38_NULL},
-	{ 6, &hf_t38_null, ASN1_NO_EXTENSIONS,
-		dissect_t38_NULL},
-	{ 7, &hf_t38_null, ASN1_NO_EXTENSIONS,
-		dissect_t38_NULL},
-	{ 0, NULL, 0, NULL }
-};
-
-
-static const per_choice_t Data_Field_field_type_choice[] = {
-	{ 0, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 1, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 2, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 3, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 4, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 5, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 6, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 7, &hf_t38_null, ASN1_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 8, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 9, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 10, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 11, &hf_t38_null, ASN1_NOT_EXTENSION_ROOT,
-		dissect_t38_NULL},
-	{ 0, NULL, 0, NULL }
-};
-
-
-static const value_string Data_Field_field_type_vals[] = {
-	{ 0, "hdlc-data" },
-	{ 1, "hdlc-sig-end" },
-	{ 2, "hdlc-fcs-OK" },
-	{ 3, "hdlc-fcs-BAD" },
-	{ 4, "hdlc-fcs-OK-sig-end" },
-	{ 5, "hdlc-fcs-BAD-sig-end" },
-	{ 6, "t4-non-ecm-data" },
-	{ 7, "t4-non-ecm-sig-end" },
-	{ 8, "cm-message" },
-	{ 9, "jm-message" },
-	{ 10, "ci-message" },
-	{ 11, "v34-rate" },
-	{ 0, NULL },
-};
-
 fragment_data *
 force_reassemble_seq(packet_info *pinfo, guint32 id,
 	     GHashTable *fragment_table)
@@ -697,397 +440,545 @@ force_reassemble_seq(packet_info *pinfo, guint32 id,
 	return fd_head;
 }
 
+/* T38 Routines */
+
+/*--- Included file: packet-t38-fn.c ---*/
+#line 1 "packet-t38-fn.c"
+
+const value_string t38_T30_indicator_vals[] = {
+  {   0, "no-signal" },
+  {   1, "cng" },
+  {   2, "ced" },
+  {   3, "v21-preamble" },
+  {   4, "v27-2400-training" },
+  {   5, "v27-4800-training" },
+  {   6, "v29-7200-training" },
+  {   7, "v29-9600-training" },
+  {   8, "v17-7200-short-training" },
+  {   9, "v17-7200-long-training" },
+  {  10, "v17-9600-short-training" },
+  {  11, "v17-9600-long-training" },
+  {  12, "v17-12000-short-training" },
+  {  13, "v17-12000-long-training" },
+  {  14, "v17-14400-short-training" },
+  {  15, "v17-14400-long-training" },
+  {  16, "v8-ansam" },
+  {  17, "v8-signal" },
+  {  18, "v34-cntl-channel-1200" },
+  {  19, "v34-pri-channel" },
+  {  20, "v34-CC-retrain" },
+  {  21, "v33-12000-training" },
+  {  22, "v33-14400-training" },
+  { 0, NULL }
+};
+
+
 static int
-dissect_t38_Data_Field_field_type(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
-{
-	if(use_pre_corrigendum_asn1_specification){
-		offset=dissect_per_choice(tvb, offset, actx,
-			tree, hf_index, ett_t38_Data_Field_field_type,
-			Data_Field_field_type_PreCorrigendum_choice, &Data_Field_field_type_value);
-	}
-	else{
-		offset=dissect_per_choice(tvb, offset, actx,
-			tree, hf_index, ett_t38_Data_Field_field_type,
-			Data_Field_field_type_choice, &Data_Field_field_type_value);
-	}
+dissect_t38_T30_indicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+                                     16, &T30ind_value, TRUE, 7, NULL);
+
+#line 31 "t38.cnf"
+    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+        col_append_fstr(actx->pinfo->cinfo, COL_INFO, " t30ind: %s",
+         val_to_str(T30ind_value,t38_T30_indicator_vals,"<unknown>"));
+    }
+
+    /* info for tap */
+    if (primary_part)
+        t38_info->t30ind_value = T30ind_value;
+
+  return offset;
+}
+
+
+const value_string t38_T30_data_vals[] = {
+  {   0, "v21" },
+  {   1, "v27-2400" },
+  {   2, "v27-4800" },
+  {   3, "v29-7200" },
+  {   4, "v29-9600" },
+  {   5, "v17-7200" },
+  {   6, "v17-9600" },
+  {   7, "v17-12000" },
+  {   8, "v17-14400" },
+  {   9, "v8" },
+  {  10, "v34-pri-rate" },
+  {  11, "v34-CC-1200" },
+  {  12, "v34-pri-ch" },
+  {  13, "v33-12000" },
+  {  14, "v33-14400" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_t38_T30_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+                                     9, &Data_value, TRUE, 6, NULL);
+
+#line 43 "t38.cnf"
+    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+        col_append_fstr(actx->pinfo->cinfo, COL_INFO, " data:%s:",
+         val_to_str(Data_value,t38_T30_data_vals,"<unknown>"));
+    }
+
+    
+    /* info for tap */
+    if (primary_part)
+        t38_info->data_value = Data_value;
+
+  return offset;
+}
+
+
+static const value_string t38_Type_of_msg_vals[] = {
+  {   0, "t30-indicator" },
+  {   1, "t30-data" },
+  { 0, NULL }
+};
+
+static const per_choice_t Type_of_msg_choice[] = {
+  {   0, &hf_t38_t30_indicator   , ASN1_NO_EXTENSIONS     , dissect_t38_T30_indicator },
+  {   1, &hf_t38_t30_data        , ASN1_NO_EXTENSIONS     , dissect_t38_T30_data },
+  { 0, NULL, 0, NULL }
+};
+
+static int
+dissect_t38_Type_of_msg(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+                                 ett_t38_Type_of_msg, Type_of_msg_choice,
+                                 &Type_of_msg_value);
+
+#line 24 "t38.cnf"
+  /* info for tap */
+  if (primary_part)
+    t38_info->type_msg = Type_of_msg_value;
+
+  return offset;
+}
+
+
+static const value_string t38_T_field_type_vals[] = {
+  {   0, "hdlc-data" },
+  {   1, "hdlc-sig-end" },
+  {   2, "hdlc-fcs-OK" },
+  {   3, "hdlc-fcs-BAD" },
+  {   4, "hdlc-fcs-OK-sig-end" },
+  {   5, "hdlc-fcs-BAD-sig-end" },
+  {   6, "t4-non-ecm-data" },
+  {   7, "t4-non-ecm-sig-end" },
+  {   8, "cm-message" },
+  {   9, "jm-message" },
+  {  10, "ci-message" },
+  {  11, "v34rate" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_t38_T_field_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+                                     8, &Data_Field_field_type_value, (use_pre_corrigendum_asn1_specification)?FALSE:TRUE, (use_pre_corrigendum_asn1_specification)?0:4, NULL);
 
+#line 63 "t38.cnf"
     if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
         col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s",
-         val_to_str(Data_Field_field_type_value,Data_Field_field_type_vals,"<unknown>"));
-	}
+         val_to_str(Data_Field_field_type_value,t38_T_field_type_vals,"<unknown>"));
+    }
 
-	/* We only reassmeble packets in the Primary part and in the first two Items.						*/
-	/* There maybe be t38 packets with more than two Items, but reassemble those packets is not easy	*/
-	/* using the current ressaemble functions.															*/
-	/* TODO: reassemble all the Items in one frame */
-	if (primary_part && (Data_Field_item_num<2)) {
-		if (Data_Field_field_type_value == 2 || Data_Field_field_type_value == 4 || Data_Field_field_type_value == 7) {/* hdlc-fcs-OK or hdlc-fcs-OK-sig-end or t4-non-ecm-sig-end*/
-			fragment_data *frag_msg = NULL;
-			tvbuff_t* new_tvb = NULL;
-			gboolean save_fragmented = actx->pinfo->fragmented;
-
-			actx->pinfo->fragmented = TRUE;
-
-			/* if reass_start_seqnum=-1 it means we have received the end of the fragmente, without received any fragment data */
-			if (p_t38_packet_conv_info->reass_start_seqnum != -1) {
-				frag_msg = fragment_add_seq(tvb, offset, actx->pinfo,
-					p_t38_packet_conv_info->reass_ID, /* ID for fragments belonging together */
-					data_fragment_table, /* list of message fragments */
-					seq_number + Data_Field_item_num - (guint32)p_t38_packet_conv_info->reass_start_seqnum,  /* fragment sequence number */
-					/*0,*/
-					0, /* fragment length */
-					FALSE); /* More fragments */
-				if ( Data_Field_field_type_value == 7 ) {
-					/* if there was packet lost or other errors during the defrag then frag_msg is NULL. This could also means
-					 * there are out of order packets (e.g, got the tail frame t4-non-ecm-sig-end before the last fragment), 
-					 * but we will assume there was packet lost instead, which is more usual. So, we are going to reassemble the packet
-					 * and get some stat, like packet lost and burst number of packet lost
-					*/
-					if (!frag_msg) {
-						force_reassemble_seq(actx->pinfo,
-							p_t38_packet_conv_info->reass_ID, /* ID for fragments belonging together */
-							data_fragment_table /* list of message fragments */
-						);
-					} else {
-						if (check_col(actx->pinfo->cinfo, COL_INFO))
-							col_append_str(actx->pinfo->cinfo, COL_INFO, " (t4-data Reassembled: No packet lost)");	
-						
-						g_snprintf(t38_info->desc_comment, MAX_T38_DESC, "No packet lost");
-					}
-
-					
-					if (p_t38_packet_conv_info->packet_lost) {
-						g_snprintf(t38_info->desc_comment, MAX_T38_DESC, " Pack lost: %d, Pack burst lost: %d", p_t38_packet_conv_info->packet_lost, p_t38_packet_conv_info->burst_lost);
-					} else {
-						g_snprintf(t38_info->desc_comment, MAX_T38_DESC, "No packet lost");
-					}
-
-					new_tvb = process_reassembled_data(tvb, offset, actx->pinfo,
-								"Reassembled Message", frag_msg, &data_frag_items, NULL, tree);
-
-					/* Now reset fragmentation information in pinfo */
-					actx->pinfo->fragmented = save_fragmented;
-
-					t38_info->time_first_t4_data = p_t38_packet_conv_info->time_first_t4_data; 
-					t38_info->frame_num_first_t4_data = p_t38_packet_conv_info->reass_ID; /* The reass_ID is the Frame number of the first t4 fragment */
-
-				} else {
-					new_tvb = process_reassembled_data(tvb, offset, actx->pinfo,
-								"Reassembled Message", frag_msg, &data_frag_items, NULL, tree);
-
-					/* Now reset fragmentation information in pinfo */
-					actx->pinfo->fragmented = save_fragmented;
+    /* We only reassmeble packets in the Primary part and in the first two Items.                       */
+    /* There maybe be t38 packets with more than two Items, but reassemble those packets is not easy    */
+    /* using the current ressaemble functions.                                                          */
+    /* TODO: reassemble all the Items in one frame */
+    if (primary_part && (Data_Field_item_num<2)) {
+        if (Data_Field_field_type_value == 2 || Data_Field_field_type_value == 4 || Data_Field_field_type_value == 7) {/* hdlc-fcs-OK or hdlc-fcs-OK-sig-end or t4-non-ecm-sig-end*/
+            fragment_data *frag_msg = NULL;
+            tvbuff_t* new_tvb = NULL;
+            gboolean save_fragmented = actx->pinfo->fragmented;
+
+            actx->pinfo->fragmented = TRUE;
+
+            /* if reass_start_seqnum=-1 it means we have received the end of the fragmente, without received any fragment data */
+            if (p_t38_packet_conv_info->reass_start_seqnum != -1) {
+                frag_msg = fragment_add_seq(tvb, offset, actx->pinfo,
+                    p_t38_packet_conv_info->reass_ID, /* ID for fragments belonging together */
+                    data_fragment_table, /* list of message fragments */
+                    seq_number + Data_Field_item_num - (guint32)p_t38_packet_conv_info->reass_start_seqnum,  /* fragment sequence number */
+                    /*0,*/
+                    0, /* fragment length */
+                    FALSE); /* More fragments */
+                if ( Data_Field_field_type_value == 7 ) {
+                    /* if there was packet lost or other errors during the defrag then frag_msg is NULL. This could also means
+                     * there are out of order packets (e.g, got the tail frame t4-non-ecm-sig-end before the last fragment), 
+                     * but we will assume there was packet lost instead, which is more usual. So, we are going to reassemble the packet
+                     * and get some stat, like packet lost and burst number of packet lost
+                    */
+                    if (!frag_msg) {
+                        force_reassemble_seq(actx->pinfo,
+                            p_t38_packet_conv_info->reass_ID, /* ID for fragments belonging together */
+                            data_fragment_table /* list of message fragments */
+                        );
+                    } else {
+                        if (check_col(actx->pinfo->cinfo, COL_INFO))
+                            col_append_str(actx->pinfo->cinfo, COL_INFO, " (t4-data Reassembled: No packet lost)"); 
+                        
+                        g_snprintf(t38_info->desc_comment, MAX_T38_DESC, "No packet lost");
+                    }
+
+                    
+                    if (p_t38_packet_conv_info->packet_lost) {
+                        g_snprintf(t38_info->desc_comment, MAX_T38_DESC, " Pack lost: %d, Pack burst lost: %d", p_t38_packet_conv_info->packet_lost, p_t38_packet_conv_info->burst_lost);
+                    } else {
+                        g_snprintf(t38_info->desc_comment, MAX_T38_DESC, "No packet lost");
+                    }
+
+                    new_tvb = process_reassembled_data(tvb, offset, actx->pinfo,
+                                "Reassembled Message", frag_msg, &data_frag_items, NULL, tree);
+
+                    /* Now reset fragmentation information in pinfo */
+                    actx->pinfo->fragmented = save_fragmented;
+
+                    t38_info->time_first_t4_data = p_t38_packet_conv_info->time_first_t4_data; 
+                    t38_info->frame_num_first_t4_data = p_t38_packet_conv_info->reass_ID; /* The reass_ID is the Frame number of the first t4 fragment */
+
+                } else {
+                    new_tvb = process_reassembled_data(tvb, offset, actx->pinfo,
+                                "Reassembled Message", frag_msg, &data_frag_items, NULL, tree);
+
+                    /* Now reset fragmentation information in pinfo */
+                    actx->pinfo->fragmented = save_fragmented;
                     actx->pinfo->private_data = t38_info;
 
-					if (new_tvb) call_dissector((t30_hdlc_handle) ? t30_hdlc_handle : data_handle, new_tvb, actx->pinfo, tree);
-				}
-			} else {
-				if(tree){
-					proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset),
-						"[RECEIVED END OF FRAGMENT W/OUT ANY FRAGMENT DATA]");
-				}
-				if (check_col(actx->pinfo->cinfo, COL_INFO)){
-					col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Malformed?]");
-				}
-				actx->pinfo->fragmented = save_fragmented;
-			}
-		}
+                    if (new_tvb) call_dissector((t30_hdlc_handle) ? t30_hdlc_handle : data_handle, new_tvb, actx->pinfo, tree);
+                }
+            } else {
+                if(tree){
+                    proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset),
+                        "[RECEIVED END OF FRAGMENT W/OUT ANY FRAGMENT DATA]");
+                }
+                if (check_col(actx->pinfo->cinfo, COL_INFO)){
+                    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Malformed?]");
+                }
+                actx->pinfo->fragmented = save_fragmented;
+            }
+        }
 
-		/* reset the reassemble ID and the start seq number if it is not HDLC data */
-		if ( p_t38_conv && ( ((Data_Field_field_type_value >0) && (Data_Field_field_type_value <6)) || (Data_Field_field_type_value == 7) ) ){
-			p_t38_conv_info->reass_ID = 0;
-			p_t38_conv_info->reass_start_seqnum = -1;
-		}
-		t38_info->Data_Field_field_type_value = Data_Field_field_type_value;
-	}
-    return offset;
+        /* reset the reassemble ID and the start seq number if it is not HDLC data */
+        if ( p_t38_conv && ( ((Data_Field_field_type_value >0) && (Data_Field_field_type_value <6)) || (Data_Field_field_type_value == 7) ) ){
+            p_t38_conv_info->reass_ID = 0;
+            p_t38_conv_info->reass_start_seqnum = -1;
+        }
+        t38_info->Data_Field_field_type_value = Data_Field_field_type_value;
+    }
+
+  return offset;
 }
 
+
+
 static int
-dissect_t38_Data_Field_field_data(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
-{
-	tvbuff_t *value_tvb = NULL;
-	guint32 value_len;
+dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 155 "t38.cnf"
+    tvbuff_t *value_tvb = NULL;
+    guint32 value_len;
+
+  offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+                                       1, 65535, &value_tvb);
+
+    value_len = tvb_length(value_tvb);
 
-	offset=dissect_per_octet_string(tvb, offset, actx,
-        tree, hf_index, 1, 65535,
-        &value_tvb);
-	value_len = tvb_length(value_tvb);
 
-	if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+
+#line 162 "t38.cnf"
+    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
         if(value_len < 8){
-        	col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s]",
+            col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s]",
                tvb_bytes_to_str(value_tvb,0,value_len));
         }
         else {
-        	col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s...]",
+            col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s...]",
                tvb_bytes_to_str(value_tvb,0,7));
         }
-	}
-
-	/* We only reassmeble packets in the Primary part and in the first two Items.						*/
-	/* There maybe be t38 packets with more than two Items, but reassemble those packets is not easy	*/
-	/* using the current ressaemble functions.															*/
-	/* TODO: reassemble all the Items in one frame */
-	if (primary_part && (Data_Field_item_num<2)) {
-		tvbuff_t* new_tvb = NULL;
-		fragment_data *frag_msg = NULL;
-	
-		/* HDLC Data or t4-non-ecm-data */
-		if (Data_Field_field_type_value == 0 || Data_Field_field_type_value == 6) { /* 0=HDLC Data or 6=t4-non-ecm-data*/
-			gboolean save_fragmented = actx->pinfo->fragmented;
-
-			actx->pinfo->fragmented = TRUE;
-
-			/* if we have not reassembled this packet and it is the first fragment, reset the reassemble ID and the start seq number*/
-			if (p_t38_packet_conv && p_t38_conv && (p_t38_packet_conv_info->reass_ID == 0)) {
-				/* we use the first fragment's frame_number as fragment ID because the protocol doesn't provide it */
-					p_t38_conv_info->reass_ID = actx->pinfo->fd->num;
-					p_t38_conv_info->reass_start_seqnum = seq_number;
-					p_t38_conv_info->time_first_t4_data = nstime_to_sec(&actx->pinfo->fd->rel_ts);
-					p_t38_packet_conv_info->reass_ID = p_t38_conv_info->reass_ID;
-					p_t38_packet_conv_info->reass_start_seqnum = p_t38_conv_info->reass_start_seqnum;
-					p_t38_packet_conv_info->time_first_t4_data = p_t38_conv_info->time_first_t4_data;
-			}
-
-			frag_msg = fragment_add_seq(value_tvb, 0, actx->pinfo,
-				p_t38_packet_conv_info->reass_ID, /* ID for fragments belonging together */
-				data_fragment_table, /* list of message fragments */
-				seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum, /* fragment sequence number */
-				value_len, /* fragment length */
-				TRUE); /* More fragments */
-
-			new_tvb = process_reassembled_data(tvb, offset, actx->pinfo,
-						"Reassembled Message", frag_msg, &data_frag_items, NULL, tree);
-
-			if (!frag_msg) { /* Not last packet of reassembled */
-				if (Data_Field_field_type_value == 0) {
-					if (check_col(actx->pinfo->cinfo, COL_INFO))
-						col_append_fstr(actx->pinfo->cinfo, COL_INFO," (HDLC fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
-				} else {
-					if (check_col(actx->pinfo->cinfo, COL_INFO))
-						col_append_fstr(actx->pinfo->cinfo, COL_INFO," (t4-data fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
-				}
-			}
+    }
 
-			/* Now reset fragmentation information in pinfo */
-			actx->pinfo->fragmented = save_fragmented;
-		}
-	}
+    /* We only reassmeble packets in the Primary part and in the first two Items.                       */
+    /* There maybe be t38 packets with more than two Items, but reassemble those packets is not easy    */
+    /* using the current ressaemble functions.                                                          */
+    /* TODO: reassemble all the Items in one frame */
+    if (primary_part && (Data_Field_item_num<2)) {
+        tvbuff_t* new_tvb = NULL;
+        fragment_data *frag_msg = NULL;
+    
+        /* HDLC Data or t4-non-ecm-data */
+        if (Data_Field_field_type_value == 0 || Data_Field_field_type_value == 6) { /* 0=HDLC Data or 6=t4-non-ecm-data*/
+            gboolean save_fragmented = actx->pinfo->fragmented;
+
+            actx->pinfo->fragmented = TRUE;
+
+            /* if we have not reassembled this packet and it is the first fragment, reset the reassemble ID and the start seq number*/
+            if (p_t38_packet_conv && p_t38_conv && (p_t38_packet_conv_info->reass_ID == 0)) {
+                /* we use the first fragment's frame_number as fragment ID because the protocol doesn't provide it */
+                    p_t38_conv_info->reass_ID = actx->pinfo->fd->num;
+                    p_t38_conv_info->reass_start_seqnum = seq_number;
+                    p_t38_conv_info->time_first_t4_data = nstime_to_sec(&actx->pinfo->fd->rel_ts);
+                    p_t38_packet_conv_info->reass_ID = p_t38_conv_info->reass_ID;
+                    p_t38_packet_conv_info->reass_start_seqnum = p_t38_conv_info->reass_start_seqnum;
+                    p_t38_packet_conv_info->time_first_t4_data = p_t38_conv_info->time_first_t4_data;
+            }
+
+            frag_msg = fragment_add_seq(value_tvb, 0, actx->pinfo,
+                p_t38_packet_conv_info->reass_ID, /* ID for fragments belonging together */
+                data_fragment_table, /* list of message fragments */
+                seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum, /* fragment sequence number */
+                value_len, /* fragment length */
+                TRUE); /* More fragments */
+
+            new_tvb = process_reassembled_data(tvb, offset, actx->pinfo,
+                        "Reassembled Message", frag_msg, &data_frag_items, NULL, tree);
+
+            if (!frag_msg) { /* Not last packet of reassembled */
+                if (Data_Field_field_type_value == 0) {
+                    if (check_col(actx->pinfo->cinfo, COL_INFO))
+                        col_append_fstr(actx->pinfo->cinfo, COL_INFO," (HDLC fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
+                } else {
+                    if (check_col(actx->pinfo->cinfo, COL_INFO))
+                        col_append_fstr(actx->pinfo->cinfo, COL_INFO," (t4-data fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
+                }
+            }
+
+            /* Now reset fragmentation information in pinfo */
+            actx->pinfo->fragmented = save_fragmented;
+        }
+    }
 
-	return offset;
+  return offset;
 }
 
+
 static const per_sequence_t Data_Field_item_sequence[] = {
-	{ &hf_t38_Data_Field_field_type, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_t38_Data_Field_field_type },
-	{ &hf_t38_Data_Field_field_data, ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
-		dissect_t38_Data_Field_field_data },
-	{ NULL, 0, 0, NULL }
+  { &hf_t38_field_type      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_T_field_type },
+  { &hf_t38_field_data      , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_t38_T_field_data },
+  { NULL, 0, 0, NULL }
 };
 
 static int
-dissect_t38_Data_Field_item(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
-{
-	offset=dissect_per_sequence(tvb, offset, actx,
-        tree, hf_index, ett_t38_Data_Field_item,
-        Data_Field_item_sequence);
+dissect_t38_Data_Field_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+                                   ett_t38_Data_Field_item, Data_Field_item_sequence);
 
-	if (primary_part) Data_Field_item_num++;
+#line 55 "t38.cnf"
+    if (primary_part) Data_Field_item_num++;
 
-	return offset;
+  return offset;
 }
 
-static const per_sequence_t t38_Data_Field_sequence_of[1] = {
-  { &hf_t38_Data_Field_item,  ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_Data_Field_item },
+
+static const per_sequence_t Data_Field_sequence_of[1] = {
+  { &hf_t38_Data_Field_item , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_Data_Field_item },
 };
 
 static int
-dissect_t38_Data_Field(tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
+dissect_t38_Data_Field(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence_of(tvb, offset, actx, tree, hf_index,
-                                      ett_t38_Data_Field, t38_Data_Field_sequence_of);
+                                      ett_t38_Data_Field, Data_Field_sequence_of);
 
   return offset;
 }
 
+
 static const per_sequence_t IFPPacket_sequence[] = {
-  { &hf_t38_Type_of_msg, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_Type_of_msg },
-  { &hf_t38_Data_Field , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_t38_Data_Field },
+  { &hf_t38_type_of_msg     , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_Type_of_msg },
+  { &hf_t38_data_field      , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_t38_Data_Field },
   { NULL, 0, 0, NULL }
 };
 
 static int
-dissect_t38_IFPPacket(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree)
-{
-	offset=dissect_per_sequence(tvb, offset, actx,
-        tree, hf_t38_IFPPacket, ett_t38_IFPPacket,
-        IFPPacket_sequence);
-	return offset;
+dissect_t38_IFPPacket(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+                                   ett_t38_IFPPacket, IFPPacket_sequence);
+
+  return offset;
 }
 
+
+
 static int
-dissect_t38_Seq_number(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
-{
-	offset=dissect_per_constrained_integer(tvb, offset, actx,
-		tree, hf_index, 0, 65535,
-		&seq_number, FALSE);
-	
-	/* info for tap */
-	if (primary_part)
-		t38_info->seq_num = seq_number;
+dissect_t38_T_seq_number(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+                                              0U, 65535U, &seq_number, FALSE);
+
+#line 232 "t38.cnf"
+    /* info for tap */
+    if (primary_part)
+        t38_info->seq_num = seq_number;
 
       if (check_col(actx->pinfo->cinfo, COL_INFO)){
         col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Seq=%05u ",seq_number);
-	}
-	return offset;
+    }
+
+  return offset;
 }
 
-static int
-dissect_t38_Primary_ifp_packet(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_)
-{
-    guint32 length;
 
-	primary_part = TRUE;
 
-    offset=dissect_per_length_determinant(tvb, offset, actx,
-        tree, hf_t38_primary_ifp_packet_length, &length);
-    offset=dissect_t38_IFPPacket(tvb, offset, actx, tree);
+static int
+dissect_t38_T_primary_ifp_packet(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 242 "t38.cnf"
+    primary_part = TRUE;
+
+  offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_t38_IFPPacket);
 
-	/* if is a valid t38 packet, add to tap */
-	if (p_t38_packet_conv && (!actx->pinfo->in_error_pkt) && ((gint32) seq_number != p_t38_packet_conv_info->last_seqnum))
-		tap_queue_packet(t38_tap, actx->pinfo, t38_info);
+#line 244 "t38.cnf"
+    /* if is a valid t38 packet, add to tap */
+    if (p_t38_packet_conv && (!actx->pinfo->in_error_pkt) && ((gint32) seq_number != p_t38_packet_conv_info->last_seqnum))
+        tap_queue_packet(t38_tap, actx->pinfo, t38_info);
 
-	if (p_t38_conv) p_t38_conv_info->last_seqnum = (gint32) seq_number;
+    if (p_t38_conv) p_t38_conv_info->last_seqnum = (gint32) seq_number;
 
-	return offset;
+  return offset;
 }
 
+
+
 static int
-dissect_t38_Secondary_ifp_packets_item(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_)
-{
-    guint32 length;
+dissect_t38_OpenType_IFPPacket(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_t38_IFPPacket);
 
-    offset=dissect_per_length_determinant(tvb, offset, actx,
-        tree, hf_t38_secondary_ifp_packets_item_length, &length);
-    offset=dissect_t38_IFPPacket(tvb, offset, actx, tree);
-	return offset;
+  return offset;
 }
 
-static const per_sequence_t SEQUENCE_OF_t38_secondary_ifp_packets_sequence_of[1] = {
-  { &hf_t38_dummy, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_Secondary_ifp_packets_item },
+
+static const per_sequence_t T_secondary_ifp_packets_sequence_of[1] = {
+  { &hf_t38_secondary_ifp_packets_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_OpenType_IFPPacket },
 };
 
 static int
-dissect_t38_Secondary_ifp_packets(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
-{
-    /* When the field-data is not present, we MUST offset 1 byte*/
-    if((Data_Field_field_type_value != 0) &&
-       (Data_Field_field_type_value != 6) &&
-	   (Data_Field_field_type_value != 7))
-    {
-        offset=offset+8;
-    }
+dissect_t38_T_secondary_ifp_packets(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_sequence_of(tvb, offset, actx, tree, hf_index,
+                                      ett_t38_T_secondary_ifp_packets, T_secondary_ifp_packets_sequence_of);
 
-    offset=dissect_per_sequence_of(tvb, offset, actx,
-        tree, hf_index, ett_t38_secondary_ifp_packets,
-        SEQUENCE_OF_t38_secondary_ifp_packets_sequence_of);
-	return offset;
+  return offset;
 }
 
+
+
 static int
-dissect_t38_Fec_npackets(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
-{
-    offset=dissect_per_integer(tvb, offset, actx, tree, hf_index, NULL);
-	return offset;
+dissect_t38_INTEGER(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, NULL);
+
+  return offset;
 }
 
+
+
 static int
-dissect_t38_Fec_data_item(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
-{
-    offset=dissect_per_octet_string(tvb, offset, actx,
-        tree, hf_index, NO_BOUND, NO_BOUND,
-        NULL);
-	return offset;
+dissect_t38_OCTET_STRING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+                                       NO_BOUND, NO_BOUND, NULL);
+
+  return offset;
 }
-static const per_sequence_t T_t38_fec_data_sequence_of[1] = {
-  { &hf_t38_fec_data_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_Fec_data_item },
+
+
+static const per_sequence_t T_fec_data_sequence_of[1] = {
+  { &hf_t38_fec_data_item   , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_OCTET_STRING },
 };
+
 static int
-dissect_t38_Fec_data(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
-{
-    offset=dissect_per_sequence_of(tvb, offset, actx,
-        tree, hf_index, ett_t38_fec_data,
-        T_t38_fec_data_sequence_of);
-	return offset;
+dissect_t38_T_fec_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_sequence_of(tvb, offset, actx, tree, hf_index,
+                                      ett_t38_T_fec_data, T_fec_data_sequence_of);
+
+  return offset;
 }
 
-static const per_sequence_t fec_info_sequence[] = {
-	{ &hf_t38_fec_npackets, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_t38_Fec_npackets },
-	{ &hf_t38_fec_data, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_t38_Fec_data },
-	{ NULL, 0, 0, NULL }
+
+static const per_sequence_t T_fec_info_sequence[] = {
+  { &hf_t38_fec_npackets    , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_INTEGER },
+  { &hf_t38_fec_data        , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_T_fec_data },
+  { NULL, 0, 0, NULL }
 };
 
 static int
-dissect_t38_Fec_info(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
-{
-	offset=dissect_per_sequence(tvb, offset, actx,
-        tree, hf_index, ett_t38_fec_info,
-        fec_info_sequence);
-	return offset;
+dissect_t38_T_fec_info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+                                   ett_t38_T_fec_info, T_fec_info_sequence);
+
+  return offset;
 }
 
-static const per_choice_t error_recovery_choice[] = {
-	{ 0, &hf_t38_secondary_ifp_packets, ASN1_NO_EXTENSIONS,
-		dissect_t38_Secondary_ifp_packets},
-	{ 1, &hf_t38_fec_info, ASN1_NO_EXTENSIONS,
-		dissect_t38_Fec_info},
-	{ 0, NULL, 0, NULL }
+
+static const value_string t38_T_error_recovery_vals[] = {
+  {   0, "secondary-ifp-packets" },
+  {   1, "fec-info" },
+  { 0, NULL }
 };
 
-static const value_string error_recovery_vals[] = {
-	{ 0, "secondary-ifp-packets" },
-	{ 1, "fec-info" },
-    { 0, NULL}
+static const per_choice_t T_error_recovery_choice[] = {
+  {   0, &hf_t38_secondary_ifp_packets, ASN1_NO_EXTENSIONS     , dissect_t38_T_secondary_ifp_packets },
+  {   1, &hf_t38_fec_info        , ASN1_NO_EXTENSIONS     , dissect_t38_T_fec_info },
+  { 0, NULL, 0, NULL }
 };
 
 static int
-dissect_t38_Error_recovery(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index)
-{
-	primary_part = FALSE;
+dissect_t38_T_error_recovery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 252 "t38.cnf"
+    primary_part = FALSE;
 
-    offset=dissect_per_choice(tvb, offset, actx,
-        tree, hf_index, ett_t38_error_recovery,
-        error_recovery_choice, NULL);
+  offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
+                                 ett_t38_T_error_recovery, T_error_recovery_choice,
+                                 NULL);
 
-	primary_part = TRUE;
+#line 254 "t38.cnf"
+    primary_part = TRUE;
 
-	return offset;
+  return offset;
 }
 
+
 static const per_sequence_t UDPTLPacket_sequence[] = {
-	{ &hf_t38_seq_number, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_t38_Seq_number },
-	{ &hf_t38_dummy, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_t38_Primary_ifp_packet },
-	{ &hf_t38_error_recovery, ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
-		dissect_t38_Error_recovery },
-	{ NULL, 0, 0, NULL }
+  { &hf_t38_seq_number      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_T_seq_number },
+  { &hf_t38_primary_ifp_packet, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_T_primary_ifp_packet },
+  { &hf_t38_error_recovery  , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t38_T_error_recovery },
+  { NULL, 0, 0, NULL }
 };
 
 static int
-dissect_t38_UDPTLPacket(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree)
-{
+dissect_t38_UDPTLPacket(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 226 "t38.cnf"
     /* Initialize to something else than data type */
     Data_Field_field_type_value = 1;
 
-	offset=dissect_per_sequence(tvb, offset, actx,
-        tree, hf_t38_UDPTLPacket, ett_t38_UDPTLPacket,
-        UDPTLPacket_sequence);
-    return offset;
+  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+                                   ett_t38_UDPTLPacket, UDPTLPacket_sequence);
+
+  return offset;
+}
+
+/*--- PDUs ---*/
+
+static int dissect_IFPPacket_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_t38_IFPPacket(tvb, offset, &asn1_ctx, tree, hf_t38_IFPPacket_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
+static int dissect_UDPTLPacket_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_t38_UDPTLPacket(tvb, offset, &asn1_ctx, tree, hf_t38_UDPTLPacket_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
 }
 
+
+/*--- End of included file: packet-t38-fn.c ---*/
+#line 400 "packet-t38-template.c"
+
 /* initialize the tap t38_info and the conversation */
 static void
 init_t38_info_conv(packet_info *pinfo)
@@ -1197,7 +1088,6 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	proto_item *it;
 	proto_tree *tr;
 	guint32 offset=0;
-	asn1_ctx_t asn1_ctx;
 
 	/*
 	 * XXX - heuristic to check for misidentified packets.
@@ -1237,13 +1127,9 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		col_append_fstr(pinfo->cinfo, COL_INFO, "UDP: UDPTLPacket ");
 	}
 
-	asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
-	offset=dissect_t38_UDPTLPacket(tvb, offset, &asn1_ctx, tr);
+	offset = dissect_UDPTLPacket_PDU(tvb, pinfo, tr);
 
-	if (offset&0x07){
-		offset=(offset&0xfffffff8)+8;
-	}
-	if (tvb_length_remaining(tvb,offset>>3)>0){
+	if (tvb_length_remaining(tvb,offset)>0){
 		if (tr){
 			proto_tree_add_text(tr, tvb, offset, tvb_reported_length_remaining(tvb, offset),
 				"[MALFORMED PACKET or wrong preference settings]");
@@ -1260,8 +1146,8 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	proto_item *it;
 	proto_tree *tr;
 	guint32 offset=0;
+    tvbuff_t *next_tvb;
 	guint16 ifp_packet_number=1;
-	asn1_ctx_t asn1_ctx;
 
 	if (check_col(pinfo->cinfo, COL_PROTOCOL)){
 		col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
@@ -1290,17 +1176,13 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		col_append_fstr(pinfo->cinfo, COL_INFO, "TCP: IFPPacket");
 	}
 
-	while(tvb_length_remaining(tvb,offset>>3)>0)
+	while(tvb_length_remaining(tvb,offset)>0)
 	{
-		asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
-		offset=dissect_t38_IFPPacket(tvb, offset, &asn1_ctx, tr);
+		next_tvb = tvb_new_subset(tvb, offset, -1, -1);
+		offset += dissect_IFPPacket_PDU(next_tvb, pinfo, tr);
 		ifp_packet_number++;
 
-		if(offset&0x07){
-			offset=(offset&0xfffffff8)+8;
-		}
-
-		if(tvb_length_remaining(tvb,offset>>3)>0){
+		if(tvb_length_remaining(tvb,offset)>0){
 			if(t38_tpkt_usage == T38_TPKT_ALWAYS){
 				if(tr){
 					proto_tree_add_text(tr, tvb, offset, tvb_reported_length_remaining(tvb, offset),
@@ -1389,66 +1271,84 @@ proto_register_t38(void)
 {
 	static hf_register_info hf[] =
 	{
-        {  &hf_t38_IFPPacket,
-            { "IFPPacket", "t38.IFPPacket", FT_NONE, BASE_NONE,
-		      NULL, 0, "IFPPacket sequence", HFILL }},
-        {  &hf_t38_Type_of_msg,
-            { "Type of msg", "t38.Type_of_msg_type", FT_UINT32, BASE_DEC,
-		      VALS(Type_of_msg_vals), 0, "Type_of_msg choice", HFILL }},
-        {  &hf_t38_t30_indicator,
-            { "T30 indicator", "t38.t30_indicator", FT_UINT32, BASE_DEC,
-              VALS(t30_indicator_vals), 0, "t30_indicator", HFILL }},
-        {  &hf_t38_data,
-            { "data", "t38.t38_data", FT_UINT32, BASE_DEC,
-              VALS(t30_data_vals), 0, "data", HFILL }},
-        {  &hf_t38_Data_Field,
-            { "Data Field", "t38.Data_Field", FT_NONE, BASE_NONE,
-              NULL, 0, "Data_Field sequence of", HFILL }},
-        {  &hf_t38_Data_Field_item,
-            { "Data_Field_item", "t38.Data_Field_item", FT_NONE, BASE_NONE,
-              NULL, 0, "Data_Field_item sequence", HFILL }},
-        {  &hf_t38_Data_Field_field_type,
-            { "Data_Field_field_type", "t38.Data_Field_field_type", FT_UINT32, BASE_DEC,
-              VALS(Data_Field_field_type_vals), 0, "Data_Field_field_type choice", HFILL }},
-        {  &hf_t38_Data_Field_field_data,
-            { "Data_Field_field_data", "t38.Data_Field_field_data", FT_BYTES, BASE_HEX,
-            NULL, 0, "Data_Field_field_data octet string", HFILL }},
-        {  &hf_t38_UDPTLPacket,
-            { "UDPTLPacket", "t38.UDPTLPacket", FT_NONE, BASE_NONE,
-		      NULL, 0, "UDPTLPacket sequence", HFILL }},
-        {  &hf_t38_seq_number,
-            { "Sequence number", "t38.seq_number", FT_UINT32, BASE_DEC,
-		      NULL, 0, "seq_number", HFILL }},
-        {  &hf_t38_primary_ifp_packet,
-            { "Primary IFPPacket", "t38.primary_ifp_packet", FT_BYTES, BASE_HEX,
-              NULL, 0, "primary_ifp_packet octet string", HFILL }},
-        {  &hf_t38_primary_ifp_packet_length,
-            { "primary_ifp_packet_length", "t38.primary_ifp_packet_length", FT_UINT32, BASE_DEC,
-            NULL, 0, "primary_ifp_packet_length", HFILL }},
-        {  &hf_t38_error_recovery,
-            { "Error recovery", "t38.error_recovery", FT_UINT32, BASE_DEC,
-		      VALS(error_recovery_vals), 0, "error_recovery choice", HFILL }},
-        {  &hf_t38_secondary_ifp_packets,
-            { "Secondary IFPPackets", "t38.secondary_ifp_packets", FT_NONE, BASE_NONE,
-              NULL, 0, "secondary_ifp_packets sequence of", HFILL }},
-        {  &hf_t38_secondary_ifp_packets_item,
-            { "Secondary IFPPackets item", "t38.secondary_ifp_packets_item", FT_BYTES, BASE_HEX,
-              NULL, 0, "secondary_ifp_packets_item octet string", HFILL }},
-        {  &hf_t38_secondary_ifp_packets_item_length,
-            { "secondary_ifp_packets_item_length", "t38.secondary_ifp_packets_item_length", FT_UINT32, BASE_DEC,
-            NULL, 0, "secondary_ifp_packets_item_length", HFILL }},
-        {  &hf_t38_fec_info,
-            { "Fec info", "t38.fec_info", FT_NONE, BASE_NONE,
-		      NULL, 0, "fec_info sequence", HFILL }},
-        {  &hf_t38_fec_npackets,
-            { "Fec npackets", "h245.fec_npackets", FT_INT32, BASE_DEC,
-              NULL, 0, "fec_npackets value", HFILL }},
-        {  &hf_t38_fec_data,
-            { "Fec data", "t38.fec_data", FT_NONE, BASE_NONE,
-              NULL, 0, "fec_data sequence of", HFILL }},
-        {  &hf_t38_fec_data_item,
-            { "t38_fec_data_item", "t38.t38_fec_data_item", FT_BYTES, BASE_HEX,
-            NULL, 0, "t38_fec_data_item octet string", HFILL }},
+
+/*--- Included file: packet-t38-hfarr.c ---*/
+#line 1 "packet-t38-hfarr.c"
+    { &hf_t38_IFPPacket_PDU,
+      { "IFPPacket", "t38.IFPPacket",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "t38.IFPPacket", HFILL }},
+    { &hf_t38_UDPTLPacket_PDU,
+      { "UDPTLPacket", "t38.UDPTLPacket",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "t38.UDPTLPacket", HFILL }},
+    { &hf_t38_type_of_msg,
+      { "type-of-msg", "t38.type_of_msg",
+        FT_UINT32, BASE_DEC, VALS(t38_Type_of_msg_vals), 0,
+        "t38.Type_of_msg", HFILL }},
+    { &hf_t38_data_field,
+      { "data-field", "t38.data_field",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "t38.Data_Field", HFILL }},
+    { &hf_t38_t30_indicator,
+      { "t30-indicator", "t38.t30_indicator",
+        FT_UINT32, BASE_DEC, VALS(t38_T30_indicator_vals), 0,
+        "t38.T30_indicator", HFILL }},
+    { &hf_t38_t30_data,
+      { "t30-data", "t38.t30_data",
+        FT_UINT32, BASE_DEC, VALS(t38_T30_data_vals), 0,
+        "t38.T30_data", HFILL }},
+    { &hf_t38_Data_Field_item,
+      { "Item", "t38.Data_Field_item",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "t38.Data_Field_item", HFILL }},
+    { &hf_t38_field_type,
+      { "field-type", "t38.field_type",
+        FT_UINT32, BASE_DEC, VALS(t38_T_field_type_vals), 0,
+        "t38.T_field_type", HFILL }},
+    { &hf_t38_field_data,
+      { "field-data", "t38.field_data",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        "t38.T_field_data", HFILL }},
+    { &hf_t38_seq_number,
+      { "seq-number", "t38.seq_number",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "t38.T_seq_number", HFILL }},
+    { &hf_t38_primary_ifp_packet,
+      { "primary-ifp-packet", "t38.primary_ifp_packet",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "t38.T_primary_ifp_packet", HFILL }},
+    { &hf_t38_error_recovery,
+      { "error-recovery", "t38.error_recovery",
+        FT_UINT32, BASE_DEC, VALS(t38_T_error_recovery_vals), 0,
+        "t38.T_error_recovery", HFILL }},
+    { &hf_t38_secondary_ifp_packets,
+      { "secondary-ifp-packets", "t38.secondary_ifp_packets",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "t38.T_secondary_ifp_packets", HFILL }},
+    { &hf_t38_secondary_ifp_packets_item,
+      { "Item", "t38.secondary_ifp_packets_item",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "t38.OpenType_IFPPacket", HFILL }},
+    { &hf_t38_fec_info,
+      { "fec-info", "t38.fec_info",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "t38.T_fec_info", HFILL }},
+    { &hf_t38_fec_npackets,
+      { "fec-npackets", "t38.fec_npackets",
+        FT_INT32, BASE_DEC, NULL, 0,
+        "t38.INTEGER", HFILL }},
+    { &hf_t38_fec_data,
+      { "fec-data", "t38.fec_data",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "t38.T_fec_data", HFILL }},
+    { &hf_t38_fec_data_item,
+      { "Item", "t38.fec_data_item",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        "t38.OCTET_STRING", HFILL }},
+
+/*--- End of included file: packet-t38-hfarr.c ---*/
+#line 694 "packet-t38-template.c"
 		{   &hf_t38_setup,
 		    { "Stream setup", "t38.setup", FT_STRING, BASE_NONE,
 		    NULL, 0x0, "Stream setup, method and frame number", HFILL }},
@@ -1489,18 +1389,21 @@ proto_register_t38(void)
 	static gint *ett[] =
 	{
 		&ett_t38,
-		&ett_t38_IFPPacket,
-		&ett_t38_Type_of_msg,
-		&ett_t38_t30_indicator,
-		&ett_t38_data,
-		&ett_t38_Data_Field,
-		&ett_t38_Data_Field_item,
-		&ett_t38_Data_Field_field_type,
-		&ett_t38_UDPTLPacket,
-		&ett_t38_error_recovery,
-		&ett_t38_secondary_ifp_packets,
-		&ett_t38_fec_info,
-		&ett_t38_fec_data,
+
+/*--- Included file: packet-t38-ettarr.c ---*/
+#line 1 "packet-t38-ettarr.c"
+    &ett_t38_IFPPacket,
+    &ett_t38_Type_of_msg,
+    &ett_t38_Data_Field,
+    &ett_t38_Data_Field_item,
+    &ett_t38_UDPTLPacket,
+    &ett_t38_T_error_recovery,
+    &ett_t38_T_secondary_ifp_packets,
+    &ett_t38_T_fec_info,
+    &ett_t38_T_fec_data,
+
+/*--- End of included file: packet-t38-ettarr.c ---*/
+#line 735 "packet-t38-template.c"
 		&ett_t38_setup,
 		&ett_data_fragment,
 		&ett_data_fragments
diff --git a/epan/dissectors/packet-t38.h b/epan/dissectors/packet-t38.h
index cfa2eda0a4..57f3610750 100644
--- a/epan/dissectors/packet-t38.h
+++ b/epan/dissectors/packet-t38.h
@@ -1,3 +1,11 @@
+/* Do not modify this file.                                                   */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
+/* .\packet-t38.h                                                             */
+/* ../../tools/asn2wrs.py -p t38 -c t38.cnf -s packet-t38-template T38(2002).asn */
+
+/* Input file: packet-t38-template.h */
+
+#line 1 "packet-t38-template.h"
 /* packet-t38.h
  *
  * Routines for T38 dissection
@@ -73,10 +81,15 @@ void t38_add_address(packet_info *pinfo,
                      int other_port,
                      const gchar *setup_method, guint32 setup_frame_number);
 
-WS_VAR_IMPORT const value_string t30_indicator_vals[];
-WS_VAR_IMPORT const value_string t30_facsimile_control_field_vals[];
-WS_VAR_IMPORT const value_string t30_facsimile_control_field_vals_short[];
-WS_VAR_IMPORT const value_string t30_data_vals[];
+
+
+/*--- Included file: packet-t38-exp.h ---*/
+#line 1 "packet-t38-exp.h"
+WS_VAR_IMPORT const value_string t38_T30_indicator_vals[];
+WS_VAR_IMPORT const value_string t38_T30_data_vals[];
+
+/*--- End of included file: packet-t38-exp.h ---*/
+#line 78 "packet-t38-template.h"
 
 
 
diff --git a/epan/libwireshark.def b/epan/libwireshark.def
index b641c7504a..2b9d5aac78 100644
--- a/epan/libwireshark.def
+++ b/epan/libwireshark.def
@@ -742,10 +742,10 @@ stream_process_reassembled
 string_to_name_resolve
 sua_co_class_type_acro_values	DATA
 swaptab
-t30_data_vals                   DATA
 t30_facsimile_control_field_vals        DATA
 t30_facsimile_control_field_vals_short  DATA
-t30_indicator_vals		DATA
+t38_T30_data_vals                   DATA
+t38_T30_indicator_vals		DATA
 T_h323_message_body_vals	DATA
 tap_push_tapped_queue
 tap_queue_init
diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c
index 75ffe8d5aa..287293ee14 100644
--- a/gtk/voip_calls.c
+++ b/gtk/voip_calls.c
@@ -59,6 +59,7 @@
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/dissectors/packet-rtp-events.h>
 #include <epan/dissectors/packet-t38.h>
+#include <epan/dissectors/packet-t30.h>
 #include <epan/dissectors/packet-h248.h>
 #include <epan/dissectors/packet-sccp.h>
 #include <epan/conversation.h>
@@ -761,8 +762,8 @@ T38_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
 
 	/* add the item to the graph list */
 	if (pi->type_msg == 0) { /* 0=t30-indicator */
-		frame_label = g_strdup(val_to_str(pi->t30ind_value, t30_indicator_vals, "Ukn (0x%02X)") );
-		comment = g_strdup_printf("t38:t30 Ind:%s",val_to_str(pi->t30ind_value, t30_indicator_vals, "Ukn (0x%02X)") );
+		frame_label = g_strdup(val_to_str(pi->t30ind_value, t38_T30_indicator_vals, "Ukn (0x%02X)") );
+		comment = g_strdup_printf("t38:t30 Ind:%s",val_to_str(pi->t30ind_value, t38_T30_indicator_vals, "Ukn (0x%02X)") );
 		line_style = 1;
 	} else if (pi->type_msg == 1) {	/* 1=data */
 		switch(pi->Data_Field_field_type_value){
@@ -771,17 +772,17 @@ T38_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
 			case 2: /* hdlc-fcs-OK */
 			case 4: /* hdlc-fcs-OK-sig-end */
 					frame_label = g_strdup_printf("%s %s", val_to_str(pi->t30_Facsimile_Control & 0x7F, t30_facsimile_control_field_vals_short, "Ukn (0x%02X)"), pi->desc);
-					comment = g_strdup_printf("t38:%s:HDLC:%s",val_to_str(pi->data_value, t30_data_vals, "Ukn (0x%02X)"), val_to_str(pi->t30_Facsimile_Control & 0x7F, t30_facsimile_control_field_vals, "Ukn (0x%02X)"));
+					comment = g_strdup_printf("t38:%s:HDLC:%s",val_to_str(pi->data_value, t38_T30_data_vals, "Ukn (0x%02X)"), val_to_str(pi->t30_Facsimile_Control & 0x7F, t30_facsimile_control_field_vals, "Ukn (0x%02X)"));
 				break;
 			case 3: /* hdlc-fcs-BAD */
 			case 5: /* hdlc-fcs-BAD-sig-end */
 				frame_label = g_strdup(pi->Data_Field_field_type_value == 3 ? "fcs-BAD" : "fcs-BAD-sig-end");
-				comment = g_strdup_printf("WARNING: received t38:%s:HDLC:%s", val_to_str(pi->data_value, t30_data_vals, "Ukn (0x%02X)"), pi->Data_Field_field_type_value == 3 ? "fcs-BAD" : "fcs-BAD-sig-end");
+				comment = g_strdup_printf("WARNING: received t38:%s:HDLC:%s", val_to_str(pi->data_value, t38_T30_data_vals, "Ukn (0x%02X)"), pi->Data_Field_field_type_value == 3 ? "fcs-BAD" : "fcs-BAD-sig-end");
 				break;
 			case 7: /* t4-non-ecm-sig-end */
 				duration = nstime_to_sec(&pinfo->fd->rel_ts) - pi->time_first_t4_data;
-				frame_label = g_strdup_printf("t4-non-ecm-data:%s",val_to_str(pi->data_value, t30_data_vals, "Ukn (0x%02X)") );
-				comment = g_strdup_printf("t38:t4-non-ecm-data:%s Duration: %.2fs %s",val_to_str(pi->data_value, t30_data_vals, "Ukn (0x%02X)"), duration, pi->desc_comment );
+				frame_label = g_strdup_printf("t4-non-ecm-data:%s",val_to_str(pi->data_value, t38_T30_data_vals, "Ukn (0x%02X)") );
+				comment = g_strdup_printf("t38:t4-non-ecm-data:%s Duration: %.2fs %s",val_to_str(pi->data_value, t38_T30_data_vals, "Ukn (0x%02X)"), duration, pi->desc_comment );
 				insert_to_graph(tapinfo, pinfo, frame_label, comment, (guint16)conv_num, &(pinfo->src), &(pinfo->dst), line_style, pi->time_first_t4_data, pi->frame_num_first_t4_data);
 				break;
 		}