aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asn1/rnsap/packet-rnsap-template.c7
-rw-r--r--epan/dissectors/packet-acse.c18
-rw-r--r--epan/dissectors/packet-h248.c9
-rw-r--r--epan/dissectors/packet-rnsap.c19
-rw-r--r--epan/dissectors/packet-x411.c3
5 files changed, 6 insertions, 50 deletions
diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index 92532925da..b3a20c4475 100644
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.c
@@ -58,8 +58,6 @@ static dissector_handle_t rrc_dl_dcch_handle = NULL;
/* Initialize the protocol and registered fields */
static int proto_rnsap = -1;
-static int hf_rnsap_L3_DL_DCCH_Message_PDU = -1;
-
#include "packet-rnsap-hf.c"
/* Initialize the subtree pointers */
@@ -139,11 +137,6 @@ void proto_register_rnsap(void) {
/* List of fields */
static hf_register_info hf[] = {
- { &hf_rnsap_L3_DL_DCCH_Message_PDU,
- { "DL-DCCH-Message", "rnsap.DL_DCCH_Message",
- FT_NONE, BASE_NONE, NULL, 0,
- "DL-DCCH-Message", HFILL }},
-
#include "packet-rnsap-hfarr.c"
};
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 31598500c3..62c9076e09 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -560,7 +560,6 @@ const value_string acse_AP_title_vals[] = {
{ 0, "ap-title-form1" },
{ 1, "ap-title-form2" },
{ 2, "ap-title-form3" },
- { 3, "ap-title-form3" },
{ 0, NULL }
};
@@ -568,8 +567,6 @@ static const ber_old_choice_t AP_title_choice[] = {
{ 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ap_title_form1 },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ap_title_form2 },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_ap_title_form3 },
- { 3, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_ap_title_form3 },
- { 4, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_ap_title_form3 },
{ 0, 0, 0, 0, NULL }
};
@@ -649,8 +646,6 @@ const value_string acse_ASO_qualifier_vals[] = {
{ 1, "aso-qualifier-form2" },
{ 2, "aso-qualifier-form3" },
{ 3, "aso-qualifier-form-any-octets" },
- { 4, "aso-qualifier-form3" },
- { 5, "aso-qualifier-form-any-octets" },
{ 0, NULL }
};
@@ -659,10 +654,6 @@ static const ber_old_choice_t ASO_qualifier_choice[] = {
{ 1, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form2 },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form3 },
{ 3, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form_any_octets },
- { 4, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form3 },
- { 5, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form_any_octets },
- { 6, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form3 },
- { 7, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form_any_octets },
{ 0, 0, 0, 0, NULL }
};
@@ -1804,9 +1795,6 @@ static const value_string acse_ACSE_apdu_vals[] = {
{ 5, "adt" },
{ 6, "acrq" },
{ 7, "acrp" },
- { 5, "adt" },
- { 6, "acrq" },
- { 7, "acrp" },
{ 0, NULL }
};
@@ -1819,12 +1807,6 @@ static const ber_old_choice_t ACSE_apdu_choice[] = {
{ 5, BER_CLASS_APP, 5, BER_FLAGS_IMPLTAG, dissect_adt_impl },
{ 6, BER_CLASS_APP, 6, BER_FLAGS_IMPLTAG, dissect_acrq_impl },
{ 7, BER_CLASS_APP, 7, BER_FLAGS_IMPLTAG, dissect_acrp_impl },
- { 5, BER_CLASS_APP, 5, BER_FLAGS_IMPLTAG, dissect_adt_impl },
- { 6, BER_CLASS_APP, 6, BER_FLAGS_IMPLTAG, dissect_acrq_impl },
- { 7, BER_CLASS_APP, 7, BER_FLAGS_IMPLTAG, dissect_acrp_impl },
- { 5, BER_CLASS_APP, 5, BER_FLAGS_IMPLTAG, dissect_adt_impl },
- { 6, BER_CLASS_APP, 6, BER_FLAGS_IMPLTAG, dissect_acrq_impl },
- { 7, BER_CLASS_APP, 7, BER_FLAGS_IMPLTAG, dissect_acrp_impl },
{ 0, 0, 0, 0, NULL }
};
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 1856018bb7..8c88c0a140 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -4378,7 +4378,6 @@ static const value_string h248_AmmDescriptor_vals[] = {
{ 6, "digitMapDescriptor" },
{ 7, "auditDescriptor" },
{ 8, "statisticsDescriptor" },
- { 8, "statisticsDescriptor" },
{ 0, NULL }
};
@@ -4392,8 +4391,6 @@ static const ber_old_choice_t AmmDescriptor_choice[] = {
{ 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_digitMapDescriptor_impl },
{ 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_auditDescriptor_impl },
{ 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_statisticsDescriptor_impl },
- { 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_statisticsDescriptor_impl },
- { 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_statisticsDescriptor_impl },
{ 0, 0, 0, 0, NULL }
};
@@ -5253,7 +5250,6 @@ static const value_string h248_AuditReply_vals[] = {
{ 1, "error" },
{ 2, "auditResult" },
{ 3, "auditResultTermList" },
- { 3, "auditResultTermList" },
{ 0, NULL }
};
@@ -5262,8 +5258,6 @@ static const ber_old_choice_t AuditReply_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_error_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_auditResult_impl },
{ 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_auditResultTermList_impl },
- { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_auditResultTermList_impl },
- { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_auditResultTermList_impl },
{ 0, 0, 0, 0, NULL }
};
@@ -5621,7 +5615,6 @@ static const value_string h248_Transaction_vals[] = {
{ 2, "transactionReply" },
{ 3, "transactionResponseAck" },
{ 4, "segmentReply" },
- { 4, "segmentReply" },
{ 0, NULL }
};
@@ -5631,8 +5624,6 @@ static const ber_old_choice_t Transaction_choice[] = {
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_transactionReply_impl },
{ 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_transactionResponseAck_impl },
{ 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_segmentReply_impl },
- { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_segmentReply_impl },
- { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_segmentReply_impl },
{ 0, 0, 0, 0, NULL }
};
diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c
index 84808c67d7..fbf76201f7 100644
--- a/epan/dissectors/packet-rnsap.c
+++ b/epan/dissectors/packet-rnsap.c
@@ -754,8 +754,6 @@ static dissector_handle_t rrc_dl_dcch_handle = NULL;
/* Initialize the protocol and registered fields */
static int proto_rnsap = -1;
-static int hf_rnsap_L3_DL_DCCH_Message_PDU = -1;
-
/*--- Included file: packet-rnsap-hf.c ---*/
#line 1 "packet-rnsap-hf.c"
@@ -2733,7 +2731,7 @@ static int hf_rnsap_value_04 = -1; /* UnsuccessfulOutcome_value *
static int hf_rnsap_value_05 = -1; /* Outcome_value */
/*--- End of included file: packet-rnsap-hf.c ---*/
-#line 64 "packet-rnsap-template.c"
+#line 62 "packet-rnsap-template.c"
/* Initialize the subtree pointers */
static int ett_rnsap = -1;
@@ -3736,7 +3734,7 @@ static gint ett_rnsap_UnsuccessfulOutcome = -1;
static gint ett_rnsap_Outcome = -1;
/*--- End of included file: packet-rnsap-ett.c ---*/
-#line 69 "packet-rnsap-template.c"
+#line 67 "packet-rnsap-template.c"
/* Global variables */
static guint32 ProcedureCode;
@@ -33104,7 +33102,7 @@ static void dissect_RNSAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
/*--- End of included file: packet-rnsap-fn.c ---*/
-#line 90 "packet-rnsap-template.c"
+#line 88 "packet-rnsap-template.c"
static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
@@ -33157,11 +33155,6 @@ void proto_register_rnsap(void) {
/* List of fields */
static hf_register_info hf[] = {
- { &hf_rnsap_L3_DL_DCCH_Message_PDU,
- { "DL-DCCH-Message", "rnsap.DL_DCCH_Message",
- FT_NONE, BASE_NONE, NULL, 0,
- "DL-DCCH-Message", HFILL }},
-
/*--- Included file: packet-rnsap-hfarr.c ---*/
#line 1 "packet-rnsap-hfarr.c"
@@ -41055,7 +41048,7 @@ void proto_register_rnsap(void) {
"rnsap.Outcome_value", HFILL }},
/*--- End of included file: packet-rnsap-hfarr.c ---*/
-#line 148 "packet-rnsap-template.c"
+#line 141 "packet-rnsap-template.c"
};
/* List of subtrees */
@@ -42059,7 +42052,7 @@ void proto_register_rnsap(void) {
&ett_rnsap_Outcome,
/*--- End of included file: packet-rnsap-ettarr.c ---*/
-#line 154 "packet-rnsap-template.c"
+#line 147 "packet-rnsap-template.c"
};
@@ -42715,7 +42708,7 @@ proto_reg_handoff_rnsap(void)
/*--- End of included file: packet-rnsap-dis-tab.c ---*/
-#line 192 "packet-rnsap-template.c"
+#line 185 "packet-rnsap-template.c"
}
diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c
index 195195a04f..3c1d8fceb4 100644
--- a/epan/dissectors/packet-x411.c
+++ b/epan/dissectors/packet-x411.c
@@ -4868,15 +4868,12 @@ dissect_x411_ReportDeliveryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
static const value_string x411_ReportDeliveryResult_vals[] = {
{ 0, "empty-result" },
{ 1, "extensions" },
- { 2, "extensions" },
{ 0, NULL }
};
static const ber_old_choice_t ReportDeliveryResult_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_empty_result },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_extensions },
- { 2, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_extensions },
- { 3, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_extensions },
{ 0, 0, 0, 0, NULL }
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 02:03:40 +0000