diff options
| author | John Thacker <johnthacker@gmail.com> | 2021-05-24 19:43:20 -0400 |
|---|---|---|
| committer | John Thacker <johnthacker@gmail.com> | 2021-05-24 19:43:20 -0400 |
| commit | ffe59d91a1c8b2a0095c985341603d187e3cf836 (patch) | |
| tree | 94e20c16b41bea1d4688f2e7527e3722b2bf6201 | |
| parent | 67ca5e98c7de2977fa0ff2bf5ff520c908947b4a (diff) | |
RANAP: Don't attempt to re-register heuristic dissectors
Move the RANAP heuristic dissector registration under the initialization
guard that they're only registered once. Prevents console warnings about
the dissectors already being registered to the sccp and sua tables if
a RANAP preference is changed. (Backported manually to regenerate the
dissector via asn2wrs.py)
| -rw-r--r-- | epan/dissectors/asn1/ranap/packet-ranap-template.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-ranap.c | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/epan/dissectors/asn1/ranap/packet-ranap-template.c b/epan/dissectors/asn1/ranap/packet-ranap-template.c index 7aef928fc8..5fb723faa3 100644 --- a/epan/dissectors/asn1/ranap/packet-ranap-template.c +++ b/epan/dissectors/asn1/ranap/packet-ranap-template.c @@ -462,6 +462,8 @@ proto_reg_handoff_ranap(void) rrc_t_to_srnc_handle = find_dissector_add_dependency("rrc.t_to_srnc_cont", proto_ranap); rrc_ho_to_utran_cmd = find_dissector_add_dependency("rrc.irat.ho_to_utran_cmd", proto_ranap); bssgp_handle = find_dissector("bssgp"); + heur_dissector_add("sccp", dissect_sccp_ranap_heur, "RANAP over SCCP", "ranap_sccp", proto_ranap, HEURISTIC_ENABLE); + heur_dissector_add("sua", dissect_sccp_ranap_heur, "RANAP over SUA", "ranap_sua", proto_ranap, HEURISTIC_ENABLE); initialized = TRUE; #include "packet-ranap-dis-tab.c" } else { @@ -470,9 +472,6 @@ proto_reg_handoff_ranap(void) dissector_add_uint("sccp.ssn", global_ranap_sccp_ssn, ranap_handle); local_ranap_sccp_ssn = global_ranap_sccp_ssn; - - heur_dissector_add("sccp", dissect_sccp_ranap_heur, "RANAP over SCCP", "ranap_sccp", proto_ranap, HEURISTIC_ENABLE); - heur_dissector_add("sua", dissect_sccp_ranap_heur, "RANAP over SUA", "ranap_sua", proto_ranap, HEURISTIC_ENABLE); } /* diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index f1b8407f90..0106ef1439 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -18766,6 +18766,8 @@ proto_reg_handoff_ranap(void) rrc_t_to_srnc_handle = find_dissector_add_dependency("rrc.t_to_srnc_cont", proto_ranap); rrc_ho_to_utran_cmd = find_dissector_add_dependency("rrc.irat.ho_to_utran_cmd", proto_ranap); bssgp_handle = find_dissector("bssgp"); + heur_dissector_add("sccp", dissect_sccp_ranap_heur, "RANAP over SCCP", "ranap_sccp", proto_ranap, HEURISTIC_ENABLE); + heur_dissector_add("sua", dissect_sccp_ranap_heur, "RANAP over SUA", "ranap_sua", proto_ranap, HEURISTIC_ENABLE); initialized = TRUE; /*--- Included file: packet-ranap-dis-tab.c ---*/ @@ -19145,16 +19147,13 @@ proto_reg_handoff_ranap(void) /*--- End of included file: packet-ranap-dis-tab.c ---*/ -#line 467 "./asn1/ranap/packet-ranap-template.c" +#line 469 "./asn1/ranap/packet-ranap-template.c" } else { dissector_delete_uint("sccp.ssn", local_ranap_sccp_ssn, ranap_handle); } dissector_add_uint("sccp.ssn", global_ranap_sccp_ssn, ranap_handle); local_ranap_sccp_ssn = global_ranap_sccp_ssn; - - heur_dissector_add("sccp", dissect_sccp_ranap_heur, "RANAP over SCCP", "ranap_sccp", proto_ranap, HEURISTIC_ENABLE); - heur_dissector_add("sua", dissect_sccp_ranap_heur, "RANAP over SUA", "ranap_sua", proto_ranap, HEURISTIC_ENABLE); } /* |