From be7d295fbf06788c7fec948cf8755c218ad7c32d Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sat, 11 Jul 2015 17:33:26 -0400 Subject: Add "user presentable" and "unique string ids" to heuristic table entries. This allows better presentation of heuristic dissectors to the end user. Change-Id: I2ff3985ab914e83c2989880cc0c7b9904045b3f6 Reviewed-on: https://code.wireshark.org/review/9602 Petri-Dish: Michael Mann Reviewed-by: Michael Mann --- plugins/ethercat/packet-esl.c | 2 +- plugins/profinet/packet-dcerpc-pn-io.c | 2 +- plugins/profinet/packet-dcom-cba-acco.c | 2 +- plugins/profinet/packet-pn-dcp.c | 2 +- plugins/profinet/packet-pn-mrrt.c | 2 +- plugins/profinet/packet-pn-ptcp.c | 2 +- plugins/profinet/packet-pn-rt.c | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins') diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c index 73ff29cf79..8cc9814ad0 100644 --- a/plugins/ethercat/packet-esl.c +++ b/plugins/ethercat/packet-esl.c @@ -365,7 +365,7 @@ proto_reg_handoff_esl(void) { if (!initialized) { eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); - heur_dissector_add("eth", dissect_esl_heur, proto_esl); + heur_dissector_add("eth", dissect_esl_heur, "EtherCAT over Ethernet", "esl_eth", proto_esl); initialized = TRUE; } proto_set_decoding(proto_esl, esl_enable_dissector); diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index aac79965b5..7537295f7e 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -12267,7 +12267,7 @@ proto_reg_handoff_pn_io (void) dcerpc_init_uuid (proto_pn_io, ett_pn_io, &uuid_pn_io_supervisor, ver_pn_io_supervisor, pn_io_dissectors, hf_pn_io_opnum); dcerpc_init_uuid (proto_pn_io, ett_pn_io, &uuid_pn_io_parameterserver, ver_pn_io_parameterserver, pn_io_dissectors, hf_pn_io_opnum); - heur_dissector_add("pn_rt", dissect_PNIO_heur, proto_pn_io); + heur_dissector_add("pn_rt", dissect_PNIO_heur, "PROFINET IO", "pn_io_pn_rt", proto_pn_io); } /* diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 6ebc8675f5..ae143370ae 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -5147,7 +5147,7 @@ proto_reg_handoff_dcom_cba_acco (void) &uuid_ICBAAccoSync, ver_ICBAAccoSync, ICBAAccoSync_dissectors, hf_cba_acco_opnum); - heur_dissector_add("pn_rt", dissect_CBA_Connection_Data_heur, proto_ICBAAccoServer); + heur_dissector_add("pn_rt", dissect_CBA_Connection_Data_heur, "PROFINET CBA IO", "pn_cba_pn_rt", proto_ICBAAccoServer); } /* diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c index 570d72018c..0ad437b9f3 100644 --- a/plugins/profinet/packet-pn-dcp.c +++ b/plugins/profinet/packet-pn-dcp.c @@ -1291,7 +1291,7 @@ void proto_reg_handoff_pn_dcp (void) { /* register ourself as an heuristic pn-rt payload dissector */ - heur_dissector_add("pn_rt", dissect_PNDCP_Data_heur, proto_pn_dcp); + heur_dissector_add("pn_rt", dissect_PNDCP_Data_heur, "PROFINET DCP IO", "pn_dcp_pn_rt", proto_pn_dcp); } /* diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c index d3e97c6608..69ddea0272 100644 --- a/plugins/profinet/packet-pn-mrrt.c +++ b/plugins/profinet/packet-pn-mrrt.c @@ -242,7 +242,7 @@ proto_reg_handoff_pn_mrrt (void) { /* register ourself as an heuristic pn-rt payload dissector */ - heur_dissector_add("pn_rt", dissect_PNMRRT_Data_heur, proto_pn_mrrt); + heur_dissector_add("pn_rt", dissect_PNMRRT_Data_heur, "PROFINET MRRT IO", "pn_mrrt_pn_rt", proto_pn_mrrt); } /* diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c index b3e04f1b48..5da4c0881d 100644 --- a/plugins/profinet/packet-pn-ptcp.c +++ b/plugins/profinet/packet-pn-ptcp.c @@ -1079,7 +1079,7 @@ void proto_reg_handoff_pn_ptcp (void) { /* register ourself as an heuristic pn-rt payload dissector */ - heur_dissector_add("pn_rt", dissect_PNPTCP_Data_heur, proto_pn_ptcp); + heur_dissector_add("pn_rt", dissect_PNPTCP_Data_heur, "PROFINET PTCP IO", "pn_ptcp_pn_rt", proto_pn_ptcp); } /* diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c index cfbfcd3ab2..bde5ca3791 100644 --- a/plugins/profinet/packet-pn-rt.c +++ b/plugins/profinet/packet-pn-rt.c @@ -1000,8 +1000,8 @@ proto_reg_handoff_pn_rt(void) dissector_add_uint("ethertype", ETHERTYPE_PROFINET, pn_rt_handle); dissector_add_uint("udp.port", 0x8892, pn_rt_handle); - heur_dissector_add("pn_rt", dissect_CSF_SDU_heur, proto_pn_rt); - heur_dissector_add("pn_rt", dissect_FRAG_PDU_heur, proto_pn_rt); + heur_dissector_add("pn_rt", dissect_CSF_SDU_heur, "PROFINET CSF_SDU IO", "pn_csf_sdu_pn_rt", proto_pn_rt); + heur_dissector_add("pn_rt", dissect_FRAG_PDU_heur, "PROFINET Frag PDU IO", "pn_frag_pn_rt", proto_pn_rt); data_handle = find_dissector("data"); ethertype_subdissector_table = find_dissector_table("ethertype"); -- cgit v1.2.3