From 2eb7b05b8c9c6408268f0d1e81f0a18a02610f1c Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Wed, 5 Oct 2016 16:33:54 -0400 Subject: Convert most UDP dissectors to use "auto" preferences. Similar to the "tcp.port" changes in I99604f95d426ad345f4b494598d94178b886eb67, convert dissectors that use "udp.port". More cleanup done on dissectors that use both TCP and UDP dissector tables, so that less preference callbacks exist. Change-Id: If07be9b9e850c244336a7069599cd554ce312dd3 Reviewed-on: https://code.wireshark.org/review/18120 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-egd.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'epan/dissectors/packet-egd.c') diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c index 4d1ee44635..f3c33d2a8e 100644 --- a/epan/dissectors/packet-egd.c +++ b/epan/dissectors/packet-egd.c @@ -28,7 +28,7 @@ #include -#define EGD_PORT 18246 /* 0x4746 */ +#define EGD_PORT 18246 /* 0x4746 - Not IANA registered */ #define EGD_ST_NONEW 0 #define EGD_ST_NOERROR 1 @@ -226,11 +226,7 @@ void proto_register_egd(void) &ett_status_item }; - proto_egd = proto_register_protocol ( - "Ethernet Global Data", /* name */ - "EGD", /* short name */ - "egd" /* abbrev */ - ); + proto_egd = proto_register_protocol ("Ethernet Global Data", "EGD", "egd"); proto_register_field_array(proto_egd, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } @@ -240,7 +236,7 @@ void proto_reg_handoff_egd(void) dissector_handle_t egd_handle; egd_handle = create_dissector_handle(dissect_egd, proto_egd); - dissector_add_uint("udp.port", EGD_PORT, egd_handle); + dissector_add_uint_with_preference("udp.port", EGD_PORT, egd_handle); } /* -- cgit v1.2.3