Get rid of some unused code warnings.

svn path=/trunk/; revision=25796

3 files changed, 23 insertions, 216 deletions

diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 0f2b1b39d7..0f9993f2cf 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -303,7 +303,7 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff
 
 int
 dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 76 "cms.cnf"
+#line 77 "cms.cnf"
   	const char *name = NULL;
 
 	  offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
@@ -323,7 +323,7 @@ dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static int
 dissect_cms_T_content(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 86 "cms.cnf"
+#line 87 "cms.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -341,7 +341,7 @@ static const ber_sequence_t ContentInfo_sequence[] = {
 
 int
 dissect_cms_ContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 67 "cms.cnf"
+#line 68 "cms.cnf"
   top_tree = tree;
     offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
                                    ContentInfo_sequence, hf_index, ett_cms_ContentInfo);
@@ -399,7 +399,7 @@ dissect_cms_DigestAlgorithmIdentifiers(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 static int
 dissect_cms_T_eContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 90 "cms.cnf"
+#line 91 "cms.cnf"
   gint8 class;
   gboolean pc, ind;
   gint32 tag;
@@ -441,7 +441,7 @@ dissect_cms_EncapsulatedContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 static int
 dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 118 "cms.cnf"
+#line 119 "cms.cnf"
   const char *name = NULL;
 
     offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id);
@@ -461,7 +461,7 @@ dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static int
 dissect_cms_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 128 "cms.cnf"
+#line 129 "cms.cnf"
 
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
@@ -903,7 +903,7 @@ dissect_cms_T_keyAttrId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static int
 dissect_cms_T_keyAttr(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 111 "cms.cnf"
+#line 112 "cms.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -1104,14 +1104,14 @@ dissect_cms_ContentEncryptionAlgorithmIdentifier(gboolean implicit_tag _U_, tvbu
 
 static int
 dissect_cms_EncryptedContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 178 "cms.cnf"
+#line 179 "cms.cnf"
 	tvbuff_t *encrypted_tvb;
 	proto_item *item;
 
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &encrypted_tvb);
 
-#line 183 "cms.cnf"
+#line 184 "cms.cnf"
 
 	item = actx->created_item;
 
@@ -1269,7 +1269,7 @@ dissect_cms_AuthenticatedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 static int
 dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 132 "cms.cnf"
+#line 133 "cms.cnf"
   proto_item *pi;
   int old_offset = offset;
 
@@ -1346,7 +1346,7 @@ dissect_cms_Countersignature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 static int
 dissect_cms_RC2ParameterVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 168 "cms.cnf"
+#line 169 "cms.cnf"
   guint32 length = 0;
 
     offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
@@ -1373,16 +1373,6 @@ dissect_cms_RC2WrapParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 
 static int
-dissect_cms_IV(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                       NULL);
-
-  return offset;
-}
-
-
-
-static int
 dissect_cms_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
                                                 NULL);
@@ -1409,7 +1399,7 @@ dissect_cms_RC2CBCParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 static int
 dissect_cms_T_capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 150 "cms.cnf"
+#line 151 "cms.cnf"
   const char *name = NULL;
 
     offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id);
@@ -1430,7 +1420,7 @@ dissect_cms_T_capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 
 static int
 dissect_cms_T_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 161 "cms.cnf"
+#line 162 "cms.cnf"
 
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c
index 450a19fef3..2c374696e5 100644
--- a/epan/dissectors/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
@@ -82,16 +82,6 @@ static int hf_h450_clearCallIfAnyInvokePduNotRecognized = -1;  /* NULL */
 static int hf_h450_rejectAnyUnrecognizedInvokePdu = -1;  /* NULL */
 static int hf_h450_rosApdus = -1;                 /* T_rosApdus */
 static int hf_h450_rosApdus_item = -1;            /* T_rosApdus_item */
-static int hf_h450_addressScreened_presentationAllowedAddress = -1;  /* AddressScreened */
-static int hf_h450_presentationRestricted = -1;   /* NULL */
-static int hf_h450_numberNotAvailableDueToInterworking = -1;  /* NULL */
-static int hf_h450_addressScreened_presentationRestrictedAddress = -1;  /* AddressScreened */
-static int hf_h450_addressUnscreened_presentationAllowedAddress = -1;  /* Address */
-static int hf_h450_addressUnscreened_presentationRestrictedAddress = -1;  /* Address */
-static int hf_h450_numberScreened_presentationAllowedAddress = -1;  /* NumberScreened */
-static int hf_h450_numberScreened_presentationRestrictedAddress = -1;  /* NumberScreened */
-static int hf_h450_numberUnscreened_presentationAllowedAddress = -1;  /* PartyNumber */
-static int hf_h450_numberUnscreened_presentationRestrictedAddress = -1;  /* PartyNumber */
 static int hf_h450_partyNumber = -1;              /* PartyNumber */
 static int hf_h450_screeningIndicator = -1;       /* ScreeningIndicator */
 static int hf_h450_partySubaddress = -1;          /* PartySubaddress */
@@ -478,10 +468,6 @@ static gint ett_h450_EntityType = -1;
 static gint ett_h450_InterpretationApdu = -1;
 static gint ett_h450_ServiceApdus = -1;
 static gint ett_h450_T_rosApdus = -1;
-static gint ett_h450_PresentedAddressScreened = -1;
-static gint ett_h450_PresentedAddressUnscreened = -1;
-static gint ett_h450_PresentedNumberScreened = -1;
-static gint ett_h450_PresentedNumberUnscreened = -1;
 static gint ett_h450_AddressScreened = -1;
 static gint ett_h450_NumberScreened = -1;
 static gint ett_h450_Address = -1;
@@ -942,7 +928,7 @@ dissect_h450_InterpretationApdu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
 
 static int
 dissect_h450_T_rosApdus_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 50 "h450.cnf"
+#line 57 "h450.cnf"
   h450_rose_ctx.apdu_depth = 1;
   actx->rose_ctx = &h450_rose_ctx;
 
@@ -995,7 +981,7 @@ static const per_sequence_t h450_H4501SupplementaryService_sequence[] = {
 
 static int
 dissect_h450_H4501SupplementaryService(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 43 "h450.cnf"
+#line 50 "h450.cnf"
   proto_item *hidden_item;
 
   hidden_item = proto_tree_add_item(tree, proto_h450, tvb, offset, -1, FALSE);
@@ -1100,73 +1086,6 @@ dissect_h450_AddressScreened(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 }
 
 
-static const value_string h450_PresentedAddressScreened_vals[] = {
-  {   0, "presentationAllowedAddress" },
-  {   1, "presentationRestricted" },
-  {   2, "numberNotAvailableDueToInterworking" },
-  {   3, "presentationRestrictedAddress" },
-  { 0, NULL }
-};
-
-static const per_choice_t h450_PresentedAddressScreened_choice[] = {
-  {   0, &hf_h450_addressScreened_presentationAllowedAddress, ASN1_EXTENSION_ROOT    , dissect_h450_AddressScreened },
-  {   1, &hf_h450_presentationRestricted, ASN1_EXTENSION_ROOT    , dissect_h450_NULL },
-  {   2, &hf_h450_numberNotAvailableDueToInterworking, ASN1_EXTENSION_ROOT    , dissect_h450_NULL },
-  {   3, &hf_h450_addressScreened_presentationRestrictedAddress, ASN1_EXTENSION_ROOT    , dissect_h450_AddressScreened },
-  { 0, NULL, 0, NULL }
-};
-
-static int
-dissect_h450_PresentedAddressScreened(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_h450_PresentedAddressScreened, h450_PresentedAddressScreened_choice,
-                                 NULL);
-
-  return offset;
-}
-
-
-static const per_sequence_t h450_Address_sequence[] = {
-  { &hf_h450_partyNumber    , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_h225_PartyNumber },
-  { &hf_h450_partySubaddress, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h450_PartySubaddress },
-  { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_h450_Address(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_h450_Address, h450_Address_sequence);
-
-  return offset;
-}
-
-
-static const value_string h450_PresentedAddressUnscreened_vals[] = {
-  {   0, "presentationAllowedAddress" },
-  {   1, "presentationRestricted" },
-  {   2, "numberNotAvailableDueToInterworking" },
-  {   3, "presentationRestrictedAddress" },
-  { 0, NULL }
-};
-
-static const per_choice_t h450_PresentedAddressUnscreened_choice[] = {
-  {   0, &hf_h450_addressUnscreened_presentationAllowedAddress, ASN1_EXTENSION_ROOT    , dissect_h450_Address },
-  {   1, &hf_h450_presentationRestricted, ASN1_EXTENSION_ROOT    , dissect_h450_NULL },
-  {   2, &hf_h450_numberNotAvailableDueToInterworking, ASN1_EXTENSION_ROOT    , dissect_h450_NULL },
-  {   3, &hf_h450_addressUnscreened_presentationRestrictedAddress, ASN1_EXTENSION_ROOT    , dissect_h450_Address },
-  { 0, NULL, 0, NULL }
-};
-
-static int
-dissect_h450_PresentedAddressUnscreened(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_h450_PresentedAddressUnscreened, h450_PresentedAddressUnscreened_choice,
-                                 NULL);
-
-  return offset;
-}
-
-
 static const per_sequence_t h450_NumberScreened_sequence[] = {
   { &hf_h450_partyNumber    , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_h225_PartyNumber },
   { &hf_h450_screeningIndicator, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_h225_ScreeningIndicator },
@@ -1182,53 +1101,16 @@ dissect_h450_NumberScreened(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 }
 
 
-static const value_string h450_PresentedNumberScreened_vals[] = {
-  {   0, "presentationAllowedAddress" },
-  {   1, "presentationRestricted" },
-  {   2, "numberNotAvailableDueToInterworking" },
-  {   3, "presentationRestrictedAddress" },
-  { 0, NULL }
-};
-
-static const per_choice_t h450_PresentedNumberScreened_choice[] = {
-  {   0, &hf_h450_numberScreened_presentationAllowedAddress, ASN1_EXTENSION_ROOT    , dissect_h450_NumberScreened },
-  {   1, &hf_h450_presentationRestricted, ASN1_EXTENSION_ROOT    , dissect_h450_NULL },
-  {   2, &hf_h450_numberNotAvailableDueToInterworking, ASN1_EXTENSION_ROOT    , dissect_h450_NULL },
-  {   3, &hf_h450_numberScreened_presentationRestrictedAddress, ASN1_EXTENSION_ROOT    , dissect_h450_NumberScreened },
-  { 0, NULL, 0, NULL }
-};
-
-static int
-dissect_h450_PresentedNumberScreened(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_h450_PresentedNumberScreened, h450_PresentedNumberScreened_choice,
-                                 NULL);
-
-  return offset;
-}
-
-
-static const value_string h450_PresentedNumberUnscreened_vals[] = {
-  {   0, "presentationAllowedAddress" },
-  {   1, "presentationRestricted" },
-  {   2, "numberNotAvailableDueToInterworking" },
-  {   3, "presentationRestrictedAddress" },
-  { 0, NULL }
-};
-
-static const per_choice_t h450_PresentedNumberUnscreened_choice[] = {
-  {   0, &hf_h450_numberUnscreened_presentationAllowedAddress, ASN1_EXTENSION_ROOT    , dissect_h225_PartyNumber },
-  {   1, &hf_h450_presentationRestricted, ASN1_EXTENSION_ROOT    , dissect_h450_NULL },
-  {   2, &hf_h450_numberNotAvailableDueToInterworking, ASN1_EXTENSION_ROOT    , dissect_h450_NULL },
-  {   3, &hf_h450_numberUnscreened_presentationRestrictedAddress, ASN1_EXTENSION_ROOT    , dissect_h225_PartyNumber },
-  { 0, NULL, 0, NULL }
+static const per_sequence_t h450_Address_sequence[] = {
+  { &hf_h450_partyNumber    , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_h225_PartyNumber },
+  { &hf_h450_partySubaddress, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h450_PartySubaddress },
+  { NULL, 0, 0, NULL }
 };
 
 static int
-dissect_h450_PresentedNumberUnscreened(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_h450_PresentedNumberUnscreened, h450_PresentedNumberUnscreened_choice,
-                                 NULL);
+dissect_h450_Address(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_h450_Address, h450_Address_sequence);
 
   return offset;
 }
@@ -5094,46 +4976,6 @@ void proto_register_h450(void) {
       { "Item", "h450.rosApdus_item",
         FT_UINT32, BASE_DEC, VALS(h450_ros_ROS_vals), 0,
         "h450.T_rosApdus_item", HFILL }},
-    { &hf_h450_addressScreened_presentationAllowedAddress,
-      { "presentationAllowedAddress", "h450.presentationAllowedAddress",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h450.AddressScreened", HFILL }},
-    { &hf_h450_presentationRestricted,
-      { "presentationRestricted", "h450.presentationRestricted",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h450.NULL", HFILL }},
-    { &hf_h450_numberNotAvailableDueToInterworking,
-      { "numberNotAvailableDueToInterworking", "h450.numberNotAvailableDueToInterworking",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h450.NULL", HFILL }},
-    { &hf_h450_addressScreened_presentationRestrictedAddress,
-      { "presentationRestrictedAddress", "h450.presentationRestrictedAddress",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h450.AddressScreened", HFILL }},
-    { &hf_h450_addressUnscreened_presentationAllowedAddress,
-      { "presentationAllowedAddress", "h450.presentationAllowedAddress",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h450.Address", HFILL }},
-    { &hf_h450_addressUnscreened_presentationRestrictedAddress,
-      { "presentationRestrictedAddress", "h450.presentationRestrictedAddress",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h450.Address", HFILL }},
-    { &hf_h450_numberScreened_presentationAllowedAddress,
-      { "presentationAllowedAddress", "h450.presentationAllowedAddress",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h450.NumberScreened", HFILL }},
-    { &hf_h450_numberScreened_presentationRestrictedAddress,
-      { "presentationRestrictedAddress", "h450.presentationRestrictedAddress",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h450.NumberScreened", HFILL }},
-    { &hf_h450_numberUnscreened_presentationAllowedAddress,
-      { "presentationAllowedAddress", "h450.presentationAllowedAddress",
-        FT_UINT32, BASE_DEC, VALS(h225_PartyNumber_vals), 0,
-        "h225.PartyNumber", HFILL }},
-    { &hf_h450_numberUnscreened_presentationRestrictedAddress,
-      { "presentationRestrictedAddress", "h450.presentationRestrictedAddress",
-        FT_UINT32, BASE_DEC, VALS(h225_PartyNumber_vals), 0,
-        "h225.PartyNumber", HFILL }},
     { &hf_h450_partyNumber,
       { "partyNumber", "h450.partyNumber",
         FT_UINT32, BASE_DEC, VALS(h225_PartyNumber_vals), 0,
@@ -6530,10 +6372,6 @@ void proto_register_h450(void) {
     &ett_h450_InterpretationApdu,
     &ett_h450_ServiceApdus,
     &ett_h450_T_rosApdus,
-    &ett_h450_PresentedAddressScreened,
-    &ett_h450_PresentedAddressUnscreened,
-    &ett_h450_PresentedNumberScreened,
-    &ett_h450_PresentedNumberUnscreened,
     &ett_h450_AddressScreened,
     &ett_h450_NumberScreened,
     &ett_h450_Address,
diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c
index 1b09fffeef..72f90d8f79 100644
--- a/epan/dissectors/packet-h460.c
+++ b/epan/dissectors/packet-h460.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-h460.c                                                              */
-/* ../../tools/asn2wrs.py -c ./h460.cnf -s ./packet-h460-template -D . NUMBER-PORTABILITY.asn CIRCUIT-STATUS-MAP.asn CALL-PRIORITY.asn QOS-MONITORING-REPORT.asn QOS-MONITORING-EXTENDED-VOIP-REPORT.asn CALL-PARTY-CATEGORY.asn MLPP.asn SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn SIGNALLING-TRAVERSAL.asn MEDIA-TRAVERSAL.asn MESSAGE-BROADCAST.asn */
+/* ../../tools/asn2wrs.py -c h460.cnf -s packet-h460-template NUMBER-PORTABILITY.asn CIRCUIT-STATUS-MAP.asn CALL-PRIORITY.asn QOS-MONITORING-REPORT.asn QOS-MONITORING-EXTENDED-VOIP-REPORT.asn CALL-PARTY-CATEGORY.asn MLPP.asn SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn SIGNALLING-TRAVERSAL.asn MEDIA-TRAVERSAL.asn MESSAGE-BROADCAST.asn */
 
 /* Input file: packet-h460-template.c */
 
@@ -258,7 +258,6 @@ static int hf_h460_21_maxGroups = -1;             /* INTEGER_1_65535 */
 static int hf_h460_21_groupIdentifer = -1;        /* GloballyUniqueID */
 static int hf_h460_21_capability = -1;            /* Capability */
 static int hf_h460_21_sourceAddress = -1;         /* UnicastAddress */
-static int hf_h460_21_MessageBroadcastGroups_item = -1;  /* GroupAttributes */
 static int hf_h460_21_priority = -1;              /* INTEGER_0_255 */
 static int hf_h460_21_groupAddress = -1;          /* MulticastAddress */
 static int hf_h460_21_alertUser = -1;             /* BOOLEAN */
@@ -359,7 +358,6 @@ static gint ett_h460_21_SEQUENCE_SIZE_1_256_OF_TransmitCapabilities = -1;
 static gint ett_h460_21_ReceiveCapabilities = -1;
 static gint ett_h460_21_SEQUENCE_SIZE_1_256_OF_Capability = -1;
 static gint ett_h460_21_TransmitCapabilities = -1;
-static gint ett_h460_21_MessageBroadcastGroups = -1;
 static gint ett_h460_21_GroupAttributes = -1;
 
 /*--- End of included file: packet-h460-ett.c ---*/
@@ -1999,20 +1997,6 @@ dissect_h460_21_GroupAttributes(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
   return offset;
 }
 
-
-static const per_sequence_t h460_21_MessageBroadcastGroups_sequence_of[1] = {
-  { &hf_h460_21_MessageBroadcastGroups_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_h460_21_GroupAttributes },
-};
-
-static int
-dissect_h460_21_MessageBroadcastGroups(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
-                                                  ett_h460_21_MessageBroadcastGroups, h460_21_MessageBroadcastGroups_sequence_of,
-                                                  1, 256);
-
-  return offset;
-}
-
 /*--- PDUs ---*/
 
 static int dissect_h460_21_CapabilityAdvertisement_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
@@ -2929,10 +2913,6 @@ void proto_register_h460(void) {
       { "sourceAddress", "h460.21.sourceAddress",
         FT_UINT32, BASE_DEC, VALS(h245_UnicastAddress_vals), 0,
         "h245.UnicastAddress", HFILL }},
-    { &hf_h460_21_MessageBroadcastGroups_item,
-      { "Item", "h460.21.MessageBroadcastGroups_item",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "h460_21.GroupAttributes", HFILL }},
     { &hf_h460_21_priority,
       { "priority", "h460.21.priority",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -3044,7 +3024,6 @@ void proto_register_h460(void) {
     &ett_h460_21_ReceiveCapabilities,
     &ett_h460_21_SEQUENCE_SIZE_1_256_OF_Capability,
     &ett_h460_21_TransmitCapabilities,
-    &ett_h460_21_MessageBroadcastGroups,
     &ett_h460_21_GroupAttributes,
 
 /*--- End of included file: packet-h460-ettarr.c ---*/