osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Completely remove dissector_add_handle. 

It has been deprecated and replaced with dissector_add_for_decode_as.

Change-Id: I5a4976f83951f749e70b5267570fca188daa7a07
Reviewed-on: https://code.wireshark.org/review/15854
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2016-06-12 09:38:55 -04:00
parent 6ff63571cf
commit 0baf13f8e9
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-adb.c
View File

@ -900,10 +900,10 @@ proto_reg_handoff_adb(void)
{
adb_service_handle = find_dissector_add_dependency("adb_service", proto_adb);
dissector_add_handle("tcp.port", adb_handle);
dissector_add_handle("usb.device", adb_handle);
dissector_add_handle("usb.product", adb_handle);
dissector_add_handle("usb.protocol", adb_handle);
dissector_add_for_decode_as("tcp.port", adb_handle);
dissector_add_for_decode_as("usb.device", adb_handle);
dissector_add_for_decode_as("usb.product", adb_handle);
dissector_add_for_decode_as("usb.protocol", adb_handle);
proto_tcp = proto_get_id_by_filter_name("tcp");
proto_usb = proto_get_id_by_filter_name("usb");

2
epan/dissectors/packet-mqtt-sn.c
View File

@ -697,7 +697,7 @@ void proto_register_mqttsn(void)
/* Dissector Handoff */
void proto_reg_handoff_mqttsn(void)
{
dissector_add_handle("udp.port", mqttsn_handle);
dissector_add_for_decode_as("udp.port", mqttsn_handle);
}
/*

3
epan/packet.h
View File

@ -371,9 +371,6 @@ WS_DLL_PUBLIC dissector_handle_t dissector_get_guid_handle(
WS_DLL_PUBLIC void dissector_add_for_decode_as(const char *name,
dissector_handle_t handle);
/* DEPRECATED, do not use in new code, call dissector_add_for_decode_as directly! */
#define dissector_add_handle dissector_add_for_decode_as
/** Get the list of handles for a dissector table
*/
WS_DLL_PUBLIC GSList *dissector_table_get_dissector_handles(dissector_table_t dissector_table);