Make it possible to dissect h221nonstandard data and fix some compile warnings from asn2eth.

svn path=/trunk/; revision=14388

2 files changed, 102 insertions, 80 deletions

diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index c8045cfcd7..1a1cfed56e 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* ./packet-h245.c                                                            */
+/* .\packet-h245.c                                                            */
 /* ../../tools/asn2eth.py -X -e -p h245 -c h245.cnf -s packet-h245-template h245.asn */
 
 /* Input file: packet-h245-template.c */
@@ -69,6 +69,7 @@ static dissector_handle_t rtcp_handle=NULL;
 static dissector_table_t nsp_object_dissector_table;
 static dissector_table_t nsp_h221_dissector_table;
 static dissector_handle_t nsp_handle;
+static dissector_handle_t data_handle;
 static dissector_handle_t h245_handle;
 static dissector_handle_t MultimediaSystemControlMessage_handle;
 
@@ -315,7 +316,7 @@ static int hf_h245_messageContent = -1;           /* SEQUENCE_OF_GenericParamete
 static int hf_h245_messageContent_item = -1;      /* GenericParameter */
 static int hf_h245_nonStandardData = -1;          /* NonStandardParameter */
 static int hf_h245_nonStandardIdentifier = -1;    /* NonStandardIdentifier */
-static int hf_h245_nsd_data = -1;                 /* OCTET_STRING */
+static int hf_h245_nsd_data = -1;                 /* T_data */
 static int hf_h245_object = -1;                   /* OBJECT_IDENTIFIER */
 static int hf_h245_h221NonStandardID = -1;        /* H221NonStandardID */
 static int hf_h245_t35CountryCode = -1;           /* T_t35CountryCode */
@@ -401,7 +402,7 @@ static int hf_h245_backwardMaximumSDUSize = -1;   /* INTEGER_0_65535 */
 static int hf_h245_transportStream_bool = -1;     /* BOOLEAN */
 static int hf_h245_programStream = -1;            /* BOOLEAN */
 static int hf_h245_availableBitRates = -1;        /* T_availableBitRates */
-static int hf_h245_Avb_type = -1;                 /* Avb_type */
+static int hf_h245_avb_type = -1;                 /* Avb_type */
 static int hf_h245_singleBitRate = -1;            /* INTEGER_1_65535 */
 static int hf_h245_rangeOfBitRates = -1;          /* T_rangeOfBitRates */
 static int hf_h245_lowerBitRate = -1;             /* INTEGER_1_65535 */
@@ -975,7 +976,7 @@ static int hf_h245_sendBufferSize = -1;           /* INTEGER_0_16777215 */
 static int hf_h245_transferMode = -1;             /* T_transferMode */
 static int hf_h245_framed = -1;                   /* NULL */
 static int hf_h245_unframed = -1;                 /* NULL */
-static int hf_h245_AL1HeaderFEC = -1;             /* AL1HeaderFEC */
+static int hf_h245_aL1HeaderFEC = -1;             /* AL1HeaderFEC */
 static int hf_h245_sebch16_7 = -1;                /* NULL */
 static int hf_h245_golay24_12 = -1;               /* NULL */
 static int hf_h245_crcLength2 = -1;               /* AL1CrcLength */
@@ -994,7 +995,7 @@ static int hf_h245_rsCodeCorrection = -1;         /* INTEGER_0_127 */
 static int hf_h245_noArq = -1;                    /* NULL */
 static int hf_h245_typeIArq = -1;                 /* H223AnnexCArqParameters */
 static int hf_h245_typeIIArq = -1;                /* H223AnnexCArqParameters */
-static int hf_h245_AL2HeaderFEC = -1;             /* AL2HeaderFEC */
+static int hf_h245_aL2HeaderFEC = -1;             /* AL2HeaderFEC */
 static int hf_h245_sebch16_5 = -1;                /* NULL */
 static int hf_h245_headerFormat = -1;             /* T_headerFormat */
 static int hf_h245_crlength2 = -1;                /* AL3CrcLength */
@@ -1107,10 +1108,10 @@ static int hf_h245_sessionID = -1;                /* INTEGER_1_255 */
 static int hf_h245_ack_mediaChannel = -1;         /* Ack_mediaChannel */
 static int hf_h245_ack_mediaControlChannel = -1;  /* Ack_mediaControlChannel */
 static int hf_h245_flowControlToZero = -1;        /* BOOLEAN */
-static int hf_h245_CloseLogicalChannel_source = -1;  /* T_source */
+static int hf_h245_cLC_source = -1;               /* T_source */
 static int hf_h245_user = -1;                     /* NULL */
 static int hf_h245_lcse = -1;                     /* NULL */
-static int hf_h245_clc_reason = -1;               /* clc_reason */
+static int hf_h245_clc_reason = -1;               /* Clc_reason */
 static int hf_h245_unknown = -1;                  /* NULL */
 static int hf_h245_reopen = -1;                   /* NULL */
 static int hf_h245_reservationFailure = -1;       /* NULL */
@@ -1123,7 +1124,7 @@ static int hf_h245_multiplexEntryDescriptors_item = -1;  /* MultiplexEntryDescri
 static int hf_h245_multiplexTableEntryNumber = -1;  /* MultiplexTableEntryNumber */
 static int hf_h245_elementList = -1;              /* SEQUENCE_SIZE_1_256_OF_MultiplexElement */
 static int hf_h245_elementList_item = -1;         /* MultiplexElement */
-static int hf_h245_Me_type = -1;                  /* Me_type */
+static int hf_h245_me_type = -1;                  /* Me_type */
 static int hf_h245_logicalChannelNum = -1;        /* INTEGER_0_65535 */
 static int hf_h245_subElementList = -1;           /* SEQUENCE_SIZE_2_255_OF_MultiplexElement */
 static int hf_h245_subElementList_item = -1;      /* MultiplexElement */
@@ -1261,7 +1262,7 @@ static int hf_h245_mlr_type = -1;                 /* Mlr_type */
 static int hf_h245_systemLoop = -1;               /* NULL */
 static int hf_h245_mediaLoop = -1;                /* LogicalChannelNumber */
 static int hf_h245_logicalChannelLoop = -1;       /* LogicalChannelNumber */
-static int hf_h245_Mla_type = -1;                 /* Mla_type */
+static int hf_h245_mla_type = -1;                 /* Mla_type */
 static int hf_h245_mlrej_type = -1;               /* Mlrej_type */
 static int hf_h245_maintloop_rej_cause = -1;      /* MaintenanceLoopRejectCause */
 static int hf_h245_canNotPerformLoop = -1;        /* NULL */
@@ -1389,7 +1390,7 @@ static int hf_h245_associatedAlgorithm = -1;      /* NonStandardParameter */
 static int hf_h245_scope = -1;                    /* Scope */
 static int hf_h245_restriction = -1;              /* Restriction */
 static int hf_h245_wholeMultiplex = -1;           /* NULL */
-static int hf_h245_Res_maximumBitRate = -1;       /* INTEGER_0_16777215 */
+static int hf_h245_res_maximumBitRate = -1;       /* INTEGER_0_16777215 */
 static int hf_h245_noRestriction = -1;            /* NULL */
 static int hf_h245_disconnect = -1;               /* NULL */
 static int hf_h245_gstnOptions = -1;              /* T_gstnOptions */
@@ -1819,7 +1820,7 @@ static gint ett_h245_OpenLogicalChannelConfirm = -1;
 static gint ett_h245_H2250LogicalChannelAckParameters = -1;
 static gint ett_h245_CloseLogicalChannel = -1;
 static gint ett_h245_T_source = -1;
-static gint ett_h245_clc_reason = -1;
+static gint ett_h245_Clc_reason = -1;
 static gint ett_h245_CloseLogicalChannelAck = -1;
 static gint ett_h245_RequestChannelClose = -1;
 static gint ett_h245_T_reason = -1;
@@ -2240,7 +2241,7 @@ dissect_h245_H221NonStandardID(tvbuff_t *tvb, int offset, packet_info *pinfo _U_
 
   h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode;
   proto_tree_add_uint(tree, hf_h245Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard);
-
+  nsp_handle = dissector_get_port_handle(nsp_h221_dissector_table, h221NonStandard);
   return offset;
 }
 static int dissect_h221NonStandardID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -2277,42 +2278,24 @@ static int dissect_vendor(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 
 
 static int
-dissect_h245_OCTET_STRING(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                    -1, -1,
-                                    NULL, NULL);
+dissect_h245_T_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+	guint32 value_offset, value_len;
+	tvbuff_t *next_tvb;
+
+	offset = dissect_per_octet_string(tvb, offset, pinfo, tree,
+				hf_index, -1, -1,
+				&value_offset, &value_len);
+
+	if (value_len > 0) {
+		next_tvb = tvb_new_subset(tvb, value_offset, value_len, value_len);
+		call_dissector((nsp_handle)?nsp_handle:data_handle, next_tvb, pinfo, tree);
+	}
+
 
   return offset;
 }
 static int dissect_nsd_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_nsd_data);
-}
-static int dissect_nlpidData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_nlpidData);
-}
-static int dissect_nonCollapsingRaw(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_nonCollapsingRaw);
-}
-static int dissect_octetString(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_octetString);
-}
-static int dissect_programDescriptors(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_programDescriptors);
-}
-static int dissect_streamDescriptors(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_streamDescriptors);
-}
-static int dissect_encryptionSE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_encryptionSE);
-}
-static int dissect_returnedFunction(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_returnedFunction);
-}
-static int dissect_iv(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_iv);
-}
-static int dissect_encrypted(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_encrypted);
+  return dissect_h245_T_data(tvb, offset, pinfo, tree, hf_h245_nsd_data);
 }
 
 static const per_sequence_t NonStandardParameter_sequence[] = {
@@ -2433,8 +2416,8 @@ static int dissect_statusDeterminationNumber(tvbuff_t *tvb, int offset, packet_i
 static int dissect_sendBufferSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
   return dissect_h245_INTEGER_0_16777215(tvb, offset, pinfo, tree, hf_h245_sendBufferSize);
 }
-static int dissect_Res_maximumBitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_INTEGER_0_16777215(tvb, offset, pinfo, tree, hf_h245_Res_maximumBitRate);
+static int dissect_res_maximumBitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_INTEGER_0_16777215(tvb, offset, pinfo, tree, hf_h245_res_maximumBitRate);
 }
 
 static const per_sequence_t MasterSlaveDetermination_sequence[] = {
@@ -3367,12 +3350,12 @@ dissect_h245_Avb_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t
 
   return offset;
 }
-static int dissect_Avb_type(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_Avb_type(tvb, offset, pinfo, tree, hf_h245_Avb_type);
+static int dissect_avb_type(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_Avb_type(tvb, offset, pinfo, tree, hf_h245_avb_type);
 }
 
 static const per_sequence_t T_availableBitRates_sequence[] = {
-  { "type"                        , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_Avb_type },
+  { "type"                        , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_avb_type },
   { NULL, 0, 0, NULL }
 };
 
@@ -4980,6 +4963,43 @@ static int dissect_t84(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
   return dissect_h245_T_t84(tvb, offset, pinfo, tree, hf_h245_t84);
 }
 
+
+static int
+dissect_h245_OCTET_STRING(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+  offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
+                                    -1, -1,
+                                    NULL, NULL);
+
+  return offset;
+}
+static int dissect_nlpidData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_nlpidData);
+}
+static int dissect_nonCollapsingRaw(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_nonCollapsingRaw);
+}
+static int dissect_octetString(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_octetString);
+}
+static int dissect_programDescriptors(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_programDescriptors);
+}
+static int dissect_streamDescriptors(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_streamDescriptors);
+}
+static int dissect_encryptionSE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_encryptionSE);
+}
+static int dissect_returnedFunction(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_returnedFunction);
+}
+static int dissect_iv(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_iv);
+}
+static int dissect_encrypted(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_OCTET_STRING(tvb, offset, pinfo, tree, hf_h245_encrypted);
+}
+
 static const per_sequence_t Nlpid_sequence[] = {
   { "nlpidProtocol"               , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nlpidProtocol },
   { "nlpidData"                   , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_nlpidData },
@@ -8764,8 +8784,8 @@ dissect_h245_AL1HeaderFEC(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pro
 
   return offset;
 }
-static int dissect_AL1HeaderFEC(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_AL1HeaderFEC(tvb, offset, pinfo, tree, hf_h245_AL1HeaderFEC);
+static int dissect_aL1HeaderFEC(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_AL1HeaderFEC(tvb, offset, pinfo, tree, hf_h245_aL1HeaderFEC);
 }
 
 
@@ -8905,7 +8925,7 @@ static int dissect_arqType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 
 static const per_sequence_t H223AL1MParameters_sequence[] = {
   { "transferMode"                , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_transferMode },
-  { "headerFEC"                   , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_AL1HeaderFEC },
+  { "headerFEC"                   , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_aL1HeaderFEC },
   { "crcLength"                   , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_crcLength2 },
   { "rcpcCodeRate"                , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_rcpcCodeRate },
   { "arqType"                     , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_arqType },
@@ -8947,12 +8967,12 @@ dissect_h245_AL2HeaderFEC(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pro
 
   return offset;
 }
-static int dissect_AL2HeaderFEC(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_AL2HeaderFEC(tvb, offset, pinfo, tree, hf_h245_AL2HeaderFEC);
+static int dissect_aL2HeaderFEC(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_AL2HeaderFEC(tvb, offset, pinfo, tree, hf_h245_aL2HeaderFEC);
 }
 
 static const per_sequence_t H223AL2MParameters_sequence[] = {
-  { "headerFEC"                   , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_AL2HeaderFEC },
+  { "headerFEC"                   , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_aL2HeaderFEC },
   { "alpduInterleaving"           , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_alpduInterleaving },
   { NULL, 0, 0, NULL }
 };
@@ -10153,19 +10173,19 @@ dissect_h245_T_source(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t
 
   return offset;
 }
-static int dissect_CloseLogicalChannel_source(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_T_source(tvb, offset, pinfo, tree, hf_h245_CloseLogicalChannel_source);
+static int dissect_cLC_source(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_T_source(tvb, offset, pinfo, tree, hf_h245_cLC_source);
 }
 
 
-static const value_string h245_clc_reason_vals[] = {
+static const value_string h245_Clc_reason_vals[] = {
   {   0, "unknown" },
   {   1, "reopen" },
   {   2, "reservationFailure" },
   { 0, NULL }
 };
 
-static const per_choice_t clc_reason_choice[] = {
+static const per_choice_t Clc_reason_choice[] = {
   {   0, "unknown"                     , ASN1_EXTENSION_ROOT    , dissect_unknown },
   {   1, "reopen"                      , ASN1_EXTENSION_ROOT    , dissect_reopen },
   {   2, "reservationFailure"          , ASN1_EXTENSION_ROOT    , dissect_reservationFailure },
@@ -10173,20 +10193,20 @@ static const per_choice_t clc_reason_choice[] = {
 };
 
 static int
-dissect_h245_clc_reason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_h245_Clc_reason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                              ett_h245_clc_reason, clc_reason_choice, "clc_reason",
+                              ett_h245_Clc_reason, Clc_reason_choice, "Clc_reason",
                               NULL);
 
   return offset;
 }
 static int dissect_clc_reason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_clc_reason(tvb, offset, pinfo, tree, hf_h245_clc_reason);
+  return dissect_h245_Clc_reason(tvb, offset, pinfo, tree, hf_h245_clc_reason);
 }
 
 static const per_sequence_t CloseLogicalChannel_sequence[] = {
   { "forwardLogicalChannelNumber" , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_forwardLogicalChannelNumber },
-  { "source"                      , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_CloseLogicalChannel_source },
+  { "source"                      , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_cLC_source },
   { "reason"                      , ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_clc_reason },
   { NULL, 0, 0, NULL }
 };
@@ -10304,8 +10324,8 @@ dissect_h245_Me_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr
 
   return offset;
 }
-static int dissect_Me_type(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_Me_type(tvb, offset, pinfo, tree, hf_h245_Me_type);
+static int dissect_me_type(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_Me_type(tvb, offset, pinfo, tree, hf_h245_me_type);
 }
 
 
@@ -10334,7 +10354,7 @@ static int dissect_me_repeatCount(tvbuff_t *tvb, int offset, packet_info *pinfo,
 }
 
 static const per_sequence_t MultiplexElement_sequence[] = {
-  { "type"                        , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_Me_type },
+  { "type"                        , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_me_type },
   { "repeatCount"                 , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_me_repeatCount },
   { NULL, 0, 0, NULL }
 };
@@ -13021,12 +13041,12 @@ dissect_h245_Mla_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t
 
   return offset;
 }
-static int dissect_Mla_type(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
-  return dissect_h245_Mla_type(tvb, offset, pinfo, tree, hf_h245_Mla_type);
+static int dissect_mla_type(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
+  return dissect_h245_Mla_type(tvb, offset, pinfo, tree, hf_h245_mla_type);
 }
 
 static const per_sequence_t MaintenanceLoopAck_sequence[] = {
-  { "type"                        , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_Mla_type },
+  { "type"                        , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_mla_type },
   { NULL, 0, 0, NULL }
 };
 
@@ -14102,7 +14122,7 @@ static const value_string h245_Restriction_vals[] = {
 };
 
 static const per_choice_t Restriction_choice[] = {
-  {   0, "maximumBitRate"              , ASN1_NO_EXTENSIONS     , dissect_Res_maximumBitRate },
+  {   0, "maximumBitRate"              , ASN1_NO_EXTENSIONS     , dissect_res_maximumBitRate },
   {   1, "noRestriction"               , ASN1_NO_EXTENSIONS     , dissect_noRestriction },
   { 0, NULL, 0, NULL }
 };
@@ -17081,7 +17101,7 @@ void proto_register_h245(void) {
       { "availableBitRates", "h245.availableBitRates",
         FT_NONE, BASE_NONE, NULL, 0,
         "VCCapability/availableBitRates", HFILL }},
-    { &hf_h245_Avb_type,
+    { &hf_h245_avb_type,
       { "type", "h245.type",
         FT_UINT32, BASE_DEC, VALS(h245_Avb_type_vals), 0,
         "VCCapability/availableBitRates/type", HFILL }},
@@ -19377,7 +19397,7 @@ void proto_register_h245(void) {
       { "unframed", "h245.unframed",
         FT_NONE, BASE_NONE, NULL, 0,
         "H223AL1MParameters/transferMode/unframed", HFILL }},
-    { &hf_h245_AL1HeaderFEC,
+    { &hf_h245_aL1HeaderFEC,
       { "headerFEC", "h245.headerFEC",
         FT_UINT32, BASE_DEC, VALS(h245_AL1HeaderFEC_vals), 0,
         "H223AL1MParameters/headerFEC", HFILL }},
@@ -19453,7 +19473,7 @@ void proto_register_h245(void) {
       { "typeIIArq", "h245.typeIIArq",
         FT_NONE, BASE_NONE, NULL, 0,
         "ArqType/typeIIArq", HFILL }},
-    { &hf_h245_AL2HeaderFEC,
+    { &hf_h245_aL2HeaderFEC,
       { "headerFEC", "h245.headerFEC",
         FT_UINT32, BASE_DEC, VALS(h245_AL2HeaderFEC_vals), 0,
         "H223AL2MParameters/headerFEC", HFILL }},
@@ -19905,7 +19925,7 @@ void proto_register_h245(void) {
       { "flowControlToZero", "h245.flowControlToZero",
         FT_BOOLEAN, 8, NULL, 0,
         "H2250LogicalChannelAckParameters/flowControlToZero", HFILL }},
-    { &hf_h245_CloseLogicalChannel_source,
+    { &hf_h245_cLC_source,
       { "source", "h245.source",
         FT_UINT32, BASE_DEC, VALS(h245_T_source_vals), 0,
         "CloseLogicalChannel/source", HFILL }},
@@ -19919,7 +19939,7 @@ void proto_register_h245(void) {
         "CloseLogicalChannel/source/lcse", HFILL }},
     { &hf_h245_clc_reason,
       { "reason", "h245.reason",
-        FT_UINT32, BASE_DEC, VALS(h245_clc_reason_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(h245_Clc_reason_vals), 0,
         "CloseLogicalChannel/reason", HFILL }},
     { &hf_h245_unknown,
       { "unknown", "h245.unknown",
@@ -19969,7 +19989,7 @@ void proto_register_h245(void) {
       { "Item", "h245.elementList_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiplexEntryDescriptor/elementList/_item", HFILL }},
-    { &hf_h245_Me_type,
+    { &hf_h245_me_type,
       { "type", "h245.type",
         FT_UINT32, BASE_DEC, VALS(h245_Me_type_vals), 0,
         "MultiplexElement/type", HFILL }},
@@ -20521,7 +20541,7 @@ void proto_register_h245(void) {
       { "logicalChannelLoop", "h245.logicalChannelLoop",
         FT_UINT32, BASE_DEC, NULL, 0,
         "", HFILL }},
-    { &hf_h245_Mla_type,
+    { &hf_h245_mla_type,
       { "type", "h245.type",
         FT_UINT32, BASE_DEC, VALS(h245_Mla_type_vals), 0,
         "MaintenanceLoopAck/type", HFILL }},
@@ -21033,7 +21053,7 @@ void proto_register_h245(void) {
       { "wholeMultiplex", "h245.wholeMultiplex",
         FT_NONE, BASE_NONE, NULL, 0,
         "Scope/wholeMultiplex", HFILL }},
-    { &hf_h245_Res_maximumBitRate,
+    { &hf_h245_res_maximumBitRate,
       { "maximumBitRate", "h245.maximumBitRate",
         FT_UINT32, BASE_DEC, NULL, 0,
         "Restriction/maximumBitRate", HFILL }},
@@ -21994,7 +22014,7 @@ void proto_register_h245(void) {
     &ett_h245_H2250LogicalChannelAckParameters,
     &ett_h245_CloseLogicalChannel,
     &ett_h245_T_source,
-    &ett_h245_clc_reason,
+    &ett_h245_Clc_reason,
     &ett_h245_CloseLogicalChannelAck,
     &ett_h245_RequestChannelClose,
     &ett_h245_T_reason,
@@ -22276,6 +22296,8 @@ void proto_register_h245(void) {
 void proto_reg_handoff_h245(void) {
 	rtp_handle = find_dissector("rtp");
 	rtcp_handle = find_dissector("rtcp");
+	data_handle = find_dissector("data");
+
 
 	h245_handle=create_dissector_handle(dissect_h245, proto_h245);
 	dissector_add_handle("tcp.port", h245_handle);
diff --git a/epan/dissectors/packet-h245.h b/epan/dissectors/packet-h245.h
index 2c0d3633a2..2d9094c11c 100644
--- a/epan/dissectors/packet-h245.h
+++ b/epan/dissectors/packet-h245.h
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* ./packet-h245.h                                                            */
+/* .\packet-h245.h                                                            */
 /* ../../tools/asn2eth.py -X -e -p h245 -c h245.cnf -s packet-h245-template h245.asn */
 
 /* Input file: packet-h245-template.h */