diff options
Diffstat (limited to 'epan')
78 files changed, 93 insertions, 92 deletions
diff --git a/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c b/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c index aca6714775..74ae39644a 100644 --- a/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -855,7 +855,7 @@ void proto_register_atn_ulcs (void) proto_atn_ulcs); /* initiate sub dissector list */ - atn_ulcs_heur_subdissector_list = register_heur_dissector_list("atn-ulcs", proto_atn_ulcs); + atn_ulcs_heur_subdissector_list = register_heur_dissector_list_with_description("atn-ulcs", "ATN-ULCS unhandled data", proto_atn_ulcs); /* init aare/aare data */ aarq_data_tree = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope()); diff --git a/epan/dissectors/asn1/credssp/packet-credssp-template.c b/epan/dissectors/asn1/credssp/packet-credssp-template.c index 0d5ef3a1ed..8e6b229d91 100644 --- a/epan/dissectors/asn1/credssp/packet-credssp-template.c +++ b/epan/dissectors/asn1/credssp/packet-credssp-template.c @@ -182,7 +182,7 @@ void proto_register_credssp(void) { proto_register_subtree_array(ett, array_length(ett)); /* heuristic dissectors for any premable e.g. CredSSP before RDP */ - credssp_heur_subdissector_list = register_heur_dissector_list("credssp", proto_credssp); + credssp_heur_subdissector_list = register_heur_dissector_list_with_description("credssp", "Unused", proto_credssp); } diff --git a/epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c b/epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c index f37069549f..302af2ca63 100644 --- a/epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -736,7 +736,7 @@ proto_register_mpeg_pes(void) proto_mpeg = proto_register_protocol("Moving Picture Experts Group", "MPEG", "mpeg"); mpeg_handle = register_dissector("mpeg", dissect_mpeg, proto_mpeg); - heur_subdissector_list = register_heur_dissector_list("mpeg", proto_mpeg); + heur_subdissector_list = register_heur_dissector_list_with_description("mpeg", "MPEG payload", proto_mpeg); proto_mpeg_pes = proto_register_protocol("Packetized Elementary Stream", "MPEG PES", "mpeg-pes"); proto_register_field_array(proto_mpeg_pes, hf, array_length(hf)); diff --git a/epan/dissectors/asn1/t125/packet-t125-template.c b/epan/dissectors/asn1/t125/packet-t125-template.c index 0a028a9edf..574a467f2c 100644 --- a/epan/dissectors/asn1/t125/packet-t125-template.c +++ b/epan/dissectors/asn1/t125/packet-t125-template.c @@ -157,7 +157,7 @@ void proto_register_t125(void) { proto_register_field_array(proto_t125, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - t125_heur_subdissector_list= register_heur_dissector_list("t125", proto_t125); + t125_heur_subdissector_list= register_heur_dissector_list_with_description("t125", "T.125 User data", proto_t125); register_dissector("t125", dissect_t125, proto_t125); } diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index c66d0970bf..c2208ff0bd 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -3352,7 +3352,7 @@ void proto_register_aeron(void) expert_aeron = expert_register_protocol(proto_aeron); expert_register_field_array(expert_aeron, ei, array_length(ei)); aeron_module = prefs_register_protocol(proto_aeron, NULL); - aeron_heuristic_subdissector_list = register_heur_dissector_list("aeron_msg_payload", proto_aeron); + aeron_heuristic_subdissector_list = register_heur_dissector_list_with_description("aeron_msg_payload", "Aeron Data payload", proto_aeron); aeron_dissector_handle = register_dissector("aeron", dissect_aeron, proto_aeron); diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c index 10d6e25260..793b5c430c 100644 --- a/epan/dissectors/packet-atn-ulcs.c +++ b/epan/dissectors/packet-atn-ulcs.c @@ -2583,7 +2583,7 @@ void proto_register_atn_ulcs (void) proto_atn_ulcs); /* initiate sub dissector list */ - atn_ulcs_heur_subdissector_list = register_heur_dissector_list("atn-ulcs", proto_atn_ulcs); + atn_ulcs_heur_subdissector_list = register_heur_dissector_list_with_description("atn-ulcs", "ATN-ULCS unhandled data", proto_atn_ulcs); /* init aare/aare data */ aarq_data_tree = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope()); diff --git a/epan/dissectors/packet-bpv7.c b/epan/dissectors/packet-bpv7.c index 59f3a5d770..5d6c4347e1 100644 --- a/epan/dissectors/packet-bpv7.c +++ b/epan/dissectors/packet-bpv7.c @@ -2352,7 +2352,7 @@ void proto_register_bpv7(void) { &bundle_reassembly_table_functions ); - btsd_heur = register_heur_dissector_list("bpv7.btsd", proto_bp); + btsd_heur = register_heur_dissector_list_with_description("bpv7.btsd", "BPv7 block data fallback", proto_bp); bp_tap = register_tap("bpv7"); register_conversation_table(proto_bp, TRUE, bp_conv_packet, bp_endp_packet); diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index ebc30cf55c..f1852dddaa 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -10295,7 +10295,7 @@ proto_register_cip(void) /* Register a heuristic dissector on the service of the message so objects * can override the dissector for common services */ - heur_subdissector_service = register_heur_dissector_list("cip.sc", proto_cip); + heur_subdissector_service = register_heur_dissector_list_with_description("cip.sc", "CIP Service data", proto_cip); build_get_attr_all_table(); } /* end of proto_register_cip() */ diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c index c644b91e9f..2aacbedb3f 100644 --- a/epan/dissectors/packet-classicstun.c +++ b/epan/dissectors/packet-classicstun.c @@ -692,7 +692,7 @@ proto_register_classicstun(void) proto_register_subtree_array(ett, array_length(ett)); /* heuristic subdissectors (used for the DATA field) */ - heur_subdissector_list = register_heur_dissector_list("classicstun", proto_classicstun); + heur_subdissector_list = register_heur_dissector_list_with_description("classicstun", "CLASSICSTUN DATA payload", proto_classicstun); register_dissector("classicstun", dissect_classicstun, proto_classicstun); register_dissector("classicstun-heur", dissect_classicstun_heur, proto_classicstun); diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 920bcd2dd3..66852cc0bb 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -695,7 +695,7 @@ proto_register_clnp(void) expert_clnp = expert_register_protocol(proto_clnp); expert_register_field_array(expert_clnp, ei, array_length(ei)); clnp_handle = register_dissector("clnp", dissect_clnp, proto_clnp); - clnp_heur_subdissector_list = register_heur_dissector_list("clnp", proto_clnp); + clnp_heur_subdissector_list = register_heur_dissector_list_with_description("clnp", "CLNP DT/MD payload", proto_clnp); reassembly_table_register(&clnp_reassembly_table, &addresses_reassembly_table_functions); diff --git a/epan/dissectors/packet-corosync-totemsrp.c b/epan/dissectors/packet-corosync-totemsrp.c index c62baf6fc1..28a278cad8 100644 --- a/epan/dissectors/packet-corosync-totemsrp.c +++ b/epan/dissectors/packet-corosync-totemsrp.c @@ -1147,7 +1147,7 @@ proto_register_corosync_totemsrp(void) proto_register_field_array(proto_corosync_totemsrp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - heur_subdissector_list = register_heur_dissector_list("corosync_totemsrp.mcast", proto_corosync_totemsrp); + heur_subdissector_list = register_heur_dissector_list_with_description("corosync_totemsrp.mcast", "COROSYNC/TOTEMSRP multicast data", proto_corosync_totemsrp); register_dissector( "corosync_totemsrp", dissect_corosync_totemsrp, proto_corosync_totemsrp); } diff --git a/epan/dissectors/packet-credssp.c b/epan/dissectors/packet-credssp.c index ba809946c0..ec76b26899 100644 --- a/epan/dissectors/packet-credssp.c +++ b/epan/dissectors/packet-credssp.c @@ -728,7 +728,7 @@ void proto_register_credssp(void) { proto_register_subtree_array(ett, array_length(ett)); /* heuristic dissectors for any premable e.g. CredSSP before RDP */ - credssp_heur_subdissector_list = register_heur_dissector_list("credssp", proto_credssp); + credssp_heur_subdissector_list = register_heur_dissector_list_with_description("credssp", "Unused", proto_credssp); } diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c index e84ce6034a..28bf0d10bd 100644 --- a/epan/dissectors/packet-db-lsp.c +++ b/epan/dissectors/packet-db-lsp.c @@ -231,7 +231,7 @@ proto_register_db_lsp (void) db_lsp_tcp_handle = register_dissector ("db-lsp.tcp", dissect_db_lsp_tcp, proto_db_lsp); db_lsp_udp_handle = register_dissector ("db-lsp.udp", dissect_db_lsp_disc, proto_db_lsp_disc); - heur_subdissector_list = register_heur_dissector_list("db-lsp", proto_db_lsp); + heur_subdissector_list = register_heur_dissector_list_with_description("db-lsp", PSNAME_DISC " payload", proto_db_lsp); proto_register_field_array (proto_db_lsp, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index 8060a15b50..2c304e4cee 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -1955,7 +1955,7 @@ proto_register_dccp(void) dccp_subdissector_table = register_dissector_table("dccp.port", "DCCP port", proto_dccp, FT_UINT16, BASE_DEC); - heur_subdissector_list = register_heur_dissector_list("dccp", proto_dccp); + heur_subdissector_list = register_heur_dissector_list_with_description("dccp", "DCCP heuristic", proto_dccp); /* reg preferences */ dccp_module = prefs_register_protocol(proto_dccp, NULL); diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c index f08924c818..c1221259d2 100644 --- a/epan/dissectors/packet-dhcp.c +++ b/epan/dissectors/packet-dhcp.c @@ -10412,8 +10412,8 @@ proto_register_dhcp(void) expert_register_field_array(expert_dhcp, ei, array_length(ei)); dhcp_option_table = register_dissector_table("dhcp.option", "BOOTP Options", proto_dhcp, FT_UINT8, BASE_DEC); - dhcp_vendor_id_subdissector = register_heur_dissector_list("dhcp.vendor_id", proto_dhcp); - dhcp_vendor_info_subdissector = register_heur_dissector_list("dhcp.vendor_info", proto_dhcp); + dhcp_vendor_id_subdissector = register_heur_dissector_list_with_description("dhcp.vendor_id", "DHCP Vendor ID", proto_dhcp); + dhcp_vendor_info_subdissector = register_heur_dissector_list_with_description("dhcp.vendor_info", "DHCP Vendor Info", proto_dhcp); dhcp_enterprise_class_table = register_dissector_table("dhcp.enterprise_class", "V-I Vendor Class Enterprise", proto_dhcp, FT_UINT32, BASE_DEC); dhcp_enterprise_specific_table = register_dissector_table("dhcp.enterprise", "V-I Vendor Specific Enterprise", proto_dhcp, FT_UINT32, BASE_DEC); diff --git a/epan/dissectors/packet-dlt.c b/epan/dissectors/packet-dlt.c index c4b3602cbb..1ec2cac211 100644 --- a/epan/dissectors/packet-dlt.c +++ b/epan/dissectors/packet-dlt.c @@ -1435,7 +1435,7 @@ void proto_register_dlt(void) { expert_module_DLT = expert_register_protocol(proto_dlt); expert_register_field_array(expert_module_DLT, ei, array_length(ei)); - heur_subdissector_list = register_heur_dissector_list("dlt", proto_dlt); + heur_subdissector_list = register_heur_dissector_list_with_description("dlt", "DLT Log Message payload", proto_dlt); } void proto_reg_handoff_dlt(void) { diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 2f5f5b982a..3bf25ea35b 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -2306,7 +2306,7 @@ proto_register_dtls(void) ssl_debug_printf("proto_register_dtls: registered tap %s:%d\n", "dtls", dtls_tap); - heur_subdissector_list = register_heur_dissector_list("dtls", proto_dtls); + heur_subdissector_list = register_heur_dissector_list_with_description("dtls", "DTLS payload fallback", proto_dtls); } diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 3dc1e1050e..48b6a90ef4 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -6352,8 +6352,8 @@ proto_register_epl(void) proto_epl = proto_register_protocol("Ethernet POWERLINK", "EPL", "epl"); /* subdissector code */ - heur_epl_subdissector_list = register_heur_dissector_list("epl", proto_epl); - heur_epl_data_subdissector_list = register_heur_dissector_list("epl_data", proto_epl); + heur_epl_subdissector_list = register_heur_dissector_list_with_description("epl", "Data encapsuated in EPL", proto_epl); + heur_epl_data_subdissector_list = register_heur_dissector_list_with_description("epl_data", "EPL Data", proto_epl); epl_asnd_dissector_table = register_dissector_table("epl.asnd", "Manufacturer specific ASND service", proto_epl, FT_UINT8, BASE_DEC /*, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE*/); diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 0717f877b8..5929b7059a 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -1147,8 +1147,8 @@ proto_register_eth(void) expert_register_field_array(expert_eth, ei, array_length(ei)); /* subdissector code */ - heur_subdissector_list = register_heur_dissector_list("eth", proto_eth); - eth_trailer_subdissector_list = register_heur_dissector_list("eth.trailer", proto_eth); + heur_subdissector_list = register_heur_dissector_list_with_description("eth", "Ethernet framed non-Ethernet data", proto_eth); + eth_trailer_subdissector_list = register_heur_dissector_list_with_description("eth.trailer", "Ethernet trailer", proto_eth); /* Register configuration preferences */ eth_module = prefs_register_protocol(proto_eth, NULL); diff --git a/epan/dissectors/packet-flexray.c b/epan/dissectors/packet-flexray.c index 2f8497b87b..95c0903418 100644 --- a/epan/dissectors/packet-flexray.c +++ b/epan/dissectors/packet-flexray.c @@ -549,7 +549,7 @@ proto_register_flexray(void) { subdissector_table = register_decode_as_next_proto(proto_flexray, "flexray.subdissector", "FLEXRAY next level dissector", NULL); flexrayid_subdissector_table = register_dissector_table("flexray.combined_id", "FlexRay ID (combined)", proto_flexray, FT_UINT32, BASE_HEX); - heur_subdissector_list = register_heur_dissector_list("flexray", proto_flexray); + heur_subdissector_list = register_heur_dissector_list_with_description("flexray", "FlexRay info", proto_flexray); } void diff --git a/epan/dissectors/packet-fp_mux.c b/epan/dissectors/packet-fp_mux.c index 01d101cc0f..51a2391fcf 100644 --- a/epan/dissectors/packet-fp_mux.c +++ b/epan/dissectors/packet-fp_mux.c @@ -347,7 +347,7 @@ proto_register_fp_mux(void) expert_register_field_array(expert_fp_mux, ei, array_length(ei)); /* Register heuristic table */ - heur_subdissector_list = register_heur_dissector_list("fp_mux", proto_fp_mux); + heur_subdissector_list = register_heur_dissector_list_with_description("fp_mux", "Huawei FP Mux payload", proto_fp_mux); /* Register configuration preferences */ fp_mux_module = prefs_register_protocol(proto_fp_mux, NULL); diff --git a/epan/dissectors/packet-geonw.c b/epan/dissectors/packet-geonw.c index 80b25880fd..80691423b4 100644 --- a/epan/dissectors/packet-geonw.c +++ b/epan/dissectors/packet-geonw.c @@ -422,7 +422,7 @@ dissect_btpb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ if (dissector_try_uint_new(btpb_subdissector_table, dst_port, next_tvb, pinfo, tree, TRUE, NULL)) { return tvb_captured_length(tvb); } - if (dissector_try_heuristic(btpa_heur_subdissector_list, next_tvb, pinfo, tree, &hdtbl_entry, NULL)) { + if (dissector_try_heuristic(btpb_heur_subdissector_list, next_tvb, pinfo, tree, &hdtbl_entry, NULL)) { return tvb_captured_length(tvb); } @@ -2848,7 +2848,7 @@ proto_register_btpa(void) btpa_subdissector_table = register_dissector_table("btpa.port", "BTP-A port", proto_btpa, FT_UINT16, BASE_HEX); - btpa_heur_subdissector_list = register_heur_dissector_list("btpa.payload", proto_btpa); + btpa_heur_subdissector_list = register_heur_dissector_list_with_description("btpa.payload", "BTP-A payload fallback", proto_btpa); // Decode as static build_valid_func btpa_da_src_values[1] = {btpa_src_value}; @@ -2901,7 +2901,7 @@ proto_register_btpb(void) btpb_subdissector_table = register_dissector_table("btpb.port", "BTP-B dst port", proto_btpb, FT_UINT16, BASE_HEX); - btpb_heur_subdissector_list = register_heur_dissector_list("btpb.payload", proto_btpb); + btpb_heur_subdissector_list = register_heur_dissector_list_with_description("btpb.payload", "BTP-B payload fallback", proto_btpb); // Decode as static build_valid_func btpb_da_build_value[1] = {btpb_dst_value}; diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c index 8fc532384e..0c293f8aaf 100644 --- a/epan/dissectors/packet-hpfeeds.c +++ b/epan/dissectors/packet-hpfeeds.c @@ -454,7 +454,7 @@ proto_register_hpfeeds(void) "hpfeeds" /* abbrev */ ); - heur_subdissector_list = register_heur_dissector_list("hpfeeds", proto_hpfeeds); + heur_subdissector_list = register_heur_dissector_list_with_description("hpfeeds", "HPFEEDS Publish payload", proto_hpfeeds); proto_register_field_array(proto_hpfeeds, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 4354ab9388..5c2070a596 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -4590,7 +4590,7 @@ proto_register_http(void) * this table using the standard heur_dissector_add() * function. */ - heur_subdissector_list = register_heur_dissector_list("http", proto_http); + heur_subdissector_list = register_heur_dissector_list_with_description("http", "HTTP payload fallback", proto_http); /* * Register for tapping diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 9a96b0a244..7b8d8d9d59 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -2437,7 +2437,7 @@ void proto_register_icmp(void) register_seq_analysis("icmp", "ICMP Flows", proto_icmp, NULL, TL_REQUIRES_COLUMNS, icmp_seq_analysis_packet); icmp_handle = register_dissector("icmp", dissect_icmp, proto_icmp); - icmp_heur_subdissector_list = register_heur_dissector_list("icmp", proto_icmp); + icmp_heur_subdissector_list = register_heur_dissector_list_with_description("icmp", "ICMP Echo payload", proto_icmp); register_dissector("icmp_extension", dissect_icmp_extension, proto_icmp); icmp_tap = register_tap("icmp"); } diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index b91c815a8a..540f4cd102 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -6425,7 +6425,7 @@ proto_register_icmpv6(void) register_seq_analysis("icmpv6", "ICMPv6 Flows", proto_icmpv6, NULL, TL_REQUIRES_COLUMNS, icmpv6_seq_analysis_packet); icmpv6_handle = register_dissector("icmpv6", dissect_icmpv6, proto_icmpv6); - icmpv6_heur_subdissector_list = register_heur_dissector_list("icmpv6", proto_icmpv6); + icmpv6_heur_subdissector_list = register_heur_dissector_list_with_description("icmpv6", "ICMPv6 Echo payload", proto_icmpv6); icmpv6_tap = register_tap("icmpv6"); } diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 1901794710..66acd2f796 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -60187,7 +60187,7 @@ proto_register_ieee80211(void) proto_wlan = proto_register_protocol("IEEE 802.11 wireless LAN", "IEEE 802.11", "wlan"); - heur_subdissector_list = register_heur_dissector_list("wlan_data", proto_wlan); + heur_subdissector_list = register_heur_dissector_list_with_description("wlan_data", "IEEE 802.11 WLAN v0 data", proto_wlan); /* Created to remove Decode As confusion */ proto_centrino = proto_register_protocol("IEEE 802.11 wireless LAN (Centrino)", "IEEE 802.11 (Centrino)", "wlan_centrino"); diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 9b52bab94e..31383ec08d 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -7490,8 +7490,8 @@ void proto_register_ieee802154(void) /* Register the subdissector list */ panid_dissector_table = register_dissector_table(IEEE802154_PROTOABBREV_WPAN_PANID, "IEEE 802.15.4 PANID", proto_ieee802154, FT_UINT16, BASE_HEX); - ieee802154_heur_subdissector_list = register_heur_dissector_list(IEEE802154_PROTOABBREV_WPAN, proto_ieee802154); - ieee802154_beacon_subdissector_list = register_heur_dissector_list(IEEE802154_PROTOABBREV_WPAN_BEACON, proto_ieee802154); + ieee802154_heur_subdissector_list = register_heur_dissector_list_with_description(IEEE802154_PROTOABBREV_WPAN, "IEEE 802.15.4 PANID", proto_ieee802154); + ieee802154_beacon_subdissector_list = register_heur_dissector_list_with_description(IEEE802154_PROTOABBREV_WPAN_BEACON, "IEEE 802.15.4 FCF beacon", proto_ieee802154); /* Register dissector tables */ header_ie_dissector_table = register_dissector_table(IEEE802154_HEADER_IE_DTABLE, "IEEE 802.15.4 Header IEs", proto_ieee802154, FT_UINT8, BASE_HEX); diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 312c6170f2..74ce5e6711 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -8823,8 +8823,8 @@ void proto_register_infiniband(void) proto_register_subtree_array(ett, array_length(ett)); /* register the subdissector tables */ - heur_dissectors_payload = register_heur_dissector_list("infiniband.payload", proto_infiniband); - heur_dissectors_cm_private = register_heur_dissector_list("infiniband.mad.cm.private", proto_infiniband); + heur_dissectors_payload = register_heur_dissector_list_with_description("infiniband.payload", "InfiniBand payload", proto_infiniband); + heur_dissectors_cm_private = register_heur_dissector_list_with_description("infiniband.mad.cm.private", "InfiniBand CM private data", proto_infiniband); /* register dissection preferences */ infiniband_module = prefs_register_protocol(proto_infiniband, proto_reg_handoff_infiniband); diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 928c790b3b..2ace398910 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -3056,7 +3056,7 @@ proto_register_ip(void) proto_ip, FT_UINT8, BASE_DEC); ip_option_table = register_dissector_table("ip.option", "IP Options", proto_ip, FT_UINT8, BASE_DEC); - heur_subdissector_list = register_heur_dissector_list("ip", proto_ip); + heur_subdissector_list = register_heur_dissector_list_with_description("ip", "IPv4 heuristic", proto_ip); register_capture_dissector_table("ip.proto", "IP protocol"); /* Register configuration options */ diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index 7d7d7956be..0fc3373d66 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -1199,7 +1199,7 @@ proto_register_iwarp_ddp_rdmap(void) proto_register_field_array(proto_iwarp_ddp_rdmap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - rdmap_heur_subdissector_list = register_heur_dissector_list("iwarp_ddp_rdmap", proto_iwarp_ddp_rdmap); + rdmap_heur_subdissector_list = register_heur_dissector_list_with_description("iwarp_ddp_rdmap", "iWARP RDMAP payload", proto_iwarp_ddp_rdmap); register_dissector("iwarp_ddp_rdmap", dissect_iwarp_ddp_rdmap, proto_iwarp_ddp_rdmap); diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index 9633df7977..66ba80e014 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -14328,7 +14328,7 @@ void proto_register_lbmc(void) expert_lbmc = expert_register_protocol(proto_lbmc); expert_register_field_array(expert_lbmc, ei, array_length(ei)); - lbmc_heuristic_subdissector_list = register_heur_dissector_list("lbm_msg_payload", proto_lbmc); + lbmc_heuristic_subdissector_list = register_heur_dissector_list_with_description("lbm_msg_payload", "LBMC UMQ command response data", proto_lbmc); prefs_register_protocol(tnw_protocol_handle, NULL); lbmc_module = prefs_register_protocol_subtree("29West", proto_lbmc, proto_reg_handoff_lbmc); diff --git a/epan/dissectors/packet-lin.c b/epan/dissectors/packet-lin.c index 276e8e1cc6..7c805988be 100644 --- a/epan/dissectors/packet-lin.c +++ b/epan/dissectors/packet-lin.c @@ -579,7 +579,7 @@ proto_register_lin(void) { /* the lin.frame_id subdissector table carries the bus id in the higher 16 bits */ subdissector_table = register_dissector_table("lin.frame_id", "LIN Frame ID", proto_lin, FT_UINT8, BASE_HEX); - heur_subdissector_list = register_heur_dissector_list(LIN_NAME_FILTER, proto_lin); + heur_subdissector_list = register_heur_dissector_list_with_description(LIN_NAME_FILTER, "LIN Message data fallback", proto_lin); static uat_field_t lin_interface_mapping_uat_fields[] = { UAT_FLD_HEX(interface_configs, interface_id, "Interface ID", "ID of the Interface with 0xffffffff = any (hex uint32 without leading 0x)"), diff --git a/epan/dissectors/packet-media.c b/epan/dissectors/packet-media.c index 721cfd9369..705658ac71 100644 --- a/epan/dissectors/packet-media.c +++ b/epan/dissectors/packet-media.c @@ -90,7 +90,7 @@ proto_register_media(void) "media" /* abbrev */ ); register_dissector("media", dissect_media, proto_media); - heur_subdissector_list = register_heur_dissector_list("media", proto_media); + heur_subdissector_list = register_heur_dissector_list_with_description("media", "Media type", proto_media); proto_register_field_array(proto_media, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-mime-encap.c b/epan/dissectors/packet-mime-encap.c index c547315bbd..f2ad9e3575 100644 --- a/epan/dissectors/packet-mime-encap.c +++ b/epan/dissectors/packet-mime-encap.c @@ -46,7 +46,7 @@ proto_register_mime_encap(void) proto_mime_encap = proto_register_protocol("MIME file", "MIME_FILE", "mime_dlt"); mime_encap_handle = register_dissector("mime_dlt", dissect_mime_encap, proto_mime_encap); - heur_subdissector_list = register_heur_dissector_list("wtap_file", proto_mime_encap); + heur_subdissector_list = register_heur_dissector_list_with_description("wtap_file", "MIME file", proto_mime_encap); } void diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index ecd0984780..d9d76f5327 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -1842,7 +1842,7 @@ proto_register_mp2t(void) expert_mp2t = expert_register_protocol(proto_mp2t); expert_register_field_array(expert_mp2t, ei, array_length(ei)); - heur_subdissector_list = register_heur_dissector_list("mp2t.pid", proto_mp2t); + heur_subdissector_list = register_heur_dissector_list_with_description("mp2t.pid", "Unused", proto_mp2t); /* Register init of processing of fragmented DEPI packets */ reassembly_table_register(&mp2t_reassembly_table, &mp2t_reassembly_table_functions); diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 257ca1fb67..fe2ebde7e5 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -1360,7 +1360,7 @@ proto_register_mpeg_pes(void) proto_mpeg = proto_register_protocol("Moving Picture Experts Group", "MPEG", "mpeg"); mpeg_handle = register_dissector("mpeg", dissect_mpeg, proto_mpeg); - heur_subdissector_list = register_heur_dissector_list("mpeg", proto_mpeg); + heur_subdissector_list = register_heur_dissector_list_with_description("mpeg", "MPEG payload", proto_mpeg); proto_mpeg_pes = proto_register_protocol("Packetized Elementary Stream", "MPEG PES", "mpeg-pes"); proto_register_field_array(proto_mpeg_pes, hf, array_length(hf)); diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 3a2e0f0a76..07a25f073f 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -4727,7 +4727,7 @@ void proto_register_mq(void) expert_mq = expert_register_protocol(proto_mq); expert_register_field_array(expert_mq, ei, array_length(ei)); - mq_heur_subdissector_list = register_heur_dissector_list("mq", proto_mq); + mq_heur_subdissector_list = register_heur_dissector_list_with_description("mq", "WebSphere MQ data", proto_mq); reassembly_table_register(&mq_reassembly_table, &addresses_reassembly_table_functions); diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index e23200864a..727c7ddf3c 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -1444,7 +1444,7 @@ proto_register_netbios(void) netbios_handle = register_dissector("netbios", dissect_netbios, proto_netbios); netbios_cap_handle = register_capture_dissector("netbios", capture_netbios, proto_netbios); - netbios_heur_subdissector_list = register_heur_dissector_list("netbios", proto_netbios); + netbios_heur_subdissector_list = register_heur_dissector_list_with_description("netbios", "NetBIOS payload", proto_netbios); netbios_module = prefs_register_protocol(proto_netbios, NULL); prefs_register_bool_preference(netbios_module, "defragment", diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index 81cf3c64cc..60fea7278a 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -2996,7 +2996,7 @@ proto_register_opensafety(void) oss_udp_module = prefs_register_protocol(proto_oss_udp_transport, apply_prefs); /* Register data dissector */ - heur_opensafety_spdo_subdissector_list = register_heur_dissector_list("opensafety.spdo", proto_opensafety); + heur_opensafety_spdo_subdissector_list = register_heur_dissector_list_with_description("opensafety.spdo", "openSAFETY data", proto_opensafety); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_opensafety, hf, array_length(hf)); diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index b2f3adfc96..3b3eef7b23 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -2373,14 +2373,14 @@ void proto_register_cotp(void) "settings.", &cotp_decode_atn); /* For handling protocols hijacking the variable part of CR or CC PDUs */ - cotp_cr_heur_subdissector_list = register_heur_dissector_list("cotp_cr", proto_cotp); - cotp_cc_heur_subdissector_list = register_heur_dissector_list("cotp_cc", proto_cotp); + cotp_cr_heur_subdissector_list = register_heur_dissector_list_with_description("cotp_cr", "COTP CR (Connect Request) payload", proto_cotp); + cotp_cc_heur_subdissector_list = register_heur_dissector_list_with_description("cotp_cc", "COTP CC (Connect Confirm) payload", proto_cotp); /* subdissector code in inactive subset */ - cotp_is_heur_subdissector_list = register_heur_dissector_list("cotp_is", proto_cotp); + cotp_is_heur_subdissector_list = register_heur_dissector_list_with_description("cotp_is", "COTP IS (Inactive Subset) payload", proto_cotp); /* other COTP/ISO 8473 subdissectors */ - cotp_heur_subdissector_list = register_heur_dissector_list("cotp", proto_cotp); + cotp_heur_subdissector_list = register_heur_dissector_list_with_description("cotp", "COTP DT (Data) payload", proto_cotp); /* XXX - what about CLTP and proto_cltp? */ ositp_handle = register_dissector("ositp", dissect_ositp, proto_cotp); @@ -2417,7 +2417,7 @@ void proto_register_cltp(void) proto_register_field_array(proto_cltp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - cltp_heur_subdissector_list = register_heur_dissector_list("cltp", proto_cltp); + cltp_heur_subdissector_list = register_heur_dissector_list_with_description("cltp", "CLTP data atop CLNP", proto_cltp); } void diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index a90f89936c..5673caf15e 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -1382,7 +1382,7 @@ proto_register_pgm(void) pgm_handle = register_dissector("pgm", dissect_pgm, proto_pgm); subdissector_table = register_dissector_table("pgm.port", "PGM port", proto_pgm, FT_UINT16, BASE_DEC); - heur_subdissector_list = register_heur_dissector_list("pgm", proto_pgm); + heur_subdissector_list = register_heur_dissector_list_with_description("pgm", "PGM data fallback", proto_pgm); /* * Register configuration preferences for UDP encapsulation diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index de6f62ef09..6834a9689b 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -3945,7 +3945,7 @@ proto_register_q931(void) /* subdissector code */ codeset_dissector_table = register_dissector_table("q931.codeset", "Q.931 Codeset", proto_q931, FT_UINT8, BASE_HEX); ie_dissector_table = register_dissector_table("q931.ie", "Q.931 IE", proto_q931, FT_UINT16, BASE_HEX); - q931_user_heur_subdissector_list = register_heur_dissector_list("q931_user", proto_q931); + q931_user_heur_subdissector_list = register_heur_dissector_list_with_description("q931_user", "Q.931 IE User payload", proto_q931); q931_module = prefs_register_protocol(proto_q931, NULL); prefs_register_bool_preference(q931_module, "desegment_h323_messages", diff --git a/epan/dissectors/packet-raknet.c b/epan/dissectors/packet-raknet.c index 9899b2694f..30fab92a57 100644 --- a/epan/dissectors/packet-raknet.c +++ b/epan/dissectors/packet-raknet.c @@ -1993,7 +1993,7 @@ proto_register_raknet(void) * ...and their heuristic dissector to this table. */ raknet_heur_subdissectors = - register_heur_dissector_list("raknet", proto_raknet); + register_heur_dissector_list_with_description("raknet", "RakNet fallback", proto_raknet); } void diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index aa0d8d5c0b..e607b541d2 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -5210,7 +5210,7 @@ proto_register_rdp(void) { "The TCP ports used by the RDP protocol should be added to the TPKT preference \"TPKT TCP ports\", or by selecting \"TPKT\" as the \"Transport\" protocol in the \"Decode As\" dialog.", "RDP TCP Port preference moved information"); - rdp_heur_subdissector_list = register_heur_dissector_list("rdp", proto_rdp); + rdp_heur_subdissector_list = register_heur_dissector_list_with_description("rdp", "RDP payload", proto_rdp); } void diff --git a/epan/dissectors/packet-realtek.c b/epan/dissectors/packet-realtek.c index b455b684af..635b4f7d59 100644 --- a/epan/dissectors/packet-realtek.c +++ b/epan/dissectors/packet-realtek.c @@ -419,7 +419,8 @@ proto_register_realtek(void) "Realtek", "realtek"); realtek_handle = register_dissector("realtek", dissect_realtek, proto_realtek); proto_register_field_array(proto_realtek, hf_realtek, array_length(hf_realtek)); - realtek_heur_subdissector_list = register_heur_dissector_list("realtek", + realtek_heur_subdissector_list = register_heur_dissector_list_with_description("realtek", + "Realtek Layer 2 payload", proto_realtek); proto_rrcp = proto_register_protocol("Realtek Remote Control Protocol", diff --git a/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c index 8204c1cefc..d13f5c336c 100644 --- a/epan/dissectors/packet-rtitcp.c +++ b/epan/dissectors/packet-rtitcp.c @@ -950,7 +950,7 @@ proto_register_rtitcp(void) expert_register_field_array(expert_rtitcp, ei, array_length(ei)); */ register_dissector("rtitcp", dissect_rtitcp, proto_rtitcp); - heur_subdissector_list = register_heur_dissector_list("rtitcp", proto_rtitcp); + heur_subdissector_list = register_heur_dissector_list_with_description("rtitcp", "RTI TCP signalling message", proto_rtitcp); } diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 32f70d1bda..76554e71a5 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -1622,7 +1622,7 @@ proto_register_rtsp(void) * this table using the standard heur_dissector_add() * function. */ - heur_subdissector_list = register_heur_dissector_list("rtsp", proto_rtsp); + heur_subdissector_list = register_heur_dissector_list_with_description("rtsp", "RTSP data", proto_rtsp); /* * Register for tapping diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c index e198c66fbc..64c1f39e7f 100644 --- a/epan/dissectors/packet-s7comm.c +++ b/epan/dissectors/packet-s7comm.c @@ -8583,7 +8583,7 @@ proto_register_s7comm (void) expert_register_field_array(expert_s7comm, ei, array_length(ei)); register_init_routine(s7comm_defragment_init); - s7comm_heur_subdissector_list = register_heur_dissector_list("s7comm-bsend", proto_s7comm); + s7comm_heur_subdissector_list = register_heur_dissector_list_with_description("s7comm-bsend", "S7COMM BSEND/BRECV", proto_s7comm); } /* Register this protocol */ diff --git a/epan/dissectors/packet-sapni.c b/epan/dissectors/packet-sapni.c index f5d2a3ce9b..041d5d465c 100644 --- a/epan/dissectors/packet-sapni.c +++ b/epan/dissectors/packet-sapni.c @@ -263,7 +263,7 @@ proto_register_sap_protocol(void) /* Sub dissector code */ sub_dissectors_table = register_dissector_table("sapni.port", "SAP Protocol Port", proto_sap_protocol, FT_UINT16, BASE_DEC); - heur_subdissector_list = register_heur_dissector_list("sapni", proto_sap_protocol); + heur_subdissector_list = register_heur_dissector_list_with_description("sapni", "SAP NI payload", proto_sap_protocol); /* Register the preferences */ sap_protocol_module = prefs_register_protocol(proto_sap_protocol, proto_reg_handoff_sap_protocol); diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 9e9cfe41f5..041326058f 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -4192,7 +4192,7 @@ proto_register_sccp(void) sccp_ssn_dissector_table = register_dissector_table("sccp.ssn", "SCCP SSN", proto_sccp, FT_UINT8, BASE_DEC); - heur_subdissector_list = register_heur_dissector_list("sccp", proto_sccp); + heur_subdissector_list = register_heur_dissector_list_with_description("sccp", "SCCP Data fallback", proto_sccp); sccp_module = prefs_register_protocol(proto_sccp, proto_reg_handoff_sccp); diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 0a2f533ce7..5d6cdeae41 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -5281,7 +5281,7 @@ proto_register_sctp(void) sctp_ppi_dissector_table = register_dissector_table("sctp.ppi", "SCTP payload protocol identifier", proto_sctp, FT_UINT32, BASE_HEX); sctp_handle = register_dissector("sctp", dissect_sctp, proto_sctp); - sctp_heur_subdissector_list = register_heur_dissector_list("sctp", proto_sctp); + sctp_heur_subdissector_list = register_heur_dissector_list_with_description("sctp", "SCTP payload", proto_sctp); register_init_routine(sctp_init); register_cleanup_routine(sctp_cleanup); diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index b55ba1c89f..69d87ee152 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -1612,7 +1612,7 @@ proto_register_sercosiii(void) siii_handle = register_dissector("sercosiii", dissect_siii, proto_siii); /* subdissector code */ - heur_subdissector_list = register_heur_dissector_list("sercosiii", proto_siii); + heur_subdissector_list = register_heur_dissector_list_with_description("sercosiii", "SERCOS III payload pre-check", proto_siii); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_siii, hf, array_length(hf)); diff --git a/epan/dissectors/packet-sinecap.c b/epan/dissectors/packet-sinecap.c index a5510ed5cb..82e30e509a 100644 --- a/epan/dissectors/packet-sinecap.c +++ b/epan/dissectors/packet-sinecap.c @@ -197,7 +197,7 @@ proto_register_ap(void) proto_register_field_array(proto_ap, hf, array_length(hf)); proto_register_subtree_array(ett, array_length (ett)); - ap_heur_subdissector_list = register_heur_dissector_list("sinecap", proto_ap); + ap_heur_subdissector_list = register_heur_dissector_list_with_description("sinecap", "SINEC AP data", proto_ap); } void diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 258123ed12..dd5dfbc417 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -7720,7 +7720,7 @@ void proto_register_sip(void) register_init_routine(&sip_init_protocol); register_cleanup_routine(&sip_cleanup_protocol); - heur_subdissector_list = register_heur_dissector_list("sip", proto_sip); + heur_subdissector_list = register_heur_dissector_list_with_description("sip", "SIP message fallback", proto_sip); /* Register for tapping */ sip_tap = register_tap("sip"); sip_follow_tap = register_tap("sip_follow"); diff --git a/epan/dissectors/packet-smb-direct.c b/epan/dissectors/packet-smb-direct.c index 75d39b19f2..3b1c200154 100644 --- a/epan/dissectors/packet-smb-direct.c +++ b/epan/dissectors/packet-smb-direct.c @@ -666,7 +666,7 @@ void proto_register_smb_direct(void) smb_direct_handle = register_dissector("smb_direct", dissect_smb_direct_infiniband, proto_smb_direct); - smb_direct_heur_subdissector_list = register_heur_dissector_list("smb_direct", proto_smb_direct); + smb_direct_heur_subdissector_list = register_heur_dissector_list_with_description("smb_direct", "SMB-Direct payload", proto_smb_direct); smb_direct_module = prefs_register_protocol(proto_smb_direct, NULL); prefs_register_bool_preference(smb_direct_module, diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index b30b119ce5..e718d733c5 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -3894,7 +3894,7 @@ proto_register_smb_pipe(void) expert_smb_pipe = expert_register_protocol(proto_smb_pipe); expert_register_field_array(expert_smb_pipe, ei, array_length(ei)); - smb_transact_heur_subdissector_list = register_heur_dissector_list("smb_transact", proto_smb_pipe); + smb_transact_heur_subdissector_list = register_heur_dissector_list_with_description("smb_transact", "SMB Pipe DCERPC data", proto_smb_pipe); /* * XXX - addresses_ports_reassembly_table_functions? * Probably correct for SMB-over-NBT and SMB-over-TCP, diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 93baed7e01..bc30f1aee3 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -14394,7 +14394,7 @@ proto_register_smb2(void) "A table of Session ID to Session keys mappings used to decrypt traffic.", seskey_uat); - smb2_pipe_subdissector_list = register_heur_dissector_list("smb2_pipe_subdissectors", proto_smb2); + smb2_pipe_subdissector_list = register_heur_dissector_list_with_description("smb2_pipe_subdissectors", "SMB2 Pipe data", proto_smb2); /* * XXX - addresses_ports_reassembly_table_functions? * Probably correct for SMB-over-NBT and SMB-over-TCP, diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index fa294c4063..ec3af1fb43 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -876,7 +876,7 @@ proto_register_socketcan(void) { subdissector_table = register_decode_as_next_proto(proto_can, "can.subdissector", "CAN next level dissector", NULL); - heur_subdissector_list = register_heur_dissector_list("can", proto_can); + heur_subdissector_list = register_heur_dissector_list_with_description("can", "CAN heuristic", proto_can); static uat_field_t can_interface_mapping_uat_fields[] = { UAT_FLD_HEX(interface_configs, interface_id, "Interface ID", "ID of the Interface with 0xffffffff = any (hex uint32 without leading 0x)"), diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index 5452e58dce..d1b0a65af2 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -538,7 +538,7 @@ proto_register_soupbintcp(void) "spanning multiple TCP segments.", &soupbintcp_desegment); - heur_subdissector_list = register_heur_dissector_list("soupbintcp", proto_soupbintcp); + heur_subdissector_list = register_heur_dissector_list_with_description("soupbintcp", "SoupBinTCP encapsulated data", proto_soupbintcp); expert_soupbinttcp = expert_register_protocol(proto_soupbintcp); expert_register_field_array(expert_soupbinttcp, ei, array_length(ei)); diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index 0ad855c7e8..954721ded2 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -2255,7 +2255,7 @@ proto_register_stun(void) proto_register_subtree_array(ett, array_length(ett)); /* heuristic subdissectors (used for the DATA field) */ - heur_subdissector_list = register_heur_dissector_list("stun", proto_stun); + heur_subdissector_list = register_heur_dissector_list_with_description("stun", "STUN DATA message", proto_stun); register_dissector("stun-tcp", dissect_stun_tcp, proto_stun); register_dissector("stun-udp", dissect_stun_udp, proto_stun); diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 8c28ad24fc..f070735ea4 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -2458,7 +2458,7 @@ proto_register_sua(void) "Set the source and destination addresses to the PC or GT digits, depending on the routing indicator." " This may affect TCAP's ability to recognize which messages belong to which TCAP session.", &set_addresses); - heur_subdissector_list = register_heur_dissector_list("sua", proto_sua); + heur_subdissector_list = register_heur_dissector_list_with_description("sua", "SUA Data fallback", proto_sua); sua_parameter_table = register_dissector_table("sua.prop.tags", "SUA Proprietary Tags", proto_sua, FT_UINT16, BASE_DEC); sua_tap = register_tap("sua"); diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index 2821d72e4b..29a1a5cba9 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -567,7 +567,7 @@ void proto_register_t125(void) { proto_register_field_array(proto_t125, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - t125_heur_subdissector_list= register_heur_dissector_list("t125", proto_t125); + t125_heur_subdissector_list= register_heur_dissector_list_with_description("t125", "T.125 User data", proto_t125); register_dissector("t125", dissect_t125, proto_t125); } diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 2e70592a04..ec50f6d719 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -9895,7 +9895,7 @@ proto_register_tcp(void) /* subdissector code */ subdissector_table = register_dissector_table("tcp.port", "TCP port", proto_tcp, FT_UINT16, BASE_DEC); - heur_subdissector_list = register_heur_dissector_list("tcp", proto_tcp); + heur_subdissector_list = register_heur_dissector_list_with_description("tcp", "TCP heuristic", proto_tcp); tcp_option_table = register_dissector_table("tcp.option", "TCP Options", proto_tcp, FT_UINT8, BASE_DEC); diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index 3f00d454fd..d59edc992a 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -1114,7 +1114,7 @@ proto_register_tftp(void) expert_tftp = expert_register_protocol(proto_tftp); expert_register_field_array(expert_tftp, ei, array_length(ei)); - heur_subdissector_list = register_heur_dissector_list("tftp", proto_tftp); + heur_subdissector_list = register_heur_dissector_list_with_description("tftp", "TFTP payload", proto_tftp); reassembly_table_register(&tftp_reassembly_table, &addresses_ports_reassembly_table_functions); tftp_handle = register_dissector("tftp", dissect_tftp, proto_tftp); diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 900a841923..d597110f31 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -3097,7 +3097,7 @@ proto_register_tipc(void) "TIPC port name type", proto_tipc, FT_UINT32, BASE_DEC); /* make heuristic dissectors possible */ - tipc_heur_subdissector_list = register_heur_dissector_list("tipc", proto_tipc); + tipc_heur_subdissector_list = register_heur_dissector_list_with_description("tipc", "TIPC v2 data", proto_tipc); /* Register by name */ tipc_handle = register_dissector("tipc", dissect_tipc, proto_tipc); diff --git a/epan/dissectors/packet-tls.c b/epan/dissectors/packet-tls.c index 803990f7e1..dfb2e27401 100644 --- a/epan/dissectors/packet-tls.c +++ b/epan/dissectors/packet-tls.c @@ -4828,7 +4828,7 @@ proto_register_tls(void) } /* heuristic dissectors for any premable e.g. CredSSP before RDP */ - ssl_heur_subdissector_list = register_heur_dissector_list("tls", proto_tls); + ssl_heur_subdissector_list = register_heur_dissector_list_with_description("tls", "TLS data", proto_tls); ssl_common_register_ssl_alpn_dissector_table("tls.alpn", "SSL/TLS Application-Layer Protocol Negotiation (ALPN) Protocol IDs", diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index 6c9f0c0a0c..343efa6cd3 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -678,7 +678,7 @@ proto_register_tpkt(void) &tpkt_desegment); /* heuristic dissectors for premable CredSSP before RDP and Fast-Path RDP packets */ - tpkt_heur_subdissector_list = register_heur_dissector_list("tpkt", proto_tpkt); + tpkt_heur_subdissector_list = register_heur_dissector_list_with_description("tpkt", "TPKT fragment", proto_tpkt); proto_tpkt_heur = proto_register_protocol_in_name_only("TPKT Heuristic (for RDP)", "TPKT Heuristic (for RDP)", "tpkt", proto_tpkt, FT_PROTOCOL); } diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c index 3d8113bd28..ee815287ab 100644 --- a/epan/dissectors/packet-turnchannel.c +++ b/epan/dissectors/packet-turnchannel.c @@ -197,7 +197,7 @@ proto_register_turnchannel(void) * doesn't actually call this dissector but uses its own implementation * of TURN Channel messages. */ - heur_subdissector_list = register_heur_dissector_list("turnchannel", proto_turnchannel); + heur_subdissector_list = register_heur_dissector_list_with_description("turnchannel", "TURN Channel message", proto_turnchannel); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_turnchannel, hf, array_length(hf)); diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index 0d7d33255b..564d6f9814 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -1459,7 +1459,7 @@ proto_register_udp(void) /* subdissector code */ udp_dissector_table = register_dissector_table("udp.port", "UDP port", proto_udp, FT_UINT16, BASE_DEC); - heur_subdissector_list = register_heur_dissector_list("udp", proto_udp); + heur_subdissector_list = register_heur_dissector_list_with_description("udp", "UDP heuristic", proto_udp); register_capture_dissector_table("udp.port", "UDP"); diff --git a/epan/dissectors/packet-uds.c b/epan/dissectors/packet-uds.c index e1eb3ef090..132b7606c8 100644 --- a/epan/dissectors/packet-uds.c +++ b/epan/dissectors/packet-uds.c @@ -3838,7 +3838,7 @@ proto_register_uds(void) { "Decide how the certificate bytes are decoded", &uds_certificate_decoding_config, certificate_decoding_vals, FALSE); - heur_subdissector_list = register_heur_dissector_list("uds", proto_uds); + heur_subdissector_list = register_heur_dissector_list_with_description("uds", "UDS RDBI data", proto_uds); } void diff --git a/epan/dissectors/packet-udt.c b/epan/dissectors/packet-udt.c index 28a937ff4b..5a89d0d8cd 100644 --- a/epan/dissectors/packet-udt.c +++ b/epan/dissectors/packet-udt.c @@ -589,7 +589,7 @@ void proto_register_udt(void) udt_handle = register_dissector("udt", dissect_udt, proto_udt); - heur_subdissector_list = register_heur_dissector_list("udt", proto_udt); + heur_subdissector_list = register_heur_dissector_list_with_description("udt", "UDT data", proto_udt); } void proto_reg_handoff_udt(void) diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 9fd4ebfad7..99e6ae6ca5 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -7377,13 +7377,13 @@ proto_register_usb(void) usb_bulk_dissector_table = register_dissector_table("usb.bulk", "USB bulk endpoint", proto_usb, FT_UINT32, BASE_HEX); - heur_bulk_subdissector_list = register_heur_dissector_list("usb.bulk", proto_usb); + heur_bulk_subdissector_list = register_heur_dissector_list_with_description("usb.bulk", "USB bulk fallback", proto_usb); usb_control_dissector_table = register_dissector_table("usb.control", "USB control endpoint", proto_usb, FT_UINT32, BASE_HEX); - heur_control_subdissector_list = register_heur_dissector_list("usb.control", proto_usb); + heur_control_subdissector_list = register_heur_dissector_list_with_description("usb.control", "USB control fallback", proto_usb); usb_interrupt_dissector_table = register_dissector_table("usb.interrupt", "USB interrupt endpoint", proto_usb, FT_UINT32, BASE_HEX); - heur_interrupt_subdissector_list = register_heur_dissector_list("usb.interrupt", proto_usb); + heur_interrupt_subdissector_list = register_heur_dissector_list_with_description("usb.interrupt", "USB interrupt fallback", proto_usb); usb_descriptor_dissector_table = register_dissector_table("usb.descriptor", "USB descriptor", proto_usb, FT_UINT8, BASE_DEC); diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index 5b516c94f8..a9ac7f0cb9 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -990,7 +990,7 @@ proto_register_vines_ipc(void) vines_ipc_handle = register_dissector("vines_ipc", dissect_vines_ipc, proto_vines_ipc); - vines_ipc_heur_subdissector_list = register_heur_dissector_list("vines_ipc", proto_vines_ipc); + vines_ipc_heur_subdissector_list = register_heur_dissector_list_with_description("vines_ipc", "Vines IPC Data payload", proto_vines_ipc); } void @@ -1156,7 +1156,7 @@ proto_register_vines_spp(void) vines_spp_handle = register_dissector("vines_spp", dissect_vines_spp, proto_vines_spp); - vines_spp_heur_subdissector_list = register_heur_dissector_list("vines_spp", proto_vines_spp); + vines_spp_heur_subdissector_list = register_heur_dissector_list_with_description("vines_spp", "Vines SPP Data payload", proto_vines_spp); } void diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c index 4baf28849c..f3b3e0b8f8 100644 --- a/epan/dissectors/packet-websocket.c +++ b/epan/dissectors/packet-websocket.c @@ -1019,7 +1019,7 @@ proto_register_websocket(void) * this table using the standard heur_dissector_add() * function. */ - heur_subdissector_list = register_heur_dissector_list("ws", proto_websocket); + heur_subdissector_list = register_heur_dissector_list_with_description("ws", "WebSocket data frame", proto_websocket); port_subdissector_table = register_dissector_table("ws.port", "TCP port for protocols using WebSocket", proto_websocket, FT_UINT16, BASE_DEC); diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index cd2b49b5b7..675099c4e2 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -7191,7 +7191,7 @@ proto_register_wsp(void) register_dissector("wsp-co", dissect_wsp_fromwap_co, proto_wsp); register_dissector("wsp-cl", dissect_wsp_fromwap_cl, proto_wsp); - heur_subdissector_list = register_heur_dissector_list("wsp", proto_wsp); + heur_subdissector_list = register_heur_dissector_list_with_description("wsp", "WSP payload fallback", proto_wsp); wsp_fromudp_handle = register_dissector("wsp.udp", dissect_wsp_fromudp, proto_wsp); diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 32e44dba18..0c75dea803 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -2344,7 +2344,7 @@ proto_register_x25(void) x25_subdissector_table = register_dissector_table("x.25.spi", "X.25 secondary protocol identifier", proto_x25, FT_UINT8, BASE_HEX); - x25_heur_subdissector_list = register_heur_dissector_list("x.25", proto_x25); + x25_heur_subdissector_list = register_heur_dissector_list_with_description("x.25", "X.25 payload", proto_x25); register_dissector("x.25_dir", dissect_x25_dir, proto_x25); x25_handle = register_dissector("x.25", dissect_x25, proto_x25); diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c index ec41460f93..0cfa234af5 100644 --- a/epan/dissectors/packet-zbee-zcl-se.c +++ b/epan/dissectors/packet-zbee-zcl-se.c @@ -8951,7 +8951,7 @@ proto_register_zbee_zcl_tun(void) proto_register_subtree_array(ett, array_length(ett)); /* Make heuristic dissectors possible */ - zbee_zcl_tun_heur_subdissector_list = register_heur_dissector_list(ZBEE_PROTOABBREV_ZCL_TUN, proto_zbee_zcl_tun); + zbee_zcl_tun_heur_subdissector_list = register_heur_dissector_list_with_description(ZBEE_PROTOABBREV_ZCL_TUN, "ZigBee Transfer Data", proto_zbee_zcl_tun); /* Register the ZigBee ZCL Tunneling dissector. */ register_dissector(ZBEE_PROTOABBREV_ZCL_TUN, dissect_zbee_zcl_tun, proto_zbee_zcl_tun); |