diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-08 22:49:44 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-09 12:37:36 +0000 |
| commit | 443a7ed259f40ba5cfcc7d9c1e0fe5d7fee0d18c (patch) | |
| tree | 4ff5916a71c682282482219343406bbf3f03da8b /epan | |
| parent | 724aeeb2b878e2044057543ea5ce2593c6661088 (diff) | |
new_create_dissector_handle -> create_dissector_handle for dissector directory.
Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now.
Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f
Reviewed-on: https://code.wireshark.org/review/12484
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
596 files changed, 1001 insertions, 1001 deletions
diff --git a/epan/dissectors/file-mp4.c b/epan/dissectors/file-mp4.c index 1ceff7d527..9ff112c62f 100644 --- a/epan/dissectors/file-mp4.c +++ b/epan/dissectors/file-mp4.c @@ -806,7 +806,7 @@ proto_register_mp4(void) void proto_reg_handoff_mp4(void) { - dissector_handle_t mp4_handle = new_create_dissector_handle(dissect_mp4, proto_mp4); + dissector_handle_t mp4_handle = create_dissector_handle(dissect_mp4, proto_mp4); dissector_add_string("media_type", "video/mp4", mp4_handle); dissector_add_string("media_type", "audio/mp4", mp4_handle); } diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c index 57a2cc505a..3e2a33fd36 100644 --- a/epan/dissectors/packet-2dparityfec.c +++ b/epan/dissectors/packet-2dparityfec.c @@ -340,7 +340,7 @@ void proto_register_2dparityfec(void) "as FEC data corresponding to Pro-MPEG Code of Practice #3 release 2", &dissect_fec); - handle_2dparityfec = new_create_dissector_handle(dissect_2dparityfec, + handle_2dparityfec = create_dissector_handle(dissect_2dparityfec, proto_2dparityfec); } diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c index 0b8f8a3608..e46f18c27f 100644 --- a/epan/dissectors/packet-3com-njack.c +++ b/epan/dissectors/packet-3com-njack.c @@ -783,7 +783,7 @@ proto_reg_handoff_njack(void) { dissector_handle_t njack_handle; - njack_handle = new_create_dissector_handle(dissect_njack_static, proto_njack); + njack_handle = create_dissector_handle(dissect_njack_static, proto_njack); dissector_add_uint("udp.port", PORT_NJACK_PC, njack_handle); /* dissector_add_uint("tcp.port", PORT_NJACK_PC, njack_handle); */ dissector_add_uint("udp.port", PORT_NJACK_SWITCH, njack_handle); diff --git a/epan/dissectors/packet-3com-xns.c b/epan/dissectors/packet-3com-xns.c index c7706aeb16..1e86f66d58 100644 --- a/epan/dissectors/packet-3com-xns.c +++ b/epan/dissectors/packet-3com-xns.c @@ -124,7 +124,7 @@ proto_reg_handoff_3com_xns(void) ethertype_subdissector_table = find_dissector_table("ethertype"); - our_xns_handle = new_create_dissector_handle(dissect_3com_xns, proto_3com_xns); + our_xns_handle = create_dissector_handle(dissect_3com_xns, proto_3com_xns); dissector_add_uint("llc.dsap", 0x80, our_xns_handle); } diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index 9aa1ae87b5..cb0d397867 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -2762,7 +2762,7 @@ void proto_reg_handoff_9P(void) data_handle = find_dissector("data"); - ninep_handle = new_create_dissector_handle(dissect_9P, proto_9P); + ninep_handle = create_dissector_handle(dissect_9P, proto_9P); dissector_add_uint("tcp.port", NINEPORT, ninep_handle); } diff --git a/epan/dissectors/packet-a21.c b/epan/dissectors/packet-a21.c index 98a143cf6f..f2da4854e4 100644 --- a/epan/dissectors/packet-a21.c +++ b/epan/dissectors/packet-a21.c @@ -963,7 +963,7 @@ void proto_reg_handoff_a21(void) if (!a21_prefs_initialized) { - a21_handle = new_create_dissector_handle(dissect_a21, proto_a21); + a21_handle = create_dissector_handle(dissect_a21, proto_a21); gcsna_handle = find_dissector("gcsna"); dissector_add_uint("udp.port", a21_udp_port, a21_handle); a21_prefs_initialized = TRUE; diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c index 7171ae0584..8fcafb8fc3 100644 --- a/epan/dissectors/packet-aarp.c +++ b/epan/dissectors/packet-aarp.c @@ -341,7 +341,7 @@ proto_reg_handoff_aarp(void) { dissector_handle_t aarp_handle; - aarp_handle = new_create_dissector_handle(dissect_aarp, proto_aarp); + aarp_handle = create_dissector_handle(dissect_aarp, proto_aarp); dissector_add_uint("ethertype", ETHERTYPE_AARP, aarp_handle); dissector_add_uint("chdlc.protocol", ETHERTYPE_AARP, aarp_handle); } diff --git a/epan/dissectors/packet-aastra-aasp.c b/epan/dissectors/packet-aastra-aasp.c index 1a2d4dde22..0ec5c70dff 100644 --- a/epan/dissectors/packet-aastra-aasp.c +++ b/epan/dissectors/packet-aastra-aasp.c @@ -521,7 +521,7 @@ void proto_reg_handoff_aasp(void) { dissector_handle_t aasp_handle; - aasp_handle = new_create_dissector_handle(dissect_aasp, proto_aasp); + aasp_handle = create_dissector_handle(dissect_aasp, proto_aasp); dissector_add_string("media_type", "message/x-aasp-signalling", aasp_handle); } diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c index 988494245e..cb306787f8 100644 --- a/epan/dissectors/packet-acap.c +++ b/epan/dissectors/packet-acap.c @@ -210,7 +210,7 @@ proto_register_acap(void) proto_register_fields(proto_acap, hfi, array_length(hfi)); proto_register_subtree_array(ett, array_length(ett)); - acap_handle = new_create_dissector_handle(dissect_acap, proto_acap); + acap_handle = create_dissector_handle(dissect_acap, proto_acap); } void diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index bfceda8d70..16c9729c18 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -3257,7 +3257,7 @@ void proto_reg_handoff_acn(void) { /* dissector_handle_t acn_handle; */ - /* acn_handle = new_create_dissector_handle(dissect_acn, proto_acn); */ + /* acn_handle = create_dissector_handle(dissect_acn, proto_acn); */ /* dissector_add_for_decode_as("udp.port", acn_handle); */ heur_dissector_add("udp", dissect_acn_heur, "ACN over UDP", "acn_udp", proto_acn, HEURISTIC_DISABLE); } diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c index 13f9ce543d..51c87073a2 100644 --- a/epan/dissectors/packet-actrace.c +++ b/epan/dissectors/packet-actrace.c @@ -816,7 +816,7 @@ void proto_reg_handoff_actrace(void) if (!actrace_prefs_initialized) { - actrace_handle = new_create_dissector_handle(dissect_actrace, proto_actrace); + actrace_handle = create_dissector_handle(dissect_actrace, proto_actrace); /* Get a handle for the lapd dissector. */ lapd_handle = find_dissector("lapd"); actrace_prefs_initialized = TRUE; diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c index 4b718c4f08..ea43b325a4 100644 --- a/epan/dissectors/packet-adwin.c +++ b/epan/dissectors/packet-adwin.c @@ -1169,7 +1169,7 @@ proto_reg_handoff_adwin(void) static unsigned int udp_port; if (! adwin_prefs_initialized) { - adwin_handle = new_create_dissector_handle(dissect_adwin, proto_adwin); + adwin_handle = create_dissector_handle(dissect_adwin, proto_adwin); data_handle = find_dissector("data"); adwin_prefs_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index 4e5ca5b306..735c805fe1 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -3136,7 +3136,7 @@ void proto_register_aeron(void) /* The registration hand-off routine */ void proto_reg_handoff_aeron(void) { - aeron_dissector_handle = new_create_dissector_handle(dissect_aeron, proto_aeron); + aeron_dissector_handle = create_dissector_handle(dissect_aeron, proto_aeron); dissector_add_for_decode_as("udp.port", aeron_dissector_handle); heur_dissector_add("udp", test_aeron_packet, "Aeron over UDP", "aeron_udp", proto_aeron, HEURISTIC_DISABLE); aeron_data_dissector_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c index c6e654efb8..74133efc6e 100644 --- a/epan/dissectors/packet-agentx.c +++ b/epan/dissectors/packet-agentx.c @@ -1138,7 +1138,7 @@ proto_reg_handoff_agentx(void) static guint agentx_tcp_port; if(!agentx_prefs_initialized) { - agentx_handle = new_create_dissector_handle(dissect_agentx, proto_agentx); + agentx_handle = create_dissector_handle(dissect_agentx, proto_agentx); agentx_prefs_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-aim-oft.c b/epan/dissectors/packet-aim-oft.c index d5b2d6a987..a3e4dc8c63 100644 --- a/epan/dissectors/packet-aim-oft.c +++ b/epan/dissectors/packet-aim-oft.c @@ -97,7 +97,7 @@ proto_reg_handoff_aim_oft(void) /* dissector_handle_t aim_handle;*/ /* FIXME - aim_handle = new_create_dissector_handle(dissect_aim, proto_aim); + aim_handle = create_dissector_handle(dissect_aim, proto_aim); dissector_add_uint("tcp.port", TCP_PORT_AIM, aim_handle);*/ } diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index 55e187d9f9..4a9c4b85a0 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -1717,7 +1717,7 @@ proto_reg_handoff_aim(void) { dissector_handle_t aim_handle; - aim_handle = new_create_dissector_handle(dissect_aim, proto_aim); + aim_handle = create_dissector_handle(dissect_aim, proto_aim); dissector_add_uint("tcp.port", TCP_PORT_AIM, aim_handle); } diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c index 7cfa2bafa1..912d68e1e9 100644 --- a/epan/dissectors/packet-ajp13.c +++ b/epan/dissectors/packet-ajp13.c @@ -1116,7 +1116,7 @@ void proto_reg_handoff_ajp13(void) { dissector_handle_t ajp13_handle; - ajp13_handle = new_create_dissector_handle(dissect_ajp13, proto_ajp13); + ajp13_handle = create_dissector_handle(dissect_ajp13, proto_ajp13); dissector_add_uint("tcp.port", 8009, ajp13_handle); } diff --git a/epan/dissectors/packet-alljoyn.c b/epan/dissectors/packet-alljoyn.c index f0079818a5..603505a665 100644 --- a/epan/dissectors/packet-alljoyn.c +++ b/epan/dissectors/packet-alljoyn.c @@ -3035,8 +3035,8 @@ proto_reg_handoff_AllJoyn(void) static dissector_handle_t alljoyn_handle_ardp; if(!initialized) { - alljoyn_handle_ns = new_create_dissector_handle(dissect_AllJoyn_name_server, proto_AllJoyn_ns); - alljoyn_handle_ardp = new_create_dissector_handle(dissect_AllJoyn_ardp, proto_AllJoyn_ardp); + alljoyn_handle_ns = create_dissector_handle(dissect_AllJoyn_name_server, proto_AllJoyn_ns); + alljoyn_handle_ardp = create_dissector_handle(dissect_AllJoyn_ardp, proto_AllJoyn_ardp); } else { dissector_delete_uint("udp.port", name_server_port, alljoyn_handle_ns); dissector_delete_uint("tcp.port", name_server_port, alljoyn_handle_ns); diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c index 1ff6b26ba5..f2524ee6a6 100644 --- a/epan/dissectors/packet-amr.c +++ b/epan/dissectors/packet-amr.c @@ -841,13 +841,13 @@ proto_reg_handoff_amr(void) /* * Register H.245 Generic parameter name(s) */ - amr_name_handle = new_create_dissector_handle(dissect_amr_name, proto_amr); + amr_name_handle = create_dissector_handle(dissect_amr_name, proto_amr); for (ftr=amr_capability_tab; ftr->id; ftr++) { if (ftr->name) dissector_add_string("h245.gef.name", ftr->id, amr_name_handle); if (ftr->content_pdu) dissector_add_string("h245.gef.content", ftr->id, - new_create_dissector_handle(ftr->content_pdu, proto_amr)); + create_dissector_handle(ftr->content_pdu, proto_amr)); } /* Activate the next line for testing with the randpkt tool dissector_add_uint("udp.port", 55555, amr_handle); diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index c115d7373b..a28e775cd0 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -928,7 +928,7 @@ proto_reg_handoff_ancp(void) { dissector_handle_t ancp_handle; - ancp_handle = new_create_dissector_handle(dissect_ancp, proto_ancp); + ancp_handle = create_dissector_handle(dissect_ancp, proto_ancp); dissector_add_uint("tcp.port", ANCP_PORT, ancp_handle); stats_tree_register("ancp", "ancp", "ANCP", 0, ancp_stats_tree_packet, ancp_stats_tree_init, NULL); diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c index 13deea31fc..63dddc7fe5 100644 --- a/epan/dissectors/packet-ans.c +++ b/epan/dissectors/packet-ans.c @@ -139,7 +139,7 @@ proto_reg_handoff_ans(void) { dissector_handle_t ans_handle; - ans_handle = new_create_dissector_handle(dissect_ans, proto_ans); + ans_handle = create_dissector_handle(dissect_ans, proto_ans); dissector_add_uint("ethertype", ETHERTYPE_INTEL_ANS, ans_handle); } diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c index 9223af1c8b..aa0fc1ee68 100644 --- a/epan/dissectors/packet-ansi_637.c +++ b/epan/dissectors/packet-ansi_637.c @@ -3356,7 +3356,7 @@ proto_reg_handoff_ansi_637(void) dissector_handle_t ansi_637_trans_app_handle; guint i; - ansi_637_trans_app_handle = new_create_dissector_handle(dissect_ansi_637_trans_app, proto_ansi_637_trans); + ansi_637_trans_app_handle = create_dissector_handle(dissect_ansi_637_trans_app, proto_ansi_637_trans); /* Dissect messages embedded in SIP */ dissector_add_string("media_type", "application/vnd.3gpp2.sms", ansi_637_trans_app_handle); diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c index e6efdaea2e..ab2a5d0c82 100644 --- a/epan/dissectors/packet-ansi_683.c +++ b/epan/dissectors/packet-ansi_683.c @@ -3574,7 +3574,7 @@ proto_reg_handoff_ansi_683(void) { dissector_handle_t ansi_683_handle; - ansi_683_handle = new_create_dissector_handle(dissect_ansi_683, proto_ansi_683); + ansi_683_handle = create_dissector_handle(dissect_ansi_683, proto_ansi_683); dissector_add_uint("ansi_map.ota", ANSI_683_FORWARD, ansi_683_handle); dissector_add_uint("ansi_map.ota", ANSI_683_REVERSE, ansi_683_handle); diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index af97338649..08d6fb952a 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -12917,9 +12917,9 @@ proto_reg_handoff_ansi_a(void) { dissector_handle_t bsmap_handle, sip_dtap_bsmap_handle; - bsmap_handle = new_create_dissector_handle(dissect_bsmap, proto_a_bsmap); - dtap_handle = new_create_dissector_handle(dissect_dtap, proto_a_dtap); - sip_dtap_bsmap_handle = new_create_dissector_handle(dissect_sip_dtap_bsmap, proto_a_dtap); + bsmap_handle = create_dissector_handle(dissect_bsmap, proto_a_bsmap); + dtap_handle = create_dissector_handle(dissect_dtap, proto_a_dtap); + sip_dtap_bsmap_handle = create_dissector_handle(dissect_sip_dtap_bsmap, proto_a_dtap); data_handle = find_dissector("data"); dissector_add_uint("bsap.pdu_type", BSSAP_PDU_TYPE_BSMAP, bsmap_handle); diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c index eeefc8e250..61bc0feba4 100644 --- a/epan/dissectors/packet-aodv.c +++ b/epan/dissectors/packet-aodv.c @@ -929,7 +929,7 @@ proto_reg_handoff_aodv(void) { dissector_handle_t aodv_handle; - aodv_handle = new_create_dissector_handle(dissect_aodv, + aodv_handle = create_dissector_handle(dissect_aodv, proto_aodv); dissector_add_uint("udp.port", UDP_PORT_AODV, aodv_handle); } diff --git a/epan/dissectors/packet-aol.c b/epan/dissectors/packet-aol.c index 2d36d6c4bf..eaccc991b7 100644 --- a/epan/dissectors/packet-aol.c +++ b/epan/dissectors/packet-aol.c @@ -398,7 +398,7 @@ void proto_register_aol(void) { void proto_reg_handoff_aol(void) { static dissector_handle_t aol_handle; - aol_handle = new_create_dissector_handle(dissect_aol,proto_aol); + aol_handle = create_dissector_handle(dissect_aol,proto_aol); dissector_add_uint("tcp.port",AOL_PORT,aol_handle); } diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c index 2550f95ad0..7fb6d162b9 100644 --- a/epan/dissectors/packet-ap1394.c +++ b/epan/dissectors/packet-ap1394.c @@ -129,7 +129,7 @@ proto_reg_handoff_ap1394(void) ethertype_subdissector_table = find_dissector_table("ethertype"); - ap1394_handle = new_create_dissector_handle(dissect_ap1394, proto_ap1394); + ap1394_handle = create_dissector_handle(dissect_ap1394, proto_ap1394); dissector_add_uint("wtap_encap", WTAP_ENCAP_APPLE_IP_OVER_IEEE1394, ap1394_handle); } diff --git a/epan/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c index 04f149be3a..151857d2c6 100644 --- a/epan/dissectors/packet-app-pkix-cert.c +++ b/epan/dissectors/packet-app-pkix-cert.c @@ -108,7 +108,7 @@ proto_reg_handoff_cert(void) { dissector_handle_t cert_handle; - cert_handle = new_create_dissector_handle(dissect_cert, proto_cert); + cert_handle = create_dissector_handle(dissect_cert, proto_cert); /* Register the PKIX-CERT media type */ dissector_add_string("media_type", "application/pkix-cert", cert_handle); diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c index 145b3452f3..fb3dc2dbeb 100644 --- a/epan/dissectors/packet-applemidi.c +++ b/epan/dissectors/packet-applemidi.c @@ -518,7 +518,7 @@ void proto_reg_handoff_applemidi( void ) { - applemidi_handle = new_create_dissector_handle( dissect_applemidi, proto_applemidi ); + applemidi_handle = create_dissector_handle( dissect_applemidi, proto_applemidi ); /* If we cannot decode the data it will be RTP-MIDI since the Apple session protocol uses * two ports: the control-port and the MIDI-port. On both ports an invitation is being sent. diff --git a/epan/dissectors/packet-ar_drone.c b/epan/dissectors/packet-ar_drone.c index 53dc0c571c..1f4e84cdea 100644 --- a/epan/dissectors/packet-ar_drone.c +++ b/epan/dissectors/packet-ar_drone.c @@ -794,7 +794,7 @@ proto_reg_handoff_ar_drone(void) if (initialized == FALSE) { - ar_drone_handle = new_create_dissector_handle(dissect_ar_drone, proto_ar_drone); + ar_drone_handle = create_dissector_handle(dissect_ar_drone, proto_ar_drone); heur_dissector_add("udp", dissect_ar_drone, "AR Drone over UDP", "ar_drone_udp", proto_ar_drone, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index bfd3a70e5e..30ab244674 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.c @@ -396,10 +396,10 @@ proto_reg_handoff_arcnet (void) { dissector_handle_t arcnet_handle, arcnet_linux_handle; - arcnet_handle = new_create_dissector_handle (dissect_arcnet, proto_arcnet); + arcnet_handle = create_dissector_handle (dissect_arcnet, proto_arcnet); dissector_add_uint ("wtap_encap", WTAP_ENCAP_ARCNET, arcnet_handle); - arcnet_linux_handle = new_create_dissector_handle (dissect_arcnet_linux, + arcnet_linux_handle = create_dissector_handle (dissect_arcnet_linux, proto_arcnet); dissector_add_uint ("wtap_encap", WTAP_ENCAP_ARCNET_LINUX, arcnet_linux_handle); data_handle = find_dissector ("data"); diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 7274cc2b57..e6a40f21ca 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -1970,8 +1970,8 @@ proto_register_arp(void) expert_arp = expert_register_protocol(proto_arp); expert_register_field_array(expert_arp, ei, array_length(ei)); - atmarp_handle = new_create_dissector_handle(dissect_atmarp, proto_atmarp); - ax25arp_handle = new_create_dissector_handle(dissect_ax25arp, proto_arp); + atmarp_handle = create_dissector_handle(dissect_atmarp, proto_atmarp); + ax25arp_handle = create_dissector_handle(dissect_ax25arp, proto_arp); arp_handle = new_register_dissector( "arp" , dissect_arp, proto_arp ); diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index e40688fa32..c64acd3fac 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -5419,7 +5419,7 @@ void proto_reg_handoff_artnet(void) { dissector_handle_t artnet_handle; - artnet_handle = new_create_dissector_handle(dissect_artnet, proto_artnet); + artnet_handle = create_dissector_handle(dissect_artnet, proto_artnet); dissector_add_for_decode_as("udp.port", artnet_handle); rdm_handle = find_dissector("rdm"); dmx_chan_handle = find_dissector("dmx-chan"); diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c index ddbeba441a..3b30ffce78 100644 --- a/epan/dissectors/packet-aruba-adp.c +++ b/epan/dissectors/packet-aruba-adp.c @@ -147,7 +147,7 @@ proto_reg_handoff_aruba_adp(void) { dissector_handle_t adp_handle; - adp_handle = new_create_dissector_handle(dissect_aruba_adp, proto_aruba_adp); + adp_handle = create_dissector_handle(dissect_aruba_adp, proto_aruba_adp); dissector_add_uint("udp.port", UDP_PORT_ADP, adp_handle); } diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c index 24b3a30096..19004302f6 100644 --- a/epan/dissectors/packet-aruba-erm.c +++ b/epan/dissectors/packet-aruba-erm.c @@ -480,13 +480,13 @@ proto_reg_handoff_aruba_erm(void) ppi_handle = find_dissector("ppi"); peek_handle = find_dissector("peekremote"); data_handle = find_dissector("data"); - aruba_erm_handle = new_create_dissector_handle(dissect_aruba_erm, proto_aruba_erm); - aruba_erm_handle_type0 = new_create_dissector_handle(dissect_aruba_erm_type0, proto_aruba_erm_type0); - aruba_erm_handle_type1 = new_create_dissector_handle(dissect_aruba_erm_type1, proto_aruba_erm_type1); - aruba_erm_handle_type2 = new_create_dissector_handle(dissect_aruba_erm_type2, proto_aruba_erm_type2); - aruba_erm_handle_type3 = new_create_dissector_handle(dissect_aruba_erm_type3, proto_aruba_erm_type3); - aruba_erm_handle_type4 = new_create_dissector_handle(dissect_aruba_erm_type4, proto_aruba_erm_type4); - aruba_erm_handle_type5 = new_create_dissector_handle(dissect_aruba_erm_type5, proto_aruba_erm_type5); + aruba_erm_handle = create_dissector_handle(dissect_aruba_erm, proto_aruba_erm); + aruba_erm_handle_type0 = create_dissector_handle(dissect_aruba_erm_type0, proto_aruba_erm_type0); + aruba_erm_handle_type1 = create_dissector_handle(dissect_aruba_erm_type1, proto_aruba_erm_type1); + aruba_erm_handle_type2 = create_dissector_handle(dissect_aruba_erm_type2, proto_aruba_erm_type2); + aruba_erm_handle_type3 = create_dissector_handle(dissect_aruba_erm_type3, proto_aruba_erm_type3); + aruba_erm_handle_type4 = create_dissector_handle(dissect_aruba_erm_type4, proto_aruba_erm_type4); + aruba_erm_handle_type5 = create_dissector_handle(dissect_aruba_erm_type5, proto_aruba_erm_type5); initialized = TRUE; } else { dissector_delete_uint_range("udp.port", aruba_erm_port_range, aruba_erm_handle); diff --git a/epan/dissectors/packet-aruba-iap.c b/epan/dissectors/packet-aruba-iap.c index 6e4730336a..5c509a0a44 100644 --- a/epan/dissectors/packet-aruba-iap.c +++ b/epan/dissectors/packet-aruba-iap.c @@ -200,7 +200,7 @@ proto_reg_handoff_aruba_iap(void) { dissector_handle_t iap_handle; - iap_handle = new_create_dissector_handle(dissect_aruba_iap, proto_aruba_iap); + iap_handle = create_dissector_handle(dissect_aruba_iap, proto_aruba_iap); dissector_add_uint("ethertype", ETHERTYPE_IAP, iap_handle); } diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c index 4f14e6df74..1155a84c18 100644 --- a/epan/dissectors/packet-aruba-papi.c +++ b/epan/dissectors/packet-aruba-papi.c @@ -340,7 +340,7 @@ proto_reg_handoff_papi(void) { dissector_handle_t papi_handle; - papi_handle = new_create_dissector_handle(dissect_papi, proto_papi); + papi_handle = create_dissector_handle(dissect_papi, proto_papi); dissector_add_uint("udp.port", UDP_PORT_PAPI, papi_handle); data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c index 9c9c5c882b..579e15ebb4 100644 --- a/epan/dissectors/packet-asap.c +++ b/epan/dissectors/packet-asap.c @@ -922,7 +922,7 @@ proto_reg_handoff_asap(void) { dissector_handle_t asap_handle; - asap_handle = new_create_dissector_handle(dissect_asap, proto_asap); + asap_handle = create_dissector_handle(dissect_asap, proto_asap); dissector_add_uint("sctp.ppi", ASAP_PAYLOAD_PROTOCOL_ID, asap_handle); dissector_add_uint("udp.port", ASAP_UDP_PORT, asap_handle); dissector_add_uint("tcp.port", ASAP_TCP_PORT, asap_handle); diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c index effb00d8c9..cd0edb5b0e 100644 --- a/epan/dissectors/packet-ascend.c +++ b/epan/dissectors/packet-ascend.c @@ -161,7 +161,7 @@ proto_reg_handoff_ascend(void) eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); ppp_hdlc_handle = find_dissector("ppp_hdlc"); - ascend_handle = new_create_dissector_handle(dissect_ascend, proto_ascend); + ascend_handle = create_dissector_handle(dissect_ascend, proto_ascend); dissector_add_uint("wtap_encap", WTAP_ENCAP_ASCEND, ascend_handle); } diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c index 2141e3318a..986ae6d2db 100644 --- a/epan/dissectors/packet-asf.c +++ b/epan/dissectors/packet-asf.c @@ -390,7 +390,7 @@ proto_reg_handoff_asf(void) data_handle = find_dissector("data"); - asf_handle = new_create_dissector_handle(dissect_asf, proto_asf); + asf_handle = create_dissector_handle(dissect_asf, proto_asf); dissector_add_uint("rmcp.class", RMCP_CLASS_ASF, asf_handle); } diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index b838e3ea02..8759f9c145 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -2092,35 +2092,35 @@ proto_reg_handoff_atalk(void) dissector_handle_t zip_ddp_handle; dissector_handle_t rtmp_data_handle, llap_handle; - ddp_short_handle = new_create_dissector_handle(dissect_ddp_short, proto_ddp); - ddp_handle = new_create_dissector_handle(dissect_ddp, proto_ddp); + ddp_short_handle = create_dissector_handle(dissect_ddp_short, proto_ddp); + ddp_handle = create_dissector_handle(dissect_ddp, proto_ddp); dissector_add_uint("ethertype", ETHERTYPE_ATALK, ddp_handle); dissector_add_uint("chdlc.protocol", ETHERTYPE_ATALK, ddp_handle); dissector_add_uint("ppp.protocol", PPP_AT, ddp_handle); dissector_add_uint("null.type", BSD_AF_APPLETALK, ddp_handle); dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_APPLETALK, ddp_handle); - nbp_handle = new_create_dissector_handle(dissect_nbp, proto_nbp); + nbp_handle = create_dissector_handle(dissect_nbp, proto_nbp); dissector_add_uint("ddp.type", DDP_NBP, nbp_handle); dissector_add_for_decode_as("udp.port", nbp_handle); - atp_handle = new_create_dissector_handle(dissect_atp, proto_atp); + atp_handle = create_dissector_handle(dissect_atp, proto_atp); dissector_add_uint("ddp.type", DDP_ATP, atp_handle); - asp_handle = new_create_dissector_handle(dissect_asp, proto_asp); - pap_handle = new_create_dissector_handle(dissect_pap, proto_pap); + asp_handle = create_dissector_handle(dissect_asp, proto_asp); + pap_handle = create_dissector_handle(dissect_pap, proto_pap); - rtmp_request_handle = new_create_dissector_handle(dissect_rtmp_request, proto_rtmp); - rtmp_data_handle = new_create_dissector_handle(dissect_rtmp_data, proto_rtmp); + rtmp_request_handle = create_dissector_handle(dissect_rtmp_request, proto_rtmp); + rtmp_data_handle = create_dissector_handle(dissect_rtmp_data, proto_rtmp); dissector_add_uint("ddp.type", DDP_RTMPREQ, rtmp_request_handle); dissector_add_uint("ddp.type", DDP_RTMPDATA, rtmp_data_handle); - zip_ddp_handle = new_create_dissector_handle(dissect_ddp_zip, proto_zip); + zip_ddp_handle = create_dissector_handle(dissect_ddp_zip, proto_zip); dissector_add_uint("ddp.type", DDP_ZIP, zip_ddp_handle); - zip_atp_handle = new_create_dissector_handle(dissect_atp_zip, proto_zip); + zip_atp_handle = create_dissector_handle(dissect_atp_zip, proto_zip); - llap_handle = new_create_dissector_handle(dissect_llap, proto_llap); + llap_handle = create_dissector_handle(dissect_llap, proto_llap); dissector_add_uint("wtap_encap", WTAP_ENCAP_LOCALTALK, llap_handle); register_init_routine( atp_init); diff --git a/epan/dissectors/packet-ath.c b/epan/dissectors/packet-ath.c index 780c67376c..55983c703b 100644 --- a/epan/dissectors/packet-ath.c +++ b/epan/dissectors/packet-ath.c @@ -440,7 +440,7 @@ proto_reg_handoff_ath(void) { static dissector_handle_t ath_handle; - ath_handle = new_create_dissector_handle(dissect_ath, proto_ath); + ath_handle = create_dissector_handle(dissect_ath, proto_ath); dissector_add_uint("udp.port", ATH_PORT, ath_handle); } diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index bee9b1dd73..5f7218749d 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -2036,8 +2036,8 @@ proto_reg_handoff_atm(void) gprs_ns_handle = find_dissector("gprs_ns"); dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_PDUS, atm_handle); - dissector_add_uint("atm.aal5.type", TRAF_LANE, new_create_dissector_handle(dissect_lane, proto_atm_lane)); - dissector_add_uint("atm.aal5.type", TRAF_ILMI, new_create_dissector_handle(dissect_ilmi, proto_ilmi)); + dissector_add_uint("atm.aal5.type", TRAF_LANE, create_dissector_handle(dissect_lane, proto_atm_lane)); + dissector_add_uint("atm.aal5.type", TRAF_ILMI, create_dissector_handle(dissect_ilmi, proto_ilmi)); dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, atm_untruncated_handle); diff --git a/epan/dissectors/packet-atmtcp.c b/epan/dissectors/packet-atmtcp.c index 9c4cded96d..e1ad0ddf25 100644 --- a/epan/dissectors/packet-atmtcp.c +++ b/epan/dissectors/packet-atmtcp.c @@ -152,7 +152,7 @@ proto_reg_handoff_atmtcp(void) static int current_port; if (!initialized) { - atmtcp_handle = new_create_dissector_handle(dissect_atmtcp, proto_atmtcp); + atmtcp_handle = create_dissector_handle(dissect_atmtcp, proto_atmtcp); data_handle = find_dissector("data"); initialized = TRUE; } else { diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c index 4080ca4c2d..74c83f1c16 100644 --- a/epan/dissectors/packet-auto_rp.c +++ b/epan/dissectors/packet-auto_rp.c @@ -297,7 +297,7 @@ proto_reg_handoff_auto_rp(void) { dissector_handle_t auto_rp_handle; - auto_rp_handle = new_create_dissector_handle(dissect_auto_rp, + auto_rp_handle = create_dissector_handle(dissect_auto_rp, proto_auto_rp); dissector_add_uint("udp.port", UDP_PORT_PIM_RP_DISC, auto_rp_handle); } diff --git a/epan/dissectors/packet-ax25-nol3.c b/epan/dissectors/packet-ax25-nol3.c index 1304c368e9..7603ce09ab 100644 --- a/epan/dissectors/packet-ax25-nol3.c +++ b/epan/dissectors/packet-ax25-nol3.c @@ -284,7 +284,7 @@ proto_register_ax25_nol3(void) void proto_reg_handoff_ax25_nol3(void) { - dissector_add_uint( "ax25.pid", AX25_P_NO_L3, new_create_dissector_handle( dissect_ax25_nol3, proto_ax25_nol3 ) ); + dissector_add_uint( "ax25.pid", AX25_P_NO_L3, create_dissector_handle( dissect_ax25_nol3, proto_ax25_nol3 ) ); /* */ diff --git a/epan/dissectors/packet-ax4000.c b/epan/dissectors/packet-ax4000.c index 42ad69239b..fda623a2c6 100644 --- a/epan/dissectors/packet-ax4000.c +++ b/epan/dissectors/packet-ax4000.c @@ -163,7 +163,7 @@ proto_reg_handoff_ax4000(void) { dissector_handle_t ax4000_handle; - ax4000_handle = new_create_dissector_handle(dissect_ax4000, + ax4000_handle = create_dissector_handle(dissect_ax4000, proto_ax4000); dissector_add_uint("ip.proto", IP_PROTO_AX4000, ax4000_handle); dissector_add_uint("tcp.port", AX4000_TCP_PORT, ax4000_handle); diff --git a/epan/dissectors/packet-babel.c b/epan/dissectors/packet-babel.c index cd1c1d9c42..15e763cc82 100644 --- a/epan/dissectors/packet-babel.c +++ b/epan/dissectors/packet-babel.c @@ -514,7 +514,7 @@ proto_reg_handoff_babel(void) { dissector_handle_t babel_handle; - babel_handle = new_create_dissector_handle(dissect_babel, proto_babel); + babel_handle = create_dissector_handle(dissect_babel, proto_babel); dissector_add_uint("udp.port", UDP_PORT_BABEL, babel_handle); dissector_add_uint("udp.port", UDP_PORT_BABEL_OLD, babel_handle); } diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c index 30e42434ba..081881dbce 100644 --- a/epan/dissectors/packet-banana.c +++ b/epan/dissectors/packet-banana.c @@ -347,7 +347,7 @@ proto_register_banana(void) void proto_reg_handoff_banana(void) { - banana_handle = new_create_dissector_handle(dissect_banana, proto_banana); + banana_handle = create_dissector_handle(dissect_banana, proto_banana); } /* diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c index 787fe6d9e2..36ff911c0c 100644 --- a/epan/dissectors/packet-bat.c +++ b/epan/dissectors/packet-bat.c @@ -885,9 +885,9 @@ void proto_reg_handoff_bat(void) bat_tap = register_tap("batman"); bat_follow_tap = register_tap("batman_follow"); - batman_handle = new_create_dissector_handle(dissect_bat_batman, proto_bat_plugin); - gw_handle = new_create_dissector_handle(dissect_bat_gw, proto_bat_gw); - vis_handle = new_create_dissector_handle(dissect_bat_vis, proto_bat_vis); + batman_handle = create_dissector_handle(dissect_bat_batman, proto_bat_plugin); + gw_handle = create_dissector_handle(dissect_bat_gw, proto_bat_gw); + vis_handle = create_dissector_handle(dissect_bat_vis, proto_bat_vis); ip_handle = find_dissector("ip"); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index eb7161035b..c188cd162b 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -5047,7 +5047,7 @@ void proto_reg_handoff_batadv(void) static unsigned int old_batadv_ethertype; if (!inited) { - batman_handle = new_create_dissector_handle(dissect_batadv_plugin, proto_batadv_plugin); + batman_handle = create_dissector_handle(dissect_batadv_plugin, proto_batadv_plugin); data_handle = find_dissector("data"); eth_handle = find_dissector("eth"); diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index a4793c5935..2269409fcb 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -1017,7 +1017,7 @@ proto_reg_handoff_beep(void) if (!beep_prefs_initialized) { - beep_handle = new_create_dissector_handle(dissect_beep, proto_beep); + beep_handle = create_dissector_handle(dissect_beep, proto_beep); beep_prefs_initialized = TRUE; diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index e62262ea7f..9faf81e349 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -436,7 +436,7 @@ new_register_ber_oid_dissector(const char *oid, new_dissector_t dissector, int p { dissector_handle_t dissector_handle; - dissector_handle = new_create_dissector_handle(dissector, proto); + dissector_handle = create_dissector_handle(dissector, proto); dissector_add_string("ber.oid", oid, dissector_handle); oid_add_from_string(name, oid); } @@ -446,7 +446,7 @@ new_register_ber_syntax_dissector(const char *syntax, int proto, new_dissector_t { dissector_handle_t dissector_handle; - dissector_handle = new_create_dissector_handle(dissector, proto); + dissector_handle = create_dissector_handle(dissector, proto); dissector_add_string("ber.syntax", syntax, dissector_handle); } diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 286fdd5b62..ce84fbadb3 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -8405,7 +8405,7 @@ proto_reg_handoff_bgp(void) { dissector_handle_t bgp_handle; - bgp_handle = new_create_dissector_handle(dissect_bgp, proto_bgp); + bgp_handle = create_dissector_handle(dissect_bgp, proto_bgp); dissector_add_uint("tcp.port", BGP_TCP_PORT, bgp_handle); } /* diff --git a/epan/dissectors/packet-bitcoin.c b/epan/dissectors/packet-bitcoin.c index 1f1c62d6d1..af1f4c4dae 100644 --- a/epan/dissectors/packet-bitcoin.c +++ b/epan/dissectors/packet-bitcoin.c @@ -1884,48 +1884,48 @@ proto_reg_handoff_bitcoin(void) heur_dissector_add( "tcp", dissect_bitcoin_heur, "Bitcoin over TCP", "bitcoin_tcp", hfi_bitcoin->id, HEURISTIC_ENABLE); /* Register all of the commands */ - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_version, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_version, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "version", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_addr, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_addr, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "addr", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_inv, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_inv, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "inv", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_getdata, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_getdata, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "getdata", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_getblocks, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_getblocks, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "getblocks", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_getheaders, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_getheaders, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "getheaders", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_tx, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_tx, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "tx", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_block, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_block, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "block", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_ping, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_ping, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "ping", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_pong, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_pong, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "pong", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_notfound, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_notfound, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "notfound", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_reject, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_reject, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "reject", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_headers, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_headers, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "headers", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_filterload, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_filterload, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "filterload", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_filteradd, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_filteradd, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "filteradd", command_handle); - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_merkleblock, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_merkleblock, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "merkleblock", command_handle); /* messages with no payload */ - command_handle = new_create_dissector_handle( dissect_bitcoin_msg_empty, hfi_bitcoin->id ); + command_handle = create_dissector_handle( dissect_bitcoin_msg_empty, hfi_bitcoin->id ); dissector_add_string("bitcoin.command", "verack", command_handle); dissector_add_string("bitcoin.command", "getaddr", command_handle); dissector_add_string("bitcoin.command", "mempool", command_handle); dissector_add_string("bitcoin.command", "filterclear", command_handle); /* messages not implemented */ - /* command_handle = new_create_dissector_handle( dissect_bitcoin_msg_empty, hfi_bitcoin->id ); */ + /* command_handle = create_dissector_handle( dissect_bitcoin_msg_empty, hfi_bitcoin->id ); */ dissector_add_string("bitcoin.command", "checkorder", command_handle); dissector_add_string("bitcoin.command", "submitorder", command_handle); dissector_add_string("bitcoin.command", "reply", command_handle); diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index cd11d2a50e..a17f33fcc5 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -1927,10 +1927,10 @@ proto_register_bluetooth(void) void proto_reg_handoff_bluetooth(void) { - dissector_handle_t bluetooth_handle = new_create_dissector_handle(dissect_bluetooth, proto_bluetooth); - dissector_handle_t bluetooth_bthci_handle = new_create_dissector_handle(dissect_bluetooth_bthci, proto_bluetooth); - dissector_handle_t bluetooth_btmon_handle = new_create_dissector_handle(dissect_bluetooth_btmon, proto_bluetooth); - dissector_handle_t bluetooth_usb_handle = new_create_dissector_handle(dissect_bluetooth_usb, proto_bluetooth); + dissector_handle_t bluetooth_handle = create_dissector_handle(dissect_bluetooth, proto_bluetooth); + dissector_handle_t bluetooth_bthci_handle = create_dissector_handle(dissect_bluetooth_bthci, proto_bluetooth); + dissector_handle_t bluetooth_btmon_handle = create_dissector_handle(dissect_bluetooth_btmon, proto_bluetooth); + dissector_handle_t bluetooth_usb_handle = create_dissector_handle(dissect_bluetooth_usb, proto_bluetooth); btle_handle = find_dissector("btle"); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-bmp.c b/epan/dissectors/packet-bmp.c index 4672b53148..d505dfeea5 100644 --- a/epan/dissectors/packet-bmp.c +++ b/epan/dissectors/packet-bmp.c @@ -809,7 +809,7 @@ proto_reg_handoff_bmp(void) { static dissector_handle_t bmp_handle; - bmp_handle = new_create_dissector_handle(dissect_bmp, proto_bmp); + bmp_handle = create_dissector_handle(dissect_bmp, proto_bmp); dissector_add_for_decode_as("tcp.port", bmp_handle); dissector_bgp = find_dissector("bgp"); } diff --git a/epan/dissectors/packet-bofl.c b/epan/dissectors/packet-bofl.c index 92969ad6d6..672672ea53 100644 --- a/epan/dissectors/packet-bofl.c +++ b/epan/dissectors/packet-bofl.c @@ -130,7 +130,7 @@ proto_reg_handoff_bofl(void) { dissector_handle_t bofl_handle; - bofl_handle = new_create_dissector_handle(dissect_bofl, proto_bofl); + bofl_handle = create_dissector_handle(dissect_bofl, proto_bofl); dissector_add_uint("ethertype", ETHER_TYPE_BOFL, bofl_handle); } diff --git a/epan/dissectors/packet-bpq.c b/epan/dissectors/packet-bpq.c index bb79485552..fc9305287b 100644 --- a/epan/dissectors/packet-bpq.c +++ b/epan/dissectors/packet-bpq.c @@ -150,7 +150,7 @@ proto_reg_handoff_bpq(void) { dissector_handle_t bpq_handle; - bpq_handle = new_create_dissector_handle( dissect_bpq, proto_bpq ); + bpq_handle = create_dissector_handle( dissect_bpq, proto_bpq ); dissector_add_uint("ethertype", ETHERTYPE_BPQ, bpq_handle); /* BPQ is only implemented for AX.25 */ diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index d0df8dd8c3..ca89c9b28a 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.c @@ -405,7 +405,7 @@ proto_reg_handoff_brdwlk(void) { dissector_handle_t brdwlk_handle; - brdwlk_handle = new_create_dissector_handle(dissect_brdwlk, proto_brdwlk); + brdwlk_handle = create_dissector_handle(dissect_brdwlk, proto_brdwlk); dissector_add_uint("ethertype", ETHERTYPE_BRDWALK, brdwlk_handle); dissector_add_uint("ethertype", 0xABCD, brdwlk_handle); fc_dissector_handle = find_dissector("fc"); diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index 0618f69d6c..68a94fad6e 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -2561,7 +2561,7 @@ proto_reg_handoff_bssap(void) heur_dissector_add("sccp", dissect_bssap_heur, "BSSAP over SCCP", "bssap_sccp", proto_bssap, HEURISTIC_ENABLE); heur_dissector_add("sua", dissect_bssap_heur, "BSSAP over SUA", "bssap_sua", proto_bssap, HEURISTIC_ENABLE); /* BSSAP+ */ - bssap_plus_handle = new_create_dissector_handle(dissect_bssap_plus, proto_bssap); + bssap_plus_handle = create_dissector_handle(dissect_bssap_plus, proto_bssap); data_handle = find_dissector("data"); rrlp_handle = find_dissector("rrlp"); diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c index f7d3baac9e..c5da3e349c 100644 --- a/epan/dissectors/packet-bt-dht.c +++ b/epan/dissectors/packet-bt-dht.c @@ -592,7 +592,7 @@ proto_reg_handoff_bt_dht(void) if (!prefs_initialized) { heur_dissector_add("udp", dissect_bt_dht_heur, "BitTorrent DHT over UDP", "bittorrent_dht_udp", proto_bt_dht, HEURISTIC_DISABLE); - bt_dht_handle = new_create_dissector_handle(dissect_bt_dht, proto_bt_dht); + bt_dht_handle = create_dissector_handle(dissect_bt_dht, proto_bt_dht); dissector_add_for_decode_as("udp.port", bt_dht_handle); prefs_initialized = TRUE; diff --git a/epan/dissectors/packet-bt-utp.c b/epan/dissectors/packet-bt-utp.c index cec1b600a7..adf19effdb 100644 --- a/epan/dissectors/packet-bt-utp.c +++ b/epan/dissectors/packet-bt-utp.c @@ -488,7 +488,7 @@ proto_reg_handoff_bt_utp(void) /* disabled by default since heuristic is weak */ heur_dissector_add("udp", dissect_bt_utp, "BitTorrent UTP over UDP", "bt_utp_udp", proto_bt_utp, HEURISTIC_DISABLE); - bt_utp_handle = new_create_dissector_handle(dissect_bt_utp, proto_bt_utp); + bt_utp_handle = create_dissector_handle(dissect_bt_utp, proto_bt_utp); dissector_add_for_decode_as("udp.port", bt_utp_handle); prefs_initialized = TRUE; diff --git a/epan/dissectors/packet-c15ch.c b/epan/dissectors/packet-c15ch.c index 9a746ecb8c..1fbbc1c14e 100644 --- a/epan/dissectors/packet-c15ch.c +++ b/epan/dissectors/packet-c15ch.c @@ -12022,7 +12022,7 @@ void proto_register_c15ch(void) void proto_reg_handoff_c15ch_hbeat(void) { static dissector_handle_t c15ch_hbeat_handle; - c15ch_hbeat_handle = new_create_dissector_handle(dissect_c15ch_hbeat, proto_c15ch_hbeat); + c15ch_hbeat_handle = create_dissector_handle(dissect_c15ch_hbeat, proto_c15ch_hbeat); dissector_add_uint("ethertype", ETHERTYPE_C15_HBEAT, c15ch_hbeat_handle); } @@ -12033,261 +12033,261 @@ void proto_reg_handoff_c15ch(void) dissector_handle_t c15ch_second_level_handle; dissector_handle_t c15ch_third_level_handle; /* first level */ - c15ch_handle = new_create_dissector_handle(dissect_c15ch, proto_c15ch); + c15ch_handle = create_dissector_handle(dissect_c15ch, proto_c15ch); dissector_add_uint("ethertype", ETHERTYPE_C15_CH, c15ch_handle); /* second_level */ - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_cp_state_ch, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_cp_state_ch, proto_c15ch_second_level); dissector_add_uint("c15", C15_CP_STATE_CH, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_cp_event, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_cp_event, proto_c15ch_second_level); dissector_add_uint("c15", C15_CP_EVENT, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_isup, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_isup, proto_c15ch_second_level); dissector_add_uint("c15", C15_ISUP, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_nitnxlate, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_nitnxlate, proto_c15ch_second_level); dissector_add_uint("c15", C15_NITN_XLATE, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_route, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_route, proto_c15ch_second_level); dissector_add_uint("c15", C15_ROUTE, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_sccp, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_sccp, proto_c15ch_second_level); dissector_add_uint("c15", C15_SCCP, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_orig, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_orig, proto_c15ch_second_level); dissector_add_uint("c15", C15_CP_ORIG, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_conn, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_conn, proto_c15ch_second_level); dissector_add_uint("c15", C15_CONN, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_ntwk_conn, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_ntwk_conn, proto_c15ch_second_level); dissector_add_uint("c15", C15_NTWK_CONN, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_mkbrk, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_mkbrk, proto_c15ch_second_level); dissector_add_uint("c15", C15_MK_BRK, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_pathfind, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_pathfind, proto_c15ch_second_level); dissector_add_uint("c15", C15_PATH_FIND, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_pathidle, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_pathidle, proto_c15ch_second_level); dissector_add_uint("c15", C15_PATH_IDLE, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_dest_digits, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_dest_digits, proto_c15ch_second_level); dissector_add_uint("c15", C15_DEST_DIGITS, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_twc_rswch, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_twc_rswch, proto_c15ch_second_level); dissector_add_uint("c15", C15_TWC_RSWCH, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_srcedest, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_srcedest, proto_c15ch_second_level); dissector_add_uint("c15", C15_SRCE_DEST, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe, proto_c15ch_second_level); dissector_add_uint("c15", C15_INC_GWE, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_out_gwe, proto_c15ch_second_level); dissector_add_uint("c15", C15_OUT_GWE, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_outgwebc, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_outgwebc, proto_c15ch_second_level); dissector_add_uint("c15", C15_OUT_GWE_BC, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_q931, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_q931, proto_c15ch_second_level); dissector_add_uint("c15", C15_Q931, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_ama, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_ama, proto_c15ch_second_level); dissector_add_uint("c15", C15_AMA, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_qos, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_qos, proto_c15ch_second_level); dissector_add_uint("c15", C15_QOS, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_echo_cancel, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_echo_cancel, proto_c15ch_second_level); dissector_add_uint("c15", C15_ECHO_CANCEL, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_tone, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_tone, proto_c15ch_second_level); dissector_add_uint("c15", C15_TONE, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_encap_isup, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_encap_isup, proto_c15ch_second_level); dissector_add_uint("c15", C15_ENCAP_ISUP, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_tcap, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_tcap, proto_c15ch_second_level); dissector_add_uint("c15", C15_TCAP, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_clli, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_clli, proto_c15ch_second_level); dissector_add_uint("c15", C15_CLLI, c15ch_second_level_handle); - c15ch_second_level_handle = new_create_dissector_handle(dissect_c15ch_c15_info, proto_c15ch_second_level); + c15ch_second_level_handle = create_dissector_handle(dissect_c15ch_c15_info, proto_c15ch_second_level); dissector_add_uint("c15", C15_INFO, c15ch_second_level_handle); /* third level */ /* tone */ - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_tone_cot_control, proto_c15ch_third_level_tone); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_tone_cot_control, proto_c15ch_third_level_tone); dissector_add_uint("c15.tone", C15_TONE_COT, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_tone_cpm, proto_c15ch_third_level_tone); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_tone_cpm, proto_c15ch_third_level_tone); dissector_add_uint("c15.tone", C15_TONE_CPM, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_tone_give_tone, proto_c15ch_third_level_tone); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_tone_give_tone, proto_c15ch_third_level_tone); dissector_add_uint("c15.tone", C15_TONE_GIVE_TONE, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_tone_madn_ring, proto_c15ch_third_level_tone); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_tone_madn_ring, proto_c15ch_third_level_tone); dissector_add_uint("c15.tone", C15_TONE_MADN_RING, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_tone_opls, proto_c15ch_third_level_tone); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_tone_opls, proto_c15ch_third_level_tone); dissector_add_uint("c15.tone", C15_TONE_OPLS, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_tone_rcvr, proto_c15ch_third_level_tone); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_tone_rcvr, proto_c15ch_third_level_tone); dissector_add_uint("c15.tone", C15_TONE_RCVR, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_tone_timeout, proto_c15ch_third_level_tone); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_tone_timeout, proto_c15ch_third_level_tone); dissector_add_uint("c15.tone", C15_TONE_TIMEOUT, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_tone_tone_control, proto_c15ch_third_level_tone); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_tone_tone_control, proto_c15ch_third_level_tone); dissector_add_uint("c15.tone", C15_TONE_TONE_CONTROL, c15ch_third_level_handle); /* inc gwe */ - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_reply, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_reply, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_REPLY, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_bc_pgi, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_bc_pgi, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_BC_PGI, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_mgcp_dlcx, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_mgcp_dlcx, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_MGCP_DLCX, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_h248_digit, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_h248_digit, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_H248_DIGIT, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_voip_cot, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_voip_cot, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_VOIP_COT, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_notify, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_notify, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_NOTIFY, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_admn_updt, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_admn_updt, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_ADMN_UPDT_REC, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_cl_setup, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_cl_setup, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_CL_SETUP, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_ptrk_setup, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_ptrk_setup, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_PTRK_SETUP, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_cl_prog, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_cl_prog, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_CL_PROG, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_cl_ans, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_cl_ans, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_CL_ANS, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_cl_rel, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_cl_rel, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_CL_REL, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_ntwk_mod, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_ntwk_mod, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_NTWK_MOD, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_rv_avail, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_rv_avail, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_RV_AVAIL, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_cl_redir, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_cl_redir, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_CL_REDIR, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_cl_refer, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_cl_refer, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_CL_REFER, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_chg_hndl, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_chg_hndl, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_CHG_HDL, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_subs_chg_hndl, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_subs_chg_hndl, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_SUBS_CHG_HDL, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_info, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_info, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_INFO, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_inv_repl, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_inv_repl, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_INV_REPL, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_admn_dn, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_admn_dn, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_ADMN_DN, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_sua_reply, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_sua_reply, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_SUA_REPLY, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_sua_hndl, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_sua_hndl, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_SUA_HNDL, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_inc_gwe_tgh_stat, proto_c15ch_third_level_inc_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_inc_gwe_tgh_stat, proto_c15ch_third_level_inc_gwe); dissector_add_uint("c15.inc_gwe", C15_INC_GWE_SUA_TGH_STAT, c15ch_third_level_handle); /* out gwe */ - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_digit_scan, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_digit_scan, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_DIGIT_SCAN, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_conn_num, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_conn_num, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_CONN_NUM, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_mk_conn, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_mk_conn, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_MK_CONN, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_md_conn, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_md_conn, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_MD_CONN, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_call_ans, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_call_ans, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_CALL_ANS, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_call_setup, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_call_setup, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_CALL_SETUP, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_call_prog, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_call_prog, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_CALL_PROG, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_call_notify, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_call_notify, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_CALL_NOTIFY, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_call_rel, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_call_rel, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_CALL_REL, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_update_ni_tn, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_update_ni_tn, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_UPDT_NI_TN, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_pcm_data, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_pcm_data, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_PCM_DATA, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_blf_data, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_blf_data, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_BLF_DATA, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_out_cot, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_out_cot, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_COT, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_ring_line, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_ring_line, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_RING_LINE, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_audit_conn, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_audit_conn, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_AUDIT_CONN, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_sac_sub_valid, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_sac_sub_valid, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_SAC_SUB_VALID, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_sac_notify, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_sac_notify, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_SAC_NOTIFY, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_sac_list_entry, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_sac_list_entry, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_SAC_LIST_ENTRY, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_rv_subs_data, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_rv_subs_data, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_RV_SUBS_DATA, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_update_rec_addr, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_update_rec_addr, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_UPDT_REC_ADDR, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_del_subs_ua, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_del_subs_ua, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_DEL_SUBS_UA, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_line_sprvsn, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_line_sprvsn, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_LINE_SPRVSN, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_sip_info, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_sip_info, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_SIP_INFO, c15ch_third_level_handle); - c15ch_third_level_handle = new_create_dissector_handle(dissect_c15ch_out_gwe_sip_refer, proto_c15ch_third_level_out_gwe); + c15ch_third_level_handle = create_dissector_handle(dissect_c15ch_out_gwe_sip_refer, proto_c15ch_third_level_out_gwe); dissector_add_uint("c15.out_gwe", C15_OUT_GWE_SIP_REFER, c15ch_third_level_handle); /* find external dissectors */ diff --git a/epan/dissectors/packet-calcappprotocol.c b/epan/dissectors/packet-calcappprotocol.c index b3db3b86bf..58d20b9e0b 100644 --- a/epan/dissectors/packet-calcappprotocol.c +++ b/epan/dissectors/packet-calcappprotocol.c @@ -159,7 +159,7 @@ proto_reg_handoff_calcappprotocol(void) { dissector_handle_t calcappprotocol_handle; - calcappprotocol_handle = new_create_dissector_handle(dissect_calcappprotocol, proto_calcappprotocol); + calcappprotocol_handle = create_dissector_handle(dissect_calcappprotocol, proto_calcappprotocol); dissector_add_uint("sctp.ppi", CALCAPPPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY, calcappprotocol_handle); dissector_add_uint("sctp.ppi", CALCAPP_PAYLOAD_PROTOCOL_ID, calcappprotocol_handle); } diff --git a/epan/dissectors/packet-canopen.c b/epan/dissectors/packet-canopen.c index 201768f39c..73ff314326 100644 --- a/epan/dissectors/packet-canopen.c +++ b/epan/dissectors/packet-canopen.c @@ -1385,7 +1385,7 @@ proto_reg_handoff_canopen(void) { dissector_handle_t canopen_handle; - canopen_handle = new_create_dissector_handle( dissect_canopen, proto_canopen ); + canopen_handle = create_dissector_handle( dissect_canopen, proto_canopen ); dissector_add_for_decode_as("can.subdissector", canopen_handle ); } diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index d5f45ee532..38fa4b2a41 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -5799,8 +5799,8 @@ proto_reg_handoff_capwap(void) static guint capwap_control_udp_port, capwap_data_udp_port; if (!inited) { - capwap_control_handle = new_create_dissector_handle(dissect_capwap_control, proto_capwap_control); - capwap_data_handle = new_create_dissector_handle(dissect_capwap_data, proto_capwap_data); + capwap_control_handle = create_dissector_handle(dissect_capwap_control, proto_capwap_control); + capwap_data_handle = create_dissector_handle(dissect_capwap_data, proto_capwap_data); dtls_handle = find_dissector("dtls"); ieee8023_handle = find_dissector("eth_withoutfcs"); ieee80211_handle = find_dissector("wlan_withoutfcs"); diff --git a/epan/dissectors/packet-carp.c b/epan/dissectors/packet-carp.c index 3862549189..cbb21725e5 100644 --- a/epan/dissectors/packet-carp.c +++ b/epan/dissectors/packet-carp.c @@ -246,7 +246,7 @@ proto_reg_handoff_carp(void) { dissector_handle_t carp_handle; - carp_handle = new_create_dissector_handle(dissect_carp, proto_carp); + carp_handle = create_dissector_handle(dissect_carp, proto_carp); dissector_add_uint("ip.proto", IP_PROTO_VRRP, carp_handle); heur_dissector_add( "ip", dissect_carp_heur, "CARP over IP", "carp_ip", proto_carp, HEURISTIC_ENABLE); } diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c index c008b41607..04e4032f00 100644 --- a/epan/dissectors/packet-cast.c +++ b/epan/dissectors/packet-cast.c @@ -1711,7 +1711,7 @@ proto_reg_handoff_cast(void) dissector_handle_t cast_handle; data_handle = find_dissector("data"); - cast_handle = new_create_dissector_handle(dissect_cast, proto_cast); + cast_handle = create_dissector_handle(dissect_cast, proto_cast); dissector_add_uint("tcp.port", TCP_PORT_CAST, cast_handle); } diff --git a/epan/dissectors/packet-cattp.c b/epan/dissectors/packet-cattp.c index d8e74fb09f..fa32308338 100644 --- a/epan/dissectors/packet-cattp.c +++ b/epan/dissectors/packet-cattp.c @@ -575,7 +575,7 @@ proto_reg_handoff_cattp(void) dissector_handle_t cattp_handle; /* Create dissector handle */ - cattp_handle = new_create_dissector_handle(dissect_cattp, proto_cattp); + cattp_handle = create_dissector_handle(dissect_cattp, proto_cattp); /* find data handle */ data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-cbor.c b/epan/dissectors/packet-cbor.c index a8d95ecbec..e62ae57774 100644 --- a/epan/dissectors/packet-cbor.c +++ b/epan/dissectors/packet-cbor.c @@ -861,7 +861,7 @@ proto_reg_handoff_cbor(void) { static dissector_handle_t cbor_handle; - cbor_handle = new_create_dissector_handle(dissect_cbor, proto_cbor); + cbor_handle = create_dissector_handle(dissect_cbor, proto_cbor); dissector_add_string("media_type", "application/cbor", cbor_handle); /* RFC 7049 */ } diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 6c8a870879..9925cfa4aa 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -1475,7 +1475,7 @@ proto_reg_handoff_cdp(void) dissector_handle_t cdp_handle; data_handle = find_dissector("data"); - cdp_handle = new_create_dissector_handle(dissect_cdp, proto_cdp); + cdp_handle = create_dissector_handle(dissect_cdp, proto_cdp); dissector_add_uint("llc.cisco_pid", 0x2000, cdp_handle); dissector_add_uint("chdlc.protocol", 0x2000, cdp_handle); dissector_add_uint("ppp.protocol", 0x0207, cdp_handle); diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index 8b74ba6802..a50c8226a8 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -10508,7 +10508,7 @@ proto_register_ceph(void) void proto_reg_handoff_ceph(void) { - ceph_handle = new_create_dissector_handle(dissect_ceph_old, proto_ceph); + ceph_handle = create_dissector_handle(dissect_ceph_old, proto_ceph); heur_dissector_add("tcp", dissect_ceph_heur, "Ceph over TCP", "ceph_tcp", proto_ceph, HEURISTIC_ENABLE); } diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c index f9180d31b4..b2c4eb0ea2 100644 --- a/epan/dissectors/packet-cfdp.c +++ b/epan/dissectors/packet-cfdp.c @@ -1633,7 +1633,7 @@ proto_reg_handoff_cfdp(void) { static dissector_handle_t cfdp_handle; - cfdp_handle = new_create_dissector_handle(dissect_cfdp, proto_cfdp); + cfdp_handle = create_dissector_handle(dissect_cfdp, proto_cfdp); dissector_add_uint("ccsds.apid", CFDP_APID, cfdp_handle); dissector_add_for_decode_as ( "udp.port", cfdp_handle ); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c index 48997b2e56..bc2238b2de 100644 --- a/epan/dissectors/packet-cgmp.c +++ b/epan/dissectors/packet-cgmp.c @@ -139,7 +139,7 @@ proto_reg_handoff_cgmp(void) { dissector_handle_t cgmp_handle; - cgmp_handle = new_create_dissector_handle(dissect_cgmp, proto_cgmp); + cgmp_handle = create_dissector_handle(dissect_cgmp, proto_cgmp); dissector_add_uint("llc.cisco_pid", 0x2001, cgmp_handle); dissector_add_uint("ethertype", 0x2001, cgmp_handle); } diff --git a/epan/dissectors/packet-chargen.c b/epan/dissectors/packet-chargen.c index d560139871..2fc0ec3ecb 100644 --- a/epan/dissectors/packet-chargen.c +++ b/epan/dissectors/packet-chargen.c @@ -92,7 +92,7 @@ proto_reg_handoff_chargen(void) { dissector_handle_t chargen_handle; - chargen_handle = new_create_dissector_handle(dissect_chargen, proto_chargen); + chargen_handle = create_dissector_handle(dissect_chargen, proto_chargen); dissector_add_uint("udp.port", CHARGEN_PORT_UDP, chargen_handle); dissector_add_uint("tcp.port", CHARGEN_PORT_TCP, chargen_handle); } diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index d193df25a4..964cb1140d 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -392,7 +392,7 @@ proto_reg_handoff_slarp(void) { dissector_handle_t slarp_handle; - slarp_handle = new_create_dissector_handle(dissect_slarp, proto_slarp); + slarp_handle = create_dissector_handle(dissect_slarp, proto_slarp); dissector_add_uint("chdlc.protocol", CISCO_SLARP, slarp_handle); } diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index a83475ca44..1e5b198de5 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -12050,7 +12050,7 @@ proto_reg_handoff_cigi(void) if( !inited ) { - cigi_handle = new_create_dissector_handle(dissect_cigi, proto_cigi); + cigi_handle = create_dissector_handle(dissect_cigi, proto_cigi); dissector_add_for_decode_as("udp.port", cigi_handle); dissector_add_for_decode_as("tcp.port", cigi_handle); heur_dissector_add("udp", dissect_cigi_heur, "CIGI over UDP", "cigi_udp", proto_cigi, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 75f19da668..136e72808a 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -1167,7 +1167,7 @@ proto_reg_handoff_cimd(void) /** * Also register as one that can be selected by a TCP port number. */ - cimd_handle = new_create_dissector_handle(dissect_cimd, proto_cimd); + cimd_handle = create_dissector_handle(dissect_cimd, proto_cimd); dissector_add_for_decode_as("tcp.port", cimd_handle); } diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 1bc41ce658..ffdd6b8198 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -7010,25 +7010,25 @@ proto_reg_handoff_cip(void) /* Create dissector handles */ /* Register for UCMM CIP data, using EtherNet/IP SendRRData service*/ /* Register for Connected CIP data, using EtherNet/IP SendUnitData service*/ - cip_handle = new_create_dissector_handle( dissect_cip, proto_cip ); + cip_handle = create_dissector_handle( dissect_cip, proto_cip ); dissector_add_uint( "enip.srrd.iface", ENIP_CIP_INTERFACE, cip_handle ); dissector_add_uint( "enip.sud.iface", ENIP_CIP_INTERFACE, cip_handle ); /* Create and register dissector handle for generic class */ - cip_class_generic_handle = new_create_dissector_handle( dissect_cip_class_generic, proto_cip_class_generic ); + cip_class_generic_handle = create_dissector_handle( dissect_cip_class_generic, proto_cip_class_generic ); dissector_add_uint( "cip.class.iface", 0, cip_class_generic_handle ); /* Create and register dissector handle for Connection Manager */ - cip_class_cm_handle = new_create_dissector_handle( dissect_cip_class_cm, proto_cip_class_cm ); + cip_class_cm_handle = create_dissector_handle( dissect_cip_class_cm, proto_cip_class_cm ); dissector_add_uint( "cip.class.iface", CI_CLS_CM, cip_class_cm_handle ); /* Create and register dissector handle for Modbus Object */ - cip_class_mb_handle = new_create_dissector_handle( dissect_cip_class_mb, proto_cip_class_mb ); + cip_class_mb_handle = create_dissector_handle( dissect_cip_class_mb, proto_cip_class_mb ); dissector_add_uint( "cip.class.iface", CI_CLS_MB, cip_class_mb_handle ); modbus_handle = find_dissector("modbus"); /* Create and register dissector handle for Connection Configuration Object */ - cip_class_cco_handle = new_create_dissector_handle( dissect_cip_class_cco, proto_cip_class_cco ); + cip_class_cco_handle = create_dissector_handle( dissect_cip_class_cco, proto_cip_class_cco ); dissector_add_uint( "cip.class.iface", CI_CLS_CCO, cip_class_cco_handle ); heur_dissector_add("cip.sc", dissect_class_cco_heur, "CIP Connection Configuration Object", "cco_cip", proto_cip_class_cco, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c index 311a44be60..5447cb8d3d 100644 --- a/epan/dissectors/packet-cipmotion.c +++ b/epan/dissectors/packet-cipmotion.c @@ -2929,7 +2929,7 @@ void proto_reg_handoff_cipmotion(void) dissector_handle_t cipmotion_handle; /* Create and register dissector for I/O data handling */ - cipmotion_handle = new_create_dissector_handle( dissect_cipmotion, proto_cipmotion ); + cipmotion_handle = create_dissector_handle( dissect_cipmotion, proto_cipmotion ); dissector_add_for_decode_as("enip.io", cipmotion_handle ); } diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c index ab52066f83..1a404108a3 100644 --- a/epan/dissectors/packet-cipsafety.c +++ b/epan/dissectors/packet-cipsafety.c @@ -2614,16 +2614,16 @@ proto_reg_handoff_cipsafety(void) dissector_handle_t cip_class_s_supervisor_handle, cipsafety_handle; /* Create and register dissector handle for Safety Supervisor */ - cip_class_s_supervisor_handle = new_create_dissector_handle( dissect_cip_class_s_supervisor, proto_cip_class_s_supervisor ); + cip_class_s_supervisor_handle = create_dissector_handle( dissect_cip_class_s_supervisor, proto_cip_class_s_supervisor ); dissector_add_uint( "cip.class.iface", CI_CLS_SAFETY_SUPERVISOR, cip_class_s_supervisor_handle ); /* Create and register dissector handle for Safety Validator */ - cip_class_s_validator_handle = new_create_dissector_handle( dissect_cip_class_s_validator, proto_cip_class_s_validator ); + cip_class_s_validator_handle = create_dissector_handle( dissect_cip_class_s_validator, proto_cip_class_s_validator ); dissector_add_uint( "cip.class.iface", CI_CLS_SAFETY_VALIDATOR, cip_class_s_validator_handle ); heur_dissector_add("cip.sc", dissect_class_svalidator_heur, "CIP Safety Validator", "s_validator_cip", proto_cip_class_s_validator, HEURISTIC_ENABLE); /* Create and register dissector for I/O data handling */ - cipsafety_handle = new_create_dissector_handle( dissect_cipsafety, proto_cipsafety ); + cipsafety_handle = create_dissector_handle( dissect_cipsafety, proto_cipsafety ); dissector_add_for_decode_as("enip.io", cipsafety_handle ); proto_cip = proto_get_id_by_filter_name( "cip" ); diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c index 73d4c46c4e..8aa874e47d 100644 --- a/epan/dissectors/packet-cisco-erspan.c +++ b/epan/dissectors/packet-cisco-erspan.c @@ -333,7 +333,7 @@ proto_reg_handoff_erspan(void) ethnofcs_handle = find_dissector("eth_withoutfcs"); - erspan_handle = new_create_dissector_handle(dissect_erspan, proto_erspan); + erspan_handle = create_dissector_handle(dissect_erspan, proto_erspan); dissector_add_uint("gre.proto", GRE_ERSPAN_88BE, erspan_handle); dissector_add_uint("gre.proto", GRE_ERSPAN_22EB, erspan_handle); diff --git a/epan/dissectors/packet-cisco-fp-mim.c b/epan/dissectors/packet-cisco-fp-mim.c index 7bc01d1516..8eabe32f84 100644 --- a/epan/dissectors/packet-cisco-fp-mim.c +++ b/epan/dissectors/packet-cisco-fp-mim.c @@ -367,7 +367,7 @@ proto_reg_handoff_fabricpath(void) { /* dissector_handle_t fp_handle; - fp_handle = new_create_dissector_handle(dissect_fp, proto_fp); + fp_handle = create_dissector_handle(dissect_fp, proto_fp); dissector_add_uint("ethertype", ETHERTYPE_DCE, fp_handle); */ static gboolean prefs_initialized = FALSE; diff --git a/epan/dissectors/packet-cisco-marker.c b/epan/dissectors/packet-cisco-marker.c index cbeac239d6..1482dcc93d 100644 --- a/epan/dissectors/packet-cisco-marker.c +++ b/epan/dissectors/packet-cisco-marker.c @@ -203,7 +203,7 @@ proto_register_erpsan_marker(void) proto_register_fields(proto_marker, hfi, array_length(hfi)); proto_register_subtree_array(ett, array_length(ett)); - marker_handle = new_create_dissector_handle(dissect_marker, proto_marker); + marker_handle = create_dissector_handle(dissect_marker, proto_marker); } void diff --git a/epan/dissectors/packet-cisco-metadata.c b/epan/dissectors/packet-cisco-metadata.c index cec3b7a397..a034d952ac 100644 --- a/epan/dissectors/packet-cisco-metadata.c +++ b/epan/dissectors/packet-cisco-metadata.c @@ -143,7 +143,7 @@ proto_reg_handoff_cmd(void) ethertype_handle = find_dissector("ethertype"); - cmd_handle = new_create_dissector_handle(dissect_cmd, proto_cmd); + cmd_handle = create_dissector_handle(dissect_cmd, proto_cmd); dissector_add_uint("ethertype", ETHERTYPE_CMD, cmd_handle); } diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c index 29b1178390..c6e86c9953 100644 --- a/epan/dissectors/packet-cisco-wids.c +++ b/epan/dissectors/packet-cisco-wids.c @@ -196,7 +196,7 @@ proto_reg_handoff_cwids(void) static gboolean initialized = FALSE; if (!initialized) { - cwids_handle = new_create_dissector_handle(dissect_cwids, proto_cwids); + cwids_handle = create_dissector_handle(dissect_cwids, proto_cwids); dissector_add_for_decode_as("udp.port", cwids_handle); ieee80211_radio_handle = find_dissector("wlan_radio"); initialized = TRUE; diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c index e29a86148d..465a6b02b4 100644 --- a/epan/dissectors/packet-clip.c +++ b/epan/dissectors/packet-clip.c @@ -121,7 +121,7 @@ proto_reg_handoff_clip(void) */ ip_handle = find_dissector("ip"); - clip_handle = new_create_dissector_handle(dissect_clip, proto_clip); + clip_handle = create_dissector_handle(dissect_clip, proto_clip); /* XXX - no protocol, can't be disabled */ dissector_add_uint("wtap_encap", WTAP_ENCAP_LINUX_ATM_CLIP, clip_handle); } diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index db73c4c984..a7fab232a5 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -772,7 +772,7 @@ proto_reg_handoff_clnp(void) idrp_handle = find_dissector("idrp"); data_handle = find_dissector("data"); - clnp_handle = new_create_dissector_handle(dissect_clnp, proto_clnp); + clnp_handle = create_dissector_handle(dissect_clnp, proto_clnp); dissector_add_uint("osinl.incl", NLPID_ISO8473_CLNP, clnp_handle); dissector_add_uint("osinl.incl", NLPID_NULL, clnp_handle); /* Inactive subset */ dissector_add_uint("x.25.spi", NLPID_ISO8473_CLNP, clnp_handle); diff --git a/epan/dissectors/packet-cmpp.c b/epan/dissectors/packet-cmpp.c index a0ee240230..4d6687727a 100644 --- a/epan/dissectors/packet-cmpp.c +++ b/epan/dissectors/packet-cmpp.c @@ -977,7 +977,7 @@ proto_reg_handoff_cmpp(void) { dissector_handle_t cmpp_handle; - cmpp_handle = new_create_dissector_handle(dissect_cmpp, proto_cmpp); + cmpp_handle = create_dissector_handle(dissect_cmpp, proto_cmpp); dissector_add_uint("tcp.port", CMPP_SP_LONG_PORT, cmpp_handle); dissector_add_uint("tcp.port", CMPP_SP_SHORT_PORT, cmpp_handle); dissector_add_uint("tcp.port", CMPP_ISMG_LONG_PORT, cmpp_handle); diff --git a/epan/dissectors/packet-cnip.c b/epan/dissectors/packet-cnip.c index 660855d998..26b3a0f00c 100644 --- a/epan/dissectors/packet-cnip.c +++ b/epan/dissectors/packet-cnip.c @@ -242,7 +242,7 @@ void proto_reg_handoff_cnip(void) { dissector_handle_t cnip_handle; - cnip_handle = new_create_dissector_handle(dissect_cnip, proto_cnip); + cnip_handle = create_dissector_handle(dissect_cnip, proto_cnip); data_handle = find_dissector("data"); dissector_add_uint ("udp.port", 1628, cnip_handle); diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index f04d65aa5e..8be7a6d921 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -1506,7 +1506,7 @@ void proto_reg_handoff_collectd (void) static dissector_handle_t collectd_handle; if (first_run) - collectd_handle = new_create_dissector_handle (dissect_collectd, + collectd_handle = create_dissector_handle (dissect_collectd, proto_collectd); /* Change the dissector registration if the preferences have been diff --git a/epan/dissectors/packet-componentstatus.c b/epan/dissectors/packet-componentstatus.c index 4e9ab5750a..0a964b5204 100644 --- a/epan/dissectors/packet-componentstatus.c +++ b/epan/dissectors/packet-componentstatus.c @@ -291,7 +291,7 @@ proto_reg_handoff_componentstatusprotocol(void) { dissector_handle_t componentstatusprotocol_handle; - componentstatusprotocol_handle = new_create_dissector_handle(dissect_componentstatusprotocol, proto_componentstatusprotocol); + componentstatusprotocol_handle = create_dissector_handle(dissect_componentstatusprotocol, proto_componentstatusprotocol); dissector_add_uint("udp.port", COMPONENTSTATUSPROTOCOL_PORT, componentstatusprotocol_handle); } diff --git a/epan/dissectors/packet-corosync-totemnet.c b/epan/dissectors/packet-corosync-totemnet.c index d867b72851..68fcdd5aff 100644 --- a/epan/dissectors/packet-corosync-totemnet.c +++ b/epan/dissectors/packet-corosync-totemnet.c @@ -482,7 +482,7 @@ proto_reg_handoff_corosync_totemnet(void) } else { - corosync_totemnet_handle = new_create_dissector_handle(dissect_corosynec_totemnet, + corosync_totemnet_handle = create_dissector_handle(dissect_corosynec_totemnet, proto_corosync_totemnet); corosync_totemsrp_handle = find_dissector("corosync_totemsrp"); diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c index 6e38a25b34..9359cc56a1 100644 --- a/epan/dissectors/packet-cosine.c +++ b/epan/dissectors/packet-cosine.c @@ -187,7 +187,7 @@ proto_reg_handoff_cosine(void) fr_handle = find_dissector("fr"); data_handle = find_dissector("data"); - cosine_handle = new_create_dissector_handle(dissect_cosine, proto_cosine); + cosine_handle = create_dissector_handle(dissect_cosine, proto_cosine); dissector_add_uint("wtap_encap", WTAP_ENCAP_COSINE, cosine_handle); } diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c index 4b6b4d335e..2888680614 100644 --- a/epan/dissectors/packet-couchbase.c +++ b/epan/dissectors/packet-couchbase.c @@ -1788,7 +1788,7 @@ proto_reg_handoff_couchbase(void) static gboolean initialized = FALSE; if (initialized == FALSE) { - couchbase_tcp_handle = new_create_dissector_handle(dissect_couchbase_tcp, proto_couchbase); + couchbase_tcp_handle = create_dissector_handle(dissect_couchbase_tcp, proto_couchbase); initialized = TRUE; } else { diff --git a/epan/dissectors/packet-cp2179.c b/epan/dissectors/packet-cp2179.c index ad9e150389..7f898b3371 100644 --- a/epan/dissectors/packet-cp2179.c +++ b/epan/dissectors/packet-cp2179.c @@ -1386,7 +1386,7 @@ proto_reg_handoff_cp2179(void) static unsigned int cp2179_port; if (!cp2179_prefs_initialized){ - cp2179_handle = new_create_dissector_handle(dissect_cp2179, proto_cp2179); + cp2179_handle = create_dissector_handle(dissect_cp2179, proto_cp2179); cp2179_prefs_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c index 2598f8da89..ce9d1aeeb7 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.c @@ -536,7 +536,7 @@ proto_reg_handoff_cpfi(void) if ( !cpfi_init_complete ) { fc_handle = find_dissector("fc"); - cpfi_handle = new_create_dissector_handle(dissect_cpfi, proto_cpfi); + cpfi_handle = create_dissector_handle(dissect_cpfi, proto_cpfi); cpfi_init_complete = TRUE; } else diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c index 42de450799..2e07d77089 100644 --- a/epan/dissectors/packet-cpha.c +++ b/epan/dissectors/packet-cpha.c @@ -533,7 +533,7 @@ proto_reg_handoff_cpha(void) { dissector_handle_t cpha_handle; - cpha_handle = new_create_dissector_handle(dissect_cpha, proto_cphap); + cpha_handle = create_dissector_handle(dissect_cpha, proto_cphap); dissector_add_uint("udp.port", UDP_PORT_CPHA, cpha_handle); } /* diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c index 066ab79586..c2f2c5a1ee 100644 --- a/epan/dissectors/packet-csm-encaps.c +++ b/epan/dissectors/packet-csm-encaps.c @@ -639,7 +639,7 @@ proto_reg_handoff_csm_encaps(void) { dissector_handle_t csm_encaps_handle; - csm_encaps_handle = new_create_dissector_handle(dissect_csm_encaps, proto_csm_encaps); + csm_encaps_handle = create_dissector_handle(dissect_csm_encaps, proto_csm_encaps); dissector_add_uint("ethertype", ETHERTYPE_CSM_ENCAPS, csm_encaps_handle); } diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index bb21ea50c2..6820db4e57 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -1240,7 +1240,7 @@ proto_reg_handoff_ctdb(void) { dissector_handle_t ctdb_handle; - ctdb_handle = new_create_dissector_handle(dissect_ctdb, proto_ctdb); + ctdb_handle = create_dissector_handle(dissect_ctdb, proto_ctdb); dissector_add_for_decode_as("tcp.port", ctdb_handle); heur_dissector_add("tcp", dissect_ctdb, "Cluster TDB over TCP", "ctdb_tcp", proto_ctdb, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c index e0f86b291d..1367d35f67 100644 --- a/epan/dissectors/packet-cups.c +++ b/epan/dissectors/packet-cups.c @@ -404,7 +404,7 @@ proto_reg_handoff_cups(void) { dissector_handle_t cups_handle; - cups_handle = new_create_dissector_handle(dissect_cups, proto_cups); + cups_handle = create_dissector_handle(dissect_cups, proto_cups); dissector_add_uint("udp.port", UDP_PORT_CUPS, cups_handle); } diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c index 7ceebc71f0..e617feb14c 100644 --- a/epan/dissectors/packet-daap.c +++ b/epan/dissectors/packet-daap.c @@ -774,7 +774,7 @@ proto_reg_handoff_daap(void) { dissector_handle_t daap_handle; - daap_handle = new_create_dissector_handle(dissect_daap, proto_daap); + daap_handle = create_dissector_handle(dissect_daap, proto_daap); http_port_add(TCP_PORT_DAAP); dissector_add_string("media_type", "application/x-dmap-tagged", daap_handle); diff --git a/epan/dissectors/packet-daytime.c b/epan/dissectors/packet-daytime.c index 9ba71bfbba..ac77d244ac 100644 --- a/epan/dissectors/packet-daytime.c +++ b/epan/dissectors/packet-daytime.c @@ -99,7 +99,7 @@ proto_register_daytime(void) proto_register_fields(proto_daytime, hfi, array_length(hfi)); proto_register_subtree_array(ett, array_length(ett)); - daytime_handle = new_create_dissector_handle(dissect_daytime, proto_daytime); + daytime_handle = create_dissector_handle(dissect_daytime, proto_daytime); } void diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c index efc665e9c0..36bf9e4ed0 100644 --- a/epan/dissectors/packet-dbus.c +++ b/epan/dissectors/packet-dbus.c @@ -708,8 +708,8 @@ proto_register_dbus(void) expert_dbus = expert_register_protocol(proto_dbus); expert_register_field_array(expert_dbus, ei, array_length(ei)); - dbus_handle = new_create_dissector_handle(dissect_dbus, proto_dbus); - dbus_handle_tcp = new_create_dissector_handle(dissect_dbus_tcp, proto_dbus); + dbus_handle = create_dissector_handle(dissect_dbus, proto_dbus); + dbus_handle_tcp = create_dissector_handle(dissect_dbus_tcp, proto_dbus); } void diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index c71e5cd81e..8721c6a278 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -1328,7 +1328,7 @@ proto_reg_handoff_dccp(void) { dissector_handle_t dccp_handle; - dccp_handle = new_create_dissector_handle(dissect_dccp, proto_dccp); + dccp_handle = create_dissector_handle(dissect_dccp, proto_dccp); dissector_add_uint("ip.proto", IP_PROTO_DCCP, dccp_handle); data_handle = find_dissector("data"); dccp_tap = register_tap("dccp"); diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index a3120c9ea9..4d77f6071a 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -1657,7 +1657,7 @@ dcerpc_init_uuid(int proto, int ett, e_guid_t *uuid, guint16 ver, hf_info->strings = value_string_from_subdissectors(procs); /* Register the GUID with the dissector table */ - guid_handle = new_create_dissector_handle( dissect_dcerpc_guid, proto); + guid_handle = create_dissector_handle( dissect_dcerpc_guid, proto); dissector_add_guid( "dcerpc.uuid", key, guid_handle ); /* add this GUID to the global name resolving */ diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index decb196061..5a15a9d529 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -7336,7 +7336,7 @@ void proto_reg_handoff_dcm(void) { - dcm_handle = new_create_dissector_handle(dissect_dcm_static, proto_dcm); + dcm_handle = create_dissector_handle(dissect_dcm_static, proto_dcm); dcm_apply_settings(); /* Register static ports */ diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index fcb44943ed..0eca1ebeef 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -650,9 +650,9 @@ proto_reg_handoff_dcp_etsi (void) dissector_handle_t pft_handle; dissector_handle_t tpl_handle; - af_handle = new_create_dissector_handle(dissect_af, proto_af); - pft_handle = new_create_dissector_handle(dissect_pft, proto_pft); - tpl_handle = new_create_dissector_handle(dissect_tpl, proto_tpl); + af_handle = create_dissector_handle(dissect_af, proto_af); + pft_handle = create_dissector_handle(dissect_pft, proto_pft); + tpl_handle = create_dissector_handle(dissect_tpl, proto_tpl); heur_dissector_add("udp", dissect_dcp_etsi, "DCP (ETSI) over UDP", "dcp_etsi_udp", proto_dcp_etsi, HEURISTIC_ENABLE); dissector_add_string("dcp-etsi.sync", "AF", af_handle); dissector_add_string("dcp-etsi.sync", "PF", pft_handle); diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c index 5a6f455078..f303ea9d6e 100644 --- a/epan/dissectors/packet-ddtp.c +++ b/epan/dissectors/packet-ddtp.c @@ -223,7 +223,7 @@ proto_reg_handoff_ddtp(void) { dissector_handle_t ddtp_handle; - ddtp_handle = new_create_dissector_handle(dissect_ddtp, proto_ddtp); + ddtp_handle = create_dissector_handle(dissect_ddtp, proto_ddtp); dissector_add_uint("udp.port", UDP_PORT_DDTP, ddtp_handle); } diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c index 06772d5d5f..8c12829f32 100644 --- a/epan/dissectors/packet-dec-bpdu.c +++ b/epan/dissectors/packet-dec-bpdu.c @@ -246,7 +246,7 @@ proto_reg_handoff_dec_bpdu(void) { dissector_handle_t dec_bpdu_handle; - dec_bpdu_handle = new_create_dissector_handle(dissect_dec_bpdu, + dec_bpdu_handle = create_dissector_handle(dissect_dec_bpdu, proto_dec_bpdu); dissector_add_uint("ethertype", ETHERTYPE_DEC_LB, dec_bpdu_handle); dissector_add_uint("chdlc.protocol", ETHERTYPE_DEC_LB, dec_bpdu_handle); diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 2dfa3e26f1..38800f973e 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -1480,7 +1480,7 @@ proto_reg_handoff_dec_rt(void) { dissector_handle_t dec_rt_handle; - dec_rt_handle = new_create_dissector_handle(dissect_dec_rt, + dec_rt_handle = create_dissector_handle(dissect_dec_rt, proto_dec_rt); dissector_add_uint("ethertype", ETHERTYPE_DNA_RT, dec_rt_handle); dissector_add_uint("chdlc.protocol", ETHERTYPE_DNA_RT, dec_rt_handle); diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index a35d22f6e7..8ee590602d 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -2590,7 +2590,7 @@ proto_reg_handoff_dect(void) { dissector_handle_t dect_handle; - dect_handle = new_create_dissector_handle(dissect_dect, proto_dect); + dect_handle = create_dissector_handle(dissect_dect, proto_dect); dissector_add_uint("ethertype", ETHERTYPE_DECT , dect_handle); } diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c index 41651504a0..15087046cb 100644 --- a/epan/dissectors/packet-devicenet.c +++ b/epan/dissectors/packet-devicenet.c @@ -1064,7 +1064,7 @@ proto_reg_handoff_devicenet(void) { dissector_handle_t devicenet_handle; - devicenet_handle = new_create_dissector_handle( dissect_devicenet, proto_devicenet ); + devicenet_handle = create_dissector_handle( dissect_devicenet, proto_devicenet ); dissector_add_for_decode_as("can.subdissector", devicenet_handle ); } diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 003c7a0e92..f80a46a462 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -1159,7 +1159,7 @@ proto_reg_handoff_dhcpfo(void) static guint saved_tcp_port; if (!initialized) { - dhcpfo_handle = new_create_dissector_handle(dissect_dhcpfo, proto_dhcpfo); + dhcpfo_handle = create_dissector_handle(dissect_dhcpfo, proto_dhcpfo); initialized = TRUE; } else { dissector_delete_uint("tcp.port", saved_tcp_port, dhcpfo_handle); diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 5a5a688d18..d894386177 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -2418,11 +2418,11 @@ proto_reg_handoff_dhcpv6(void) { dissector_handle_t dhcpv6_handle, dhcpv6_bulkquery_handle; - dhcpv6_handle = new_create_dissector_handle(dissect_dhcpv6_stream, proto_dhcpv6); + dhcpv6_handle = create_dissector_handle(dissect_dhcpv6_stream, proto_dhcpv6); dissector_add_uint("udp.port", UDP_PORT_DHCPV6_DOWNSTREAM, dhcpv6_handle); dissector_add_uint("udp.port", UDP_PORT_DHCPV6_UPSTREAM, dhcpv6_handle); - dhcpv6_bulkquery_handle = new_create_dissector_handle(dissect_dhcpv6_bulk_leasequery, + dhcpv6_bulkquery_handle = create_dissector_handle(dissect_dhcpv6_bulk_leasequery, proto_dhcpv6_bulk_leasequery); dissector_add_uint("tcp.port", UDP_PORT_DHCPV6_UPSTREAM, dhcpv6_bulkquery_handle); } diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index f4ffcb5095..9ee630e2d5 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -2355,9 +2355,9 @@ proto_reg_handoff_diameter(void) if (!Initialized) { diameter_sctp_handle = find_dissector("diameter"); - diameter_tcp_handle = new_create_dissector_handle(dissect_diameter_tcp, + diameter_tcp_handle = create_dissector_handle(dissect_diameter_tcp, proto_diameter); - diameter_udp_handle = new_create_dissector_handle(dissect_diameter, proto_diameter); + diameter_udp_handle = create_dissector_handle(dissect_diameter, proto_diameter); data_handle = find_dissector("data"); eap_handle = find_dissector("eap"); @@ -2366,33 +2366,33 @@ proto_reg_handoff_diameter(void) /* Register special decoding for some AVPs */ /* AVP Code: 1 User-Name */ - dissector_add_uint("diameter.base", 1, new_create_dissector_handle(dissect_diameter_user_name, proto_diameter)); + dissector_add_uint("diameter.base", 1, create_dissector_handle(dissect_diameter_user_name, proto_diameter)); /* AVP Code: 97 Framed-IPv6-Address */ - dissector_add_uint("diameter.base", 97, new_create_dissector_handle(dissect_diameter_base_framed_ipv6_prefix, proto_diameter)); + dissector_add_uint("diameter.base", 97, create_dissector_handle(dissect_diameter_base_framed_ipv6_prefix, proto_diameter)); /* AVP Code: 265 Suported-Vendor-Id */ - dissector_add_uint("diameter.base", 265, new_create_dissector_handle(dissect_diameter_vendor_id, proto_diameter)); + dissector_add_uint("diameter.base", 265, create_dissector_handle(dissect_diameter_vendor_id, proto_diameter)); /* AVP Code: 266 Vendor-Id */ - dissector_add_uint("diameter.base", 266, new_create_dissector_handle(dissect_diameter_vendor_id, proto_diameter)); + dissector_add_uint("diameter.base", 266, create_dissector_handle(dissect_diameter_vendor_id, proto_diameter)); /* AVP Code: 443 Subscription-Id */ - dissector_add_uint("diameter.base", 443, new_create_dissector_handle(dissect_diameter_subscription_id, proto_diameter)); + dissector_add_uint("diameter.base", 443, create_dissector_handle(dissect_diameter_subscription_id, proto_diameter)); /* AVP Code: 450 Subscription-Id-Type */ - dissector_add_uint("diameter.base", 450, new_create_dissector_handle(dissect_diameter_subscription_id_type, proto_diameter)); + dissector_add_uint("diameter.base", 450, create_dissector_handle(dissect_diameter_subscription_id_type, proto_diameter)); /* AVP Code: 444 Subscription-Id-Data */ - dissector_add_uint("diameter.base", 444, new_create_dissector_handle(dissect_diameter_subscription_id_data, proto_diameter)); + dissector_add_uint("diameter.base", 444, create_dissector_handle(dissect_diameter_subscription_id_data, proto_diameter)); /* AVP Code: 462 EAP-Payload */ - dissector_add_uint("diameter.base", 462, new_create_dissector_handle(dissect_diameter_eap_payload, proto_diameter)); + dissector_add_uint("diameter.base", 462, create_dissector_handle(dissect_diameter_eap_payload, proto_diameter)); /* AVP Code: 463 EAP-Reissued-Payload */ - dissector_add_uint("diameter.base", 463, new_create_dissector_handle(dissect_diameter_eap_payload, proto_diameter)); + dissector_add_uint("diameter.base", 463, create_dissector_handle(dissect_diameter_eap_payload, proto_diameter)); /* Register dissector for Experimental result code, with 3GPP2's vendor Id */ - dissector_add_uint("diameter.vnd_exp_res", VENDOR_THE3GPP2, new_create_dissector_handle(dissect_diameter_3gpp2_exp_res, proto_diameter)); + dissector_add_uint("diameter.vnd_exp_res", VENDOR_THE3GPP2, create_dissector_handle(dissect_diameter_3gpp2_exp_res, proto_diameter)); Initialized=TRUE; } else { diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index c0f5be5c2d..4f206d0a71 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -1452,136 +1452,136 @@ proto_reg_handoff_diameter_3gpp(void) /* Registered by packet-gtp.c */ /* AVP Code: 15 3GPP-SGSN-IPv6-Address */ - dissector_add_uint("diameter.3gpp", 15, new_create_dissector_handle(dissect_diameter_3gpp_sgsn_ipv6_address, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 15, create_dissector_handle(dissect_diameter_3gpp_sgsn_ipv6_address, proto_diameter_3gpp)); /* AVP Code: 20 3GPP-IMEISV */ - dissector_add_uint("diameter.3gpp", 20, new_create_dissector_handle(dissect_diameter_3gpp_imeisv, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 20, create_dissector_handle(dissect_diameter_3gpp_imeisv, proto_diameter_3gpp)); /* AVP Code: 22 3GPP-User-Location-Info * Registered by packet-gtpv2.c */ /* AVP Code: 23 3GPP-MS-TimeZone */ - dissector_add_uint("diameter.3gpp", 23, new_create_dissector_handle(dissect_diameter_3gpp_ms_timezone, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 23, create_dissector_handle(dissect_diameter_3gpp_ms_timezone, proto_diameter_3gpp)); /* AVP Code: 504 AF-Application-Identifier */ - dissector_add_uint("diameter.3gpp", 504, new_create_dissector_handle(dissect_diameter_3gpp_af_application_identifier, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 504, create_dissector_handle(dissect_diameter_3gpp_af_application_identifier, proto_diameter_3gpp)); /* AVP Code: 505 AF-Charging-Identifier */ - dissector_add_uint("diameter.3gpp", 505, new_create_dissector_handle(dissect_diameter_3gpp_af_charging_identifier, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 505, create_dissector_handle(dissect_diameter_3gpp_af_charging_identifier, proto_diameter_3gpp)); /* AVP Code: 600 Visited-Network-Identifier */ - dissector_add_uint("diameter.3gpp", 600, new_create_dissector_handle(dissect_diameter_3gpp_visited_nw_id, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 600, create_dissector_handle(dissect_diameter_3gpp_visited_nw_id, proto_diameter_3gpp)); /* AVP Code: 601 Public-Identity */ - dissector_add_uint("diameter.3gpp", 601, new_create_dissector_handle(dissect_diameter_3gpp_public_identity, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 601, create_dissector_handle(dissect_diameter_3gpp_public_identity, proto_diameter_3gpp)); /* AVP Code: 606 User-Data */ - dissector_add_uint("diameter.3gpp", 606, new_create_dissector_handle(dissect_diameter_3gpp_user_data, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 606, create_dissector_handle(dissect_diameter_3gpp_user_data, proto_diameter_3gpp)); /* AVP Code: 629 Feature-List */ - dissector_add_uint("diameter.3gpp", 629, new_create_dissector_handle(dissect_diameter_3gpp_feature_list_id, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 629, create_dissector_handle(dissect_diameter_3gpp_feature_list_id, proto_diameter_3gpp)); /* AVP Code: 630 Feature-List */ - dissector_add_uint("diameter.3gpp", 630, new_create_dissector_handle(dissect_diameter_3gpp_feature_list, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 630, create_dissector_handle(dissect_diameter_3gpp_feature_list, proto_diameter_3gpp)); /* AVP Code: 637 UAR-Flags */ - dissector_add_uint("diameter.3gpp", 637, new_create_dissector_handle(dissect_diameter_3gpp_uar_flags, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 637, create_dissector_handle(dissect_diameter_3gpp_uar_flags, proto_diameter_3gpp)); /* AVP Code: 640 Path */ - dissector_add_uint("diameter.3gpp", 640, new_create_dissector_handle(dissect_diameter_3gpp_path, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 640, create_dissector_handle(dissect_diameter_3gpp_path, proto_diameter_3gpp)); /* AVP Code: 641 Contact */ - dissector_add_uint("diameter.3gpp", 641, new_create_dissector_handle(dissect_diameter_3gpp_contact, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 641, create_dissector_handle(dissect_diameter_3gpp_contact, proto_diameter_3gpp)); /* AVP Code: 655 SAR-Flags */ - dissector_add_uint("diameter.3gpp", 655, new_create_dissector_handle(dissect_diameter_3gpp_sar_flags, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 655, create_dissector_handle(dissect_diameter_3gpp_sar_flags, proto_diameter_3gpp)); /* AVP Code: 701 MSISDN */ - dissector_add_uint("diameter.3gpp", 701, new_create_dissector_handle(dissect_diameter_3gpp_msisdn, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 701, create_dissector_handle(dissect_diameter_3gpp_msisdn, proto_diameter_3gpp)); /* AVP Code: 702 User-Data */ - dissector_add_uint("diameter.3gpp", 702, new_create_dissector_handle(dissect_diameter_3gpp_user_data, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 702, create_dissector_handle(dissect_diameter_3gpp_user_data, proto_diameter_3gpp)); /* AVP Code: 704 Service-Indication */ - dissector_add_uint("diameter.3gpp", 704, new_create_dissector_handle(dissect_diameter_3gpp_service_ind, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 704, create_dissector_handle(dissect_diameter_3gpp_service_ind, proto_diameter_3gpp)); /* AVP Code: 900 TMGI */ - dissector_add_uint("diameter.3gpp", 900, new_create_dissector_handle(dissect_diameter_3gpp_tmgi, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 900, create_dissector_handle(dissect_diameter_3gpp_tmgi, proto_diameter_3gpp)); /* AVP Code: 904 MBMS-Session-Duration Registered by packet-gtp.c */ /* AVP Code: 903 MBMS-Service-Area Registered by packet-gtp.c */ /* AVP Code: 909 RAI */ - dissector_add_uint("diameter.3gpp", 909, new_create_dissector_handle(dissect_diameter_3gpp_rai, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 909, create_dissector_handle(dissect_diameter_3gpp_rai, proto_diameter_3gpp)); /* AVP Code: 911 MBMS-Time-To-Data-Transfer Registered by packet-gtp.c */ /* Registered by packet-gtp.c */ /* AVP Code: 913 MBMS-Required-QoS */ - dissector_add_uint("diameter.3gpp", 913, new_create_dissector_handle(dissect_diameter_3gpp_mbms_required_qos, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 913, create_dissector_handle(dissect_diameter_3gpp_mbms_required_qos, proto_diameter_3gpp)); /* AVP Code: 917 MBMS-GGSN-IPv6-Address */ - dissector_add_uint("diameter.3gpp", 917, new_create_dissector_handle(dissect_diameter_3gpp_ipv6addr, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 917, create_dissector_handle(dissect_diameter_3gpp_ipv6addr, proto_diameter_3gpp)); /* AVP Code: 918 MBMS-BMSC-SSM-IP-Address */ - dissector_add_uint("diameter.3gpp", 918, new_create_dissector_handle(dissect_diameter_3gpp_ipaddr, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 918, create_dissector_handle(dissect_diameter_3gpp_ipaddr, proto_diameter_3gpp)); /* AVP Code: 926 MBMS-BMSC-SSM-UDP-Port */ /* AVP Code: 927 MBMS-GW-UDP-Port */ - dissector_add_uint("diameter.3gpp", 926, new_create_dissector_handle(dissect_diameter_3gpp_udp_port, proto_diameter_3gpp)); - dissector_add_uint("diameter.3gpp", 927, new_create_dissector_handle(dissect_diameter_3gpp_udp_port, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 926, create_dissector_handle(dissect_diameter_3gpp_udp_port, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 927, create_dissector_handle(dissect_diameter_3gpp_udp_port, proto_diameter_3gpp)); /* AVP Code: 929 MBMS-Data-Transfer-Start */ - dissector_add_uint("diameter.3gpp", 929, new_create_dissector_handle(dissect_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 929, create_dissector_handle(dissect_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer, proto_diameter_3gpp)); /* AVP Code: 930 MBMS-Data-Transfer-Stop */ - dissector_add_uint("diameter.3gpp", 930, new_create_dissector_handle(dissect_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 930, create_dissector_handle(dissect_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer, proto_diameter_3gpp)); /* AVP Code: 1005 Charging-Rule-Name */ - dissector_add_uint("diameter.3gpp", 1005, new_create_dissector_handle(dissect_diameter_3gpp_charging_rule_name, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 1005, create_dissector_handle(dissect_diameter_3gpp_charging_rule_name, proto_diameter_3gpp)); /* AVP Code: 1005 Credit-Management-Status */ - dissector_add_uint("diameter.3gpp", 1082, new_create_dissector_handle(dissect_diameter_3gpp_credit_management_status, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 1082, create_dissector_handle(dissect_diameter_3gpp_credit_management_status, proto_diameter_3gpp)); /* AVP Code: 1405 ULR-Flags */ - dissector_add_uint("diameter.3gpp", 1405, new_create_dissector_handle(dissect_diameter_3gpp_ulr_flags, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 1405, create_dissector_handle(dissect_diameter_3gpp_ulr_flags, proto_diameter_3gpp)); /* AVP Code: 1406 ULA-Flags */ - dissector_add_uint("diameter.3gpp", 1406, new_create_dissector_handle(dissect_diameter_3gpp_ula_flags, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 1406, create_dissector_handle(dissect_diameter_3gpp_ula_flags, proto_diameter_3gpp)); /*AVP Code: 1407 Visited-PLMN-Id */ - dissector_add_uint("diameter.3gpp", 1407, new_create_dissector_handle(dissect_diameter_3gpp_visited_plmn_id, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 1407, create_dissector_handle(dissect_diameter_3gpp_visited_plmn_id, proto_diameter_3gpp)); /* AVP Code: 1421 DSR-Flags */ - dissector_add_uint("diameter.3gpp", 1421, new_create_dissector_handle(dissect_diameter_3gpp_dsr_flags, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 1421, create_dissector_handle(dissect_diameter_3gpp_dsr_flags, proto_diameter_3gpp)); /* AVP Code: 1422 DSA-Flags */ - dissector_add_uint("diameter.3gpp", 1422, new_create_dissector_handle(dissect_diameter_3gpp_dsa_flags, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 1422, create_dissector_handle(dissect_diameter_3gpp_dsa_flags, proto_diameter_3gpp)); /* AVP Code: 1441 IDA-Flags */ - dissector_add_uint("diameter.3gpp", 1441, new_create_dissector_handle(dissect_diameter_3gpp_ida_flags, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 1441, create_dissector_handle(dissect_diameter_3gpp_ida_flags, proto_diameter_3gpp)); /* AVP Code: 1442 PUA-Flags */ - dissector_add_uint("diameter.3gpp", 1442, new_create_dissector_handle(dissect_diameter_3gpp_pua_flags, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 1442, create_dissector_handle(dissect_diameter_3gpp_pua_flags, proto_diameter_3gpp)); /* AVP Code: 1443 NOR-Flags */ - dissector_add_uint("diameter.3gpp", 1443, new_create_dissector_handle(dissect_diameter_3gpp_nor_flags, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 1443, create_dissector_handle(dissect_diameter_3gpp_nor_flags, proto_diameter_3gpp)); /* AVP Code: 1490 IDR-Flags */ - dissector_add_uint("diameter.3gpp", 1490, new_create_dissector_handle(dissect_diameter_3gpp_idr_flags, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 1490, create_dissector_handle(dissect_diameter_3gpp_idr_flags, proto_diameter_3gpp)); /* AVP Code: 3502 MBMS-Bearer-Event */ - dissector_add_uint("diameter.3gpp", 3502, new_create_dissector_handle(dissect_diameter_3gpp_mbms_bearer_event, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 3502, create_dissector_handle(dissect_diameter_3gpp_mbms_bearer_event, proto_diameter_3gpp)); /* AVP Code: 3506 MBMS-Bearer-Result */ - dissector_add_uint("diameter.3gpp", 3506, new_create_dissector_handle(dissect_diameter_3gpp_mbms_bearer_result, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 3506, create_dissector_handle(dissect_diameter_3gpp_mbms_bearer_result, proto_diameter_3gpp)); /* AVP Code: 3511 TMGI-Allocation-Result */ - dissector_add_uint("diameter.3gpp", 3511, new_create_dissector_handle(dissect_diameter_3gpp_tmgi_allocation_result, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 3511, create_dissector_handle(dissect_diameter_3gpp_tmgi_allocation_result, proto_diameter_3gpp)); /* AVP Code: 3514 TMGI-Deallocation-Result */ - dissector_add_uint("diameter.3gpp", 3514, new_create_dissector_handle(dissect_diameter_3gpp_tmgi_deallocation_result, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 3514, create_dissector_handle(dissect_diameter_3gpp_tmgi_deallocation_result, proto_diameter_3gpp)); xml_handle = find_dissector("xml"); } diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c index e64a272bbd..fb9f4ca0a2 100644 --- a/epan/dissectors/packet-dis.c +++ b/epan/dissectors/packet-dis.c @@ -9359,7 +9359,7 @@ void proto_reg_handoff_dis(void) if (!dis_prefs_initialized) { - dis_dissector_handle = new_create_dissector_handle(dissect_dis, proto_dis); + dis_dissector_handle = create_dissector_handle(dissect_dis, proto_dis); dis_prefs_initialized = TRUE; } else diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index 96f11029b1..ad473d7d9c 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -394,7 +394,7 @@ proto_reg_handoff_distcc(void) * We haven't registered the dissector yet; get a handle * for it. */ - distcc_handle = new_create_dissector_handle(dissect_distcc, + distcc_handle = create_dissector_handle(dissect_distcc, proto_distcc); data_handle = find_dissector("data"); registered_dissector = TRUE; diff --git a/epan/dissectors/packet-dji-uav.c b/epan/dissectors/packet-dji-uav.c index 7f57dd46cb..a1f47cbc14 100644 --- a/epan/dissectors/packet-dji-uav.c +++ b/epan/dissectors/packet-dji-uav.c @@ -388,7 +388,7 @@ proto_reg_handoff_djiuav(void) dissector_handle_t djiuav_handle; - djiuav_handle = new_create_dissector_handle(dissect_djiuav_static, proto_djiuav); + djiuav_handle = create_dissector_handle(dissect_djiuav_static, proto_djiuav); dissector_add_uint("tcp.port", PORT_DJIUAV, djiuav_handle); } diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c index 2d0f085070..450836942c 100644 --- a/epan/dissectors/packet-dlm3.c +++ b/epan/dissectors/packet-dlm3.c @@ -1245,8 +1245,8 @@ proto_reg_handoff_dlm3(void) static dissector_handle_t dlm3_sctp_handle; if (!dissector_registered) { - dlm3_sctp_handle = new_create_dissector_handle(dissect_dlm3, proto_dlm3); - dlm3_tcp_handle = new_create_dissector_handle(dissect_dlm3, proto_dlm3); + dlm3_sctp_handle = create_dissector_handle(dissect_dlm3, proto_dlm3); + dlm3_tcp_handle = create_dissector_handle(dissect_dlm3, proto_dlm3); dissector_registered = TRUE; } else { dissector_delete_uint("tcp.port", tcp_port, dlm3_tcp_handle); diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c index e9bcb42f85..070b21354f 100644 --- a/epan/dissectors/packet-dlsw.c +++ b/epan/dissectors/packet-dlsw.c @@ -685,10 +685,10 @@ proto_reg_handoff_dlsw(void) { dissector_handle_t dlsw_udp_handle, dlsw_tcp_handle; - dlsw_udp_handle = new_create_dissector_handle(dissect_dlsw_udp, proto_dlsw); + dlsw_udp_handle = create_dissector_handle(dissect_dlsw_udp, proto_dlsw); dissector_add_uint("udp.port", UDP_PORT_DLSW, dlsw_udp_handle); - dlsw_tcp_handle = new_create_dissector_handle(dissect_dlsw_tcp, proto_dlsw); + dlsw_tcp_handle = create_dissector_handle(dissect_dlsw_tcp, proto_dlsw); dissector_add_uint("tcp.port", TCP_PORT_DLSW, dlsw_tcp_handle); } diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 408b7e958e..cb679140e5 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -4594,8 +4594,8 @@ proto_reg_handoff_dnp3(void) heur_dissector_add("tcp", dissect_dnp3_tcp_heur, "DNP 3.0 over TCP", "dnp3_tcp", proto_dnp3, HEURISTIC_DISABLE); heur_dissector_add("udp", dissect_dnp3_udp_heur, "DNP 3.0 over UDP", "dnp3_udp", proto_dnp3, HEURISTIC_DISABLE); - dnp3_tcp_handle = new_create_dissector_handle(dissect_dnp3_tcp, proto_dnp3); - dnp3_udp_handle = new_create_dissector_handle(dissect_dnp3_udp, proto_dnp3); + dnp3_tcp_handle = create_dissector_handle(dissect_dnp3_tcp, proto_dnp3); + dnp3_udp_handle = create_dissector_handle(dissect_dnp3_udp, proto_dnp3); dissector_add_uint("tcp.port", TCP_PORT_DNP, dnp3_tcp_handle); dissector_add_uint("udp.port", UDP_PORT_DNP, dnp3_udp_handle); dissector_add_for_decode_as("rtacser.data", dnp3_udp_handle); diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 985c917e61..bec218ea3c 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -4096,11 +4096,11 @@ proto_reg_handoff_dns(void) dissector_handle_t mdns_udp_handle; dissector_handle_t llmnr_udp_handle; - dns_udp_handle = new_create_dissector_handle(dissect_dns_udp_sctp, proto_dns); - dns_tcp_handle = new_create_dissector_handle(dissect_dns_tcp, proto_dns); - dns_sctp_handle = new_create_dissector_handle(dissect_dns_udp_sctp, proto_dns); - mdns_udp_handle = new_create_dissector_handle(dissect_mdns_udp, proto_mdns); - llmnr_udp_handle = new_create_dissector_handle(dissect_llmnr_udp, proto_llmnr); + dns_udp_handle = create_dissector_handle(dissect_dns_udp_sctp, proto_dns); + dns_tcp_handle = create_dissector_handle(dissect_dns_tcp, proto_dns); + dns_sctp_handle = create_dissector_handle(dissect_dns_udp_sctp, proto_dns); + mdns_udp_handle = create_dissector_handle(dissect_mdns_udp, proto_mdns); + llmnr_udp_handle = create_dissector_handle(dissect_llmnr_udp, proto_llmnr); dissector_add_uint("udp.port", UDP_PORT_MDNS, mdns_udp_handle); dissector_add_uint("tcp.port", TCP_PORT_MDNS, dns_tcp_handle); dissector_add_uint("udp.port", UDP_PORT_LLMNR, llmnr_udp_handle); diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c index 131a543af0..a6e84c042c 100644 --- a/epan/dissectors/packet-drda.c +++ b/epan/dissectors/packet-drda.c @@ -943,7 +943,7 @@ void proto_reg_handoff_drda(void) { heur_dissector_add("tcp", dissect_drda_heur, "DRDA over TCP", "drda_tcp", proto_drda, HEURISTIC_ENABLE); - drda_tcp_handle = new_create_dissector_handle(dissect_drda_tcp, proto_drda); + drda_tcp_handle = create_dissector_handle(dissect_drda_tcp, proto_drda); } /* diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index f9313c36a6..21051dbb19 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -479,7 +479,7 @@ proto_reg_handoff_dsi(void) { dissector_handle_t dsi_handle; - dsi_handle = new_create_dissector_handle(dissect_dsi, proto_dsi); + dsi_handle = create_dissector_handle(dissect_dsi, proto_dsi); dissector_add_uint("tcp.port", TCP_PORT_DSI, dsi_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-dsr.c b/epan/dissectors/packet-dsr.c index 6502f75812..56fbd0f0cf 100755 --- a/epan/dissectors/packet-dsr.c +++ b/epan/dissectors/packet-dsr.c @@ -757,7 +757,7 @@ proto_reg_handoff_dsr(void) ip_dissector_table = find_dissector_table("ip.proto"); - dsr_handle = new_create_dissector_handle(dissect_dsr, proto_dsr); + dsr_handle = create_dissector_handle(dissect_dsr, proto_dsr); dissector_add_uint("ip.proto", IP_PROTO_DSR, dsr_handle); } /* diff --git a/epan/dissectors/packet-dtcp-ip.c b/epan/dissectors/packet-dtcp-ip.c index 497caace16..0c2cc2df9b 100644 --- a/epan/dissectors/packet-dtcp-ip.c +++ b/epan/dissectors/packet-dtcp-ip.c @@ -309,7 +309,7 @@ proto_reg_handoff_dtcp_ip(void) if (!initialized) { dtcp_ip_handle = - new_create_dissector_handle(dissect_dtcp_ip, proto_dtcp_ip); + create_dissector_handle(dissect_dtcp_ip, proto_dtcp_ip); initialized = TRUE; } else diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index a04c6177c5..8f2d629dfd 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -2774,7 +2774,7 @@ proto_reg_handoff_bundle(void) static int Initialized = FALSE; if (!Initialized) { - tcpcl_handle = new_create_dissector_handle(dissect_tcpcl, proto_bundle); + tcpcl_handle = create_dissector_handle(dissect_tcpcl, proto_bundle); data_handle = find_dissector("data"); Initialized = TRUE; } diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index e7a68969f0..e586d199c3 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -366,7 +366,7 @@ proto_reg_handoff_dtp(void) { dissector_handle_t dtp_handle; - dtp_handle = new_create_dissector_handle(dissect_dtp, proto_dtp); + dtp_handle = create_dissector_handle(dissect_dtp, proto_dtp); dissector_add_uint("llc.cisco_pid", 0x2004, dtp_handle); } diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index bc537c8ba9..79fff44987 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -1197,9 +1197,9 @@ proto_reg_handoff_dtpt(void) static int ServerPort; if (!Initialized) { - dtpt_handle = new_create_dissector_handle(dissect_dtpt, proto_dtpt); - dtpt_conversation_handle = new_create_dissector_handle(dissect_dtpt_conversation, proto_dtpt); -/** dtpt_data_handle = new_create_dissector_handle(dissect_dtpt_data, proto_dtpt); **/ + dtpt_handle = create_dissector_handle(dissect_dtpt, proto_dtpt); + dtpt_conversation_handle = create_dissector_handle(dissect_dtpt_conversation, proto_dtpt); +/** dtpt_data_handle = create_dissector_handle(dissect_dtpt_data, proto_dtpt); **/ data_handle = find_dissector("data"); Initialized=TRUE; diff --git a/epan/dissectors/packet-dvb-ait.c b/epan/dissectors/packet-dvb-ait.c index 35508014e0..23f131f521 100644 --- a/epan/dissectors/packet-dvb-ait.c +++ b/epan/dissectors/packet-dvb-ait.c @@ -574,7 +574,7 @@ proto_reg_handoff_dvb_ait(void) { dissector_handle_t dvb_ait_handle; - dvb_ait_handle = new_create_dissector_handle(dissect_dvb_ait, proto_dvb_ait); + dvb_ait_handle = create_dissector_handle(dissect_dvb_ait, proto_dvb_ait); dissector_add_uint("mpeg_sect.tid", DVB_AIT_TID, dvb_ait_handle); } diff --git a/epan/dissectors/packet-dvb-bat.c b/epan/dissectors/packet-dvb-bat.c index e8cae2416e..1b59f73793 100644 --- a/epan/dissectors/packet-dvb-bat.c +++ b/epan/dissectors/packet-dvb-bat.c @@ -260,7 +260,7 @@ void proto_reg_handoff_dvb_bat(void) { dissector_handle_t dvb_bat_handle; - dvb_bat_handle = new_create_dissector_handle(dissect_dvb_bat, proto_dvb_bat); + dvb_bat_handle = create_dissector_handle(dissect_dvb_bat, proto_dvb_bat); dissector_add_uint("mpeg_sect.tid", DVB_BAT_TID, dvb_bat_handle); } diff --git a/epan/dissectors/packet-dvb-data-mpe.c b/epan/dissectors/packet-dvb-data-mpe.c index db88a7973b..f8f445c85b 100644 --- a/epan/dissectors/packet-dvb-data-mpe.c +++ b/epan/dissectors/packet-dvb-data-mpe.c @@ -201,7 +201,7 @@ proto_reg_handoff_dvb_data_mpe(void) dissector_handle_t dvb_data_mpe_handle; - dvb_data_mpe_handle = new_create_dissector_handle(dissect_dvb_data_mpe, proto_dvb_data_mpe); + dvb_data_mpe_handle = create_dissector_handle(dissect_dvb_data_mpe, proto_dvb_data_mpe); dissector_add_uint("mpeg_sect.tid", DVB_DATA_MPE_TID, dvb_data_mpe_handle); ip_handle = find_dissector("ip"); diff --git a/epan/dissectors/packet-dvb-eit.c b/epan/dissectors/packet-dvb-eit.c index 48a8bb1fe4..73128588a1 100644 --- a/epan/dissectors/packet-dvb-eit.c +++ b/epan/dissectors/packet-dvb-eit.c @@ -293,7 +293,7 @@ void proto_reg_handoff_dvb_eit(void) int tid; dissector_handle_t dvb_eit_handle; - dvb_eit_handle = new_create_dissector_handle(dissect_dvb_eit, proto_dvb_eit); + dvb_eit_handle = create_dissector_handle(dissect_dvb_eit, proto_dvb_eit); for (tid = DVB_EIT_TID_MIN; tid <= DVB_EIT_TID_MAX; tid++) dissector_add_uint("mpeg_sect.tid", tid, dvb_eit_handle); diff --git a/epan/dissectors/packet-dvb-ipdc.c b/epan/dissectors/packet-dvb-ipdc.c index be8a417e91..4e54ea3c7e 100644 --- a/epan/dissectors/packet-dvb-ipdc.c +++ b/epan/dissectors/packet-dvb-ipdc.c @@ -103,7 +103,7 @@ proto_reg_handoff_dvb_ipdc(void) sub_handles[DVB_IPDC_SUB_FLUTE] = find_dissector("alc"); - ipdc_handle = new_create_dissector_handle(dissect_ipdc, proto_ipdc); + ipdc_handle = create_dissector_handle(dissect_ipdc, proto_ipdc); dissector_add_uint("udp.port", UDP_PORT_IPDC_ESG_BOOTSTRAP, ipdc_handle); } diff --git a/epan/dissectors/packet-dvb-sdt.c b/epan/dissectors/packet-dvb-sdt.c index e292bf63b7..9542c36a4b 100644 --- a/epan/dissectors/packet-dvb-sdt.c +++ b/epan/dissectors/packet-dvb-sdt.c @@ -267,7 +267,7 @@ void proto_reg_handoff_dvb_sdt(void) { dissector_handle_t dvb_sdt_handle; - dvb_sdt_handle = new_create_dissector_handle(dissect_dvb_sdt, proto_dvb_sdt); + dvb_sdt_handle = create_dissector_handle(dissect_dvb_sdt, proto_dvb_sdt); dissector_add_uint("mpeg_sect.tid", DVB_SDT_TID_ACTUAL, dvb_sdt_handle); dissector_add_uint("mpeg_sect.tid", DVB_SDT_TID_OTHER, dvb_sdt_handle); } diff --git a/epan/dissectors/packet-dvb-tdt.c b/epan/dissectors/packet-dvb-tdt.c index a80cdb4999..449d839661 100644 --- a/epan/dissectors/packet-dvb-tdt.c +++ b/epan/dissectors/packet-dvb-tdt.c @@ -91,7 +91,7 @@ void proto_reg_handoff_dvb_tdt(void) { dissector_handle_t dvb_tdt_handle; - dvb_tdt_handle = new_create_dissector_handle(dissect_dvb_tdt, proto_dvb_tdt); + dvb_tdt_handle = create_dissector_handle(dissect_dvb_tdt, proto_dvb_tdt); dissector_add_uint("mpeg_sect.tid", DVB_TDT_TID, dvb_tdt_handle); } diff --git a/epan/dissectors/packet-dvb-tot.c b/epan/dissectors/packet-dvb-tot.c index 41db257bf6..d43dbc14bd 100644 --- a/epan/dissectors/packet-dvb-tot.c +++ b/epan/dissectors/packet-dvb-tot.c @@ -118,7 +118,7 @@ void proto_reg_handoff_dvb_tot(void) { dissector_handle_t dvb_tot_handle; - dvb_tot_handle = new_create_dissector_handle(dissect_dvb_tot, proto_dvb_tot); + dvb_tot_handle = create_dissector_handle(dissect_dvb_tot, proto_dvb_tot); dissector_add_uint("mpeg_sect.tid", DVB_TOT_TID, dvb_tot_handle); } diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 85dd237264..c544794d42 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -6346,7 +6346,7 @@ proto_reg_handoff_dvbci(void) { dissector_handle_t dvbci_handle; - dvbci_handle = new_create_dissector_handle(dissect_dvbci, proto_dvbci); + dvbci_handle = create_dissector_handle(dissect_dvbci, proto_dvbci); dissector_add_uint("wtap_encap", WTAP_ENCAP_DVBCI, dvbci_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index d645226075..e115339922 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -901,7 +901,7 @@ proto_reg_handoff_dvmrp(void) { dissector_handle_t dvmrp_handle; - dvmrp_handle = new_create_dissector_handle(dissect_dvmrp, proto_dvmrp); + dvmrp_handle = create_dissector_handle(dissect_dvmrp, proto_dvmrp); dissector_add_uint("igmp.type", IGMP_DVMRP, dvmrp_handle); } diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c index 20825281d5..96a925e52a 100644 --- a/epan/dissectors/packet-eapol.c +++ b/epan/dissectors/packet-eapol.c @@ -330,7 +330,7 @@ proto_reg_handoff_eapol(void) /* * EAPOL key descriptor types. */ - eapol_rc4_key_handle = new_create_dissector_handle(dissect_eapol_rc4_key, + eapol_rc4_key_handle = create_dissector_handle(dissect_eapol_rc4_key, proto_eapol); dissector_add_uint("eapol.keydes.type", EAPOL_RC4_KEY, eapol_rc4_key_handle); } diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c index 990384313e..b52bacf674 100644 --- a/epan/dissectors/packet-echo.c +++ b/epan/dissectors/packet-echo.c @@ -112,7 +112,7 @@ void proto_reg_handoff_echo(void) dissector_handle_t echo_handle; - echo_handle = new_create_dissector_handle(dissect_echo, proto_echo); + echo_handle = create_dissector_handle(dissect_echo, proto_echo); dissector_add_uint("udp.port", ECHO_PORT, echo_handle); dissector_add_uint("tcp.port", ECHO_PORT, echo_handle); diff --git a/epan/dissectors/packet-ecmp.c b/epan/dissectors/packet-ecmp.c index 10a48a3f5f..561d10043e 100644 --- a/epan/dissectors/packet-ecmp.c +++ b/epan/dissectors/packet-ecmp.c @@ -3567,8 +3567,8 @@ void proto_reg_handoff_ecmp(void) static dissector_handle_t ecmp_tcp_handle, ecmp_udp_handle; if (!initialized) { - ecmp_tcp_handle = new_create_dissector_handle(dissect_ecmp_tcp, proto_ecmp); - ecmp_udp_handle = new_create_dissector_handle(dissect_ecmp_udp, proto_ecmp); + ecmp_tcp_handle = create_dissector_handle(dissect_ecmp_tcp, proto_ecmp); + ecmp_udp_handle = create_dissector_handle(dissect_ecmp_udp, proto_ecmp); /* Cyclic frames are over UDP and non-cyclic are over TCP */ dissector_add_uint("udp.port", global_ecmp_port, ecmp_udp_handle); diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 627592c2de..4bb3aec41b 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -3404,8 +3404,8 @@ void proto_reg_handoff_edonkey(void) { dissector_handle_t edonkey_tcp_handle; dissector_handle_t edonkey_udp_handle; - edonkey_tcp_handle = new_create_dissector_handle(dissect_edonkey_tcp, proto_edonkey); - edonkey_udp_handle = new_create_dissector_handle(dissect_edonkey_udp, proto_edonkey); + edonkey_tcp_handle = create_dissector_handle(dissect_edonkey_tcp, proto_edonkey); + edonkey_udp_handle = create_dissector_handle(dissect_edonkey_udp, proto_edonkey); dissector_add_uint("tcp.port", 4661, edonkey_tcp_handle); dissector_add_uint("tcp.port", 4662, edonkey_tcp_handle); diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c index 89ceb797db..5a96c3a484 100644 --- a/epan/dissectors/packet-egd.c +++ b/epan/dissectors/packet-egd.c @@ -241,7 +241,7 @@ void proto_reg_handoff_egd(void) { dissector_handle_t egd_handle; - egd_handle = new_create_dissector_handle(dissect_egd, proto_egd); + egd_handle = create_dissector_handle(dissect_egd, proto_egd); dissector_add_uint("udp.port", EGD_PORT, egd_handle); /* find data dissector */ diff --git a/epan/dissectors/packet-ehdlc.c b/epan/dissectors/packet-ehdlc.c index 8b342f793e..d96a027bb3 100644 --- a/epan/dissectors/packet-ehdlc.c +++ b/epan/dissectors/packet-ehdlc.c @@ -325,7 +325,7 @@ proto_reg_handoff_ehdlc(void) sub_handles[SUB_OML] = find_dissector("gsm_abis_oml"); sub_handles[SUB_DATA] = find_dissector("data"); - ehdlc_handle = new_create_dissector_handle( dissect_ehdlc, proto_ehdlc ); + ehdlc_handle = create_dissector_handle( dissect_ehdlc, proto_ehdlc ); dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_ERICSSON, ehdlc_handle); } diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 0f39a458a8..354c5d9e84 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -3413,7 +3413,7 @@ proto_reg_handoff_eigrp(void) ipxsap_handle = find_dissector("ipxsap"); media_type_table = find_dissector_table("media_type"); - eigrp_handle = new_create_dissector_handle(dissect_eigrp, proto_eigrp); + eigrp_handle = create_dissector_handle(dissect_eigrp, proto_eigrp); dissector_add_uint("ip.proto", IP_PROTO_EIGRP, eigrp_handle); dissector_add_uint("ddp.type", DDP_EIGRP, eigrp_handle); diff --git a/epan/dissectors/packet-eiss.c b/epan/dissectors/packet-eiss.c index 4458b429e6..9cbe3323b5 100644 --- a/epan/dissectors/packet-eiss.c +++ b/epan/dissectors/packet-eiss.c @@ -577,7 +577,7 @@ proto_reg_handoff_eiss(void) { dissector_handle_t eiss_handle; - eiss_handle = new_create_dissector_handle(dissect_eiss, proto_eiss); + eiss_handle = create_dissector_handle(dissect_eiss, proto_eiss); dissector_add_uint("mpeg_sect.tid", EISS_SECTION_TID, eiss_handle); data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-elasticsearch.c b/epan/dissectors/packet-elasticsearch.c index 0e8bc3536c..0f96a769b1 100644 --- a/epan/dissectors/packet-elasticsearch.c +++ b/epan/dissectors/packet-elasticsearch.c @@ -748,8 +748,8 @@ void proto_reg_handoff_elasticsearch(void) { dissector_handle_t elasticsearch_zen_handle; elasticsearch_http_handle = find_dissector("http"); - elasticsearch_handle = new_create_dissector_handle(dissect_elasticsearch, proto_elasticsearch); - elasticsearch_zen_handle = new_create_dissector_handle(dissect_elasticsearch_zen_ping, proto_elasticsearch); + elasticsearch_handle = create_dissector_handle(dissect_elasticsearch, proto_elasticsearch); + elasticsearch_zen_handle = create_dissector_handle(dissect_elasticsearch_zen_ping, proto_elasticsearch); dissector_add_uint("udp.port", ELASTICSEARCH_DISCOVERY_PORT, elasticsearch_zen_handle); dissector_add_uint("tcp.port", ELASTICSEARCH_BINARY_PORT, elasticsearch_handle); dissector_add_uint("tcp.port", ELASTICSEARCH_HTTP_PORT, elasticsearch_handle); diff --git a/epan/dissectors/packet-elcom.c b/epan/dissectors/packet-elcom.c index 99eae2a57d..a3179125a8 100644 --- a/epan/dissectors/packet-elcom.c +++ b/epan/dissectors/packet-elcom.c @@ -760,7 +760,7 @@ proto_reg_handoff_elcom(void) { dissector_handle_t elcom_handle; - elcom_handle = new_create_dissector_handle(dissect_elcom, proto_elcom); + elcom_handle = create_dissector_handle(dissect_elcom, proto_elcom); dissector_add_uint("tcp.port", TCP_PORT_ELCOM, elcom_handle); } diff --git a/epan/dissectors/packet-elmi.c b/epan/dissectors/packet-elmi.c index 56c1d22de4..845892f5f4 100644 --- a/epan/dissectors/packet-elmi.c +++ b/epan/dissectors/packet-elmi.c @@ -534,7 +534,7 @@ proto_reg_handoff_elmi(void) { dissector_handle_t elmi_handle; - elmi_handle = new_create_dissector_handle(dissect_elmi, proto_elmi); + elmi_handle = create_dissector_handle(dissect_elmi, proto_elmi); dissector_add_uint("ethertype", ETHERTYPE_ELMI, elmi_handle); } diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c index 117c4f2596..abab500169 100644 --- a/epan/dissectors/packet-enc.c +++ b/epan/dissectors/packet-enc.c @@ -192,7 +192,7 @@ proto_reg_handoff_enc(void) ipv6_handle = find_dissector("ipv6"); data_handle = find_dissector("data"); - enc_handle = new_create_dissector_handle(dissect_enc, proto_enc); + enc_handle = create_dissector_handle(dissect_enc, proto_enc); dissector_add_uint("wtap_encap", WTAP_ENCAP_ENC, enc_handle); } diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 1c52ff95eb..639f165a57 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -3768,15 +3768,15 @@ proto_reg_handoff_enip(void) dissector_handle_t dlr_handle; /* Register for EtherNet/IP, using TCP */ - enip_tcp_handle = new_create_dissector_handle(dissect_enip_tcp, proto_enip); + enip_tcp_handle = create_dissector_handle(dissect_enip_tcp, proto_enip); dissector_add_uint("tcp.port", ENIP_ENCAP_PORT, enip_tcp_handle); /* Register for EtherNet/IP, using UDP */ - enip_udp_handle = new_create_dissector_handle(dissect_enip_udp, proto_enip); + enip_udp_handle = create_dissector_handle(dissect_enip_udp, proto_enip); dissector_add_uint("udp.port", ENIP_ENCAP_PORT, enip_udp_handle); /* Register for EtherNet/IP IO data (UDP) */ - enipio_handle = new_create_dissector_handle(dissect_enipio, proto_enipio); + enipio_handle = create_dissector_handle(dissect_enipio, proto_enipio); dissector_add_uint("udp.port", ENIP_IO_PORT, enipio_handle); /* Find dissector for data packet */ @@ -3793,7 +3793,7 @@ proto_reg_handoff_enip(void) cip_implicit_handle = find_dissector("cip_implicit"); /* Register for EtherNet/IP Device Level Ring protocol */ - dlr_handle = new_create_dissector_handle(dissect_dlr, proto_dlr); + dlr_handle = create_dissector_handle(dissect_dlr, proto_dlr); dissector_add_uint("ethertype", ETHERTYPE_DLR, dlr_handle); proto_cipsafety = proto_get_id_by_filter_name( "cipsafety" ); diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c index 0d02809b1a..e0cc51a8f3 100644 --- a/epan/dissectors/packet-enrp.c +++ b/epan/dissectors/packet-enrp.c @@ -1089,7 +1089,7 @@ proto_reg_handoff_enrp(void) { dissector_handle_t enrp_handle; - enrp_handle = new_create_dissector_handle(dissect_enrp, proto_enrp); + enrp_handle = create_dissector_handle(dissect_enrp, proto_enrp); dissector_add_uint("sctp.ppi", ENRP_PAYLOAD_PROTOCOL_ID, enrp_handle); dissector_add_uint("sctp.port", ENRP_SCTP_PORT, enrp_handle); dissector_add_uint("udp.port", ENRP_UDP_PORT, enrp_handle); diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c index 7715c53d66..40f1c78bc0 100644 --- a/epan/dissectors/packet-enttec.c +++ b/epan/dissectors/packet-enttec.c @@ -596,8 +596,8 @@ proto_reg_handoff_enttec(void) { static guint tcp_port_enttec; if(!enttec_initialized) { - enttec_udp_handle = new_create_dissector_handle(dissect_enttec_udp,proto_enttec); - enttec_tcp_handle = new_create_dissector_handle(dissect_enttec_tcp,proto_enttec); + enttec_udp_handle = create_dissector_handle(dissect_enttec_udp,proto_enttec); + enttec_tcp_handle = create_dissector_handle(dissect_enttec_tcp,proto_enttec); enttec_initialized = TRUE; } else { dissector_delete_uint("udp.port",udp_port_enttec,enttec_udp_handle); diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 9cc7c93c03..af23788a9c 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -4383,7 +4383,7 @@ proto_register_epl(void) void proto_reg_handoff_epl(void) { - dissector_handle_t epl_udp_handle = new_create_dissector_handle( dissect_epludp, proto_epl ); + dissector_handle_t epl_udp_handle = create_dissector_handle( dissect_epludp, proto_epl ); /* Store a pointer to the data_dissector */ if ( data_dissector == NULL ) diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c index fb6b684bf9..662d0d9525 100644 --- a/epan/dissectors/packet-epl_v1.c +++ b/epan/dissectors/packet-epl_v1.c @@ -647,7 +647,7 @@ proto_reg_handoff_epl_v1(void) { dissector_handle_t epl_v1_handle; - epl_v1_handle = new_create_dissector_handle(dissect_epl_v1, proto_epl_v1); + epl_v1_handle = create_dissector_handle(dissect_epl_v1, proto_epl_v1); dissector_add_uint("ethertype", ETHERTYPE_EPL_V1, epl_v1_handle); } diff --git a/epan/dissectors/packet-epon.c b/epan/dissectors/packet-epon.c index 4733358c5e..aeef8731e3 100644 --- a/epan/dissectors/packet-epon.c +++ b/epan/dissectors/packet-epon.c @@ -288,7 +288,7 @@ proto_reg_handoff_epon(void) { dissector_handle_t epon_handle; - epon_handle = new_create_dissector_handle(dissect_epon, proto_epon); + epon_handle = create_dissector_handle(dissect_epon, proto_epon); dissector_add_uint("wtap_encap", WTAP_ENCAP_EPON, epon_handle); eth_handle = find_dissector("eth"); diff --git a/epan/dissectors/packet-esio.c b/epan/dissectors/packet-esio.c index 8f201ec41c..8726a42fd1 100644 --- a/epan/dissectors/packet-esio.c +++ b/epan/dissectors/packet-esio.c @@ -418,7 +418,7 @@ proto_reg_handoff_esio(void) { dissector_handle_t esio_handle; - esio_handle = new_create_dissector_handle(dissect_esio, proto_esio); + esio_handle = create_dissector_handle(dissect_esio, proto_esio); dissector_add_uint("udp.port", 6060, esio_handle); } diff --git a/epan/dissectors/packet-etv.c b/epan/dissectors/packet-etv.c index 11622d470a..d160bf8e11 100644 --- a/epan/dissectors/packet-etv.c +++ b/epan/dissectors/packet-etv.c @@ -232,8 +232,8 @@ proto_reg_handoff_etv(void) dissector_handle_t etv_dii_handle; dissector_handle_t etv_ddb_handle; - etv_dii_handle = new_create_dissector_handle(dissect_etv_dii, proto_etv_dii); - etv_ddb_handle = new_create_dissector_handle(dissect_etv_ddb, proto_etv_ddb); + etv_dii_handle = create_dissector_handle(dissect_etv_dii, proto_etv_dii); + etv_ddb_handle = create_dissector_handle(dissect_etv_ddb, proto_etv_ddb); dissector_add_uint("mpeg_sect.tid", ETV_TID_DII_SECTION, etv_dii_handle); dissector_add_uint("mpeg_sect.tid", ETV_TID_DDB_SECTION, etv_ddb_handle); dsmcc_handle = find_dissector("mp2t-dsmcc"); diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c index 977aa406a6..849f83d8fa 100644 --- a/epan/dissectors/packet-evrc.c +++ b/epan/dissectors/packet-evrc.c @@ -617,12 +617,12 @@ proto_reg_handoff_evrc(void) dissector_handle_t evrcnw_handle; dissector_handle_t evrcnw2k_handle; - evrc_handle = new_create_dissector_handle(dissect_evrc, proto_evrc); - evrcb_handle = new_create_dissector_handle(dissect_evrcb, proto_evrc); - evrcwb_handle = new_create_dissector_handle(dissect_evrcwb, proto_evrc); - evrcnw_handle = new_create_dissector_handle(dissect_evrcnw, proto_evrc); - evrcnw2k_handle = new_create_dissector_handle(dissect_evrcnw2k, proto_evrc); - evrc_legacy_handle = new_create_dissector_handle(dissect_evrc_legacy, proto_evrc); + evrc_handle = create_dissector_handle(dissect_evrc, proto_evrc); + evrcb_handle = create_dissector_handle(dissect_evrcb, proto_evrc); + evrcwb_handle = create_dissector_handle(dissect_evrcwb, proto_evrc); + evrcnw_handle = create_dissector_handle(dissect_evrcnw, proto_evrc); + evrcnw2k_handle = create_dissector_handle(dissect_evrcnw2k, proto_evrc); + evrc_legacy_handle = create_dissector_handle(dissect_evrc_legacy, proto_evrc); /* header-full mime types */ dissector_add_string("rtp_dyn_payload_type", "EVRC", evrc_handle); diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c index 2e240c76cf..843edec099 100644 --- a/epan/dissectors/packet-exec.c +++ b/epan/dissectors/packet-exec.c @@ -407,7 +407,7 @@ proto_reg_handoff_exec(void) { dissector_handle_t exec_handle; - exec_handle = new_create_dissector_handle(dissect_exec, proto_exec); + exec_handle = create_dissector_handle(dissect_exec, proto_exec); dissector_add_uint("tcp.port", EXEC_PORT, exec_handle); } diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 3302649dbf..c8608ce79d 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -1484,7 +1484,7 @@ proto_reg_handoff_edp(void) { dissector_handle_t edp_handle; - edp_handle = new_create_dissector_handle(dissect_edp, proto_edp); + edp_handle = create_dissector_handle(dissect_edp, proto_edp); dissector_add_uint("llc.extreme_pid", 0x00bb, edp_handle); } diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 4c0a5d9256..0f9a2b35c5 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -1621,7 +1621,7 @@ void proto_reg_handoff_fc (void) { dissector_add_uint("wtap_encap", WTAP_ENCAP_FIBRE_CHANNEL_FC2, - new_create_dissector_handle(dissect_fc_wtap, proto_fc)); + create_dissector_handle(dissect_fc_wtap, proto_fc)); dissector_add_uint("wtap_encap", WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS, fcsof_handle); diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c index 747db42b81..accd4d6d88 100644 --- a/epan/dissectors/packet-fcct.c +++ b/epan/dissectors/packet-fcct.c @@ -284,7 +284,7 @@ proto_reg_handoff_fcct (void) { dissector_handle_t fcct_handle; - fcct_handle = new_create_dissector_handle (dissect_fcct, proto_fcct); + fcct_handle = create_dissector_handle (dissect_fcct, proto_fcct); dissector_add_uint("fc.ftype", FC_FTYPE_FCCT, fcct_handle); data_handle = find_dissector ("data"); diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index 61c02d749a..1d2d10295d 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -1859,7 +1859,7 @@ proto_register_fcdns (void) register_init_routine (&fcdns_init_protocol); register_cleanup_routine (&fcdns_cleanup_protocol); - dns_handle = new_create_dissector_handle (dissect_fcdns, proto_fcdns); + dns_handle = create_dissector_handle (dissect_fcdns, proto_fcdns); } void diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index b44080e178..e7e4e55e11 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -2624,7 +2624,7 @@ proto_reg_handoff_fcels (void) { dissector_handle_t els_handle; - els_handle = new_create_dissector_handle (dissect_fcels, proto_fcels); + els_handle = create_dissector_handle (dissect_fcels, proto_fcels); dissector_add_uint("fc.ftype", FC_FTYPE_ELS, els_handle); data_handle = find_dissector ("data"); diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index ee93ca0ef2..14956e8348 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -1053,7 +1053,7 @@ proto_reg_handoff_fcfcs (void) { dissector_handle_t fcs_handle; - fcs_handle = new_create_dissector_handle (dissect_fcfcs, proto_fcfcs); + fcs_handle = create_dissector_handle (dissect_fcfcs, proto_fcfcs); dissector_add_uint("fcct.server", FCCT_GSRVR_FCS, fcs_handle); diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index d0a72f64e1..b966fd0b91 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -879,7 +879,7 @@ proto_reg_handoff_fcfzs(void) { dissector_handle_t fzs_handle; - fzs_handle = new_create_dissector_handle(dissect_fcfzs, proto_fcfzs); + fzs_handle = create_dissector_handle(dissect_fcfzs, proto_fcfzs); dissector_add_uint("fcct.server", FCCT_GSRVR_FZS, fzs_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index e60f6bc492..980356e992 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -651,7 +651,7 @@ proto_reg_handoff_fcip (void) heur_dissector_add("tcp", dissect_fcip_heur, "FCIP over TCP", "fcip_tcp", proto_fcip, HEURISTIC_ENABLE); - fcip_handle = new_create_dissector_handle(dissect_fcip_handle, proto_fcip); + fcip_handle = create_dissector_handle(dissect_fcip_handle, proto_fcip); dissector_add_for_decode_as("tcp.port", fcip_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c index 7c24ee4059..8aa1ebf4c3 100644 --- a/epan/dissectors/packet-fcoe.c +++ b/epan/dissectors/packet-fcoe.c @@ -334,7 +334,7 @@ proto_reg_handoff_fcoe(void) { dissector_handle_t fcoe_handle; - fcoe_handle = new_create_dissector_handle(dissect_fcoe, proto_fcoe); + fcoe_handle = create_dissector_handle(dissect_fcoe, proto_fcoe); dissector_add_uint("ethertype", ETHERTYPE_FCOE, fcoe_handle); data_handle = find_dissector("data"); fc_handle = find_dissector("fc"); diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 8d2c88de5e..4e6ae746a3 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -983,7 +983,7 @@ proto_reg_handoff_fcp(void) { dissector_handle_t fcp_handle; - fcp_handle = new_create_dissector_handle(dissect_fcp, proto_fcp); + fcp_handle = create_dissector_handle(dissect_fcp, proto_fcp); dissector_add_uint("fc.ftype", FC_FTYPE_SCSI, fcp_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index d0f5008c84..188e002101 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -1140,7 +1140,7 @@ proto_reg_handoff_fcsbccs (void) { dissector_handle_t fc_sbccs_handle; - fc_sbccs_handle = new_create_dissector_handle (dissect_fc_sbccs, + fc_sbccs_handle = create_dissector_handle (dissect_fc_sbccs, proto_fc_sbccs); dissector_add_uint("fc.ftype", FC_FTYPE_SBCCS, fc_sbccs_handle); diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index 81a11dcd2f..4896098d57 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -2541,7 +2541,7 @@ proto_reg_handoff_fcswils(void) { dissector_handle_t swils_handle; - swils_handle = new_create_dissector_handle(dissect_fcswils, proto_fcswils); + swils_handle = create_dissector_handle(dissect_fcswils, proto_fcswils); dissector_add_uint("fc.ftype", FC_FTYPE_SWILS, swils_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index df740c0312..9dca69fd55 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -540,7 +540,7 @@ proto_reg_handoff_fddi(void) dissector_add_uint("sflow_245.header_protocol", SFLOW_245_HEADER_FDDI, fddi_handle); fddi_bitswapped_handle = - new_create_dissector_handle(dissect_fddi_bitswapped, proto_fddi); + create_dissector_handle(dissect_fddi_bitswapped, proto_fddi); dissector_add_uint("wtap_encap", WTAP_ENCAP_FDDI_BITSWAPPED, fddi_bitswapped_handle); } diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index 587bcd52fc..a238340741 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.c @@ -287,7 +287,7 @@ proto_reg_handoff_fefd(void) dissector_handle_t fefd_handle; data_handle = find_dissector("data"); - fefd_handle = new_create_dissector_handle(dissect_fefd, proto_fefd); + fefd_handle = create_dissector_handle(dissect_fefd, proto_fefd); dissector_add_uint("llc.force10_pid", 0x0111, fefd_handle); } diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index fd72394436..4e950abacd 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -15282,8 +15282,8 @@ proto_reg_handoff_ff(void) /* * 4.8. Using UDP and TCP */ - ff_udp_handle = new_create_dissector_handle(dissect_ff_udp, proto_ff); - ff_tcp_handle = new_create_dissector_handle(dissect_ff_tcp, proto_ff); + ff_udp_handle = create_dissector_handle(dissect_ff_udp, proto_ff); + ff_tcp_handle = create_dissector_handle(dissect_ff_tcp, proto_ff); /* * 4.8.4.2. Use diff --git a/epan/dissectors/packet-finger.c b/epan/dissectors/packet-finger.c index 612ab7ba46..6e58f8ac09 100644 --- a/epan/dissectors/packet-finger.c +++ b/epan/dissectors/packet-finger.c @@ -201,7 +201,7 @@ proto_reg_handoff_finger(void) { static dissector_handle_t finger_handle; - finger_handle = new_create_dissector_handle(dissect_finger, proto_finger); + finger_handle = create_dissector_handle(dissect_finger, proto_finger); dissector_add_uint("tcp.port", FINGER_PORT, finger_handle); } diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index 6805414fb9..194d13ba22 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -825,7 +825,7 @@ proto_reg_handoff_fip(void) { dissector_handle_t fip_handle; - fip_handle = new_create_dissector_handle(dissect_fip, proto_fip); + fip_handle = create_dissector_handle(dissect_fip, proto_fip); dissector_add_uint("ethertype", ETHERTYPE_FIP, fip_handle); fc_handle = find_dissector("fc"); } diff --git a/epan/dissectors/packet-flexnet.c b/epan/dissectors/packet-flexnet.c index 4d42aaa276..5555a2d952 100644 --- a/epan/dissectors/packet-flexnet.c +++ b/epan/dissectors/packet-flexnet.c @@ -134,7 +134,7 @@ proto_register_flexnet(void) void proto_reg_handoff_flexnet(void) { - dissector_add_uint( "ax25.pid", AX25_P_FLEXNET, new_create_dissector_handle( dissect_flexnet, proto_flexnet ) ); + dissector_add_uint( "ax25.pid", AX25_P_FLEXNET, create_dissector_handle( dissect_flexnet, proto_flexnet ) ); /* */ diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c index 516233e724..e75eef824b 100644 --- a/epan/dissectors/packet-flip.c +++ b/epan/dissectors/packet-flip.c @@ -490,7 +490,7 @@ proto_reg_handoff_flip(void) { dissector_handle_t flip_handle; - flip_handle = new_create_dissector_handle(dissect_flip, proto_flip); + flip_handle = create_dissector_handle(dissect_flip, proto_flip); dissector_add_uint("ethertype", ETHERTYPE_FLIP, flip_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-forces.c b/epan/dissectors/packet-forces.c index bd443b8366..0c1ecdb3a4 100644 --- a/epan/dissectors/packet-forces.c +++ b/epan/dissectors/packet-forces.c @@ -870,8 +870,8 @@ proto_reg_handoff_forces(void) static dissector_handle_t forces_handle_tcp, forces_handle; if (!inited) { - forces_handle_tcp = new_create_dissector_handle(dissect_forces_tcp, proto_forces); - forces_handle = new_create_dissector_handle(dissect_forces_not_tcp, proto_forces); + forces_handle_tcp = create_dissector_handle(dissect_forces_tcp, proto_forces); + forces_handle = create_dissector_handle(dissect_forces_not_tcp, proto_forces); ip_handle = find_dissector("ip"); inited = TRUE; } diff --git a/epan/dissectors/packet-foundry.c b/epan/dissectors/packet-foundry.c index cc0e338c7b..3fead09505 100644 --- a/epan/dissectors/packet-foundry.c +++ b/epan/dissectors/packet-foundry.c @@ -458,7 +458,7 @@ proto_reg_handoff_fdp(void) { dissector_handle_t fdp_handle; - fdp_handle = new_create_dissector_handle(dissect_fdp, proto_fdp); + fdp_handle = create_dissector_handle(dissect_fdp, proto_fdp); dissector_add_uint("llc.foundry_pid", 0x2000, fdp_handle); } diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index fa27e2ece4..6e92df901a 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -1016,7 +1016,7 @@ proto_reg_handoff_fr(void) dissector_add_uint("atm.aal5.type", TRAF_FR, fr_handle); dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_FR, fr_handle); - fr_phdr_handle = new_create_dissector_handle(dissect_fr_phdr, proto_fr); + fr_phdr_handle = create_dissector_handle(dissect_fr_phdr, proto_fr); dissector_add_uint("wtap_encap", WTAP_ENCAP_FRELAY_WITH_PHDR, fr_phdr_handle); eth_withfcs_handle = find_dissector("eth_withfcs"); diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c index b61808b37f..de02cdd789 100644 --- a/epan/dissectors/packet-fractalgeneratorprotocol.c +++ b/epan/dissectors/packet-fractalgeneratorprotocol.c @@ -225,7 +225,7 @@ proto_reg_handoff_fractalgeneratorprotocol(void) { dissector_handle_t fractalgeneratorprotocol_handle; - fractalgeneratorprotocol_handle = new_create_dissector_handle(dissect_fractalgeneratorprotocol, proto_fractalgeneratorprotocol); + fractalgeneratorprotocol_handle = create_dissector_handle(dissect_fractalgeneratorprotocol, proto_fractalgeneratorprotocol); dissector_add_uint("sctp.ppi", FRACTALGENERATORPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY, fractalgeneratorprotocol_handle); dissector_add_uint("sctp.ppi", FGP_PAYLOAD_PROTOCOL_ID, fractalgeneratorprotocol_handle); } diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c index 5713411c10..3e235d09ab 100644 --- a/epan/dissectors/packet-g723.c +++ b/epan/dissectors/packet-g723.c @@ -91,7 +91,7 @@ proto_reg_handoff_g723(void) { dissector_handle_t g723_handle; - g723_handle = new_create_dissector_handle(dissect_g723, proto_g723); + g723_handle = create_dissector_handle(dissect_g723, proto_g723); dissector_add_uint("rtp.pt", PT_G723, g723_handle); diff --git a/epan/dissectors/packet-gadu-gadu.c b/epan/dissectors/packet-gadu-gadu.c index f2469c7a2f..b411d6d700 100644 --- a/epan/dissectors/packet-gadu-gadu.c +++ b/epan/dissectors/packet-gadu-gadu.c @@ -2106,7 +2106,7 @@ proto_register_gadu_gadu(void) proto_register_fields(proto_gadu_gadu, hfi, array_length(hfi)); proto_register_subtree_array(ett, array_length(ett)); - gadu_gadu_handle = new_create_dissector_handle(dissect_gadu_gadu, proto_gadu_gadu); + gadu_gadu_handle = create_dissector_handle(dissect_gadu_gadu, proto_gadu_gadu); } void diff --git a/epan/dissectors/packet-gdb.c b/epan/dissectors/packet-gdb.c index 453428d71e..0dc1c947d2 100644 --- a/epan/dissectors/packet-gdb.c +++ b/epan/dissectors/packet-gdb.c @@ -239,7 +239,7 @@ proto_reg_handoff_gdb(void) static dissector_handle_t gdb_handle; if (!initialized) { - gdb_handle = new_create_dissector_handle(dissect_gdb_tcp, proto_gdb); + gdb_handle = create_dissector_handle(dissect_gdb_tcp, proto_gdb); initialized = TRUE; } diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index 2fba0f6d3e..7705395877 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -2049,7 +2049,7 @@ proto_reg_handoff_gdsdb(void) dissector_handle_t gdsdb_handle; - gdsdb_handle = new_create_dissector_handle(dissect_gdsdb, + gdsdb_handle = create_dissector_handle(dissect_gdsdb, proto_gdsdb); dissector_add_uint("tcp.port", TCP_PORT, gdsdb_handle); } diff --git a/epan/dissectors/packet-gearman.c b/epan/dissectors/packet-gearman.c index 40980485c8..7628429666 100644 --- a/epan/dissectors/packet-gearman.c +++ b/epan/dissectors/packet-gearman.c @@ -549,7 +549,7 @@ proto_reg_handoff_gearman(void) { dissector_handle_t gearman_handle; - gearman_handle = new_create_dissector_handle(dissect_gearman, proto_gearman); + gearman_handle = create_dissector_handle(dissect_gearman, proto_gearman); dissector_add_uint("tcp.port", GEARMAN_PORT, gearman_handle); } diff --git a/epan/dissectors/packet-geneve.c b/epan/dissectors/packet-geneve.c index c3aae29914..39fe82249f 100644 --- a/epan/dissectors/packet-geneve.c +++ b/epan/dissectors/packet-geneve.c @@ -446,7 +446,7 @@ proto_reg_handoff_geneve(void) { dissector_handle_t geneve_handle; - geneve_handle = new_create_dissector_handle(dissect_geneve, proto_geneve); + geneve_handle = create_dissector_handle(dissect_geneve, proto_geneve); dissector_add_uint("udp.port", UDP_PORT_GENEVE, geneve_handle); dissector_add_for_decode_as("udp.port", geneve_handle); diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c index b917a791ed..2178580b12 100644 --- a/epan/dissectors/packet-gift.c +++ b/epan/dissectors/packet-gift.c @@ -157,7 +157,7 @@ proto_reg_handoff_gift(void) { dissector_handle_t gift_handle; - gift_handle = new_create_dissector_handle(dissect_gift, proto_gift); + gift_handle = create_dissector_handle(dissect_gift, proto_gift); dissector_add_uint("tcp.port", TCP_PORT_GIFT, gift_handle); } diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c index e54ff72c9e..f7ef19be28 100644 --- a/epan/dissectors/packet-glbp.c +++ b/epan/dissectors/packet-glbp.c @@ -609,7 +609,7 @@ proto_reg_handoff_glbp(void) { dissector_handle_t glbp_handle; - glbp_handle = new_create_dissector_handle(dissect_glbp_static, proto_glbp); + glbp_handle = create_dissector_handle(dissect_glbp_static, proto_glbp); dissector_add_uint("udp.port", 3222, glbp_handle); } diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c index 34d0a2ad28..bde563c5d5 100644 --- a/epan/dissectors/packet-gmhdr.c +++ b/epan/dissectors/packet-gmhdr.c @@ -521,7 +521,7 @@ proto_reg_handoff_gmhdr(void) ethertype_handle = find_dissector("ethertype"); - gmhdr_handle = new_create_dissector_handle(dissect_gmhdr, proto_gmhdr); + gmhdr_handle = create_dissector_handle(dissect_gmhdr, proto_gmhdr); dissector_add_uint("ethertype", ETHERTYPE_GIGAMON, gmhdr_handle); heur_dissector_add("eth.trailer", dissect_gmtrailer, "Gigamon Ethernet header", "gmhdr_eth", proto_gmhdr, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c index 7a67f4b33b..79a9e9359a 100644 --- a/epan/dissectors/packet-gnutella.c +++ b/epan/dissectors/packet-gnutella.c @@ -744,7 +744,7 @@ void proto_register_gnutella(void) { void proto_reg_handoff_gnutella(void) { dissector_handle_t gnutella_handle; - gnutella_handle = new_create_dissector_handle(dissect_gnutella, + gnutella_handle = create_dissector_handle(dissect_gnutella, proto_gnutella); dissector_add_uint("tcp.port", GNUTELLA_TCP_PORT, gnutella_handle); } diff --git a/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c index b3851bc00c..8d0db445ea 100644 --- a/epan/dissectors/packet-gopher.c +++ b/epan/dissectors/packet-gopher.c @@ -298,7 +298,7 @@ proto_register_gopher(void) void proto_reg_handoff_gopher(void) { - gopher_handle = new_create_dissector_handle(dissect_gopher, proto_gopher); + gopher_handle = create_dissector_handle(dissect_gopher, proto_gopher); gopher_prefs_apply(); } diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index 766f0261cc..ea2a44105a 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -745,7 +745,7 @@ proto_reg_handoff_gre(void) { dissector_handle_t gre_handle; - gre_handle = new_create_dissector_handle(dissect_gre, proto_gre); + gre_handle = create_dissector_handle(dissect_gre, proto_gre); dissector_add_uint("ip.proto", IP_PROTO_GRE, gre_handle); data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c index be5eb4208a..ec2d6d9757 100644 --- a/epan/dissectors/packet-gsm_a_rp.c +++ b/epan/dissectors/packet-gsm_a_rp.c @@ -568,7 +568,7 @@ proto_reg_handoff_gsm_a_rp(void) { dissector_handle_t gsm_a_rp_handle; - gsm_a_rp_handle = new_create_dissector_handle(dissect_rp, proto_a_rp); + gsm_a_rp_handle = create_dissector_handle(dissect_rp, proto_a_rp); /* Dissect messages embedded in SIP */ dissector_add_string("media_type","application/vnd.3gpp.sms", gsm_a_rp_handle); gsm_sms_handle = find_dissector("gsm_sms"); diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c index 7422bce999..f7dbd901dc 100644 --- a/epan/dissectors/packet-gsm_abis_oml.c +++ b/epan/dissectors/packet-gsm_abis_oml.c @@ -2394,7 +2394,7 @@ proto_reg_handoff_abis_oml(void) { dissector_handle_t abis_oml_handle; - abis_oml_handle = new_create_dissector_handle(dissect_abis_oml, + abis_oml_handle = create_dissector_handle(dissect_abis_oml, proto_abis_oml); dissector_add_uint("lapd.gsm.sapi", LAPD_GSM_SAPI_OM_PROC, abis_oml_handle); diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c index c50784dcb2..31a5fcd8b6 100644 --- a/epan/dissectors/packet-gsm_ipa.c +++ b/epan/dissectors/packet-gsm_ipa.c @@ -494,8 +494,8 @@ void proto_reg_handoff_gsm_ipa(void) sub_handles[SUB_MGCP] = find_dissector("mgcp"); sub_handles[SUB_DATA] = find_dissector("data"); - ipa_tcp_handle = new_create_dissector_handle(dissect_ipa_tcp, proto_ipa); - ipa_udp_handle = new_create_dissector_handle(dissect_ipa_udp, proto_ipa); + ipa_tcp_handle = create_dissector_handle(dissect_ipa_tcp, proto_ipa); + ipa_udp_handle = create_dissector_handle(dissect_ipa_udp, proto_ipa); ipa_initialized = TRUE; } else { dissector_delete_uint_range("tcp.port", ipa_tcp_ports, ipa_tcp_handle); diff --git a/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c index 5960e0495a..8b29d6b616 100644 --- a/epan/dissectors/packet-gsm_um.c +++ b/epan/dissectors/packet-gsm_um.c @@ -301,7 +301,7 @@ proto_reg_handoff_gsm_um(void) dtap_handle = find_dissector("gsm_a_dtap"); data_handle = find_dissector("data"); - gsm_um_handle = new_create_dissector_handle(dissect_gsm_um, proto_gsm_um); + gsm_um_handle = create_dissector_handle(dissect_gsm_um, proto_gsm_um); dissector_add_uint("wtap_encap", WTAP_ENCAP_GSM_UM, gsm_um_handle); } diff --git a/epan/dissectors/packet-gsmtap.c b/epan/dissectors/packet-gsmtap.c index ac6ca5b3e0..2fa76b5bd4 100644 --- a/epan/dissectors/packet-gsmtap.c +++ b/epan/dissectors/packet-gsmtap.c @@ -868,7 +868,7 @@ proto_reg_handoff_gsmtap(void) rrc_sub_handles[GSMTAP_RRC_SUB_ToTargetRNC_Container] = find_dissector("rrc.s_to_trnc_cont"); rrc_sub_handles[GSMTAP_RRC_SUB_TargetRNC_ToSourceRNC_Container] = find_dissector("rrc.t_to_srnc_cont"); - gsmtap_handle = new_create_dissector_handle(dissect_gsmtap, proto_gsmtap); + gsmtap_handle = create_dissector_handle(dissect_gsmtap, proto_gsmtap); dissector_add_uint("udp.port", GSMTAP_UDP_PORT, gsmtap_handle); } diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 06df44c7c0..a17b66bd41 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -9851,13 +9851,13 @@ proto_reg_handoff_gtp(void) bssgp_handle = find_dissector("bssgp"); bssap_pdu_type_table = find_dissector_table("bssap.pdu_type"); /* AVP Code: 5 3GPP-GPRS Negotiated QoS profile */ - dissector_add_uint("diameter.3gpp", 5, new_create_dissector_handle(dissect_diameter_3gpp_qosprofile, proto_gtp)); + dissector_add_uint("diameter.3gpp", 5, create_dissector_handle(dissect_diameter_3gpp_qosprofile, proto_gtp)); /* AVP Code: 903 MBMS-Service-Area */ - dissector_add_uint("diameter.3gpp", 903, new_create_dissector_handle(dissect_gtp_3gpp_mbms_service_area, proto_gtp)); + dissector_add_uint("diameter.3gpp", 903, create_dissector_handle(dissect_gtp_3gpp_mbms_service_area, proto_gtp)); /* AVP Code: 904 MBMS-Session-Duration */ - dissector_add_uint("diameter.3gpp", 904, new_create_dissector_handle(dissect_gtp_mbms_ses_dur, proto_gtp)); + dissector_add_uint("diameter.3gpp", 904, create_dissector_handle(dissect_gtp_mbms_ses_dur, proto_gtp)); /* AVP Code: 911 MBMS-Time-To-Data-Transfer */ - dissector_add_uint("diameter.3gpp", 911, new_create_dissector_handle(dissect_gtp_mbms_time_to_data_tr, proto_gtp)); + dissector_add_uint("diameter.3gpp", 911, create_dissector_handle(dissect_gtp_mbms_time_to_data_tr, proto_gtp)); Initialized = TRUE; } else { diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index c508b70aa7..021c71d3fd 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -8127,10 +8127,10 @@ void proto_register_gtpv2(void) expert_register_field_array(expert_gtpv2, ei, array_length(ei)); /* AVP Code: 22 3GPP-User-Location-Info */ - dissector_add_uint("diameter.3gpp", 22, new_create_dissector_handle(dissect_diameter_3gpp_uli, proto_gtpv2)); + dissector_add_uint("diameter.3gpp", 22, create_dissector_handle(dissect_diameter_3gpp_uli, proto_gtpv2)); /* AVP Code: 2820 Presence-Reporting-Area-Elements-List */ - dissector_add_uint("diameter.3gpp", 2820, new_create_dissector_handle(dissect_diameter_3gpp_presence_reporting_area_elements_list, proto_gtpv2)); + dissector_add_uint("diameter.3gpp", 2820, create_dissector_handle(dissect_diameter_3gpp_presence_reporting_area_elements_list, proto_gtpv2)); new_register_dissector("gtpv2", dissect_gtpv2, proto_gtpv2); /* Dissector table for private extensions */ diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index fd56506a44..962a27a5fd 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -3825,7 +3825,7 @@ void proto_register_gvcp(void) void proto_reg_handoff_gvcp(void) { static dissector_handle_t gvcp_handle; - gvcp_handle = new_create_dissector_handle((new_dissector_t)dissect_gvcp, proto_gvcp); + gvcp_handle = create_dissector_handle((new_dissector_t)dissect_gvcp, proto_gvcp); dissector_add_uint("udp.port", global_gvcp_port, gvcp_handle); } diff --git a/epan/dissectors/packet-gvsp.c b/epan/dissectors/packet-gvsp.c index e68d4182dc..b336d1a790 100644 --- a/epan/dissectors/packet-gvsp.c +++ b/epan/dissectors/packet-gvsp.c @@ -1994,7 +1994,7 @@ void proto_reg_handoff_gvsp(void) static gboolean initialized = FALSE; if (!initialized) { - gvsp_handle = new_create_dissector_handle((new_dissector_t)dissect_gvsp, proto_gvsp); + gvsp_handle = create_dissector_handle((new_dissector_t)dissect_gvsp, proto_gvsp); dissector_add_for_decode_as("udp.port", gvsp_handle); heur_dissector_add("udp", dissect_gvsp_heur, "GigE Vision over UDP", "gvsp_udp", proto_gvsp, HEURISTIC_ENABLE); initialized = TRUE; diff --git a/epan/dissectors/packet-h221_nonstd.c b/epan/dissectors/packet-h221_nonstd.c index 2725523b2a..683848f10c 100644 --- a/epan/dissectors/packet-h221_nonstd.c +++ b/epan/dissectors/packet-h221_nonstd.c @@ -132,7 +132,7 @@ proto_reg_handoff_nonstd(void) static dissector_handle_t ms_nonstd_handle; - ms_nonstd_handle = new_create_dissector_handle(dissect_ms_nonstd, proto_nonstd); + ms_nonstd_handle = create_dissector_handle(dissect_ms_nonstd, proto_nonstd); dissector_add_uint("h245.nsp.h221",0xb500534c, ms_nonstd_handle); dissector_add_uint("h225.nsp.h221",0xb500534c, ms_nonstd_handle); diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index eea65ba644..e6d4eff906 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -1664,10 +1664,10 @@ void proto_reg_handoff_h223(void) data_handle = find_dissector("data"); srp_handle = find_dissector("srp"); - dissector_add_for_decode_as("tcp.port", new_create_dissector_handle( dissect_h223, proto_h223)); + dissector_add_for_decode_as("tcp.port", create_dissector_handle( dissect_h223, proto_h223)); dissector_add_for_decode_as("tcp.port", h223_bitswapped); dissector_add_string("rtp_dyn_payload_type","CLEARMODE", h223_bitswapped); - dissector_add_uint("iax2.dataformat", AST_DATAFORMAT_H223_H245, new_create_dissector_handle(dissect_h223_bitswapped_circuit_data, proto_h223_bitswapped)); + dissector_add_uint("iax2.dataformat", AST_DATAFORMAT_H223_H245, create_dissector_handle(dissect_h223_bitswapped_circuit_data, proto_h223_bitswapped)); } /* diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c index 62cde4d80e..0f912a2fd2 100644 --- a/epan/dissectors/packet-h261.c +++ b/epan/dissectors/packet-h261.c @@ -256,7 +256,7 @@ proto_reg_handoff_h261(void) { dissector_handle_t h261_handle; - h261_handle = new_create_dissector_handle(dissect_h261, proto_h261); + h261_handle = create_dissector_handle(dissect_h261, proto_h261); dissector_add_uint("rtp.pt", PT_H261, h261_handle); dissector_add_uint("iax2.codec", AST_FORMAT_H261, h261_handle); } diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index 2031c62cb8..7cc6267d3c 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -3720,12 +3720,12 @@ proto_reg_handoff_h264(void) dissector_add_string("rtp_dyn_payload_type","H264-SVC", h264_handle); dissector_add_string("rtp_dyn_payload_type","X-H264UC", h264_handle); - h264_name_handle = new_create_dissector_handle(dissect_h264_name, proto_h264); + h264_name_handle = create_dissector_handle(dissect_h264_name, proto_h264); for (ftr=h264_capability_tab; ftr->id; ftr++) { if (ftr->name) dissector_add_string("h245.gef.name", ftr->id, h264_name_handle); if (ftr->content_pdu) - dissector_add_string("h245.gef.content", ftr->id, new_create_dissector_handle(ftr->content_pdu, proto_h264)); + dissector_add_string("h245.gef.content", ftr->id, create_dissector_handle(ftr->content_pdu, proto_h264)); } h264_prefs_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-hartip.c b/epan/dissectors/packet-hartip.c index 444326f750..cc95a58c8a 100644 --- a/epan/dissectors/packet-hartip.c +++ b/epan/dissectors/packet-hartip.c @@ -1527,8 +1527,8 @@ proto_register_hartip(void) void proto_reg_handoff_hartip(void) { - hartip_tcp_handle = new_create_dissector_handle(dissect_hartip_tcp, proto_hartip); - hartip_udp_handle = new_create_dissector_handle(dissect_hartip_udp, proto_hartip); + hartip_tcp_handle = create_dissector_handle(dissect_hartip_tcp, proto_hartip); + hartip_udp_handle = create_dissector_handle(dissect_hartip_udp, proto_hartip); dissector_add_uint("udp.port", HARTIP_PORT, hartip_udp_handle); dissector_add_uint("tcp.port", HARTIP_PORT, hartip_tcp_handle); diff --git a/epan/dissectors/packet-hazelcast.c b/epan/dissectors/packet-hazelcast.c index 399457a679..f2c8217dcc 100644 --- a/epan/dissectors/packet-hazelcast.c +++ b/epan/dissectors/packet-hazelcast.c @@ -589,7 +589,7 @@ proto_reg_handoff_hazelcast(void) { static int currentPort; if (!initialized) { - hazelcast_handle = new_create_dissector_handle(dissect_hazelcast, proto_hazelcast); + hazelcast_handle = create_dissector_handle(dissect_hazelcast, proto_hazelcast); initialized = TRUE; } else { dissector_delete_uint("tcp.port", currentPort, hazelcast_handle); diff --git a/epan/dissectors/packet-hcrt.c b/epan/dissectors/packet-hcrt.c index d0bb94d03a..1ee5607133 100644 --- a/epan/dissectors/packet-hcrt.c +++ b/epan/dissectors/packet-hcrt.c @@ -497,7 +497,7 @@ void proto_reg_handoff_hcrt(void) static gint hcrt_ethertype; if (!hcrt_prefs_initialized) { - hcrt_handle = new_create_dissector_handle(dissect_hcrt, proto_hcrt); + hcrt_handle = create_dissector_handle(dissect_hcrt, proto_hcrt); /* Also register as a dissector that can be selected by a TCP port number via "decode as" */ dissector_add_for_decode_as("tcp.port", hcrt_handle); diff --git a/epan/dissectors/packet-hdmi.c b/epan/dissectors/packet-hdmi.c index a9da459aa3..872a3ccfac 100644 --- a/epan/dissectors/packet-hdmi.c +++ b/epan/dissectors/packet-hdmi.c @@ -268,7 +268,7 @@ proto_reg_handoff_hdmi(void) hdcp_handle = find_dissector("hdcp"); - hdmi_handle = new_create_dissector_handle( dissect_hdmi, proto_hdmi ); + hdmi_handle = create_dissector_handle( dissect_hdmi, proto_hdmi ); dissector_add_for_decode_as("i2c.message", hdmi_handle ); } diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index b52a8202b6..37625304ae 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -1610,10 +1610,10 @@ proto_reg_handoff_hip(void) dissector_handle_t hip_handle; dissector_handle_t hip_handle2; - hip_handle = new_create_dissector_handle(dissect_hip, proto_hip); + hip_handle = create_dissector_handle(dissect_hip, proto_hip); dissector_add_uint("ip.proto", IP_PROTO_HIP, hip_handle); - hip_handle2 = new_create_dissector_handle(dissect_hip_in_udp, proto_hip); + hip_handle2 = create_dissector_handle(dissect_hip_in_udp, proto_hip); dissector_add_uint("udp.port", 10500, hip_handle2); } /* diff --git a/epan/dissectors/packet-hiqnet.c b/epan/dissectors/packet-hiqnet.c index 8810b088ac..b201abd909 100644 --- a/epan/dissectors/packet-hiqnet.c +++ b/epan/dissectors/packet-hiqnet.c @@ -1668,8 +1668,8 @@ proto_reg_handoff_hiqnet(void) static dissector_handle_t hiqnet_udp_handle; static dissector_handle_t hiqnet_tcp_handle; - hiqnet_udp_handle = new_create_dissector_handle(dissect_hiqnet_udp, proto_hiqnet); - hiqnet_tcp_handle = new_create_dissector_handle(dissect_hiqnet_tcp, proto_hiqnet); + hiqnet_udp_handle = create_dissector_handle(dissect_hiqnet_udp, proto_hiqnet); + hiqnet_tcp_handle = create_dissector_handle(dissect_hiqnet_tcp, proto_hiqnet); dissector_add_uint("udp.port", HIQNET_PORT, hiqnet_udp_handle); dissector_add_uint("tcp.port", HIQNET_PORT, hiqnet_tcp_handle); } diff --git a/epan/dissectors/packet-hislip.c b/epan/dissectors/packet-hislip.c index 1cf57a4c9c..f022847094 100644 --- a/epan/dissectors/packet-hislip.c +++ b/epan/dissectors/packet-hislip.c @@ -1031,7 +1031,7 @@ proto_reg_handoff_hislip(void) if (!initialized) { - hislip_handle = new_create_dissector_handle(dissect_hislip, proto_hislip); + hislip_handle = create_dissector_handle(dissect_hislip, proto_hislip); /* disabled by default since heuristic is weak */ heur_dissector_add("tcp", dissect_hislip_heur, "HiSLIP over TCP", "hislip_tcp", proto_hislip, HEURISTIC_DISABLE); initialized = TRUE; diff --git a/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c index 7419c52093..bff72d68b2 100644 --- a/epan/dissectors/packet-homeplug-av.c +++ b/epan/dissectors/packet-homeplug-av.c @@ -4745,7 +4745,7 @@ proto_reg_handoff_homeplug_av(void) { dissector_handle_t homeplug_av_handle; - homeplug_av_handle = new_create_dissector_handle(dissect_homeplug_av, proto_homeplug_av); + homeplug_av_handle = create_dissector_handle(dissect_homeplug_av, proto_homeplug_av); dissector_add_uint("ethertype", ETHERTYPE_HOMEPLUG_AV, homeplug_av_handle); } diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index b0799263ae..8a1c8cc469 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -1357,7 +1357,7 @@ proto_reg_handoff_homeplug(void) { dissector_handle_t homeplug_handle; - homeplug_handle = new_create_dissector_handle(dissect_homeplug, proto_homeplug); + homeplug_handle = create_dissector_handle(dissect_homeplug, proto_homeplug); dissector_add_uint("ethertype", ETHERTYPE_HOMEPLUG, homeplug_handle); } diff --git a/epan/dissectors/packet-hp-erm.c b/epan/dissectors/packet-hp-erm.c index 0582c1cd55..a0779b67e5 100644 --- a/epan/dissectors/packet-hp-erm.c +++ b/epan/dissectors/packet-hp-erm.c @@ -173,7 +173,7 @@ proto_reg_handoff_hp_erm(void) if (!initialized) { eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); - hp_erm_handle = new_create_dissector_handle(dissect_hp_erm, proto_hp_erm); + hp_erm_handle = create_dissector_handle(dissect_hp_erm, proto_hp_erm); initialized = TRUE; } else { if (hp_erm_udp_port != 0) diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c index cb23d5e83d..e1795f6616 100644 --- a/epan/dissectors/packet-hpfeeds.c +++ b/epan/dissectors/packet-hpfeeds.c @@ -499,7 +499,7 @@ proto_reg_handoff_hpfeeds(void) static gint16 hpfeeds_dissector_port; if (!hpfeeds_prefs_initialized) { - hpfeeds_handle = new_create_dissector_handle(dissect_hpfeeds, proto_hpfeeds); + hpfeeds_handle = create_dissector_handle(dissect_hpfeeds, proto_hpfeeds); stats_tree_register("hpfeeds", "hpfeeds", "HPFEEDS", 0, hpfeeds_stats_tree_packet, hpfeeds_stats_tree_init, NULL); hpfeeds_prefs_initialized = TRUE; } diff --git a/epan/dissectors/packet-hsr-prp-supervision.c b/epan/dissectors/packet-hsr-prp-supervision.c index ddde483542..ac2e378b65 100644 --- a/epan/dissectors/packet-hsr-prp-supervision.c +++ b/epan/dissectors/packet-hsr-prp-supervision.c @@ -253,7 +253,7 @@ void proto_register_hsr_prp_supervision(void) void proto_reg_handoff_hsr_prp_supervision(void) { dissector_handle_t hsr_prp_supervision_handle; - hsr_prp_supervision_handle = new_create_dissector_handle(dissect_hsr_prp_supervision, proto_hsr_prp_supervision); + hsr_prp_supervision_handle = create_dissector_handle(dissect_hsr_prp_supervision, proto_hsr_prp_supervision); dissector_add_uint("ethertype", ETHERTYPE_PRP, hsr_prp_supervision_handle); } diff --git a/epan/dissectors/packet-hsr.c b/epan/dissectors/packet-hsr.c index 8a063c1897..f8e3a347f9 100644 --- a/epan/dissectors/packet-hsr.c +++ b/epan/dissectors/packet-hsr.c @@ -189,7 +189,7 @@ void proto_register_hsr(void) void proto_reg_handoff_hsr(void) { dissector_handle_t hsr_frame_handle; - hsr_frame_handle = new_create_dissector_handle(dissect_hsr_frame, proto_hsr); + hsr_frame_handle = create_dissector_handle(dissect_hsr_frame, proto_hsr); dissector_add_uint("ethertype", ETHERTYPE_HSR, hsr_frame_handle); ethertype_subdissector_table = find_dissector_table("ethertype"); diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index c753a14546..387e5c76bf 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -854,7 +854,7 @@ proto_reg_handoff_hsrp(void) dissector_handle_t hsrp_handle; data_handle = find_dissector("data"); - hsrp_handle = new_create_dissector_handle(dissect_hsrp, proto_hsrp); + hsrp_handle = create_dissector_handle(dissect_hsrp, proto_hsrp); dissector_add_uint("udp.port", UDP_PORT_HSRP, hsrp_handle); dissector_add_uint("udp.port", UDP_PORT_HSRP2_V6, hsrp_handle); } diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 1a4ce6e6fa..cc48337994 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -3541,7 +3541,7 @@ proto_reg_handoff_http(void) * XXX - is there anything to dissect in the body of an SSDP * request or reply? I.e., should there be an SSDP dissector? */ - ssdp_handle = new_create_dissector_handle(dissect_ssdp, proto_ssdp); + ssdp_handle = create_dissector_handle(dissect_ssdp, proto_ssdp); dissector_add_uint("udp.port", UDP_PORT_SSDP, ssdp_handle); ntlmssp_handle = find_dissector("ntlmssp"); @@ -3607,7 +3607,7 @@ proto_reg_handoff_message_http(void) { dissector_handle_t message_http_handle; - message_http_handle = new_create_dissector_handle(dissect_message_http, + message_http_handle = create_dissector_handle(dissect_message_http, proto_message_http); dissector_add_string("media_type", "message/http", message_http_handle); diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index ac318318c5..c7bee423c2 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -1879,7 +1879,7 @@ proto_reg_handoff_http2(void) { data_handle = find_dissector("data"); - http2_handle = new_create_dissector_handle(dissect_http2, proto_http2); + http2_handle = create_dissector_handle(dissect_http2, proto_http2); dissector_add_for_decode_as("tcp.port", http2_handle); heur_dissector_add("ssl", dissect_http2_heur, "HTTP2 over SSL", "http2_ssl", proto_http2, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c index 5a8656dc7c..305a56e314 100644 --- a/epan/dissectors/packet-i2c.c +++ b/epan/dissectors/packet-i2c.c @@ -263,7 +263,7 @@ proto_reg_handoff_i2c(void) data_handle = find_dissector("data"); - i2c_handle = new_create_dissector_handle(dissect_i2c, proto_i2c); + i2c_handle = create_dissector_handle(dissect_i2c, proto_i2c); dissector_add_uint("wtap_encap", WTAP_ENCAP_I2C, i2c_handle); } diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c index 8591408b32..160d3497fd 100644 --- a/epan/dissectors/packet-iapp.c +++ b/epan/dissectors/packet-iapp.c @@ -479,7 +479,7 @@ proto_reg_handoff_iapp(void) { dissector_handle_t iapp_handle; - iapp_handle = new_create_dissector_handle(dissect_iapp, proto_iapp); + iapp_handle = create_dissector_handle(dissect_iapp, proto_iapp); dissector_add_uint("udp.port", UDP_PORT_IAPP, iapp_handle); } /* diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c index 8f0d5bb4f7..809e6dc19b 100644 --- a/epan/dissectors/packet-icap.c +++ b/epan/dissectors/packet-icap.c @@ -324,7 +324,7 @@ proto_reg_handoff_icap(void) data_handle = find_dissector("data"); http_handle = find_dissector("http"); - icap_handle = new_create_dissector_handle(dissect_icap, proto_icap); + icap_handle = create_dissector_handle(dissect_icap, proto_icap); dissector_add_uint("tcp.port", TCP_PORT_ICAP, icap_handle); } diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 9ed9cd8b93..d45806f4fe 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -1335,8 +1335,8 @@ void proto_reg_handoff_icep(void) /* Register as a heuristic TCP/UDP dissector */ if (icep_prefs_initialized == FALSE) { - icep_tcp_handle = new_create_dissector_handle(dissect_icep_tcp, proto_icep); - icep_udp_handle = new_create_dissector_handle(dissect_icep_udp, proto_icep); + icep_tcp_handle = create_dissector_handle(dissect_icep_tcp, proto_icep); + icep_udp_handle = create_dissector_handle(dissect_icep_udp, proto_icep); heur_dissector_add("tcp", dissect_icep_tcp, "ICEP over TCP", "icep_tcp", proto_icep, HEURISTIC_ENABLE); heur_dissector_add("udp", dissect_icep_udp, "ICEP over UDP", "icep_udp", proto_icep, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c index 6a573fcb1a..12c973949f 100644 --- a/epan/dissectors/packet-icp.c +++ b/epan/dissectors/packet-icp.c @@ -257,7 +257,7 @@ proto_reg_handoff_icp(void) { dissector_handle_t icp_handle; - icp_handle = new_create_dissector_handle(dissect_icp, proto_icp); + icp_handle = create_dissector_handle(dissect_icp, proto_icp); dissector_add_uint("udp.port", UDP_PORT_ICP, icp_handle); } diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index 4b4b83ca94..4736f7f9c8 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -1403,7 +1403,7 @@ proto_reg_handoff_icq(void) { dissector_handle_t icq_handle; - icq_handle = new_create_dissector_handle(dissect_icq, proto_icq); + icq_handle = create_dissector_handle(dissect_icq, proto_icq); dissector_add_uint("udp.port", UDP_PORT_ICQ, icq_handle); } diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c index 01a520724c..14b667cb9b 100644 --- a/epan/dissectors/packet-idp.c +++ b/epan/dissectors/packet-idp.c @@ -206,7 +206,7 @@ proto_reg_handoff_idp(void) { dissector_handle_t idp_handle; - idp_handle = new_create_dissector_handle(dissect_idp, proto_idp); + idp_handle = create_dissector_handle(dissect_idp, proto_idp); dissector_add_uint("ethertype", ETHERTYPE_XNS_IDP, idp_handle); dissector_add_uint("chdlc.protocol", ETHERTYPE_XNS_IDP, idp_handle); diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index ae1fc419d0..476d65d678 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -1855,8 +1855,8 @@ proto_reg_handoff_iec104(void) { dissector_handle_t iec104apci_handle; - iec104apci_handle = new_create_dissector_handle(dissect_iec104reas, proto_iec104apci); - iec104asdu_handle = new_create_dissector_handle(dissect_iec104asdu, proto_iec104asdu); + iec104apci_handle = create_dissector_handle(dissect_iec104reas, proto_iec104apci); + iec104asdu_handle = create_dissector_handle(dissect_iec104asdu, proto_iec104asdu); dissector_add_uint("tcp.port", IEC104_PORT, iec104apci_handle); } diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index 2a51acffc9..916994d735 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -411,7 +411,7 @@ void proto_reg_handoff_1722(void) { dissector_handle_t avbtp_handle; - avbtp_handle = new_create_dissector_handle(dissect_1722, proto_1722); + avbtp_handle = create_dissector_handle(dissect_1722, proto_1722); dissector_add_uint("ethertype", ETHERTYPE_AVBTP, avbtp_handle); } diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c index 4034ec94ea..d24197eb40 100644 --- a/epan/dissectors/packet-ieee17221.c +++ b/epan/dissectors/packet-ieee17221.c @@ -7020,7 +7020,7 @@ proto_reg_handoff_17221(void) /* avb17221_handle = find_dissector("ieee1722"); */ - avb17221_handle = new_create_dissector_handle(dissect_17221, proto_17221); + avb17221_handle = create_dissector_handle(dissect_17221, proto_17221); dissector_add_uint("ieee1722.subtype", 0x7A, avb17221_handle); dissector_add_uint("ieee1722.subtype", 0x7B, avb17221_handle); dissector_add_uint("ieee1722.subtype", 0x7C, avb17221_handle); diff --git a/epan/dissectors/packet-ieee1722a.c b/epan/dissectors/packet-ieee1722a.c index 84c6ee3a01..df56f2962f 100644 --- a/epan/dissectors/packet-ieee1722a.c +++ b/epan/dissectors/packet-ieee1722a.c @@ -513,7 +513,7 @@ void proto_reg_handoff_1722a(void) { dissector_handle_t avb1722a_handle; - avb1722a_handle = new_create_dissector_handle(dissect_1722a, proto_1722a); + avb1722a_handle = create_dissector_handle(dissect_1722a, proto_1722a); dissector_add_uint("ieee1722.subtype", IEEE_1722A_SUBTYPE_AVTP_AUDIO, avb1722a_handle); dissector_add_uint("ieee1722.subtype", IEEE_1722A_SUBTYPE_CRF, avb1722a_handle); } diff --git a/epan/dissectors/packet-ieee80211-netmon.c b/epan/dissectors/packet-ieee80211-netmon.c index b7d3893f2d..a91a2fb4fa 100644 --- a/epan/dissectors/packet-ieee80211-netmon.c +++ b/epan/dissectors/packet-ieee80211-netmon.c @@ -398,7 +398,7 @@ proto_reg_handoff_netmon_802_11(void) /* handle for 802.11+radio information dissector */ ieee80211_radio_handle = find_dissector("wlan_radio"); - netmon_802_11_handle = new_create_dissector_handle(dissect_netmon_802_11, + netmon_802_11_handle = create_dissector_handle(dissect_netmon_802_11, proto_netmon_802_11); dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_NETMON, netmon_802_11_handle); } diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index 973fb94820..4d9d734f1d 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -563,7 +563,7 @@ void proto_reg_handoff_ieee80211_prism(void) { dissector_handle_t prism_handle; - prism_handle = new_create_dissector_handle(dissect_prism, proto_prism); + prism_handle = create_dissector_handle(dissect_prism, proto_prism); dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_PRISM, prism_handle); ieee80211_handle = find_dissector("wlan"); ieee80211_radio_handle = find_dissector("wlan_radio"); diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c index 0f12f7c8aa..01ea936597 100644 --- a/epan/dissectors/packet-ieee80211-wlancap.c +++ b/epan/dissectors/packet-ieee80211-wlancap.c @@ -849,7 +849,7 @@ void proto_register_ieee80211_wlancap(void) array_length(hf_wlancap)); new_register_dissector("wlancap", dissect_wlancap, proto_wlancap); - wlancap_handle = new_create_dissector_handle(dissect_wlancap, proto_wlancap); + wlancap_handle = create_dissector_handle(dissect_wlancap, proto_wlancap); dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_AVS, wlancap_handle); proto_register_subtree_array(tree_array, array_length(tree_array)); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 60be87e221..a328e67d06 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -27297,7 +27297,7 @@ proto_reg_handoff_ieee80211(void) ieee80211_handle = find_dissector("wlan"); dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11, ieee80211_handle); - centrino_handle = new_create_dissector_handle( dissect_ieee80211_centrino, proto_centrino ); + centrino_handle = create_dissector_handle( dissect_ieee80211_centrino, proto_centrino ); dissector_add_uint("ethertype", ETHERTYPE_CENTRINO_PROMISC, centrino_handle); /* Register handoff to Aruba GRE */ @@ -27326,17 +27326,17 @@ proto_reg_handoff_ieee80211(void) dissector_add_uint("gre.proto", GRE_ARUBA_8360, ieee80211_handle); dissector_add_uint("gre.proto", GRE_ARUBA_8370, ieee80211_handle); - data_encap_handle = new_create_dissector_handle(dissect_data_encap, proto_wlan); + data_encap_handle = create_dissector_handle(dissect_data_encap, proto_wlan); dissector_add_uint("ethertype", ETHERTYPE_IEEE80211_DATA_ENCAP, data_encap_handle); /* * EAPOL key descriptor types. */ - wlan_rsna_eapol_wpa_key_handle = new_create_dissector_handle(dissect_wlan_rsna_eapol_wpa_or_rsn_key, + wlan_rsna_eapol_wpa_key_handle = create_dissector_handle(dissect_wlan_rsna_eapol_wpa_or_rsn_key, proto_wlan_rsna_eapol); dissector_add_uint("eapol.keydes.type", EAPOL_WPA_KEY, wlan_rsna_eapol_wpa_key_handle); - wlan_rsna_eapol_rsn_key_handle = new_create_dissector_handle(dissect_wlan_rsna_eapol_wpa_or_rsn_key, + wlan_rsna_eapol_rsn_key_handle = create_dissector_handle(dissect_wlan_rsna_eapol_wpa_or_rsn_key, proto_wlan_rsna_eapol); dissector_add_uint("eapol.keydes.type", EAPOL_RSN_KEY, wlan_rsna_eapol_rsn_key_handle); diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c index 51c84f65d8..1fea137b20 100644 --- a/epan/dissectors/packet-ieee8021ah.c +++ b/epan/dissectors/packet-ieee8021ah.c @@ -423,9 +423,9 @@ proto_reg_handoff_ieee8021ah(void) if (!prefs_initialized){ dissector_handle_t ieee8021ad_handle; - ieee8021ah_handle = new_create_dissector_handle(dissect_ieee8021ah, + ieee8021ah_handle = create_dissector_handle(dissect_ieee8021ah, proto_ieee8021ah); - ieee8021ad_handle = new_create_dissector_handle(dissect_ieee8021ad, + ieee8021ad_handle = create_dissector_handle(dissect_ieee8021ad, proto_ieee8021ad); dissector_add_uint("ethertype", ETHERTYPE_IEEE_802_1AD, ieee8021ad_handle); ethertype_handle = find_dissector("ethertype"); diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c index 1ee75ac476..1b1028c083 100644 --- a/epan/dissectors/packet-ieee802a.c +++ b/epan/dissectors/packet-ieee802a.c @@ -175,7 +175,7 @@ proto_reg_handoff_ieee802a(void) data_handle = find_dissector("data"); - ieee802a_handle = new_create_dissector_handle(dissect_ieee802a, + ieee802a_handle = create_dissector_handle(dissect_ieee802a, proto_ieee802a); dissector_add_uint("ethertype", ETHERTYPE_IEEE802_OUI_EXTENDED, ieee802a_handle); diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c index 902ca39cec..8401a26202 100644 --- a/epan/dissectors/packet-ifcp.c +++ b/epan/dissectors/packet-ifcp.c @@ -610,7 +610,7 @@ proto_reg_handoff_ifcp (void) { heur_dissector_add("tcp", dissect_ifcp_heur, "iFCP over TCP", "ifcp_tcp", proto_ifcp, HEURISTIC_ENABLE); - ifcp_handle = new_create_dissector_handle(dissect_ifcp_handle, proto_ifcp); + ifcp_handle = create_dissector_handle(dissect_ifcp_handle, proto_ifcp); dissector_add_for_decode_as("tcp.port", ifcp_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index ee2afe2686..86d3c86edf 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -344,7 +344,7 @@ proto_reg_handoff_igap(void) { dissector_handle_t igap_handle; - igap_handle = new_create_dissector_handle(dissect_igap, proto_igap); + igap_handle = create_dissector_handle(dissect_igap, proto_igap); dissector_add_uint("igmp.type", IGMP_IGAP_JOIN, igap_handle); dissector_add_uint("igmp.type", IGMP_IGAP_QUERY, igap_handle); dissector_add_uint("igmp.type", IGMP_IGAP_LEAVE, igap_handle); diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index ecd6505295..2b99620777 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -1120,32 +1120,32 @@ proto_reg_handoff_igmp(void) igmp_mquery_handle, igmp_mtrace_handle, igmp_report_handle; range_t *igmpv0_range = NULL; - igmp_handle = new_create_dissector_handle(dissect_igmp, proto_igmp); + igmp_handle = create_dissector_handle(dissect_igmp, proto_igmp); dissector_add_uint("ip.proto", IP_PROTO_IGMP, igmp_handle); /* IGMP v0 */ range_convert_str(&igmpv0_range, "0-15", 15); - igmpv0_handle = new_create_dissector_handle(dissect_igmp_v0, proto_igmp); + igmpv0_handle = create_dissector_handle(dissect_igmp_v0, proto_igmp); dissector_add_uint_range("igmp.type", igmpv0_range, igmpv0_handle); g_free(igmpv0_range); /* IGMP v1 */ - igmpv1_handle = new_create_dissector_handle(dissect_igmp_v1, proto_igmp); + igmpv1_handle = create_dissector_handle(dissect_igmp_v1, proto_igmp); dissector_add_uint("igmp.type", IGMP_V1_HOST_MEMBERSHIP_REPORT, igmpv1_handle); /* IGMP v2 */ - igmpv2_handle = new_create_dissector_handle(dissect_igmp_v2, proto_igmp); + igmpv2_handle = create_dissector_handle(dissect_igmp_v2, proto_igmp); dissector_add_uint("igmp.type", IGMP_V2_MEMBERSHIP_REPORT, igmpv2_handle); dissector_add_uint("igmp.type", IGMP_V2_LEAVE_GROUP, igmpv2_handle); /* IGMP_V1_HOST_MEMBERSHIP_QUERY, all versions */ - igmp_mquery_handle = new_create_dissector_handle(dissect_igmp_mquery, proto_igmp); + igmp_mquery_handle = create_dissector_handle(dissect_igmp_mquery, proto_igmp); dissector_add_uint("igmp.type", IGMP_V1_HOST_MEMBERSHIP_QUERY, igmp_mquery_handle); - igmp_report_handle = new_create_dissector_handle(dissect_igmp_v3_report, proto_igmp); + igmp_report_handle = create_dissector_handle(dissect_igmp_v3_report, proto_igmp); dissector_add_uint("igmp.type", IGMP_V3_MEMBERSHIP_REPORT, igmp_report_handle); - igmp_mtrace_handle = new_create_dissector_handle(dissect_igmp_mtrace, proto_igmp); + igmp_mtrace_handle = create_dissector_handle(dissect_igmp_mtrace, proto_igmp); dissector_add_uint("igmp.type", IGMP_TRACEROUTE_RESPONSE, igmp_mtrace_handle); dissector_add_uint("igmp.type", IGMP_TRACEROUTE_QUERY_REQ, igmp_mtrace_handle); } diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c index ad79b4c87d..0b290ec329 100644 --- a/epan/dissectors/packet-igrp.c +++ b/epan/dissectors/packet-igrp.c @@ -256,7 +256,7 @@ proto_reg_handoff_igrp(void) { dissector_handle_t igrp_handle; - igrp_handle = new_create_dissector_handle(dissect_igrp, proto_igrp); + igrp_handle = create_dissector_handle(dissect_igrp, proto_igrp); dissector_add_uint("ip.proto", IP_PROTO_IGRP, igrp_handle); } diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 10e8e0107e..03a85b86ef 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -7466,11 +7466,11 @@ void proto_reg_handoff_infiniband(void) dissector_add_uint("erf.types.type", ERF_TYPE_INFINIBAND_LINK, ib_link_handle); /* create and announce an anonymous RoCE dissector */ - roce_handle = new_create_dissector_handle(dissect_roce, proto_infiniband); + roce_handle = create_dissector_handle(dissect_roce, proto_infiniband); dissector_add_uint("ethertype", ETHERTYPE_ROCE, roce_handle); /* create and announce an anonymous RRoCE dissector */ - rroce_handle = new_create_dissector_handle(dissect_rroce, proto_infiniband); + rroce_handle = create_dissector_handle(dissect_rroce, proto_infiniband); if (!initialized) { initialized = TRUE; diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index a9316a5ca4..8f9ee7b9e1 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -3187,7 +3187,7 @@ proto_reg_handoff_ip(void) ip_handle = find_dissector("ip"); ipv6_handle = find_dissector("ipv6"); data_handle = find_dissector("data"); - ipv4_handle = new_create_dissector_handle(dissect_ip_v4, proto_ip); + ipv4_handle = create_dissector_handle(dissect_ip_v4, proto_ip); dissector_add_uint("ethertype", ETHERTYPE_IP, ipv4_handle); dissector_add_uint("erf.types.type", ERF_TYPE_IPV4, ip_handle); diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index d40c123cc8..04612d7361 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -1096,7 +1096,7 @@ proto_reg_handoff_ipdc(void) ipdc_tcp_handle); } else { ipdc_tcp_handle = - new_create_dissector_handle(dissect_ipdc_tcp, proto_ipdc); + create_dissector_handle(dissect_ipdc_tcp, proto_ipdc); q931_handle = find_dissector("q931"); } diff --git a/epan/dissectors/packet-ipdr.c b/epan/dissectors/packet-ipdr.c index c431e241f9..f9bc12b1e0 100644 --- a/epan/dissectors/packet-ipdr.c +++ b/epan/dissectors/packet-ipdr.c @@ -368,7 +368,7 @@ proto_reg_handoff_ipdr(void) { dissector_handle_t ipdr_handle; - ipdr_handle = new_create_dissector_handle(dissect_ipdr, proto_ipdr); + ipdr_handle = create_dissector_handle(dissect_ipdr, proto_ipdr); dissector_add_uint("tcp.port", IPDR_PORT, ipdr_handle); } diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c index b1bbee44bb..5c885e61a5 100644 --- a/epan/dissectors/packet-ipfc.c +++ b/epan/dissectors/packet-ipfc.c @@ -125,7 +125,7 @@ proto_reg_handoff_ipfc (void) { dissector_handle_t ipfc_handle; - ipfc_handle = new_create_dissector_handle (dissect_ipfc, proto_ipfc); + ipfc_handle = create_dissector_handle (dissect_ipfc, proto_ipfc); dissector_add_uint("wtap_encap", WTAP_ENCAP_IP_OVER_FC, ipfc_handle); llc_handle = find_dissector ("llc"); diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c index d3b00f430d..f67134f34f 100644 --- a/epan/dissectors/packet-ipmi-session.c +++ b/epan/dissectors/packet-ipmi-session.c @@ -314,7 +314,7 @@ proto_reg_handoff_ipmi_session(void) { dissector_handle_t ipmi_session_handle; - ipmi_session_handle = new_create_dissector_handle(dissect_ipmi_session, proto_ipmi_session); + ipmi_session_handle = create_dissector_handle(dissect_ipmi_session, proto_ipmi_session); dissector_add_uint("rmcp.class", RMCP_CLASS_IPMI, ipmi_session_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-ipmi-trace.c b/epan/dissectors/packet-ipmi-trace.c index 2a2fcb378e..bec437a2ee 100644 --- a/epan/dissectors/packet-ipmi-trace.c +++ b/epan/dissectors/packet-ipmi-trace.c @@ -449,7 +449,7 @@ proto_reg_handoff_ipmi_trace(void) { dissector_handle_t ipmi_trace_handle; - ipmi_trace_handle = new_create_dissector_handle(dissect_ipmi_trace, + ipmi_trace_handle = create_dissector_handle(dissect_ipmi_trace, proto_ipmi_trace); data_dissector_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 58a115c703..13721069fc 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -1834,7 +1834,7 @@ void proto_reg_handoff_ipmi(void) { dissector_handle_t ipmi_handle; - ipmi_handle = new_create_dissector_handle( dissect_i2c_ipmi, proto_ipmi ); + ipmi_handle = create_dissector_handle( dissect_i2c_ipmi, proto_ipmi ); dissector_add_for_decode_as("i2c.message", ipmi_handle ); } diff --git a/epan/dissectors/packet-ipnet.c b/epan/dissectors/packet-ipnet.c index 34a48847a7..6d4ff97f2d 100644 --- a/epan/dissectors/packet-ipnet.c +++ b/epan/dissectors/packet-ipnet.c @@ -151,7 +151,7 @@ proto_reg_handoff_ipnet(void) ip_handle = find_dissector("ip"); ipv6_handle = find_dissector("ipv6"); - ipnet_handle = new_create_dissector_handle(dissect_ipnet, proto_ipnet); + ipnet_handle = create_dissector_handle(dissect_ipnet, proto_ipnet); dissector_add_uint("wtap_encap", WTAP_ENCAP_IPNET, ipnet_handle); } diff --git a/epan/dissectors/packet-ipoib.c b/epan/dissectors/packet-ipoib.c index 6731556560..7f3ddf36d6 100644 --- a/epan/dissectors/packet-ipoib.c +++ b/epan/dissectors/packet-ipoib.c @@ -117,7 +117,7 @@ proto_reg_handoff_ipoib(void) ip_handle = find_dissector("ip"); ipv6_handle = find_dissector("ipv6"); - ipoib_handle = new_create_dissector_handle(dissect_ipoib, proto_ipoib); + ipoib_handle = create_dissector_handle(dissect_ipoib, proto_ipoib); dissector_add_uint("wtap_encap", WTAP_ENCAP_IP_OVER_IB, ipoib_handle); } diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index d8a074c206..779b362d26 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -717,7 +717,7 @@ proto_reg_handoff_ipp(void) /* * Register ourselves as running atop HTTP and using port 631. */ - ipp_handle = new_create_dissector_handle(dissect_ipp, proto_ipp); + ipp_handle = create_dissector_handle(dissect_ipp, proto_ipp); http_dissector_add(631, ipp_handle); dissector_add_string("media_type", "application/ipp", ipp_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c index 83458e29c7..7561f7e20f 100644 --- a/epan/dissectors/packet-ipsec-tcp.c +++ b/epan/dissectors/packet-ipsec-tcp.c @@ -244,7 +244,7 @@ proto_reg_handoff_tcpencap(void) static guint tcpencap_tcp_port = 0; if (!initialized) { - tcpencap_handle = new_create_dissector_handle(dissect_tcpencap, proto_tcpencap); + tcpencap_handle = create_dissector_handle(dissect_tcpencap, proto_tcpencap); esp_handle = find_dissector("esp"); udp_handle = find_dissector("udp"); diff --git a/epan/dissectors/packet-ipsec-udp.c b/epan/dissectors/packet-ipsec-udp.c index 01c17d79d2..08527bbff3 100644 --- a/epan/dissectors/packet-ipsec-udp.c +++ b/epan/dissectors/packet-ipsec-udp.c @@ -107,7 +107,7 @@ proto_reg_handoff_udpencap(void) esp_handle = find_dissector("esp"); isakmp_handle = find_dissector("isakmp"); - udpencap_handle = new_create_dissector_handle(dissect_udpencap, proto_udpencap); + udpencap_handle = create_dissector_handle(dissect_udpencap, proto_udpencap); dissector_add_uint("udp.port", 4500, udpencap_handle); } diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 4e52241fe6..1cfa14869c 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -2553,9 +2553,9 @@ proto_reg_handoff_ipsec(void) dissector_add_uint("ip.proto", IP_PROTO_AH, ah_handle); esp_handle = find_dissector("esp"); dissector_add_uint("ip.proto", IP_PROTO_ESP, esp_handle); - ipcomp_handle = new_create_dissector_handle(dissect_ipcomp, proto_ipcomp); + ipcomp_handle = create_dissector_handle(dissect_ipcomp, proto_ipcomp); dissector_add_uint("ip.proto", IP_PROTO_IPCOMP, ipcomp_handle); - ipv6_ah_handle = new_create_dissector_handle(dissect_ah_header, proto_ah ); + ipv6_ah_handle = create_dissector_handle(dissect_ah_header, proto_ah ); dissector_add_uint("ipv6.nxt", IP_PROTO_AH, ipv6_ah_handle); ip_dissector_table = find_dissector_table("ip.proto"); diff --git a/epan/dissectors/packet-ipsi-ctl.c b/epan/dissectors/packet-ipsi-ctl.c index 3bbf9c1910..bc22f520b4 100644 --- a/epan/dissectors/packet-ipsi-ctl.c +++ b/epan/dissectors/packet-ipsi-ctl.c @@ -235,7 +235,7 @@ void proto_reg_handoff_ipsictl(void) dissector_handle_t ipsictl_handle = NULL; - ipsictl_handle = new_create_dissector_handle(dissect_ipsictl, proto_ipsictl); + ipsictl_handle = create_dissector_handle(dissect_ipsictl, proto_ipsictl); dissector_add_uint("tcp.port", IPSICTL_PORT, ipsictl_handle); diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index f778e090d5..1a0a2b7f3d 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -3557,13 +3557,13 @@ proto_reg_handoff_ipv6(void) dissector_add_for_decode_as("udp.port", ipv6_handle); - ipv6_hopopts_handle = new_create_dissector_handle(dissect_hopopts, proto_ipv6_hopopts ); + ipv6_hopopts_handle = create_dissector_handle(dissect_hopopts, proto_ipv6_hopopts ); dissector_add_uint("ipv6.nxt", IP_PROTO_HOPOPTS, ipv6_hopopts_handle); - ipv6_routing_handle = new_create_dissector_handle(dissect_routing6, proto_ipv6_routing ); + ipv6_routing_handle = create_dissector_handle(dissect_routing6, proto_ipv6_routing ); dissector_add_uint("ipv6.nxt", IP_PROTO_ROUTING, ipv6_routing_handle); - ipv6_shim6_handle = new_create_dissector_handle(dissect_shim6, proto_ipv6_shim6 ); + ipv6_shim6_handle = create_dissector_handle(dissect_shim6, proto_ipv6_shim6 ); dissector_add_uint("ipv6.nxt", IP_PROTO_SHIM6, ipv6_shim6_handle); - ipv6_dstopts_handle = new_create_dissector_handle(dissect_dstopts, proto_ipv6_dstopts ); + ipv6_dstopts_handle = create_dissector_handle(dissect_dstopts, proto_ipv6_dstopts ); dissector_add_uint("ipv6.nxt", IP_PROTO_DSTOPTS, ipv6_dstopts_handle); ip_dissector_table = find_dissector_table("ip.proto"); diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c index 036e2710e9..a66a72fac8 100644 --- a/epan/dissectors/packet-ipvs-syncd.c +++ b/epan/dissectors/packet-ipvs-syncd.c @@ -333,7 +333,7 @@ proto_reg_handoff_ipvs_syncd(void) { dissector_handle_t ipvs_syncd_handle; - ipvs_syncd_handle = new_create_dissector_handle(dissect_ipvs_syncd, proto_ipvs_syncd); + ipvs_syncd_handle = create_dissector_handle(dissect_ipvs_syncd, proto_ipvs_syncd); dissector_add_uint("udp.port", IPVS_SYNCD_PORT, ipvs_syncd_handle); } diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index 1656d0f978..2d5557c445 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -1604,21 +1604,21 @@ proto_reg_handoff_ipx(void) dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_IPX, ipx_handle); dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_NOVELL_EC, ipx_handle); - spx_handle = new_create_dissector_handle(dissect_spx, proto_spx); + spx_handle = create_dissector_handle(dissect_spx, proto_spx); dissector_add_uint("ipx.packet_type", IPX_PACKET_TYPE_SPX, spx_handle); ipxsap_handle = find_dissector("ipxsap"); dissector_add_uint("ipx.socket", IPX_SOCKET_SAP, ipxsap_handle); - ipxrip_handle = new_create_dissector_handle(dissect_ipxrip, proto_ipxrip); + ipxrip_handle = create_dissector_handle(dissect_ipxrip, proto_ipxrip); dissector_add_uint("ipx.socket", IPX_SOCKET_IPXRIP, ipxrip_handle); - serialization_handle = new_create_dissector_handle(dissect_serialization, + serialization_handle = create_dissector_handle(dissect_serialization, proto_serialization); dissector_add_uint("ipx.socket", IPX_SOCKET_SERIALIZATION, serialization_handle); - ipxmsg_handle = new_create_dissector_handle(dissect_ipxmsg, proto_ipxmsg); + ipxmsg_handle = create_dissector_handle(dissect_ipxmsg, proto_ipxmsg); dissector_add_uint("ipx.socket", IPX_SOCKET_IPX_MESSAGE, ipxmsg_handle); dissector_add_uint("ipx.socket", IPX_SOCKET_IPX_MESSAGE1, ipxmsg_handle); diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index 113c55ef9f..c432069608 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.c @@ -454,7 +454,7 @@ proto_reg_handoff_ipxwan(void) { dissector_handle_t ipxwan_handle; - ipxwan_handle = new_create_dissector_handle(dissect_ipxwan, + ipxwan_handle = create_dissector_handle(dissect_ipxwan, proto_ipxwan); dissector_add_uint("ipx.socket", IPX_SOCKET_IPXWAN, ipxwan_handle); } diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c index a1ba34a190..64bd63def7 100644 --- a/epan/dissectors/packet-irc.c +++ b/epan/dissectors/packet-irc.c @@ -572,7 +572,7 @@ proto_reg_handoff_irc(void) { dissector_handle_t irc_handle; - irc_handle = new_create_dissector_handle(dissect_irc, proto_irc); + irc_handle = create_dissector_handle(dissect_irc, proto_irc); dissector_add_uint("tcp.port", TCP_PORT_IRC, irc_handle); dissector_add_uint("tcp.port", TCP_PORT_DIRCPROXY, irc_handle); } diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 7fd78dd6fd..cdb3befc7c 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -3168,7 +3168,7 @@ proto_reg_handoff_iscsi(void) { heur_dissector_add("tcp", dissect_iscsi_heur, "iSCSI over TCP", "iscsi_tcp", proto_iscsi, HEURISTIC_ENABLE); - iscsi_handle = new_create_dissector_handle(dissect_iscsi_handle, proto_iscsi); + iscsi_handle = create_dissector_handle(dissect_iscsi_handle, proto_iscsi); dissector_add_for_decode_as("tcp.port", iscsi_handle); } diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index 80e7d87120..a6782eecdd 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.c @@ -244,7 +244,7 @@ proto_reg_handoff_isdn(void) v120_handle = find_dissector("v120"); data_handle = find_dissector("data"); - isdn_handle = new_create_dissector_handle(dissect_isdn, proto_isdn); + isdn_handle = create_dissector_handle(dissect_isdn, proto_isdn); dissector_add_uint("wtap_encap", WTAP_ENCAP_ISDN, isdn_handle); } diff --git a/epan/dissectors/packet-iser.c b/epan/dissectors/packet-iser.c index 3fc5b9646c..eee5be583e 100644 --- a/epan/dissectors/packet-iser.c +++ b/epan/dissectors/packet-iser.c @@ -396,7 +396,7 @@ proto_reg_handoff_iser(void) static gboolean initialized = FALSE; if (!initialized) { - new_create_dissector_handle(dissect_iser, proto_iser); + create_dissector_handle(dissect_iser, proto_iser); heur_dissector_add("infiniband.payload", dissect_iser, "iSER Infiniband", "iser_infiniband", proto_iser, HEURISTIC_ENABLE); heur_dissector_add("infiniband.mad.cm.private", dissect_iser, "iSER in PrivateData of CM packets", "iser_ib_private", proto_iser, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-isi.c b/epan/dissectors/packet-isi.c index ad4b9de79d..cf441e16a3 100644 --- a/epan/dissectors/packet-isi.c +++ b/epan/dissectors/packet-isi.c @@ -2140,17 +2140,17 @@ proto_reg_handoff_isi(void) if(!initialized) { data_handle = find_dissector("data"); - dissector_add_uint("sll.ltype", LINUX_SLL_P_ISI, new_create_dissector_handle(dissect_isi, proto_isi)); + dissector_add_uint("sll.ltype", LINUX_SLL_P_ISI, create_dissector_handle(dissect_isi, proto_isi)); heur_dissector_add("usb.bulk", dissect_usb_isi, "ISI bulk endpoint", "usb_bulk_isi", proto_isi, HEURISTIC_DISABLE); - dissector_add_uint("isi.resource", 0x02, new_create_dissector_handle(dissect_isi_sms, proto_isi)); - dissector_add_uint("isi.resource", 0x06, new_create_dissector_handle(dissect_isi_ss, proto_isi)); - dissector_add_uint("isi.resource", 0x08, new_create_dissector_handle(dissect_isi_sim_auth, proto_isi)); - dissector_add_uint("isi.resource", 0x09, new_create_dissector_handle(dissect_isi_sim, proto_isi)); - dissector_add_uint("isi.resource", 0x0a, new_create_dissector_handle(dissect_isi_network, proto_isi)); - dissector_add_uint("isi.resource", 0x32, new_create_dissector_handle(dissect_isi_gss, proto_isi)); - dissector_add_uint("isi.resource", 0x54, new_create_dissector_handle(dissect_isi_gps, proto_isi)); + dissector_add_uint("isi.resource", 0x02, create_dissector_handle(dissect_isi_sms, proto_isi)); + dissector_add_uint("isi.resource", 0x06, create_dissector_handle(dissect_isi_ss, proto_isi)); + dissector_add_uint("isi.resource", 0x08, create_dissector_handle(dissect_isi_sim_auth, proto_isi)); + dissector_add_uint("isi.resource", 0x09, create_dissector_handle(dissect_isi_sim, proto_isi)); + dissector_add_uint("isi.resource", 0x0a, create_dissector_handle(dissect_isi_network, proto_isi)); + dissector_add_uint("isi.resource", 0x32, create_dissector_handle(dissect_isi_gss, proto_isi)); + dissector_add_uint("isi.resource", 0x54, create_dissector_handle(dissect_isi_gps, proto_isi)); } } diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index d6d7497158..fd34211cd0 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -1508,9 +1508,9 @@ proto_register_isis_hello(void) void proto_reg_handoff_isis_hello(void) { - dissector_add_uint("isis.type", ISIS_TYPE_L1_HELLO, new_create_dissector_handle(dissect_isis_l1_hello, proto_isis_hello)); - dissector_add_uint("isis.type", ISIS_TYPE_L2_HELLO, new_create_dissector_handle(dissect_isis_l2_hello, proto_isis_hello)); - dissector_add_uint("isis.type", ISIS_TYPE_PTP_HELLO, new_create_dissector_handle(dissect_isis_ptp_hello, proto_isis_hello)); + dissector_add_uint("isis.type", ISIS_TYPE_L1_HELLO, create_dissector_handle(dissect_isis_l1_hello, proto_isis_hello)); + dissector_add_uint("isis.type", ISIS_TYPE_L2_HELLO, create_dissector_handle(dissect_isis_l2_hello, proto_isis_hello)); + dissector_add_uint("isis.type", ISIS_TYPE_PTP_HELLO, create_dissector_handle(dissect_isis_ptp_hello, proto_isis_hello)); } /* diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index cc89ba28ec..2d4d7bac7c 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -4976,8 +4976,8 @@ proto_register_isis_lsp(void) void proto_reg_handoff_isis_lsp(void) { - dissector_add_uint("isis.type", ISIS_TYPE_L1_LSP, new_create_dissector_handle(dissect_isis_l1_lsp, proto_isis_lsp)); - dissector_add_uint("isis.type", ISIS_TYPE_L2_LSP, new_create_dissector_handle(dissect_isis_l2_lsp, proto_isis_lsp)); + dissector_add_uint("isis.type", ISIS_TYPE_L1_LSP, create_dissector_handle(dissect_isis_l1_lsp, proto_isis_lsp)); + dissector_add_uint("isis.type", ISIS_TYPE_L2_LSP, create_dissector_handle(dissect_isis_l2_lsp, proto_isis_lsp)); } /* diff --git a/epan/dissectors/packet-isis-snp.c b/epan/dissectors/packet-isis-snp.c index 9587e003f2..cecd0655c6 100644 --- a/epan/dissectors/packet-isis-snp.c +++ b/epan/dissectors/packet-isis-snp.c @@ -569,8 +569,8 @@ proto_register_isis_csnp(void) void proto_reg_handoff_isis_csnp(void) { - dissector_add_uint("isis.type", ISIS_TYPE_L1_CSNP, new_create_dissector_handle(dissect_isis_l1_csnp, proto_isis_csnp)); - dissector_add_uint("isis.type", ISIS_TYPE_L2_CSNP, new_create_dissector_handle(dissect_isis_l2_csnp, proto_isis_csnp)); + dissector_add_uint("isis.type", ISIS_TYPE_L1_CSNP, create_dissector_handle(dissect_isis_l1_csnp, proto_isis_csnp)); + dissector_add_uint("isis.type", ISIS_TYPE_L2_CSNP, create_dissector_handle(dissect_isis_l2_csnp, proto_isis_csnp)); } void @@ -622,8 +622,8 @@ proto_register_isis_psnp(void) void proto_reg_handoff_isis_psnp(void) { - dissector_add_uint("isis.type", ISIS_TYPE_L1_PSNP, new_create_dissector_handle(dissect_isis_l1_psnp, proto_isis_psnp)); - dissector_add_uint("isis.type", ISIS_TYPE_L2_PSNP, new_create_dissector_handle(dissect_isis_l2_psnp, proto_isis_psnp)); + dissector_add_uint("isis.type", ISIS_TYPE_L1_PSNP, create_dissector_handle(dissect_isis_l1_psnp, proto_isis_psnp)); + dissector_add_uint("isis.type", ISIS_TYPE_L2_PSNP, create_dissector_handle(dissect_isis_l2_psnp, proto_isis_psnp)); } /* diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index 9f27142577..5f140aaa74 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -1007,9 +1007,9 @@ void proto_reg_handoff_ismacryp(void) if (!ismacryp_prefs_initialized) { dissector_handle_t ismacryp_v11_handle; dissector_handle_t ismacryp_v20_handle; - ismacryp_handle = new_create_dissector_handle(dissect_ismacryp, proto_ismacryp); - ismacryp_v11_handle = new_create_dissector_handle(dissect_ismacryp_v11, proto_ismacryp); - ismacryp_v20_handle = new_create_dissector_handle(dissect_ismacryp_v20, proto_ismacryp); + ismacryp_handle = create_dissector_handle(dissect_ismacryp, proto_ismacryp); + ismacryp_v11_handle = create_dissector_handle(dissect_ismacryp_v11, proto_ismacryp); + ismacryp_v20_handle = create_dissector_handle(dissect_ismacryp_v20, proto_ismacryp); ismacryp_prefs_initialized = TRUE; dissector_add_string("rtp_dyn_payload_type", "ISMACRYP", ismacryp_handle); dissector_add_string("rtp_dyn_payload_type", "enc-mpeg4-generic", ismacryp_v11_handle); diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index fe68fca7b6..4e1527c7ee 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -882,7 +882,7 @@ proto_reg_handoff_ismp(void) { dissector_handle_t ismp_handle; - ismp_handle = new_create_dissector_handle(dissect_ismp, + ismp_handle = create_dissector_handle(dissect_ismp, proto_ismp); dissector_add_uint("ethertype", ETHERTYPE_ISMP, ismp_handle); } diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 05ef73745e..a9d96ddc4f 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -1724,8 +1724,8 @@ void proto_register_isns(void) void proto_reg_handoff_isns(void) { - isns_tcp_handle = new_create_dissector_handle(dissect_isns_tcp,proto_isns); - isns_udp_handle = new_create_dissector_handle(dissect_isns_udp,proto_isns); + isns_tcp_handle = create_dissector_handle(dissect_isns_tcp,proto_isns); + isns_udp_handle = create_dissector_handle(dissect_isns_udp,proto_isns); dissector_add_uint("tcp.port",ISNS_TCP_PORT,isns_tcp_handle); dissector_add_uint("udp.port",ISNS_UDP_PORT,isns_udp_handle); diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index 2ae069219d..ef545b9854 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -1092,31 +1092,31 @@ proto_reg_handoff_iso14443(void) dissector_add_uint("wtap_encap", WTAP_ENCAP_ISO14443, iso14443_handle); - cmd_type_handle = new_create_dissector_handle( + cmd_type_handle = create_dissector_handle( dissect_iso14443_cmd_type_wupa, proto_iso14443); dissector_add_uint("iso14443.cmd_type", CMD_TYPE_WUPA, cmd_type_handle); - cmd_type_handle = new_create_dissector_handle( + cmd_type_handle = create_dissector_handle( dissect_iso14443_cmd_type_wupb, proto_iso14443); dissector_add_uint("iso14443.cmd_type", CMD_TYPE_WUPB, cmd_type_handle); - cmd_type_handle = new_create_dissector_handle( + cmd_type_handle = create_dissector_handle( dissect_iso14443_cmd_type_hlta, proto_iso14443); dissector_add_uint("iso14443.cmd_type", CMD_TYPE_HLTA, cmd_type_handle); - cmd_type_handle = new_create_dissector_handle( + cmd_type_handle = create_dissector_handle( dissect_iso14443_cmd_type_uid, proto_iso14443); dissector_add_uint("iso14443.cmd_type", CMD_TYPE_UID, cmd_type_handle); - cmd_type_handle = new_create_dissector_handle( + cmd_type_handle = create_dissector_handle( dissect_iso14443_cmd_type_ats, proto_iso14443); dissector_add_uint("iso14443.cmd_type", CMD_TYPE_ATS, cmd_type_handle); - cmd_type_handle = new_create_dissector_handle( + cmd_type_handle = create_dissector_handle( dissect_iso14443_cmd_type_attrib, proto_iso14443); dissector_add_uint("iso14443.cmd_type", CMD_TYPE_ATTRIB, cmd_type_handle); - cmd_type_handle = new_create_dissector_handle( + cmd_type_handle = create_dissector_handle( dissect_iso14443_cmd_type_block, proto_iso14443); dissector_add_uint("iso14443.cmd_type", CMD_TYPE_BLOCK, cmd_type_handle); } diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index a1c509fdba..1d1149d85f 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -12425,8 +12425,8 @@ proto_reg_handoff_isup(void) dissector_handle_t isup_handle; dissector_handle_t application_isup_handle; - isup_handle = new_create_dissector_handle(dissect_isup, proto_isup); - application_isup_handle = new_create_dissector_handle(dissect_application_isup, proto_isup); + isup_handle = create_dissector_handle(dissect_isup, proto_isup); + application_isup_handle = create_dissector_handle(dissect_application_isup, proto_isup); dissector_add_uint("mtp3.service_indicator", MTP_SI_ISUP, isup_handle); dissector_add_string("media_type", "application/isup", application_isup_handle); dissector_add_string("tali.opcode", "isot", isup_handle); diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c index 84bc943e91..a465a03fac 100644 --- a/epan/dissectors/packet-itdm.c +++ b/epan/dissectors/packet-itdm.c @@ -466,7 +466,7 @@ proto_reg_handoff_itdm(void) static guint ItdmMPLSLabel; if (!Initialized) { - itdm_handle = new_create_dissector_handle( dissect_itdm, proto_itdm ); + itdm_handle = create_dissector_handle( dissect_itdm, proto_itdm ); data_handle = find_dissector("data"); Initialized=TRUE; } else { diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index c563892ab6..56df118f52 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -1682,7 +1682,7 @@ void proto_reg_handoff_ixveriwave(void) /* handle for 802.11+radio information dissector */ ieee80211_radio_handle = find_dissector("wlan_radio"); - ixveriwave_handle = new_create_dissector_handle(dissect_ixveriwave, proto_ixveriwave); + ixveriwave_handle = create_dissector_handle(dissect_ixveriwave, proto_ixveriwave); dissector_add_uint("wtap_encap", WTAP_ENCAP_IXVERIWAVE, ixveriwave_handle); } diff --git a/epan/dissectors/packet-j1939.c b/epan/dissectors/packet-j1939.c index 0fb7f9bfa4..199f5a63fb 100644 --- a/epan/dissectors/packet-j1939.c +++ b/epan/dissectors/packet-j1939.c @@ -358,7 +358,7 @@ proto_reg_handoff_j1939(void) { dissector_handle_t j1939_handle; - j1939_handle = new_create_dissector_handle( dissect_j1939, proto_j1939 ); + j1939_handle = create_dissector_handle( dissect_j1939, proto_j1939 ); dissector_add_for_decode_as("can.subdissector", j1939_handle ); } diff --git a/epan/dissectors/packet-jmirror.c b/epan/dissectors/packet-jmirror.c index d86f486368..7b05bad2c7 100644 --- a/epan/dissectors/packet-jmirror.c +++ b/epan/dissectors/packet-jmirror.c @@ -205,7 +205,7 @@ proto_reg_handoff_jmirror(void) /* heur_dissector_add("udp", dissect_jmirror, proto_jmirror); */ /* Create a dissector handle for the Jmirror protocol */ - jmirror_handle = new_create_dissector_handle(dissect_jmirror, proto_jmirror); + jmirror_handle = create_dissector_handle(dissect_jmirror, proto_jmirror); /* Create pointer to ipv4, ipv6, ppp and data dissectors */ ipv4_handle = find_dissector("ip"); diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c index 315a9cdf1c..7836807e28 100644 --- a/epan/dissectors/packet-jpeg.c +++ b/epan/dissectors/packet-jpeg.c @@ -297,7 +297,7 @@ proto_register_jpeg(void) proto_register_fields(proto_jpeg, hfi, array_length(hfi)); proto_register_subtree_array(ett, array_length(ett)); - jpeg_handle = new_create_dissector_handle(dissect_jpeg, proto_jpeg); + jpeg_handle = create_dissector_handle(dissect_jpeg, proto_jpeg); /* RFC 2798 */ register_ber_oid_dissector_handle("0.9.2342.19200300.100.1.60", jpeg_handle, proto_jpeg, "jpegPhoto"); diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index 53440e9800..1234e63a90 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -644,7 +644,7 @@ proto_register_json(void) void proto_reg_handoff_json(void) { - dissector_handle_t json_file_handle = new_create_dissector_handle(dissect_json_file, proto_json); + dissector_handle_t json_file_handle = create_dissector_handle(dissect_json_file, proto_json); heur_dissector_add("hpfeeds", dissect_json_heur, "JSON over HPFEEDS", "json_hpfeeds", proto_json, HEURISTIC_ENABLE); heur_dissector_add("db-lsp", dissect_json_heur, "JSON over DB-LSP", "json_db_lsp", proto_json, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index e328c9f83d..e74672ffa0 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -1439,18 +1439,18 @@ proto_reg_handoff_juniper(void) ipv4_handle = find_dissector("ip"); data_handle = find_dissector("data"); - juniper_atm2_handle = new_create_dissector_handle(dissect_juniper_atm2, proto_juniper); - juniper_atm1_handle = new_create_dissector_handle(dissect_juniper_atm1, proto_juniper); - juniper_pppoe_handle = new_create_dissector_handle(dissect_juniper_pppoe, proto_juniper); - juniper_mlppp_handle = new_create_dissector_handle(dissect_juniper_mlppp, proto_juniper); - juniper_mlfr_handle = new_create_dissector_handle(dissect_juniper_mlfr, proto_juniper); - juniper_ether_handle = new_create_dissector_handle(dissect_juniper_ether, proto_juniper); - juniper_ppp_handle = new_create_dissector_handle(dissect_juniper_ppp, proto_juniper); - juniper_frelay_handle = new_create_dissector_handle(dissect_juniper_frelay, proto_juniper); - juniper_chdlc_handle = new_create_dissector_handle(dissect_juniper_chdlc, proto_juniper); - juniper_ggsn_handle = new_create_dissector_handle(dissect_juniper_ggsn, proto_juniper); - juniper_vp_handle = new_create_dissector_handle(dissect_juniper_vp, proto_juniper); - juniper_svcs_handle = new_create_dissector_handle(dissect_juniper_svcs, proto_juniper); + juniper_atm2_handle = create_dissector_handle(dissect_juniper_atm2, proto_juniper); + juniper_atm1_handle = create_dissector_handle(dissect_juniper_atm1, proto_juniper); + juniper_pppoe_handle = create_dissector_handle(dissect_juniper_pppoe, proto_juniper); + juniper_mlppp_handle = create_dissector_handle(dissect_juniper_mlppp, proto_juniper); + juniper_mlfr_handle = create_dissector_handle(dissect_juniper_mlfr, proto_juniper); + juniper_ether_handle = create_dissector_handle(dissect_juniper_ether, proto_juniper); + juniper_ppp_handle = create_dissector_handle(dissect_juniper_ppp, proto_juniper); + juniper_frelay_handle = create_dissector_handle(dissect_juniper_frelay, proto_juniper); + juniper_chdlc_handle = create_dissector_handle(dissect_juniper_chdlc, proto_juniper); + juniper_ggsn_handle = create_dissector_handle(dissect_juniper_ggsn, proto_juniper); + juniper_vp_handle = create_dissector_handle(dissect_juniper_vp, proto_juniper); + juniper_svcs_handle = create_dissector_handle(dissect_juniper_svcs, proto_juniper); dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_ATM2, juniper_atm2_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_ATM1, juniper_atm1_handle); diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 39737b9d01..6004bbd75c 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -2400,7 +2400,7 @@ void proto_reg_handoff_jxta(void) static gboolean msg_media_register_done = FALSE; if(!init_done) { - message_jxta_handle = new_create_dissector_handle(dissect_jxta_message, proto_message_jxta); + message_jxta_handle = create_dissector_handle(dissect_jxta_message, proto_message_jxta); stream_jxta_handle = find_dissector("jxta.stream"); media_type_dissector_table = find_dissector_table("media_type"); diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c index 8345c2c02d..7f1b7527a3 100644 --- a/epan/dissectors/packet-kafka.c +++ b/epan/dissectors/packet-kafka.c @@ -1267,7 +1267,7 @@ proto_reg_handoff_kafka(void) static int currentPort; if (!initialized) { - kafka_handle = new_create_dissector_handle(dissect_kafka_tcp, + kafka_handle = create_dissector_handle(dissect_kafka_tcp, proto_kafka); initialized = TRUE; diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c index 7b655d8858..e676731acc 100644 --- a/epan/dissectors/packet-kdp.c +++ b/epan/dissectors/packet-kdp.c @@ -405,7 +405,7 @@ void proto_register_kdp(void) { void proto_reg_handoff_kdp(void) { dissector_handle_t kdp_handle; - kdp_handle = new_create_dissector_handle(dissect_kdp, proto_kdp); + kdp_handle = create_dissector_handle(dissect_kdp, proto_kdp); dissector_add_uint("udp.port", KDP_PORT, kdp_handle); } diff --git a/epan/dissectors/packet-kdsp.c b/epan/dissectors/packet-kdsp.c index 69588227a6..b304654dfb 100644 --- a/epan/dissectors/packet-kdsp.c +++ b/epan/dissectors/packet-kdsp.c @@ -1166,7 +1166,7 @@ proto_reg_handoff_kdsp(void) if (!initialized) { - kdsp_handle = new_create_dissector_handle(dissect_kdsp, proto_kdsp); + kdsp_handle = create_dissector_handle(dissect_kdsp, proto_kdsp); dlt_handle = find_dissector("radiotap"); if (dlt_handle) dissector_add_uint( "kdsp.cpt.dlt", DATALINK_RADIOTAP, dlt_handle); diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c index 30d6e5d85a..9a6c8dcb12 100644 --- a/epan/dissectors/packet-kingfisher.c +++ b/epan/dissectors/packet-kingfisher.c @@ -371,7 +371,7 @@ proto_reg_handoff_kingfisher( void ) { dissector_handle_t kingfisher_handle=NULL; - kingfisher_handle = new_create_dissector_handle(dissect_kingfisher_heur, proto_kingfisher); + kingfisher_handle = create_dissector_handle(dissect_kingfisher_heur, proto_kingfisher); dissector_add_uint("tcp.port", TCP_PORT_KINGFISHER, kingfisher_handle); dissector_add_uint("udp.port", UDP_PORT_KINGFISHER, kingfisher_handle); @@ -379,7 +379,7 @@ proto_reg_handoff_kingfisher( void ) dissector_add_uint("tcp.port", TCP_PORT_KINGFISHER_OLD, kingfisher_handle); dissector_add_uint("udp.port", UDP_PORT_KINGFISHER_OLD, kingfisher_handle); #endif - kingfisher_conv_handle = new_create_dissector_handle(dissect_kingfisher_conv, proto_kingfisher); + kingfisher_conv_handle = create_dissector_handle(dissect_kingfisher_conv, proto_kingfisher); } diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index a2e0527520..081fa1ac7e 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -993,7 +993,7 @@ void proto_reg_handoff_kink(void) { dissector_handle_t kink_handle = NULL; - kink_handle = new_create_dissector_handle(dissect_kink, proto_kink); + kink_handle = create_dissector_handle(dissect_kink, proto_kink); dissector_add_uint("udp.port", KINK_PORT, kink_handle); diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c index f23b9a74ca..32fbcfe4da 100644 --- a/epan/dissectors/packet-kismet.c +++ b/epan/dissectors/packet-kismet.c @@ -338,7 +338,7 @@ proto_reg_handoff_kismet(void) static guint tcp_port; if (!kismet_prefs_initialized) { - kismet_handle = new_create_dissector_handle(dissect_kismet, proto_kismet); + kismet_handle = create_dissector_handle(dissect_kismet, proto_kismet); data_handle = find_dissector("data"); kismet_prefs_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c index 7d31c9c3b2..27b906fc50 100644 --- a/epan/dissectors/packet-kpasswd.c +++ b/epan/dissectors/packet-kpasswd.c @@ -326,8 +326,8 @@ proto_reg_handoff_kpasswd(void) dissector_handle_t kpasswd_handle_udp; dissector_handle_t kpasswd_handle_tcp; - kpasswd_handle_udp = new_create_dissector_handle(dissect_kpasswd_udp, proto_kpasswd); - kpasswd_handle_tcp = new_create_dissector_handle(dissect_kpasswd_tcp, proto_kpasswd); + kpasswd_handle_udp = create_dissector_handle(dissect_kpasswd_udp, proto_kpasswd); + kpasswd_handle_tcp = create_dissector_handle(dissect_kpasswd_tcp, proto_kpasswd); dissector_add_uint("udp.port", UDP_PORT_KPASSWD, kpasswd_handle_udp); dissector_add_uint("tcp.port", TCP_PORT_KPASSWD, kpasswd_handle_tcp); } diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c index f05fe6d83e..bb044f07e6 100644 --- a/epan/dissectors/packet-l1-events.c +++ b/epan/dissectors/packet-l1-events.c @@ -109,7 +109,7 @@ proto_register_l1_events(void) void proto_reg_handoff_l1_events(void) { - dissector_handle_t l1_events_handle = new_create_dissector_handle(dissect_l1_events, proto_l1_events); + dissector_handle_t l1_events_handle = create_dissector_handle(dissect_l1_events, proto_l1_events); dissector_add_uint("wtap_encap", WTAP_ENCAP_LAYER1_EVENT, l1_events_handle); /* for text msgs from trace files */ } diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 8718c4f257..947ffd214d 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -3045,10 +3045,10 @@ proto_reg_handoff_l2tp(void) { dissector_handle_t atm_oam_llc_handle; - l2tp_udp_handle = new_create_dissector_handle(dissect_l2tp_udp, proto_l2tp); + l2tp_udp_handle = create_dissector_handle(dissect_l2tp_udp, proto_l2tp); dissector_add_uint("udp.port", UDP_PORT_L2TP, l2tp_udp_handle); - l2tp_ip_handle = new_create_dissector_handle(dissect_l2tp_ip, proto_l2tp); + l2tp_ip_handle = create_dissector_handle(dissect_l2tp_ip, proto_l2tp); dissector_add_uint("ip.proto", IP_PROTO_L2TP, l2tp_ip_handle); /* @@ -3058,7 +3058,7 @@ proto_reg_handoff_l2tp(void) ppp_lcp_options_handle = find_dissector("ppp_lcp_options"); /* Register vendor AVP dissector(s)*/ - dissector_add_uint("l2tp.vendor_avp", VENDOR_CABLELABS, new_create_dissector_handle(dissect_l2tp_vnd_cablelabs_avps, proto_l2tp)); + dissector_add_uint("l2tp.vendor_avp", VENDOR_CABLELABS, create_dissector_handle(dissect_l2tp_vnd_cablelabs_avps, proto_l2tp)); /* @@ -3068,7 +3068,7 @@ proto_reg_handoff_l2tp(void) llc_handle = find_dissector("llc"); data_handle = find_dissector("data"); - atm_oam_llc_handle = new_create_dissector_handle( dissect_atm_oam_llc, proto_l2tp ); + atm_oam_llc_handle = create_dissector_handle( dissect_atm_oam_llc, proto_l2tp ); dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_AAL5, atm_oam_llc_handle); } diff --git a/epan/dissectors/packet-lacp.c b/epan/dissectors/packet-lacp.c index 977b6d52f8..a456b34306 100644 --- a/epan/dissectors/packet-lacp.c +++ b/epan/dissectors/packet-lacp.c @@ -558,7 +558,7 @@ proto_reg_handoff_lacp(void) { dissector_handle_t lacp_handle; - lacp_handle = new_create_dissector_handle(dissect_lacp, proto_lacp); + lacp_handle = create_dissector_handle(dissect_lacp, proto_lacp); dissector_add_uint("slow.subtype", LACP_SUBTYPE, lacp_handle); } diff --git a/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c index 7b9d8b1e1d..9e018b4166 100644 --- a/epan/dissectors/packet-lapbether.c +++ b/epan/dissectors/packet-lapbether.c @@ -97,7 +97,7 @@ proto_reg_handoff_lapbether(void) */ lapb_handle = find_dissector("lapb"); - lapbether_handle = new_create_dissector_handle(dissect_lapbether, + lapbether_handle = create_dissector_handle(dissect_lapbether, proto_lapbether); dissector_add_uint("ethertype", ETHERTYPE_DEC, lapbether_handle); diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c index d30fca4ba6..363efa996d 100644 --- a/epan/dissectors/packet-laplink.c +++ b/epan/dissectors/packet-laplink.c @@ -235,11 +235,11 @@ proto_reg_handoff_laplink(void) dissector_handle_t laplink_udp_handle; dissector_handle_t laplink_tcp_handle; - laplink_tcp_handle = new_create_dissector_handle(dissect_laplink_tcp, + laplink_tcp_handle = create_dissector_handle(dissect_laplink_tcp, proto_laplink); dissector_add_uint("tcp.port", TCP_PORT_LAPLINK, laplink_tcp_handle); - laplink_udp_handle = new_create_dissector_handle(dissect_laplink_udp, + laplink_udp_handle = create_dissector_handle(dissect_laplink_udp, proto_laplink); dissector_add_uint("udp.port", UDP_PORT_LAPLINK, laplink_udp_handle); } diff --git a/epan/dissectors/packet-lbmpdmtcp.c b/epan/dissectors/packet-lbmpdmtcp.c index d130006ce2..b97b8f217d 100644 --- a/epan/dissectors/packet-lbmpdmtcp.c +++ b/epan/dissectors/packet-lbmpdmtcp.c @@ -439,7 +439,7 @@ void proto_reg_handoff_lbmpdm_tcp(void) if (!already_registered) { - lbmpdm_tcp_dissector_handle = new_create_dissector_handle(dissect_lbmpdm_tcp, lbmpdm_tcp_protocol_handle); + lbmpdm_tcp_dissector_handle = create_dissector_handle(dissect_lbmpdm_tcp, lbmpdm_tcp_protocol_handle); dissector_add_for_decode_as("tcp.port", lbmpdm_tcp_dissector_handle); heur_dissector_add("tcp", test_lbmpdm_tcp_packet, "LBMPDM over TCP", "lbmpdm_tcp", lbmpdm_tcp_protocol_handle, HEURISTIC_ENABLE); } diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index 89dd0d0db6..35c43e3665 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -6691,7 +6691,7 @@ void proto_reg_handoff_lbmr(void) if (!already_registered) { - lbmr_dissector_handle = new_create_dissector_handle(dissect_lbmr, proto_lbmr); + lbmr_dissector_handle = create_dissector_handle(dissect_lbmr, proto_lbmr); dissector_add_for_decode_as("udp.port", lbmr_dissector_handle); heur_dissector_add("udp", test_lbmr_packet, "LBM Topic Resolution over UDP", "lbmr_udp", proto_lbmr, HEURISTIC_ENABLE); } diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c index ee2d1c2f03..a2e3f0f1d6 100644 --- a/epan/dissectors/packet-lbtrm.c +++ b/epan/dissectors/packet-lbtrm.c @@ -1872,7 +1872,7 @@ void proto_reg_handoff_lbtrm(void) if (!already_registered) { - lbtrm_dissector_handle = new_create_dissector_handle(dissect_lbtrm, proto_lbtrm); + lbtrm_dissector_handle = create_dissector_handle(dissect_lbtrm, proto_lbtrm); dissector_add_for_decode_as("udp.port", lbtrm_dissector_handle); heur_dissector_add("udp", test_lbtrm_packet, "LBT Reliable Multicast over UDP", "lbtrm_udp", proto_lbtrm, HEURISTIC_ENABLE); lbtrm_tap_handle = register_tap("lbm_lbtrm"); diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c index 7cef0d1463..e435e702fe 100644 --- a/epan/dissectors/packet-lbtru.c +++ b/epan/dissectors/packet-lbtru.c @@ -2003,7 +2003,7 @@ void proto_reg_handoff_lbtru(void) if (!already_registered) { - lbtru_dissector_handle = new_create_dissector_handle(dissect_lbtru, proto_lbtru); + lbtru_dissector_handle = create_dissector_handle(dissect_lbtru, proto_lbtru); dissector_add_for_decode_as("udp.port", lbtru_dissector_handle); heur_dissector_add("udp", test_lbtru_packet, "LBT Reliable Unicast over UDP", "lbtru_udp", proto_lbtru, HEURISTIC_ENABLE); lbtru_tap_handle = register_tap("lbm_lbtru"); diff --git a/epan/dissectors/packet-lbttcp.c b/epan/dissectors/packet-lbttcp.c index b67f2e7eee..de4610fa6a 100644 --- a/epan/dissectors/packet-lbttcp.c +++ b/epan/dissectors/packet-lbttcp.c @@ -801,7 +801,7 @@ void proto_reg_handoff_lbttcp(void) if (!already_registered) { - lbttcp_dissector_handle = new_create_dissector_handle(dissect_lbttcp, proto_lbttcp); + lbttcp_dissector_handle = create_dissector_handle(dissect_lbttcp, proto_lbttcp); dissector_add_for_decode_as("tcp.port", lbttcp_dissector_handle); heur_dissector_add("tcp", test_lbttcp_packet, "LBT over TCP", "lbttcp_tcp", proto_lbttcp, HEURISTIC_ENABLE); } diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 036ac57d05..0f75301d25 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -4310,8 +4310,8 @@ proto_reg_handoff_ldp(void) if (!ldp_prefs_initialized) { - ldp_tcp_handle = new_create_dissector_handle(dissect_ldp_tcp, proto_ldp); - ldp_handle = new_create_dissector_handle(dissect_ldp, proto_ldp); + ldp_tcp_handle = create_dissector_handle(dissect_ldp_tcp, proto_ldp); + ldp_handle = create_dissector_handle(dissect_ldp, proto_ldp); ldp_prefs_initialized = TRUE; diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index 55e61595c6..40996bda00 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -994,8 +994,8 @@ proto_reg_handoff_ldss (void) static gboolean ldss_initialized = FALSE; if (!ldss_initialized) { - ldss_udp_handle = new_create_dissector_handle(dissect_ldss, proto_ldss); - ldss_tcp_handle = new_create_dissector_handle(dissect_ldss_transfer, proto_ldss); + ldss_udp_handle = create_dissector_handle(dissect_ldss, proto_ldss); + ldss_tcp_handle = create_dissector_handle(dissect_ldss_transfer, proto_ldss); ldss_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-lg8979.c b/epan/dissectors/packet-lg8979.c index cbc9412e46..314c14b088 100644 --- a/epan/dissectors/packet-lg8979.c +++ b/epan/dissectors/packet-lg8979.c @@ -1534,7 +1534,7 @@ proto_reg_handoff_lg8979(void) /* Make sure to use L&G 8979 Protocol Preferences field to determine default TCP port */ if (! lg8979_prefs_initialized) { - lg8979_handle = new_create_dissector_handle(dissect_lg8979_tcp, proto_lg8979); + lg8979_handle = create_dissector_handle(dissect_lg8979_tcp, proto_lg8979); lg8979_prefs_initialized = TRUE; } diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c index d24d34029a..beabbaf2ad 100644 --- a/epan/dissectors/packet-lge_monitor.c +++ b/epan/dissectors/packet-lge_monitor.c @@ -121,7 +121,7 @@ proto_reg_handoff_lge_monitor(void) static gboolean lge_monitor_prefs_initialized = FALSE; if (!lge_monitor_prefs_initialized) { - lge_monitor_handle = new_create_dissector_handle(dissect_lge_monitor, proto_lge_monitor); + lge_monitor_handle = create_dissector_handle(dissect_lge_monitor, proto_lge_monitor); dissector_add_for_decode_as("udp.port", lge_monitor_handle); mtp3_handle = find_dissector("mtp3"); m3ua_handle = find_dissector("m3ua"); diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index b624522f6f..2e77b0a6b3 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -839,7 +839,7 @@ proto_reg_handoff_linx(void) { dissector_handle_t linx_handle; - linx_handle = new_create_dissector_handle(dissect_linx, proto_linx); + linx_handle = create_dissector_handle(dissect_linx, proto_linx); dissector_add_uint("ethertype", ETHERTYPE_LINX, linx_handle); } @@ -1089,7 +1089,7 @@ proto_reg_handoff_linx_tcp(void) if (!linx_tcp_prefs_initialized) { - linx_tcp_handle = new_create_dissector_handle(dissect_linx_tcp, proto_linx_tcp); + linx_tcp_handle = create_dissector_handle(dissect_linx_tcp, proto_linx_tcp); dissector_add_uint("tcp.port", linx_tcp_port, linx_tcp_handle); linx_tcp_prefs_initialized = TRUE; } diff --git a/epan/dissectors/packet-lisp-data.c b/epan/dissectors/packet-lisp-data.c index cae168e1cc..924c38b64c 100644 --- a/epan/dissectors/packet-lisp-data.c +++ b/epan/dissectors/packet-lisp-data.c @@ -287,7 +287,7 @@ proto_reg_handoff_lisp_data(void) { dissector_handle_t lisp_data_handle; - lisp_data_handle = new_create_dissector_handle(dissect_lisp_data, + lisp_data_handle = create_dissector_handle(dissect_lisp_data, proto_lisp_data); dissector_add_uint("udp.port", LISP_DATA_PORT, lisp_data_handle); ipv4_handle = find_dissector("ip"); diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index a3314bed05..57096b96d5 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -5057,7 +5057,7 @@ proto_reg_handoff_lldp(void) { dissector_handle_t lldp_handle; - lldp_handle = new_create_dissector_handle(dissect_lldp,proto_lldp); + lldp_handle = create_dissector_handle(dissect_lldp,proto_lldp); dissector_add_uint("ethertype", ETHERTYPE_LLDP, lldp_handle); } diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c index fe34ed748b..3024f8d624 100644 --- a/epan/dissectors/packet-llrp.c +++ b/epan/dissectors/packet-llrp.c @@ -3797,7 +3797,7 @@ proto_reg_handoff_llrp(void) { dissector_handle_t llrp_handle; - llrp_handle = new_create_dissector_handle(dissect_llrp, proto_llrp); + llrp_handle = create_dissector_handle(dissect_llrp, proto_llrp); dissector_add_uint("tcp.port", LLRP_PORT, llrp_handle); } diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c index 1783d61938..8460a18883 100644 --- a/epan/dissectors/packet-llt.c +++ b/epan/dissectors/packet-llt.c @@ -138,7 +138,7 @@ proto_reg_handoff_llt(void) static guint preference_alternate_ethertype_last; if (!initialized) { - llt_handle = new_create_dissector_handle(dissect_llt, proto_llt); + llt_handle = create_dissector_handle(dissect_llt, proto_llt); dissector_add_uint("ethertype", ETHERTYPE_LLT, llt_handle); initialized = TRUE; } else { diff --git a/epan/dissectors/packet-lltd.c b/epan/dissectors/packet-lltd.c index 6d8c4181fe..39b7b7c2d7 100644 --- a/epan/dissectors/packet-lltd.c +++ b/epan/dissectors/packet-lltd.c @@ -960,7 +960,7 @@ void proto_reg_handoff_lltd(void) { dissector_handle_t lltd_handle; - lltd_handle = new_create_dissector_handle(dissect_lltd, proto_lltd); + lltd_handle = create_dissector_handle(dissect_lltd, proto_lltd); dissector_add_uint("ethertype", ETHERTYPE_LLTD, lltd_handle); } diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c index 2737e1e9fd..9d5cf26798 100644 --- a/epan/dissectors/packet-lmi.c +++ b/epan/dissectors/packet-lmi.c @@ -237,7 +237,7 @@ proto_reg_handoff_lmi(void) { dissector_handle_t lmi_handle; - lmi_handle = new_create_dissector_handle(dissect_lmi, proto_lmi); + lmi_handle = create_dissector_handle(dissect_lmi, proto_lmi); dissector_add_uint("fr.nlpid", NLPID_LMI, lmi_handle); } diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index d6bf8141c8..45e66d2068 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -2653,7 +2653,7 @@ proto_register_lmp(void) void proto_reg_handoff_lmp(void) { - lmp_handle = new_create_dissector_handle(dissect_lmp, proto_lmp); + lmp_handle = create_dissector_handle(dissect_lmp, proto_lmp); dissector_add_uint("udp.port", lmp_udp_port, lmp_handle); } diff --git a/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c index fbcf25d9fa..69f00af0a5 100644 --- a/epan/dissectors/packet-lon.c +++ b/epan/dissectors/packet-lon.c @@ -761,7 +761,7 @@ proto_reg_handoff_lon(void) { dissector_handle_t lon_handle; - lon_handle = new_create_dissector_handle(dissect_lon, proto_lon); + lon_handle = create_dissector_handle(dissect_lon, proto_lon); data_handle = find_dissector("data"); dissector_add_uint("cnip.protocol", 0, lon_handle); diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c index 9aad70a671..a61d5ca4b0 100644 --- a/epan/dissectors/packet-loop.c +++ b/epan/dissectors/packet-loop.c @@ -165,7 +165,7 @@ proto_reg_handoff_loop(void) { dissector_handle_t loop_handle; - loop_handle = new_create_dissector_handle(dissect_loop, proto_loop); + loop_handle = create_dissector_handle(dissect_loop, proto_loop); dissector_add_uint("ethertype", ETHERTYPE_LOOP, loop_handle); diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c index 41db5ce3a5..8046917c49 100644 --- a/epan/dissectors/packet-lpd.c +++ b/epan/dissectors/packet-lpd.c @@ -199,7 +199,7 @@ proto_reg_handoff_lpd(void) { dissector_handle_t lpd_handle; - lpd_handle = new_create_dissector_handle(dissect_lpd, proto_lpd); + lpd_handle = create_dissector_handle(dissect_lpd, proto_lpd); dissector_add_uint("tcp.port", TCP_PORT_PRINTER, lpd_handle); data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c index c1260ffddb..eaa92736df 100644 --- a/epan/dissectors/packet-lsc.c +++ b/epan/dissectors/packet-lsc.c @@ -433,8 +433,8 @@ proto_reg_handoff_lsc(void) static guint saved_lsc_port; if (!initialized) { - lsc_udp_handle = new_create_dissector_handle(dissect_lsc_udp, proto_lsc); - lsc_tcp_handle = new_create_dissector_handle(dissect_lsc_tcp, proto_lsc); + lsc_udp_handle = create_dissector_handle(dissect_lsc_udp, proto_lsc); + lsc_tcp_handle = create_dissector_handle(dissect_lsc_tcp, proto_lsc); dissector_add_for_decode_as("udp.port", lsc_udp_handle); dissector_add_for_decode_as("tcp.port", lsc_tcp_handle); initialized = TRUE; diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c index 7f911e4ad2..bc5382751a 100644 --- a/epan/dissectors/packet-ltp.c +++ b/epan/dissectors/packet-ltp.c @@ -992,7 +992,7 @@ proto_reg_handoff_ltp(void) static int currentPort; if (!initialized) { - ltp_handle = new_create_dissector_handle(dissect_ltp, proto_ltp); + ltp_handle = create_dissector_handle(dissect_ltp, proto_ltp); bundle_handle = find_dissector("bundle"); initialized = TRUE; } else { diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index d9409d9ea4..87e437bd91 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -549,10 +549,10 @@ proto_reg_handoff_lwapp(void) data_handle = find_dissector("data"); /* This dissector assumes lwapp packets in an 802.3 frame */ - lwapp_l3_handle = new_create_dissector_handle(dissect_lwapp_l3, proto_lwapp_l3); + lwapp_l3_handle = create_dissector_handle(dissect_lwapp_l3, proto_lwapp_l3); /* This dissector assumes a lwapp packet */ - lwapp_handle = new_create_dissector_handle(dissect_lwapp, proto_lwapp); + lwapp_handle = create_dissector_handle(dissect_lwapp, proto_lwapp); /* * Ok, the following deserves some comments. We have four diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index c43c7ec672..e9d618b257 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -1157,7 +1157,7 @@ proto_reg_handoff_lwres(void) static guint lwres_port; if(!lwres_prefs_initialized) { - lwres_handle = new_create_dissector_handle(dissect_lwres, proto_lwres); + lwres_handle = create_dissector_handle(dissect_lwres, proto_lwres); lwres_prefs_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c index ffec3e6703..80eea7567e 100644 --- a/epan/dissectors/packet-m2tp.c +++ b/epan/dissectors/packet-m2tp.c @@ -656,7 +656,7 @@ proto_reg_handoff_m2tp(void) { dissector_handle_t m2tp_handle; mtp2_handle = find_dissector("mtp2"); - m2tp_handle = new_create_dissector_handle(dissect_m2tp, proto_m2tp); + m2tp_handle = create_dissector_handle(dissect_m2tp, proto_m2tp); dissector_add_uint("sctp.ppi", M2TP_PAYLOAD_PROTOCOL_ID, m2tp_handle); dissector_add_uint("sctp.port", SCTP_PORT_M2TP, m2tp_handle); } diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c index bcc900f475..78ee7fbea1 100644 --- a/epan/dissectors/packet-m2ua.c +++ b/epan/dissectors/packet-m2ua.c @@ -1143,7 +1143,7 @@ proto_reg_handoff_m2ua(void) dissector_handle_t m2ua_handle; mtp3_handle = find_dissector("mtp3"); - m2ua_handle = new_create_dissector_handle(dissect_m2ua, proto_m2ua); + m2ua_handle = create_dissector_handle(dissect_m2ua, proto_m2ua); dissector_add_uint("sctp.ppi", M2UA_PAYLOAD_PROTOCOL_ID, m2ua_handle); dissector_add_uint("sctp.port", SCTP_PORT_M2UA, m2ua_handle); } diff --git a/epan/dissectors/packet-maap.c b/epan/dissectors/packet-maap.c index dfa95d8e9f..7459ba812a 100644 --- a/epan/dissectors/packet-maap.c +++ b/epan/dissectors/packet-maap.c @@ -213,7 +213,7 @@ proto_reg_handoff_maap(void) { dissector_handle_t maap_handle; - maap_handle = new_create_dissector_handle(dissect_maap, proto_maap); + maap_handle = create_dissector_handle(dissect_maap, proto_maap); dissector_add_uint("ieee1722.subtype", 0x7E, maap_handle); } diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index d727009b5d..a61d67939a 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -392,7 +392,7 @@ proto_reg_handoff_macctrl(void) { dissector_handle_t macctrl_handle; - macctrl_handle = new_create_dissector_handle(dissect_macctrl, proto_macctrl); + macctrl_handle = create_dissector_handle(dissect_macctrl, proto_macctrl); dissector_add_uint("ethertype", ETHERTYPE_MAC_CONTROL, macctrl_handle); } diff --git a/epan/dissectors/packet-macsec.c b/epan/dissectors/packet-macsec.c index f70ae6d590..ca2e13ea7f 100644 --- a/epan/dissectors/packet-macsec.c +++ b/epan/dissectors/packet-macsec.c @@ -193,7 +193,7 @@ proto_reg_handoff_macsec(void) { dissector_handle_t macsec_handle; data_handle = find_dissector("data"); - macsec_handle = new_create_dissector_handle(dissect_macsec, proto_macsec); + macsec_handle = create_dissector_handle(dissect_macsec, proto_macsec); dissector_add_uint("ethertype", ETHERTYPE_MACSEC, macsec_handle); } diff --git a/epan/dissectors/packet-mactelnet.c b/epan/dissectors/packet-mactelnet.c index 3b34e9def1..78df49fdf7 100644 --- a/epan/dissectors/packet-mactelnet.c +++ b/epan/dissectors/packet-mactelnet.c @@ -399,7 +399,7 @@ proto_reg_handoff_mactelnet(void) static dissector_handle_t mactelnet_handle; if (!initialized) { - mactelnet_handle = new_create_dissector_handle(dissect_mactelnet, proto_mactelnet); + mactelnet_handle = create_dissector_handle(dissect_mactelnet, proto_mactelnet); data_handle = find_dissector("data"); initialized = TRUE; } else { diff --git a/epan/dissectors/packet-manolito.c b/epan/dissectors/packet-manolito.c index a4d7665de2..e006099078 100644 --- a/epan/dissectors/packet-manolito.c +++ b/epan/dissectors/packet-manolito.c @@ -296,7 +296,7 @@ proto_reg_handoff_manolito(void) { dissector_handle_t manolito_handle; - manolito_handle = new_create_dissector_handle(dissect_manolito, + manolito_handle = create_dissector_handle(dissect_manolito, proto_manolito); dissector_add_uint("udp.port", 41170, manolito_handle); } diff --git a/epan/dissectors/packet-marker.c b/epan/dissectors/packet-marker.c index 2e0218c28e..ce31f4e643 100644 --- a/epan/dissectors/packet-marker.c +++ b/epan/dissectors/packet-marker.c @@ -200,7 +200,7 @@ proto_reg_handoff_marker(void) { dissector_handle_t marker_handle; - marker_handle = new_create_dissector_handle(dissect_marker, proto_marker); + marker_handle = create_dissector_handle(dissect_marker, proto_marker); dissector_add_uint("slow.subtype", MARKER_SUBTYPE, marker_handle); } diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index b060446ee1..96c186d136 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -2247,10 +2247,10 @@ proto_reg_handoff_mausb(void) if (!initialized) { /* only initialize once */ - mausb_tcp_handle = new_create_dissector_handle(dissect_mausb, + mausb_tcp_handle = create_dissector_handle(dissect_mausb, proto_mausb); - mausb_pkt_handle = new_create_dissector_handle(dissect_mausb_pkt, + mausb_pkt_handle = create_dissector_handle(dissect_mausb_pkt, proto_mausb); dissector_add_uint("llc.wfa_pid", PID_MAUSB, mausb_pkt_handle); diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index 67f3c1610f..f6a674fdfa 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -8021,7 +8021,7 @@ proto_reg_handoff_mbim(void) static gboolean initialized = FALSE, mbim_control_decode_unknown_itf_prev = FALSE; if (!initialized) { - dissector_handle_t mbim_decode_as_handle = new_create_dissector_handle(dissect_mbim_decode_as, proto_mbim); + dissector_handle_t mbim_decode_as_handle = create_dissector_handle(dissect_mbim_decode_as, proto_mbim); bertlv_handle = find_dissector("gsm_sim.bertlv"); etsi_cat_handle = find_dissector("etsi_cat"); gsm_sms_handle = find_dissector("gsm_sms"); diff --git a/epan/dissectors/packet-mcpe.c b/epan/dissectors/packet-mcpe.c index 7a649145d1..d6e172c42f 100644 --- a/epan/dissectors/packet-mcpe.c +++ b/epan/dissectors/packet-mcpe.c @@ -371,16 +371,16 @@ proto_reg_handoff_mcpe(void) init_done = TRUE; raknet_dissector = find_dissector("raknet"); - mcpe_gen_handle = new_create_dissector_handle(mcpe_dissect, proto_mcpe); + mcpe_gen_handle = create_dissector_handle(mcpe_dissect, proto_mcpe); dissector_add_uint("raknet.packet_id", 0x80, mcpe_gen_handle); dissector_add_uint("raknet.packet_id", 0x84, mcpe_gen_handle); dissector_add_uint("raknet.packet_id", 0x88, mcpe_gen_handle); dissector_add_uint("raknet.packet_id", 0x8C, mcpe_gen_handle); dissector_add_uint("raknet.packet_id", 0xA0, - new_create_dissector_handle(mcpe_dissect_0xA0, + create_dissector_handle(mcpe_dissect_0xA0, proto_mcpe)); dissector_add_uint("raknet.packet_id", 0xC0, - new_create_dissector_handle(mcpe_dissect_0xC0, + create_dissector_handle(mcpe_dissect_0xC0, proto_mcpe)); } diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c index 87387a3cd5..d8e9fe3dd5 100644 --- a/epan/dissectors/packet-mdshdr.c +++ b/epan/dissectors/packet-mdshdr.c @@ -320,7 +320,7 @@ proto_reg_handoff_mdshdr(void) * ethertype ETHERTYPE_FCFT, and fetch the data and Fibre * Channel handles. */ - mdshdr_handle = new_create_dissector_handle(dissect_mdshdr, proto_mdshdr); + mdshdr_handle = create_dissector_handle(dissect_mdshdr, proto_mdshdr); dissector_add_uint("ethertype", ETHERTYPE_FCFT, mdshdr_handle); data_handle = find_dissector("data"); fc_dissector_handle = find_dissector("fc"); diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index f487965753..3e9ea3c2f1 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -3819,7 +3819,7 @@ proto_reg_handoff_megaco(void) data_handle = find_dissector("data"); megaco_text_handle = find_dissector("megaco"); - megaco_text_tcp_handle = new_create_dissector_handle(dissect_megaco_text_tcp, proto_megaco); + megaco_text_tcp_handle = create_dissector_handle(dissect_megaco_text_tcp, proto_megaco); dissector_add_uint("sctp.ppi", H248_PAYLOAD_PROTOCOL_ID, megaco_text_handle); diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index d015d07669..f13a5b63ea 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -2377,8 +2377,8 @@ void proto_reg_handoff_mgcp(void) { /* Get a handle for the SDP dissector. */ sdp_handle = find_dissector("sdp"); - mgcp_handle = new_create_dissector_handle(dissect_mgcp, proto_mgcp); - mgcp_tpkt_handle = new_create_dissector_handle(dissect_tpkt_mgcp, proto_mgcp); + mgcp_handle = create_dissector_handle(dissect_mgcp, proto_mgcp); + mgcp_tpkt_handle = create_dissector_handle(dissect_tpkt_mgcp, proto_mgcp); mgcp_prefs_initialized = TRUE; } else diff --git a/epan/dissectors/packet-mih.c b/epan/dissectors/packet-mih.c index e1b237664e..a0c4392a8d 100644 --- a/epan/dissectors/packet-mih.c +++ b/epan/dissectors/packet-mih.c @@ -4869,7 +4869,7 @@ void proto_reg_handoff_mih(void) { dissector_handle_t mih_handle; - mih_handle = new_create_dissector_handle(dissect_mih, proto_mih); + mih_handle = create_dissector_handle(dissect_mih, proto_mih); /*Layer 3 handle*/ dissector_add_uint("udp.port", MIH_PORT, mih_handle); dissector_add_uint("tcp.port", MIH_PORT, mih_handle); diff --git a/epan/dissectors/packet-mint.c b/epan/dissectors/packet-mint.c index aae5704309..ea05ef7987 100644 --- a/epan/dissectors/packet-mint.c +++ b/epan/dissectors/packet-mint.c @@ -728,9 +728,9 @@ proto_register_mint(void) proto_register_fields(proto_mint, hfi, array_length(hfi)); proto_register_subtree_array(ett, array_length(ett)); - mint_control_handle = new_create_dissector_handle(dissect_mint_control_static, proto_mint); - mint_data_handle = new_create_dissector_handle(dissect_mint_data_static, proto_mint_data); - mint_eth_handle = new_create_dissector_handle(dissect_mint_ethshim_static, proto_mint); + mint_control_handle = create_dissector_handle(dissect_mint_control_static, proto_mint); + mint_data_handle = create_dissector_handle(dissect_mint_data_static, proto_mint_data); + mint_eth_handle = create_dissector_handle(dissect_mint_ethshim_static, proto_mint); } void diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index f6a0a79674..d07f73a2e4 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -1485,7 +1485,7 @@ proto_reg_handoff_mip(void) /* Register as dissector for 3GPP2 NVSE */ dissector_add_uint("mip.nvse_ext", VENDOR_THE3GPP2, - new_create_dissector_handle(dissect_mip_priv_ext_3gpp2, proto_mip)); + create_dissector_handle(dissect_mip_priv_ext_3gpp2, proto_mip)); } /* diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 70f68fe48d..c5e8b538d1 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -5362,14 +5362,14 @@ proto_reg_handoff_mip6(void) dissector_handle_t mip6_handle; /* mip6_handle = find_dissector("mipv6"); */ - mip6_handle = new_create_dissector_handle(dissect_mip6, proto_mip6); + mip6_handle = create_dissector_handle(dissect_mip6, proto_mip6); dissector_add_uint("ip.proto", IP_PROTO_MIPV6_OLD, mip6_handle); dissector_add_uint("ip.proto", IP_PROTO_MIPV6, mip6_handle); /* Add support for PMIPv6 control messages over IPV4 */ dissector_add_uint("udp.port", UDP_PORT_PMIP6_CNTL, mip6_handle); ip_dissector_table = find_dissector_table("ip.proto"); - dissector_add_uint("mip6.vsm", VENDOR_THE3GPP, new_create_dissector_handle(dissect_mip6_opt_vsm_3gpp, proto_mip6)); + dissector_add_uint("mip6.vsm", VENDOR_THE3GPP, create_dissector_handle(dissect_mip6_opt_vsm_3gpp, proto_mip6)); } /* diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 1476741f9e..52553f2f44 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -1667,9 +1667,9 @@ proto_reg_handoff_mmse(void) dissector_handle_t mmse_encapsulated_handle; heur_dissector_add("wsp", dissect_mmse_heur, "MMS Message Encapsulation over WSP", "mmse_wsp", proto_mmse, HEURISTIC_ENABLE); - mmse_standalone_handle = new_create_dissector_handle( + mmse_standalone_handle = create_dissector_handle( dissect_mmse_standalone, proto_mmse); - mmse_encapsulated_handle = new_create_dissector_handle( + mmse_encapsulated_handle = create_dissector_handle( dissect_mmse_encapsulated, proto_mmse); /* As the media types for WSP and HTTP are the same, the WSP dissector * uses the same string dissector table as the HTTP protocol. */ diff --git a/epan/dissectors/packet-mndp.c b/epan/dissectors/packet-mndp.c index c5261ad2ff..a1e0f0c481 100644 --- a/epan/dissectors/packet-mndp.c +++ b/epan/dissectors/packet-mndp.c @@ -358,7 +358,7 @@ proto_reg_handoff_mndp(void) { dissector_handle_t mndp_handle; - mndp_handle = new_create_dissector_handle(dissect_mndp_static, proto_mndp); + mndp_handle = create_dissector_handle(dissect_mndp_static, proto_mndp); dissector_add_uint("udp.port", PORT_MNDP, mndp_handle); heur_dissector_add("udp", dissect_mndp_heur, "MNDP over UDP", "mndp_udp", proto_mndp, HEURISTIC_DISABLE); } diff --git a/epan/dissectors/packet-mojito.c b/epan/dissectors/packet-mojito.c index 22e7c4b889..63f135cbe3 100644 --- a/epan/dissectors/packet-mojito.c +++ b/epan/dissectors/packet-mojito.c @@ -1044,7 +1044,7 @@ proto_reg_handoff_mojito(void) static dissector_handle_t mojito_handle; if (!initialized) { - mojito_handle = new_create_dissector_handle(dissect_mojito, proto_mojito); + mojito_handle = create_dissector_handle(dissect_mojito, proto_mojito); heur_dissector_add("udp", dissect_mojito_heuristic, "Mojito over UDP", "mojito_udp", proto_mojito, HEURISTIC_ENABLE); initialized = TRUE; } diff --git a/epan/dissectors/packet-moldudp.c b/epan/dissectors/packet-moldudp.c index 6bd3e71671..b121633a2b 100644 --- a/epan/dissectors/packet-moldudp.c +++ b/epan/dissectors/packet-moldudp.c @@ -263,7 +263,7 @@ proto_reg_handoff_moldudp(void) static int currentPort; if (!initialized) { - moldudp_handle = new_create_dissector_handle(dissect_moldudp, + moldudp_handle = create_dissector_handle(dissect_moldudp, proto_moldudp); initialized = TRUE; } else { diff --git a/epan/dissectors/packet-moldudp64.c b/epan/dissectors/packet-moldudp64.c index b8c46cee11..00c1a821a7 100644 --- a/epan/dissectors/packet-moldudp64.c +++ b/epan/dissectors/packet-moldudp64.c @@ -309,7 +309,7 @@ proto_reg_handoff_moldudp64(void) if (!initialized) { - moldudp64_handle = new_create_dissector_handle(dissect_moldudp64, + moldudp64_handle = create_dissector_handle(dissect_moldudp64, proto_moldudp64); initialized = TRUE; } else { diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c index 63b2c2a5e7..9c21f16a03 100644 --- a/epan/dissectors/packet-mongo.c +++ b/epan/dissectors/packet-mongo.c @@ -1057,7 +1057,7 @@ proto_reg_handoff_mongo(void) if (!initialized) { - mongo_handle = new_create_dissector_handle(dissect_mongo, proto_mongo); + mongo_handle = create_dissector_handle(dissect_mongo, proto_mongo); initialized = TRUE; } else { dissector_delete_uint("tcp.port", currentPort, mongo_handle); diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c index d8d0163ade..3990214316 100644 --- a/epan/dissectors/packet-mp4ves.c +++ b/epan/dissectors/packet-mp4ves.c @@ -1047,12 +1047,12 @@ proto_reg_handoff_mp4ves(void) dissector_add_string("rtp_dyn_payload_type","MP4V-ES", mp4ves_handle); mp4ves_prefs_initialized = TRUE; - mp4ves_name_handle = new_create_dissector_handle(dissect_mp4ves_name, proto_mp4ves); + mp4ves_name_handle = create_dissector_handle(dissect_mp4ves_name, proto_mp4ves); for (ftr=mp4ves_capability_tab; ftr->id; ftr++) { if (ftr->name) dissector_add_string("h245.gef.name", ftr->id, mp4ves_name_handle); if (ftr->content_pdu) - dissector_add_string("h245.gef.content", ftr->id, new_create_dissector_handle(ftr->content_pdu, proto_mp4ves)); + dissector_add_string("h245.gef.content", ftr->id, create_dissector_handle(ftr->content_pdu, proto_mp4ves)); } }else{ if ( dynamic_payload_type > 95 ) diff --git a/epan/dissectors/packet-mpeg-ca.c b/epan/dissectors/packet-mpeg-ca.c index 26f1f48198..3eb95f7653 100644 --- a/epan/dissectors/packet-mpeg-ca.c +++ b/epan/dissectors/packet-mpeg-ca.c @@ -145,7 +145,7 @@ void proto_reg_handoff_mpeg_ca(void) { dissector_handle_t mpeg_ca_handle; - mpeg_ca_handle = new_create_dissector_handle(dissect_mpeg_ca, proto_mpeg_ca); + mpeg_ca_handle = create_dissector_handle(dissect_mpeg_ca, proto_mpeg_ca); dissector_add_uint("mpeg_sect.tid", MPEG_CA_TID, mpeg_ca_handle); } diff --git a/epan/dissectors/packet-mpeg-dsmcc.c b/epan/dissectors/packet-mpeg-dsmcc.c index 776d7d9209..434a9f7827 100644 --- a/epan/dissectors/packet-mpeg-dsmcc.c +++ b/epan/dissectors/packet-mpeg-dsmcc.c @@ -1222,8 +1222,8 @@ proto_reg_handoff_dsmcc(void) { dissector_handle_t dsmcc_ts_handle, dsmcc_tcp_handle; - dsmcc_ts_handle = new_create_dissector_handle(dissect_dsmcc_ts, proto_dsmcc); - dsmcc_tcp_handle = new_create_dissector_handle(dissect_dsmcc_tcp, proto_dsmcc); + dsmcc_ts_handle = create_dissector_handle(dissect_dsmcc_ts, proto_dsmcc); + dsmcc_tcp_handle = create_dissector_handle(dissect_dsmcc_tcp, proto_dsmcc); dissector_add_uint("mpeg_sect.tid", DSMCC_TID_LLCSNAP, dsmcc_ts_handle); dissector_add_uint("mpeg_sect.tid", DSMCC_TID_UN_MSG, dsmcc_ts_handle); diff --git a/epan/dissectors/packet-mpeg-pat.c b/epan/dissectors/packet-mpeg-pat.c index 8e6ef0291a..a769d74845 100644 --- a/epan/dissectors/packet-mpeg-pat.c +++ b/epan/dissectors/packet-mpeg-pat.c @@ -190,7 +190,7 @@ void proto_reg_handoff_mpeg_pat(void) { dissector_handle_t mpeg_pat_handle; - mpeg_pat_handle = new_create_dissector_handle(dissect_mpeg_pat, proto_mpeg_pat); + mpeg_pat_handle = create_dissector_handle(dissect_mpeg_pat, proto_mpeg_pat); dissector_add_uint("mpeg_sect.tid", MPEG_PAT_TID, mpeg_pat_handle); } diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c index 88c53c4fc2..878bea2bbd 100644 --- a/epan/dissectors/packet-mpeg1.c +++ b/epan/dissectors/packet-mpeg1.c @@ -328,7 +328,7 @@ proto_reg_handoff_mpeg1(void) { dissector_handle_t mpeg1_handle; - mpeg1_handle = new_create_dissector_handle(dissect_mpeg1, proto_mpg); + mpeg1_handle = create_dissector_handle(dissect_mpeg1, proto_mpg); dissector_add_uint("rtp.pt", PT_MPV, mpeg1_handle); } diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index c365ac7d52..4c99b50c15 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -2569,7 +2569,7 @@ proto_reg_handoff_mpls_echo(void) static guint mpls_echo_udp_port; if (!mpls_echo_prefs_initialized) { - mpls_echo_handle = new_create_dissector_handle(dissect_mpls_echo, + mpls_echo_handle = create_dissector_handle(dissect_mpls_echo, proto_mpls_echo); mpls_echo_prefs_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-mpls-pm.c b/epan/dissectors/packet-mpls-pm.c index 4052ecb8c5..f08d95a607 100644 --- a/epan/dissectors/packet-mpls-pm.c +++ b/epan/dissectors/packet-mpls-pm.c @@ -1526,15 +1526,15 @@ proto_reg_handoff_mpls_pm(void) dissector_handle_t mpls_pm_dlm_handle, mpls_pm_ilm_handle, mpls_pm_dm_handle, mpls_pm_dlm_dm_handle, mpls_pm_ilm_dm_handle; - mpls_pm_dlm_handle = new_create_dissector_handle( dissect_mpls_pm_dlm, proto_mpls_pm_dlm ); + mpls_pm_dlm_handle = create_dissector_handle( dissect_mpls_pm_dlm, proto_mpls_pm_dlm ); dissector_add_uint("pwach.channel_type", 0x000A, mpls_pm_dlm_handle); /* FF: MPLS PM, RFC 6374, DLM */ - mpls_pm_ilm_handle = new_create_dissector_handle( dissect_mpls_pm_ilm, proto_mpls_pm_ilm ); + mpls_pm_ilm_handle = create_dissector_handle( dissect_mpls_pm_ilm, proto_mpls_pm_ilm ); dissector_add_uint("pwach.channel_type", 0x000B, mpls_pm_ilm_handle); /* FF: MPLS PM, RFC 6374, ILM */ - mpls_pm_dm_handle = new_create_dissector_handle( dissect_mpls_pm_delay, proto_mpls_pm_dm ); + mpls_pm_dm_handle = create_dissector_handle( dissect_mpls_pm_delay, proto_mpls_pm_dm ); dissector_add_uint("pwach.channel_type", 0x000C, mpls_pm_dm_handle); /* FF: MPLS PM, RFC 6374, DM */ - mpls_pm_dlm_dm_handle = new_create_dissector_handle( dissect_mpls_pm_dlm_dm, proto_mpls_pm_dlm_dm ); + mpls_pm_dlm_dm_handle = create_dissector_handle( dissect_mpls_pm_dlm_dm, proto_mpls_pm_dlm_dm ); dissector_add_uint("pwach.channel_type", 0x000D, mpls_pm_dlm_dm_handle); /* FF: MPLS PM, RFC 6374, DLM+DM */ - mpls_pm_ilm_dm_handle = new_create_dissector_handle( dissect_mpls_pm_ilm_dm, proto_mpls_pm_ilm_dm ); + mpls_pm_ilm_dm_handle = create_dissector_handle( dissect_mpls_pm_ilm_dm, proto_mpls_pm_ilm_dm ); dissector_add_uint("pwach.channel_type", 0x000E, mpls_pm_ilm_dm_handle); /* FF: MPLS PM, RFC 6374, ILM+DM */ } diff --git a/epan/dissectors/packet-mpls-psc.c b/epan/dissectors/packet-mpls-psc.c index a2d3d83ee4..ff4edb327e 100644 --- a/epan/dissectors/packet-mpls-psc.c +++ b/epan/dissectors/packet-mpls-psc.c @@ -240,7 +240,7 @@ proto_reg_handoff_mpls_psc(void) { dissector_handle_t mpls_psc_handle; - mpls_psc_handle = new_create_dissector_handle( dissect_mpls_psc, proto_mpls_psc ); + mpls_psc_handle = create_dissector_handle( dissect_mpls_psc, proto_mpls_psc ); dissector_add_uint("pwach.channel_type", 0x0024, mpls_psc_handle); /* FF: PSC, RFC 6378 */ } diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index 5180a7cad4..00eac2da73 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -649,7 +649,7 @@ proto_reg_handoff_mpls(void) dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_MPLS, mpls_handle); dissector_add_uint("udp.port", UDP_PORT_MPLS_OVER_UDP, mpls_handle); - mpls_pwcw_handle = new_create_dissector_handle( dissect_pw_mcw, proto_pw_mcw ); + mpls_pwcw_handle = create_dissector_handle( dissect_pw_mcw, proto_pw_mcw ); dissector_add_uint( "mpls.label", MPLS_LABEL_INVALID, mpls_pwcw_handle ); dissector_data = find_dissector("data"); @@ -657,7 +657,7 @@ proto_reg_handoff_mpls(void) dissector_ip = find_dissector("ip"); dissector_pw_eth_heuristic = find_dissector("pw_eth_heuristic"); - dissector_pw_ach = new_create_dissector_handle(dissect_pw_ach, proto_pw_ach ); + dissector_pw_ach = create_dissector_handle(dissect_pw_ach, proto_pw_ach ); } /* * Editor modelines diff --git a/epan/dissectors/packet-mplstp-oam.c b/epan/dissectors/packet-mplstp-oam.c index ccecd8151f..9771f5bd2f 100644 --- a/epan/dissectors/packet-mplstp-oam.c +++ b/epan/dissectors/packet-mplstp-oam.c @@ -254,7 +254,7 @@ proto_reg_handoff_mplstp_lock(void) { dissector_handle_t mplstp_lock_handle; - mplstp_lock_handle = new_create_dissector_handle( dissect_mplstp_lock, proto_mplstp_lock ); + mplstp_lock_handle = create_dissector_handle( dissect_mplstp_lock, proto_mplstp_lock ); dissector_add_uint("pwach.channel_type", 0x0026, mplstp_lock_handle); /* KM: MPLSTP LOCK, RFC 6435 */ } @@ -343,7 +343,7 @@ proto_reg_handoff_mplstp_fm(void) { dissector_handle_t mplstp_fm_handle; - mplstp_fm_handle = new_create_dissector_handle( dissect_mplstp_fm, proto_mplstp_fm ); + mplstp_fm_handle = create_dissector_handle( dissect_mplstp_fm, proto_mplstp_fm ); dissector_add_uint("pwach.channel_type", 0x0058, mplstp_fm_handle); /* KM: MPLSTP FM, RFC 6427 */ } diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 7ab19dda2e..5fcb53962a 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -4779,8 +4779,8 @@ void proto_reg_handoff_mq(void) * class of applications (web browser, e-mail client, ...) and have a very well * known port number, the MQ applications are most often specific to a business application */ - mq_tcp_handle = new_create_dissector_handle(dissect_mq_tcp, proto_mq); - mq_spx_handle = new_create_dissector_handle(dissect_mq_spx, proto_mq); + mq_tcp_handle = create_dissector_handle(dissect_mq_tcp, proto_mq); + mq_spx_handle = create_dissector_handle(dissect_mq_spx, proto_mq); dissector_add_for_decode_as("tcp.port", mq_tcp_handle); heur_dissector_add("tcp", dissect_mq_heur_tcp, "WebSphere MQ over TCP", "mq_tcp", proto_mq, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-mqtt-sn.c b/epan/dissectors/packet-mqtt-sn.c index daf1f8668a..ebdad0f1bf 100644 --- a/epan/dissectors/packet-mqtt-sn.c +++ b/epan/dissectors/packet-mqtt-sn.c @@ -687,7 +687,7 @@ void proto_register_mqttsn(void) proto_mqttsn = proto_register_protocol("MQ Telemetry Transport Protocol for Sensor Networks", "MQTT-SN", "mqttsn"); /* Create the dissector handle. */ - mqttsn_handle = new_create_dissector_handle(dissect_mqttsn, proto_mqttsn); + mqttsn_handle = create_dissector_handle(dissect_mqttsn, proto_mqttsn); /* Register fields and subtrees. */ proto_register_field_array(proto_mqttsn, hf_mqttsn, array_length(hf_mqttsn)); diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c index 50deaac6ff..5ea6315fa0 100644 --- a/epan/dissectors/packet-mrcpv2.c +++ b/epan/dissectors/packet-mrcpv2.c @@ -1524,7 +1524,7 @@ proto_reg_handoff_mrcpv2(void) static range_t *mrcpv2_tcp_range = NULL; if (!initialized) { - mrcpv2_handle = new_create_dissector_handle(dissect_mrcpv2_tcp, proto_mrcpv2); + mrcpv2_handle = create_dissector_handle(dissect_mrcpv2_tcp, proto_mrcpv2); initialized = TRUE; } else { dissector_delete_uint_range ("tcp.port", mrcpv2_tcp_range, mrcpv2_handle); diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c index d31ff65600..19ab0c1141 100644 --- a/epan/dissectors/packet-mrdisc.c +++ b/epan/dissectors/packet-mrdisc.c @@ -288,7 +288,7 @@ proto_reg_handoff_mrdisc(void) { dissector_handle_t mrdisc_handle; - mrdisc_handle = new_create_dissector_handle(dissect_mrdisc, proto_mrdisc); + mrdisc_handle = create_dissector_handle(dissect_mrdisc, proto_mrdisc); dissector_add_uint("igmp.type", IGMP_TYPE_0x24, mrdisc_handle); dissector_add_uint("igmp.type", IGMP_TYPE_0x25, mrdisc_handle); dissector_add_uint("igmp.type", IGMP_TYPE_0x26, mrdisc_handle); diff --git a/epan/dissectors/packet-mrp-mmrp.c b/epan/dissectors/packet-mrp-mmrp.c index f39d49709e..eae806668a 100644 --- a/epan/dissectors/packet-mrp-mmrp.c +++ b/epan/dissectors/packet-mrp-mmrp.c @@ -426,7 +426,7 @@ proto_reg_handoff_mrp_mmrp(void) { dissector_handle_t mmrp_handle; - mmrp_handle = new_create_dissector_handle(dissect_mmrp, proto_mmrp); + mmrp_handle = create_dissector_handle(dissect_mmrp, proto_mmrp); dissector_add_uint("ethertype", ETHERTYPE_MMRP, mmrp_handle); } diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c index 6144448483..851fdc5842 100644 --- a/epan/dissectors/packet-mrp-msrp.c +++ b/epan/dissectors/packet-mrp-msrp.c @@ -789,7 +789,7 @@ proto_reg_handoff_mrp_msrp(void) { dissector_handle_t msrp_handle; - msrp_handle = new_create_dissector_handle(dissect_msrp, proto_msrp); + msrp_handle = create_dissector_handle(dissect_msrp, proto_msrp); dissector_add_uint("ethertype", ETHERTYPE_MSRP, msrp_handle); } diff --git a/epan/dissectors/packet-mrp-mvrp.c b/epan/dissectors/packet-mrp-mvrp.c index 94d9460252..051aa8d5aa 100644 --- a/epan/dissectors/packet-mrp-mvrp.c +++ b/epan/dissectors/packet-mrp-mvrp.c @@ -432,7 +432,7 @@ proto_reg_handoff_mrp_mvrp(void) { dissector_handle_t mvrp_handle; - mvrp_handle = new_create_dissector_handle(dissect_mvrp, proto_mvrp); + mvrp_handle = create_dissector_handle(dissect_mvrp, proto_mvrp); dissector_add_uint("ethertype", ETHERTYPE_MVRP, mvrp_handle); } /* diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index 4be3ec5e0f..2e96cfad5f 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.c @@ -585,7 +585,7 @@ proto_reg_handoff_msdp(void) { dissector_handle_t msdp_handle; - msdp_handle = new_create_dissector_handle(dissect_msdp, proto_msdp); + msdp_handle = create_dissector_handle(dissect_msdp, proto_msdp); dissector_add_uint("tcp.port", 639, msdp_handle); ip_handle = find_dissector("ip"); diff --git a/epan/dissectors/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c index 111afd1dda..fb068945ab 100644 --- a/epan/dissectors/packet-msn-messenger.c +++ b/epan/dissectors/packet-msn-messenger.c @@ -132,7 +132,7 @@ proto_reg_handoff_msnms(void) { dissector_handle_t msnms_handle; - msnms_handle = new_create_dissector_handle(dissect_msnms, proto_msnms); + msnms_handle = create_dissector_handle(dissect_msnms, proto_msnms); dissector_add_uint("tcp.port", TCP_PORT_MSNMS, msnms_handle); /* * For MSN Messenger Protocol over HTTP diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c index 330ceceacb..e1544a418e 100644 --- a/epan/dissectors/packet-msnip.c +++ b/epan/dissectors/packet-msnip.c @@ -317,7 +317,7 @@ proto_reg_handoff_msnip(void) { dissector_handle_t msnip_handle; - msnip_handle = new_create_dissector_handle(dissect_msnip, proto_msnip); + msnip_handle = create_dissector_handle(dissect_msnip, proto_msnip); dissector_add_uint("igmp.type", IGMP_TYPE_0x23, msnip_handle); dissector_add_uint("igmp.type", IGMP_TYPE_0x24, msnip_handle); dissector_add_uint("igmp.type", IGMP_TYPE_0x25, msnip_handle); diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c index 78318c69fc..08744357cb 100644 --- a/epan/dissectors/packet-msnlb.c +++ b/epan/dissectors/packet-msnlb.c @@ -632,7 +632,7 @@ proto_reg_handoff_msnlb(void) { dissector_handle_t msnlb_handle; - msnlb_handle = new_create_dissector_handle(dissect_msnlb, proto_msnlb); + msnlb_handle = create_dissector_handle(dissect_msnlb, proto_msnlb); dissector_add_uint("ethertype", ETHERTYPE_MS_NLB_HEARTBEAT, msnlb_handle); } diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index 41d531ddc8..7c2094839f 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -1256,7 +1256,7 @@ proto_register_msproxy( void){ expert_msproxy = expert_register_protocol(proto_msproxy); expert_register_field_array(expert_msproxy, ei, array_length(ei)); - msproxy_sub_handle = new_create_dissector_handle(msproxy_sub_dissector, + msproxy_sub_handle = create_dissector_handle(msproxy_sub_dissector, proto_msproxy); } @@ -1268,7 +1268,7 @@ proto_reg_handoff_msproxy(void) { dissector_handle_t msproxy_handle; - msproxy_handle = new_create_dissector_handle(dissect_msproxy, + msproxy_handle = create_dissector_handle(dissect_msproxy, proto_msproxy); dissector_add_uint("udp.port", UDP_PORT_MSPROXY, msproxy_handle); } diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c index 7f5793716c..79a71d087f 100644 --- a/epan/dissectors/packet-mtp2.c +++ b/epan/dissectors/packet-mtp2.c @@ -437,7 +437,7 @@ proto_reg_handoff_mtp2(void) dissector_handle_t mtp2_with_phdr_handle; dissector_add_uint("wtap_encap", WTAP_ENCAP_MTP2, mtp2_handle); - mtp2_with_phdr_handle = new_create_dissector_handle(dissect_mtp2_with_phdr, + mtp2_with_phdr_handle = create_dissector_handle(dissect_mtp2_with_phdr, proto_mtp2); dissector_add_uint("wtap_encap", WTAP_ENCAP_MTP2_WITH_PHDR, mtp2_with_phdr_handle); diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index e70b5fc312..bbedf74937 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -1042,7 +1042,7 @@ proto_reg_handoff_multipart(void) /* * Handle for multipart dissection */ - multipart_handle = new_create_dissector_handle( + multipart_handle = create_dissector_handle( dissect_multipart, proto_multipart); dissector_add_string("media_type", diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index b136998b9d..77814670d4 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -3205,7 +3205,7 @@ void proto_register_mysql(void) void proto_reg_handoff_mysql(void) { ssl_handle = find_dissector("ssl"); - mysql_handle = new_create_dissector_handle(dissect_mysql, proto_mysql); + mysql_handle = create_dissector_handle(dissect_mysql, proto_mysql); dissector_add_uint("tcp.port", TCP_PORT_MySQL, mysql_handle); } diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c index c8686f7c8c..2df90a5329 100644 --- a/epan/dissectors/packet-nasdaq-itch.c +++ b/epan/dissectors/packet-nasdaq-itch.c @@ -595,7 +595,7 @@ proto_reg_handoff_nasdaq_itch(void) { dissector_handle_t nasdaq_itch_handle; - nasdaq_itch_handle = new_create_dissector_handle( dissect_nasdaq_itch, proto_nasdaq_itch ); + nasdaq_itch_handle = create_dissector_handle( dissect_nasdaq_itch, proto_nasdaq_itch ); dissector_add_for_decode_as("moldudp64.payload", nasdaq_itch_handle ); } diff --git a/epan/dissectors/packet-nasdaq-soup.c b/epan/dissectors/packet-nasdaq-soup.c index 4a84891f3d..1062785580 100644 --- a/epan/dissectors/packet-nasdaq-soup.c +++ b/epan/dissectors/packet-nasdaq-soup.c @@ -290,7 +290,7 @@ proto_register_nasdaq_soup(void) void proto_reg_handoff_nasdaq_soup(void) { - nasdaq_soup_handle = new_create_dissector_handle(dissect_nasdaq_soup, proto_nasdaq_soup); + nasdaq_soup_handle = create_dissector_handle(dissect_nasdaq_soup, proto_nasdaq_soup); nasdaq_itch_handle = find_dissector("nasdaq-itch"); dissector_add_for_decode_as("tcp.port", nasdaq_soup_handle); } diff --git a/epan/dissectors/packet-nat-pmp.c b/epan/dissectors/packet-nat-pmp.c index 587264467a..9ad9dfcab4 100644 --- a/epan/dissectors/packet-nat-pmp.c +++ b/epan/dissectors/packet-nat-pmp.c @@ -792,11 +792,11 @@ void proto_reg_handoff_nat_pmp(void) dissector_handle_t pcp_handle; - pcp_handle = new_create_dissector_handle(dissect_portcontrol, proto_pcp); + pcp_handle = create_dissector_handle(dissect_portcontrol, proto_pcp); dissector_add_uint("udp.port", PCP_STATUS_PORT, pcp_handle); dissector_add_uint("udp.port", PCP_PORT, pcp_handle); - nat_pmp_handle = new_create_dissector_handle(dissect_nat_pmp, proto_nat_pmp); + nat_pmp_handle = create_dissector_handle(dissect_nat_pmp, proto_nat_pmp); /* Port Control Protocol (packet-portcontrol.c) shares the same UDP ports as NAT-PMP, but it backwards compatible. However, still let NAT-PMP use Decode As diff --git a/epan/dissectors/packet-nb_rtpmux.c b/epan/dissectors/packet-nb_rtpmux.c index f8609ddcef..c1a2ba18f1 100644 --- a/epan/dissectors/packet-nb_rtpmux.c +++ b/epan/dissectors/packet-nb_rtpmux.c @@ -276,11 +276,11 @@ proto_reg_handoff_nb_rtpmux(void) static gboolean nb_rtpmux_initialized = FALSE; dissector_handle_t nb_rtpmux_handle; - /* Use new_create_dissector_handle() to indicate that dissect_nb_rtpmux() + /* Use create_dissector_handle() to indicate that dissect_nb_rtpmux() * returns the number of bytes it dissected (or 0 if it thinks the packet * does not belong to PROTONAME). */ - nb_rtpmux_handle = new_create_dissector_handle(dissect_nb_rtpmux, + nb_rtpmux_handle = create_dissector_handle(dissect_nb_rtpmux, proto_nb_rtpmux); if (!nb_rtpmux_initialized) diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c index f025bfed06..5a5b51a777 100644 --- a/epan/dissectors/packet-nbipx.c +++ b/epan/dissectors/packet-nbipx.c @@ -657,7 +657,7 @@ proto_reg_handoff_nbipx(void) { dissector_handle_t nbipx_handle; - nbipx_handle = new_create_dissector_handle(dissect_nbipx, proto_nbipx); + nbipx_handle = create_dissector_handle(dissect_nbipx, proto_nbipx); dissector_add_uint("ipx.socket", IPX_SOCKET_NETBIOS, nbipx_handle); netbios_heur_subdissector_list = find_heur_dissector_list("netbios"); data_handle = find_dissector("data"); @@ -870,7 +870,7 @@ proto_reg_handoff_nmpi(void) { dissector_handle_t nmpi_handle; - nmpi_handle = new_create_dissector_handle(dissect_nmpi, proto_nmpi); + nmpi_handle = create_dissector_handle(dissect_nmpi, proto_nmpi); dissector_add_uint("ipx.socket", IPX_SOCKET_NWLINK_SMB_NAMEQUERY, nmpi_handle); dissector_add_uint("ipx.socket", IPX_SOCKET_NWLINK_SMB_MAILSLOT, diff --git a/epan/dissectors/packet-nbt.c b/epan/dissectors/packet-nbt.c index 2403a56b3e..8b30969305 100644 --- a/epan/dissectors/packet-nbt.c +++ b/epan/dissectors/packet-nbt.c @@ -2086,13 +2086,13 @@ proto_reg_handoff_nbt(void) { dissector_handle_t nbns_handle, nbdgm_handle, nbss_handle; - nbns_handle = new_create_dissector_handle(dissect_nbns, proto_nbns); + nbns_handle = create_dissector_handle(dissect_nbns, proto_nbns); dissector_add_uint("udp.port", UDP_PORT_NBNS, nbns_handle); - nbdgm_handle = new_create_dissector_handle(dissect_nbdgm, proto_nbdgm); + nbdgm_handle = create_dissector_handle(dissect_nbdgm, proto_nbdgm); dissector_add_uint("udp.port", UDP_PORT_NBDGM, nbdgm_handle); - nbss_handle = new_create_dissector_handle(dissect_nbss, proto_nbss); + nbss_handle = create_dissector_handle(dissect_nbss, proto_nbss); dissector_add_uint("tcp.port", TCP_PORT_NBSS, nbss_handle); dissector_add_uint("tcp.port", TCP_PORT_CIFS, nbss_handle); diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 7aa34fbd1a..bcc561e47f 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -1391,8 +1391,8 @@ proto_reg_handoff_ncp(void) dissector_handle_t ncp_handle; dissector_handle_t ncp_tcp_handle; - ncp_handle = new_create_dissector_handle(dissect_ncp, proto_ncp); - ncp_tcp_handle = new_create_dissector_handle(dissect_ncp_tcp, proto_ncp); + ncp_handle = create_dissector_handle(dissect_ncp, proto_ncp); + ncp_tcp_handle = create_dissector_handle(dissect_ncp_tcp, proto_ncp); dissector_add_uint("tcp.port", TCP_PORT_NCP, ncp_tcp_handle); dissector_add_uint("udp.port", UDP_PORT_NCP, ncp_handle); dissector_add_uint("ipx.packet_type", IPX_PACKET_TYPE_NCP, ncp_handle); diff --git a/epan/dissectors/packet-ncs.c b/epan/dissectors/packet-ncs.c index 21fb3c0b5e..a52cc4a1f6 100644 --- a/epan/dissectors/packet-ncs.c +++ b/epan/dissectors/packet-ncs.c @@ -86,7 +86,7 @@ proto_reg_handoff_ncs(void) { dissector_handle_t ncs_handle; - ncs_handle = new_create_dissector_handle(dissect_ncs, proto_ncs); + ncs_handle = create_dissector_handle(dissect_ncs, proto_ncs); dissector_add_uint("ip.proto", IP_PROTO_NCS_HEARTBEAT, ncs_handle); } diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index a88febad79..a67d6ec3b2 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -4263,7 +4263,7 @@ proto_register_ndmp(void) void proto_reg_handoff_ndmp(void) { - ndmp_handle = new_create_dissector_handle(dissect_ndmp, proto_ndmp); + ndmp_handle = create_dissector_handle(dissect_ndmp, proto_ndmp); dissector_add_uint("tcp.port",TCP_PORT_NDMP, ndmp_handle); heur_dissector_add("tcp", dissect_ndmp_heur, "NDMP over TCP", "ndmp_tcp", proto_ndmp, HEURISTIC_ENABLE); } diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 0feaaee10b..b31db4e033 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -9524,8 +9524,8 @@ proto_reg_handoff_ndps(void) { dissector_handle_t ndps_handle, ndps_tcp_handle; - ndps_handle = new_create_dissector_handle(dissect_ndps_ipx, proto_ndps); - ndps_tcp_handle = new_create_dissector_handle(dissect_ndps_tcp, proto_ndps); + ndps_handle = create_dissector_handle(dissect_ndps_ipx, proto_ndps); + ndps_tcp_handle = create_dissector_handle(dissect_ndps_tcp, proto_ndps); dissector_add_uint("spx.socket", SPX_SOCKET_PA, ndps_handle); dissector_add_uint("spx.socket", SPX_SOCKET_BROKER, ndps_handle); diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index 195dc4426d..b9c471cffa 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -464,8 +464,8 @@ void proto_reg_handoff_netanalyzer(void) eth_dissector_handle = find_dissector("eth_withfcs"); data_dissector_handle = find_dissector("data"); - netana_handle = new_create_dissector_handle(dissect_netanalyzer, proto_netanalyzer); - netana_handle_transparent = new_create_dissector_handle(dissect_netanalyzer_transparent, proto_netanalyzer); + netana_handle = create_dissector_handle(dissect_netanalyzer, proto_netanalyzer); + netana_handle_transparent = create_dissector_handle(dissect_netanalyzer_transparent, proto_netanalyzer); dissector_add_uint("wtap_encap", WTAP_ENCAP_NETANALYZER, netana_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_NETANALYZER_TRANSPARENT, netana_handle_transparent); } diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index 02eba9bfd2..4a4305b10d 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -1484,7 +1484,7 @@ proto_reg_handoff_netbios(void) { dissector_handle_t netbios_handle; - netbios_handle = new_create_dissector_handle(dissect_netbios, + netbios_handle = create_dissector_handle(dissect_netbios, proto_netbios); dissector_add_uint("llc.dsap", SAP_NETBIOS, netbios_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c index d9bc3d4016..5dec2cc4fd 100644 --- a/epan/dissectors/packet-netdump.c +++ b/epan/dissectors/packet-netdump.c @@ -203,7 +203,7 @@ void proto_reg_handoff_netdump(void) static int CurrentPort; if (!initalized) { - netdump_handle = new_create_dissector_handle(dissect_netdump, + netdump_handle = create_dissector_handle(dissect_netdump, proto_netdump); dissector_add_for_decode_as("udp.port", netdump_handle); diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 7a380991e3..0b8f69a062 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -11570,7 +11570,7 @@ proto_reg_handoff_netflow(void) static range_t *ipfix_ports; if (!netflow_prefs_initialized) { - netflow_handle = new_create_dissector_handle(dissect_netflow, proto_netflow); + netflow_handle = create_dissector_handle(dissect_netflow, proto_netflow); netflow_prefs_initialized = TRUE; dissector_add_uint("wtap_encap", WTAP_ENCAP_RAW_IPFIX, netflow_handle); } else { diff --git a/epan/dissectors/packet-netlink-netfilter.c b/epan/dissectors/packet-netlink-netfilter.c index 7037425c82..3752b77ea9 100644 --- a/epan/dissectors/packet-netlink-netfilter.c +++ b/epan/dissectors/packet-netlink-netfilter.c @@ -221,7 +221,7 @@ proto_register_netlink_netfilter(void) proto_register_fields(proto_netlink_netfilter, hfi, array_length(hfi)); proto_register_subtree_array(ett, array_length(ett)); - netlink_netfilter = new_create_dissector_handle(dissect_netlink_netfilter, proto_netlink_netfilter); + netlink_netfilter = create_dissector_handle(dissect_netlink_netfilter, proto_netlink_netfilter); } void diff --git a/epan/dissectors/packet-netlink-route.c b/epan/dissectors/packet-netlink-route.c index 2022c0a229..6bcdbfdbc8 100644 --- a/epan/dissectors/packet-netlink-route.c +++ b/epan/dissectors/packet-netlink-route.c @@ -999,7 +999,7 @@ proto_register_netlink_route(void) proto_register_fields(proto_netlink_route, hfi, array_length(hfi)); proto_register_subtree_array(ett, array_length(ett)); - netlink_route_handle = new_create_dissector_handle(dissect_netlink_route, proto_netlink_route); + netlink_route_handle = create_dissector_handle(dissect_netlink_route, proto_netlink_route); } void diff --git a/epan/dissectors/packet-netlink-sock_diag.c b/epan/dissectors/packet-netlink-sock_diag.c index b7e5c869c0..00c3646501 100644 --- a/epan/dissectors/packet-netlink-sock_diag.c +++ b/epan/dissectors/packet-netlink-sock_diag.c @@ -1201,7 +1201,7 @@ proto_register_netlink_sock_diag(void) proto_register_fields(proto_netlink_sock_diag, hfi, array_length(hfi)); proto_register_subtree_array(ett, array_length(ett)); - netlink_sock_diag_handle = new_create_dissector_handle(dissect_netlink_sock_diag, proto_netlink_sock_diag); + netlink_sock_diag_handle = create_dissector_handle(dissect_netlink_sock_diag, proto_netlink_sock_diag); } void diff --git a/epan/dissectors/packet-netlink.c b/epan/dissectors/packet-netlink.c index ca09c2c4d5..b0be56a7e7 100644 --- a/epan/dissectors/packet-netlink.c +++ b/epan/dissectors/packet-netlink.c @@ -410,7 +410,7 @@ proto_register_netlink(void) proto_register_fields(proto_netlink, hfi, array_length(hfi)); proto_register_subtree_array(ett, array_length(ett)); - netlink_handle = new_create_dissector_handle(dissect_netlink, proto_netlink); + netlink_handle = create_dissector_handle(dissect_netlink, proto_netlink); netlink_dissector_table = register_dissector_table( "netlink.protocol", diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c index 8c77f25c39..1fcd48e4b7 100644 --- a/epan/dissectors/packet-netperfmeter.c +++ b/epan/dissectors/packet-netperfmeter.c @@ -465,7 +465,7 @@ proto_reg_handoff_npmp(void) { dissector_handle_t npmp_handle; - npmp_handle = new_create_dissector_handle(dissect_npmp, proto_npmp); + npmp_handle = create_dissector_handle(dissect_npmp, proto_npmp); dissector_add_uint("sctp.ppi", PPID_NETPERFMETER_CONTROL_LEGACY, npmp_handle); dissector_add_uint("sctp.ppi", PPID_NETPERFMETER_DATA_LEGACY, npmp_handle); dissector_add_uint("sctp.ppi", NPMP_CTRL_PAYLOAD_PROTOCOL_ID, npmp_handle); diff --git a/epan/dissectors/packet-netrom.c b/epan/dissectors/packet-netrom.c index cd8391db13..7afdad7b92 100644 --- a/epan/dissectors/packet-netrom.c +++ b/epan/dissectors/packet-netrom.c @@ -626,7 +626,7 @@ proto_register_netrom(void) void proto_reg_handoff_netrom(void) { - dissector_add_uint( "ax25.pid", AX25_P_NETROM, new_create_dissector_handle( dissect_netrom, proto_netrom ) ); + dissector_add_uint( "ax25.pid", AX25_P_NETROM, create_dissector_handle( dissect_netrom, proto_netrom ) ); ip_handle = find_dissector( "ip" ); data_handle = find_dissector( "data" ); diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c index 20a422e92b..90ba55bce5 100644 --- a/epan/dissectors/packet-netsync.c +++ b/epan/dissectors/packet-netsync.c @@ -750,7 +750,7 @@ proto_reg_handoff_netsync(void) static gboolean initialized = FALSE; if (!initialized) { - netsync_handle = new_create_dissector_handle(dissect_netsync, proto_netsync); + netsync_handle = create_dissector_handle(dissect_netsync, proto_netsync); initialized = TRUE; } else { dissector_delete_uint("tcp.port", tcp_port_netsync, netsync_handle); diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c index fd0d4d3628..677bcfbea9 100644 --- a/epan/dissectors/packet-nettl.c +++ b/epan/dissectors/packet-nettl.c @@ -354,7 +354,7 @@ proto_reg_handoff_nettl(void) ip_proto_dissector_table = find_dissector_table("ip.proto"); tcp_subdissector_table = find_dissector_table("tcp.port"); - nettl_handle = new_create_dissector_handle(dissect_nettl, proto_nettl); + nettl_handle = create_dissector_handle(dissect_nettl, proto_nettl); dissector_add_uint("wtap_encap", WTAP_ENCAP_NETTL_ETHERNET, nettl_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_NETTL_TOKEN_RING, nettl_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_NETTL_FDDI, nettl_handle); diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 158557bf68..74b66a5d82 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -13759,37 +13759,37 @@ proto_reg_handoff_nfs(void) rpc_init_prog(proto_nfs, NFS_CB_PROGRAM, ett_nfs, G_N_ELEMENTS(nfs_cb_vers_info), nfs_cb_vers_info); - fhandle_handle = new_create_dissector_handle(dissect_fhandle_data_SVR4, proto_nfs_svr4); + fhandle_handle = create_dissector_handle(dissect_fhandle_data_SVR4, proto_nfs_svr4); dissector_add_for_decode_as("nfs_fhandle.type", fhandle_handle); - fhandle_handle = new_create_dissector_handle(dissect_fhandle_data_LINUX_KNFSD_LE, proto_nfs_knfsd_le); + fhandle_handle = create_dissector_handle(dissect_fhandle_data_LINUX_KNFSD_LE, proto_nfs_knfsd_le); dissector_add_for_decode_as("nfs_fhandle.type", fhandle_handle); - fhandle_handle = new_create_dissector_handle(dissect_fhandle_data_LINUX_NFSD_LE, proto_nfs_nfsd_le); + fhandle_handle = create_dissector_handle(dissect_fhandle_data_LINUX_NFSD_LE, proto_nfs_nfsd_le); dissector_add_for_decode_as("nfs_fhandle.type", fhandle_handle); - fhandle_handle = new_create_dissector_handle(dissect_fhandle_data_LINUX_KNFSD_NEW, proto_nfs_knfsd_new); + fhandle_handle = create_dissector_handle(dissect_fhandle_data_LINUX_KNFSD_NEW, proto_nfs_knfsd_new); dissector_add_for_decode_as("nfs_fhandle.type", fhandle_handle); - fhandle_handle = new_create_dissector_handle(dissect_fhandle_data_NETAPP, proto_nfs_ontap_v3); + fhandle_handle = create_dissector_handle(dissect_fhandle_data_NETAPP, proto_nfs_ontap_v3); dissector_add_for_decode_as("nfs_fhandle.type", fhandle_handle); - fhandle_handle = new_create_dissector_handle(dissect_fhandle_data_NETAPP_V4, proto_nfs_ontap_v4); + fhandle_handle = create_dissector_handle(dissect_fhandle_data_NETAPP_V4, proto_nfs_ontap_v4); dissector_add_for_decode_as("nfs_fhandle.type", fhandle_handle); - fhandle_handle = new_create_dissector_handle(dissect_fhandle_data_NETAPP_GX_v3, proto_nfs_ontap_gx_v3); + fhandle_handle = create_dissector_handle(dissect_fhandle_data_NETAPP_GX_v3, proto_nfs_ontap_gx_v3); dissector_add_for_decode_as("nfs_fhandle.type", fhandle_handle); - fhandle_handle = new_create_dissector_handle(dissect_fhandle_data_CELERRA_VNX, proto_nfs_celerra_vnx); + fhandle_handle = create_dissector_handle(dissect_fhandle_data_CELERRA_VNX, proto_nfs_celerra_vnx); dissector_add_for_decode_as("nfs_fhandle.type", fhandle_handle); - fhandle_handle = new_create_dissector_handle(dissect_fhandle_data_GLUSTER, proto_nfs_gluster); + fhandle_handle = create_dissector_handle(dissect_fhandle_data_GLUSTER, proto_nfs_gluster); dissector_add_for_decode_as("nfs_fhandle.type", fhandle_handle); - fhandle_handle = new_create_dissector_handle(dissect_fhandle_data_DCACHE, proto_nfs_dcache); + fhandle_handle = create_dissector_handle(dissect_fhandle_data_DCACHE, proto_nfs_dcache); dissector_add_for_decode_as("nfs_fhandle.type", fhandle_handle); - fhandle_handle = new_create_dissector_handle(dissect_fhandle_data_unknown, proto_nfs_unknown); + fhandle_handle = create_dissector_handle(dissect_fhandle_data_unknown, proto_nfs_unknown); dissector_add_for_decode_as("nfs_fhandle.type", fhandle_handle); } diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index ab43844acf..32fb8ebd6a 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -1393,7 +1393,7 @@ proto_reg_handoff_nhrp(void) osinl_excl_subdissector_table = find_dissector_table("osinl.excl"); ethertype_subdissector_table = find_dissector_table("ethertype"); - nhrp_handle = new_create_dissector_handle(dissect_nhrp, proto_nhrp); + nhrp_handle = create_dissector_handle(dissect_nhrp, proto_nhrp); dissector_add_uint("ip.proto", IP_PROTO_NARP, nhrp_handle); dissector_add_uint("gre.proto", GRE_NHRP, nhrp_handle); dissector_add_uint("llc.iana_pid", IANA_PID_MARS_NHRP_CONTROL, nhrp_handle); diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index 56d3167832..c23356ee63 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -1775,7 +1775,7 @@ proto_reg_handoff_nlsp(void) { dissector_handle_t nlsp_handle; - nlsp_handle = new_create_dissector_handle(dissect_nlsp, proto_nlsp); + nlsp_handle = create_dissector_handle(dissect_nlsp, proto_nlsp); dissector_add_uint("ipx.socket", IPX_SOCKET_NLSP, nlsp_handle); } diff --git a/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c index 91f87db533..aeb3059654 100644 --- a/epan/dissectors/packet-nntp.c +++ b/epan/dissectors/packet-nntp.c @@ -133,7 +133,7 @@ proto_reg_handoff_nntp(void) { dissector_handle_t nntp_handle; - nntp_handle = new_create_dissector_handle(dissect_nntp, proto_nntp); + nntp_handle = create_dissector_handle(dissect_nntp, proto_nntp); dissector_add_uint("tcp.port", TCP_PORT_NNTP, nntp_handle); } diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c index 40ad06ec02..70dc51c995 100644 --- a/epan/dissectors/packet-nsrp.c +++ b/epan/dissectors/packet-nsrp.c @@ -510,7 +510,7 @@ proto_reg_handoff_nsrp(void) { dissector_handle_t nsrp_handle; - nsrp_handle = new_create_dissector_handle(dissect_nsrp, proto_nsrp); + nsrp_handle = create_dissector_handle(dissect_nsrp, proto_nsrp); dissector_add_uint("ethertype", ETHERTYPE_NSRP, nsrp_handle); } diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c index 88b373a9ed..f341662cbd 100644 --- a/epan/dissectors/packet-nstrace.c +++ b/epan/dissectors/packet-nstrace.c @@ -1141,7 +1141,7 @@ void proto_reg_handoff_ns(void) eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); - nstrace_handle = new_create_dissector_handle(dissect_nstrace, proto_nstrace); + nstrace_handle = create_dissector_handle(dissect_nstrace, proto_nstrace); dissector_add_uint("wtap_encap", WTAP_ENCAP_NSTRACE_1_0, nstrace_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_NSTRACE_2_0, nstrace_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_NSTRACE_3_0, nstrace_handle); diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c index b24f643b85..8b2f1940f5 100644 --- a/epan/dissectors/packet-nt-tpcp.c +++ b/epan/dissectors/packet-nt-tpcp.c @@ -243,7 +243,7 @@ proto_reg_handoff_tpcp(void) { dissector_handle_t tpcp_handle; - tpcp_handle = new_create_dissector_handle(dissect_tpcp, proto_tpcp); + tpcp_handle = create_dissector_handle(dissect_tpcp, proto_tpcp); dissector_add_uint("udp.port", UDP_PORT_TPCP, tpcp_handle); } diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index d0cb9ba1da..a67d10d4fd 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -1703,7 +1703,7 @@ proto_reg_handoff_ntp(void) { dissector_handle_t ntp_handle; - ntp_handle = new_create_dissector_handle(dissect_ntp, proto_ntp); + ntp_handle = create_dissector_handle(dissect_ntp, proto_ntp); dissector_add_uint("udp.port", UDP_PORT_NTP, ntp_handle); dissector_add_uint("tcp.port", TCP_PORT_NTP, ntp_handle); } diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c index 98c9b25923..369478b032 100644 --- a/epan/dissectors/packet-null.c +++ b/epan/dissectors/packet-null.c @@ -554,10 +554,10 @@ proto_reg_handoff_null(void) ethertype_dissector_table = find_dissector_table("ethertype"); - null_handle = new_create_dissector_handle(dissect_null, proto_null); + null_handle = create_dissector_handle(dissect_null, proto_null); dissector_add_uint("wtap_encap", WTAP_ENCAP_NULL, null_handle); - loop_handle = new_create_dissector_handle(dissect_loop, proto_null); + loop_handle = create_dissector_handle(dissect_loop, proto_null); dissector_add_uint("wtap_encap", WTAP_ENCAP_LOOP, loop_handle); } diff --git a/epan/dissectors/packet-nwp.c b/epan/dissectors/packet-nwp.c index d347e11f38..c84d2f17de 100644 --- a/epan/dissectors/packet-nwp.c +++ b/epan/dissectors/packet-nwp.c @@ -357,7 +357,7 @@ void proto_reg_handoff_nwp(void) { dissector_handle_t nwp_handle; - nwp_handle = new_create_dissector_handle(dissect_nwp, proto_nwp); + nwp_handle = create_dissector_handle(dissect_nwp, proto_nwp); dissector_add_uint("ethertype", ETHERTYPE_NWP, nwp_handle); } diff --git a/epan/dissectors/packet-oampdu.c b/epan/dissectors/packet-oampdu.c index 71ebf546a7..b088e9adc0 100644 --- a/epan/dissectors/packet-oampdu.c +++ b/epan/dissectors/packet-oampdu.c @@ -2541,7 +2541,7 @@ proto_reg_handoff_oampdu(void) { dissector_handle_t oampdu_handle; - oampdu_handle = new_create_dissector_handle(dissect_oampdu, proto_oampdu); + oampdu_handle = create_dissector_handle(dissect_oampdu, proto_oampdu); dissector_add_uint("slow.subtype", OAM_SUBTYPE, oampdu_handle); } diff --git a/epan/dissectors/packet-ocfs2.c b/epan/dissectors/packet-ocfs2.c index 51f62022b0..a0540bf9e9 100644 --- a/epan/dissectors/packet-ocfs2.c +++ b/epan/dissectors/packet-ocfs2.c @@ -1655,7 +1655,7 @@ void proto_reg_handoff_ocfs2(void) { dissector_handle_t ocfs2_handle; - ocfs2_handle = new_create_dissector_handle(dissect_ocfs2, proto_ocfs2); + ocfs2_handle = create_dissector_handle(dissect_ocfs2, proto_ocfs2); dissector_add_for_decode_as("tcp.port", ocfs2_handle); diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c index dc918cd2a5..4063038209 100644 --- a/epan/dissectors/packet-oicq.c +++ b/epan/dissectors/packet-oicq.c @@ -196,7 +196,7 @@ proto_reg_handoff_oicq(void) { dissector_handle_t oicq_handle; - oicq_handle = new_create_dissector_handle(dissect_oicq, proto_oicq); + oicq_handle = create_dissector_handle(dissect_oicq, proto_oicq); dissector_add_uint("udp.port", UDP_PORT_OICQ, oicq_handle); } diff --git a/epan/dissectors/packet-oipf.c b/epan/dissectors/packet-oipf.c index f9869c06c9..8416c95b13 100644 --- a/epan/dissectors/packet-oipf.c +++ b/epan/dissectors/packet-oipf.c @@ -169,7 +169,7 @@ proto_reg_handoff_oipf(void) dissector_handle_t oipf_ciplus_handle; oipf_ciplus_handle = - new_create_dissector_handle(dissect_oipf_ciplus, proto_oipf_ciplus); + create_dissector_handle(dissect_oipf_ciplus, proto_oipf_ciplus); dissector_add_string("dvb-ci.sas.app_id_str", sas_app_id_str_oipf, oipf_ciplus_handle); diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index 334a0e337d..162217d916 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -994,7 +994,7 @@ void proto_register_olsr(void) { void proto_reg_handoff_olsr(void) { dissector_handle_t olsr_handle; - olsr_handle = new_create_dissector_handle(dissect_olsr, proto_olsr); + olsr_handle = create_dissector_handle(dissect_olsr, proto_olsr); dissector_add_uint("udp.port", UDP_PORT_OLSR, olsr_handle); } diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c index 1e9c8f646b..1e104a2da1 100644 --- a/epan/dissectors/packet-omapi.c +++ b/epan/dissectors/packet-omapi.c @@ -317,7 +317,7 @@ proto_reg_handoff_omapi(void) { dissector_handle_t omapi_handle; - omapi_handle = new_create_dissector_handle(dissect_omapi, proto_omapi); + omapi_handle = create_dissector_handle(dissect_omapi, proto_omapi); dissector_add_uint("tcp.port", OMAPI_PORT, omapi_handle); } diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c index b2777760e0..6e8dfcf9c5 100644 --- a/epan/dissectors/packet-omron-fins.c +++ b/epan/dissectors/packet-omron-fins.c @@ -3968,7 +3968,7 @@ proto_reg_handoff_omron_fins(void) { dissector_handle_t omron_fins_handle; - omron_fins_handle = new_create_dissector_handle(dissect_omron_fins, proto_omron_fins); + omron_fins_handle = create_dissector_handle(dissect_omron_fins, proto_omron_fins); dissector_add_uint("udp.port", OMRON_FINS_UDP_PORT, omron_fins_handle); } diff --git a/epan/dissectors/packet-openflow.c b/epan/dissectors/packet-openflow.c index 49a9e50bde..b7f9a2d9d6 100644 --- a/epan/dissectors/packet-openflow.c +++ b/epan/dissectors/packet-openflow.c @@ -191,7 +191,7 @@ proto_reg_handoff_openflow(void) static int currentPort; if (!initialized) { - openflow_handle = new_create_dissector_handle(dissect_openflow, proto_openflow); + openflow_handle = create_dissector_handle(dissect_openflow, proto_openflow); heur_dissector_add("tcp", dissect_openflow_heur, "OpenFlow over TCP", "openflow_tcp", proto_openflow, HEURISTIC_ENABLE); initialized = TRUE; } else { diff --git a/epan/dissectors/packet-openwire.c b/epan/dissectors/packet-openwire.c index ecc7e4872f..8a30596c9c 100644 --- a/epan/dissectors/packet-openwire.c +++ b/epan/dissectors/packet-openwire.c @@ -2006,7 +2006,7 @@ void proto_reg_handoff_openwire(void) { heur_dissector_add("tcp", dissect_openwire_heur, "OpenWire over TCP", "openwire_tcp", proto_openwire, HEURISTIC_ENABLE); - openwire_tcp_handle = new_create_dissector_handle(dissect_openwire_tcp, proto_openwire); + openwire_tcp_handle = create_dissector_handle(dissect_openwire_tcp, proto_openwire); dissector_add_for_decode_as("tcp.port", openwire_tcp_handle); } diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c index f67e9fc39a..bcbf2426fc 100644 --- a/epan/dissectors/packet-opsi.c +++ b/epan/dissectors/packet-opsi.c @@ -885,7 +885,7 @@ void proto_reg_handoff_opsi(void) { dissector_handle_t opsi_handle; - opsi_handle = new_create_dissector_handle(dissect_opsi, proto_opsi); + opsi_handle = create_dissector_handle(dissect_opsi, proto_opsi); dissector_add_uint("tcp.port", TCP_PORT_OPSI, opsi_handle); } diff --git a/epan/dissectors/packet-optommp.c b/epan/dissectors/packet-optommp.c index 14186cd9d1..4913787a3f 100644 --- a/epan/dissectors/packet-optommp.c +++ b/epan/dissectors/packet-optommp.c @@ -921,9 +921,9 @@ void proto_reg_handoff_optommp(void) if( !initialized ) { - optommp_tcp_handle = new_create_dissector_handle( + optommp_tcp_handle = create_dissector_handle( dissect_optommp_reassemble_tcp, proto_optommp); - optommp_udp_handle = new_create_dissector_handle( + optommp_udp_handle = create_dissector_handle( dissect_optommp_reassemble_udp, proto_optommp); initialized = TRUE; } diff --git a/epan/dissectors/packet-osc.c b/epan/dissectors/packet-osc.c index 111bb72fa7..de6348645d 100644 --- a/epan/dissectors/packet-osc.c +++ b/epan/dissectors/packet-osc.c @@ -899,13 +899,13 @@ proto_reg_handoff_osc(void) if(! initialized) { - osc_tcp_handle = new_create_dissector_handle(dissect_osc_tcp, proto_osc); + osc_tcp_handle = create_dissector_handle(dissect_osc_tcp, proto_osc); /* register for "decode as" for TCP connections */ dissector_add_for_decode_as("tcp.port", osc_tcp_handle); /* XXX: Add port pref and "decode as" for UDP ? */ /* (The UDP heuristic is a bit expensive */ - osc_udp_handle = new_create_dissector_handle(dissect_osc_udp, proto_osc); + osc_udp_handle = create_dissector_handle(dissect_osc_udp, proto_osc); /* register as heuristic dissector for UDP connections */ heur_dissector_add("udp", dissect_osc_heur_udp, "Open Sound Control over UDP", "osc_udp", proto_osc, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c index 29f40f2b6f..5a1ea2b5ae 100644 --- a/epan/dissectors/packet-osi.c +++ b/epan/dissectors/packet-osi.c @@ -530,7 +530,7 @@ proto_reg_handoff_osi(void) static guint tcp_port_osi_over_tpkt; if (!osi_prefs_initialized) { - osi_handle = new_create_dissector_handle(dissect_osi, proto_osi); + osi_handle = create_dissector_handle(dissect_osi, proto_osi); dissector_add_uint("llc.dsap", SAP_OSINL1, osi_handle); dissector_add_uint("llc.dsap", SAP_OSINL2, osi_handle); dissector_add_uint("llc.dsap", SAP_OSINL3, osi_handle); @@ -542,7 +542,7 @@ proto_reg_handoff_osi(void) dissector_add_uint("gre.proto", SAP_OSINL5, osi_handle); dissector_add_uint("ip.proto", IP_PROTO_ISOIP, osi_handle); /* ISO network layer PDUs [RFC 1070] */ - osi_juniper_handle = new_create_dissector_handle(dissect_osi_juniper, proto_osi); + osi_juniper_handle = create_dissector_handle(dissect_osi_juniper, proto_osi); dissector_add_uint("juniper.proto", JUNIPER_PROTO_ISO, osi_juniper_handle); dissector_add_uint("juniper.proto", JUNIPER_PROTO_CLNP, osi_juniper_handle); dissector_add_uint("juniper.proto", JUNIPER_PROTO_MPLS_CLNP, osi_juniper_handle); @@ -551,7 +551,7 @@ proto_reg_handoff_osi(void) ppp_handle = find_dissector("ppp"); - osi_tpkt_handle = new_create_dissector_handle(dissect_osi_tpkt, proto_osi); + osi_tpkt_handle = create_dissector_handle(dissect_osi_tpkt, proto_osi); dissector_add_for_decode_as("tcp.port", osi_tpkt_handle); osi_prefs_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 2f9f0904af..3c4b6d0eac 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -3792,7 +3792,7 @@ proto_reg_handoff_ospf(void) { dissector_handle_t ospf_handle; - ospf_handle = new_create_dissector_handle(dissect_ospf, proto_ospf); + ospf_handle = create_dissector_handle(dissect_ospf, proto_ospf); dissector_add_uint("ip.proto", IP_PROTO_OSPF, ospf_handle); data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-ossp.c b/epan/dissectors/packet-ossp.c index 3e56dac146..355add2658 100644 --- a/epan/dissectors/packet-ossp.c +++ b/epan/dissectors/packet-ossp.c @@ -692,7 +692,7 @@ proto_reg_handoff_ossp(void) { dissector_handle_t ossp_handle; - ossp_handle = new_create_dissector_handle(dissect_ossp_pdu, proto_ossp); + ossp_handle = create_dissector_handle(dissect_ossp_pdu, proto_ossp); dissector_add_uint("slow.subtype", OSSP_SUBTYPE, ossp_handle); dh_data = find_dissector("data"); diff --git a/epan/dissectors/packet-ouch.c b/epan/dissectors/packet-ouch.c index 07b201ae58..fe7b4867e1 100644 --- a/epan/dissectors/packet-ouch.c +++ b/epan/dissectors/packet-ouch.c @@ -1595,7 +1595,7 @@ proto_register_ouch(void) void proto_reg_handoff_ouch(void) { - ouch_handle = new_create_dissector_handle(dissect_ouch, proto_ouch); + ouch_handle = create_dissector_handle(dissect_ouch, proto_ouch); heur_dissector_add("soupbintcp", dissect_ouch_heur, "OUCH over SoupBinTCP", "ouch_soupbintcp", proto_ouch, HEURISTIC_ENABLE); } diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c index cf99426596..643de7f0a8 100644 --- a/epan/dissectors/packet-packetbb.c +++ b/epan/dissectors/packet-packetbb.c @@ -740,7 +740,7 @@ void proto_reg_handoff_packetbb(void) { static guint packetbb_udp_port; if (!packetbb_prefs_initialized) { - packetbb_handle = new_create_dissector_handle(dissect_packetbb, proto_packetbb); + packetbb_handle = create_dissector_handle(dissect_packetbb, proto_packetbb); packetbb_prefs_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c index 6bcda313a1..7a3f30ca19 100644 --- a/epan/dissectors/packet-pagp.c +++ b/epan/dissectors/packet-pagp.c @@ -490,7 +490,7 @@ proto_reg_handoff_pagp(void) { dissector_handle_t pagp_handle; - pagp_handle = new_create_dissector_handle(dissect_pagp, proto_pagp); + pagp_handle = create_dissector_handle(dissect_pagp, proto_pagp); dissector_add_uint("llc.cisco_pid", 0x0104, pagp_handle); } diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index 9a26324aea..ed9fe61e0e 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -889,7 +889,7 @@ proto_reg_handoff_pana(void) heur_dissector_add("udp", dissect_pana, "PANA over UDP", "pana_udp", proto_pana, HEURISTIC_ENABLE); - pana_handle = new_create_dissector_handle(dissect_pana, proto_pana); + pana_handle = create_dissector_handle(dissect_pana, proto_pana); dissector_add_for_decode_as("udp.port", pana_handle); eap_handle = find_dissector("eap"); diff --git a/epan/dissectors/packet-pathport.c b/epan/dissectors/packet-pathport.c index c44157063e..23b57eca31 100644 --- a/epan/dissectors/packet-pathport.c +++ b/epan/dissectors/packet-pathport.c @@ -694,7 +694,7 @@ proto_reg_handoff_pathport(void) { static dissector_handle_t pathport_handle; - pathport_handle = new_create_dissector_handle(dissect_pathport, proto_pathport); + pathport_handle = create_dissector_handle(dissect_pathport, proto_pathport); heur_dissector_add("udp", dissect_pathport_heur, "Pathport over UDP", "pathport_udp", proto_pathport, HEURISTIC_ENABLE); dissector_add_uint("udp.port", PATHPORT_UDP_PORT, pathport_handle); } diff --git a/epan/dissectors/packet-pcapng_block.c b/epan/dissectors/packet-pcapng_block.c index c1bd9d8016..a8a8b1342d 100644 --- a/epan/dissectors/packet-pcapng_block.c +++ b/epan/dissectors/packet-pcapng_block.c @@ -67,7 +67,7 @@ proto_reg_handoff_pcapng_block(void) { dissector_handle_t pcapng_block_handle; - pcapng_block_handle = new_create_dissector_handle(dissect_pcapng_block, + pcapng_block_handle = create_dissector_handle(dissect_pcapng_block, proto_pcapng_block); dissector_add_uint("wtap_fts_rec", WTAP_FILE_TYPE_SUBTYPE_PCAPNG, pcapng_block_handle); diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index 8489f4da62..cfd0afdef5 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -4781,7 +4781,7 @@ proto_reg_handoff_pcep(void) { dissector_handle_t pcep_handle; - pcep_handle = new_create_dissector_handle(dissect_pcep, proto_pcep); + pcep_handle = create_dissector_handle(dissect_pcep, proto_pcep); dissector_add_uint("tcp.port", TCP_PORT_PCEP, pcep_handle); } diff --git a/epan/dissectors/packet-pcli.c b/epan/dissectors/packet-pcli.c index 8b212bd862..31729c5355 100644 --- a/epan/dissectors/packet-pcli.c +++ b/epan/dissectors/packet-pcli.c @@ -285,10 +285,10 @@ proto_reg_handoff_pcli(void) static dissector_handle_t pcli_handle, pcli_handle8, pcli_handle12, pcli_handle20; if(!pcli_initialized) { - pcli_handle = new_create_dissector_handle(dissect_pcli, proto_pcli); - pcli_handle8 = new_create_dissector_handle(dissect_pcli8, proto_pcli8); - pcli_handle12 = new_create_dissector_handle(dissect_pcli12, proto_pcli12); - pcli_handle20 = new_create_dissector_handle(dissect_pcli20, proto_pcli20); + pcli_handle = create_dissector_handle(dissect_pcli, proto_pcli); + pcli_handle8 = create_dissector_handle(dissect_pcli8, proto_pcli8); + pcli_handle12 = create_dissector_handle(dissect_pcli12, proto_pcli12); + pcli_handle20 = create_dissector_handle(dissect_pcli20, proto_pcli20); data_handle = find_dissector("data"); pcli_initialized = TRUE; } diff --git a/epan/dissectors/packet-pdc.c b/epan/dissectors/packet-pdc.c index f8b1911720..bef702a25d 100644 --- a/epan/dissectors/packet-pdc.c +++ b/epan/dissectors/packet-pdc.c @@ -597,7 +597,7 @@ void proto_reg_handoff_pdc(void) if (! initialized) { asterix_handle = find_dissector("asterix"); - pdc_tcp_handle = new_create_dissector_handle(tcp_dissect_pdc, proto_pdc); + pdc_tcp_handle = create_dissector_handle(tcp_dissect_pdc, proto_pdc); dissector_add_for_decode_as("tcp.port", pdc_tcp_handle); initialized = TRUE; } diff --git a/epan/dissectors/packet-peekremote.c b/epan/dissectors/packet-peekremote.c index 0be19b51da..cd124e03fa 100644 --- a/epan/dissectors/packet-peekremote.c +++ b/epan/dissectors/packet-peekremote.c @@ -690,7 +690,7 @@ proto_reg_handoff_peekremote(void) wlan_radio_handle = find_dissector("wlan_radio"); - peekremote_handle = new_create_dissector_handle(dissect_peekremote_legacy, proto_peekremote); + peekremote_handle = create_dissector_handle(dissect_peekremote_legacy, proto_peekremote); dissector_add_uint("udp.port", 5000, peekremote_handle); heur_dissector_add("udp", dissect_peekremote_new, "OmniPeek Remote over UDP", "peekremote_udp", proto_peekremote, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index d769c24052..25fadc2b70 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -2555,7 +2555,7 @@ new_register_per_oid_dissector(const char *oid, new_dissector_t dissector, int p { dissector_handle_t dissector_handle; - dissector_handle = new_create_dissector_handle(dissector, proto); + dissector_handle = create_dissector_handle(dissector, proto); dissector_add_string("per.oid", oid, dissector_handle); oid_add_from_string(name, oid); } diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c index 242ec3e2f8..a5c2a16770 100644 --- a/epan/dissectors/packet-pflog.c +++ b/epan/dissectors/packet-pflog.c @@ -418,7 +418,7 @@ proto_reg_handoff_pflog(void) ipv6_handle = find_dissector("ipv6"); data_handle = find_dissector("data"); - pflog_handle = new_create_dissector_handle(dissect_pflog, proto_pflog); + pflog_handle = create_dissector_handle(dissect_pflog, proto_pflog); dissector_add_uint("wtap_encap", WTAP_ENCAP_PFLOG, pflog_handle); } @@ -535,7 +535,7 @@ proto_reg_handoff_old_pflog(void) ipv6_handle = find_dissector("ipv6"); data_handle = find_dissector("data"); - pflog_handle = new_create_dissector_handle(dissect_old_pflog, proto_old_pflog); + pflog_handle = create_dissector_handle(dissect_old_pflog, proto_old_pflog); dissector_add_uint("wtap_encap", WTAP_ENCAP_OLD_PFLOG, pflog_handle); } /* diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 804d01d8c5..5c8823ccba 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -1448,7 +1448,7 @@ proto_reg_handoff_pgm(void) static guint old_udp_encap_mcast_port; if (! initialized) { - pgm_handle = new_create_dissector_handle(dissect_pgm, proto_pgm); + pgm_handle = create_dissector_handle(dissect_pgm, proto_pgm); dissector_add_for_decode_as("udp.port", pgm_handle); dissector_add_uint("ip.proto", IP_PROTO_PGM, pgm_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c index 343cd4ca2a..d20618d5fe 100644 --- a/epan/dissectors/packet-pgsql.c +++ b/epan/dissectors/packet-pgsql.c @@ -904,7 +904,7 @@ proto_reg_handoff_pgsql(void) static guint saved_pgsql_port; if (!initialized) { - pgsql_handle = new_create_dissector_handle(dissect_pgsql, proto_pgsql); + pgsql_handle = create_dissector_handle(dissect_pgsql, proto_pgsql); initialized = TRUE; } else { dissector_delete_uint("tcp.port", saved_pgsql_port, pgsql_handle); diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index 1c8152cb09..7e74b4443e 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -1862,10 +1862,10 @@ proto_reg_handoff_pim(void) { dissector_handle_t pim_handle, pimv1_handle; - pim_handle = new_create_dissector_handle(dissect_pim, proto_pim); + pim_handle = create_dissector_handle(dissect_pim, proto_pim); dissector_add_uint("ip.proto", IP_PROTO_PIM, pim_handle); - pimv1_handle = new_create_dissector_handle(dissect_pimv1, proto_pim); + pimv1_handle = create_dissector_handle(dissect_pimv1, proto_pim); dissector_add_uint("igmp.type", IGMP_V1_PIM_ROUTING_MESSAGE, pimv1_handle); /* diff --git a/epan/dissectors/packet-pingpongprotocol.c b/epan/dissectors/packet-pingpongprotocol.c index 16ca28ed49..7a4d9f1554 100644 --- a/epan/dissectors/packet-pingpongprotocol.c +++ b/epan/dissectors/packet-pingpongprotocol.c @@ -193,7 +193,7 @@ proto_reg_handoff_pingpongprotocol(void) { dissector_handle_t pingpongprotocol_handle; - pingpongprotocol_handle = new_create_dissector_handle(dissect_pingpongprotocol, proto_pingpongprotocol); + pingpongprotocol_handle = create_dissector_handle(dissect_pingpongprotocol, proto_pingpongprotocol); dissector_add_uint("sctp.ppi", PINGPONGPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY, pingpongprotocol_handle); dissector_add_uint("sctp.ppi", PPP_PAYLOAD_PROTOCOL_ID, pingpongprotocol_handle); } diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index e6ed4064b4..06ea5b5603 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -739,7 +739,7 @@ proto_reg_handoff_pktc(void) { dissector_handle_t pktc_handle; - pktc_handle = new_create_dissector_handle(dissect_pktc, proto_pktc); + pktc_handle = create_dissector_handle(dissect_pktc, proto_pktc); dissector_add_uint("udp.port", PKTC_PORT, pktc_handle); } @@ -799,7 +799,7 @@ proto_reg_handoff_pktc_mtafqdn(void) { dissector_handle_t pktc_mtafqdn_handle; - pktc_mtafqdn_handle = new_create_dissector_handle(dissect_pktc_mtafqdn, proto_pktc_mtafqdn); + pktc_mtafqdn_handle = create_dissector_handle(dissect_pktc_mtafqdn, proto_pktc_mtafqdn); dissector_add_uint("udp.port", PKTC_MTAFQDN_PORT, pktc_mtafqdn_handle); } diff --git a/epan/dissectors/packet-pmproxy.c b/epan/dissectors/packet-pmproxy.c index bbc5caa8df..0792102b95 100644 --- a/epan/dissectors/packet-pmproxy.c +++ b/epan/dissectors/packet-pmproxy.c @@ -255,7 +255,7 @@ void proto_register_pmproxy(void) { void proto_reg_handoff_pmproxy(void) { - pmproxy_handle = new_create_dissector_handle(dissect_pmproxy, proto_pmproxy); + pmproxy_handle = create_dissector_handle(dissect_pmproxy, proto_pmproxy); pcp_handle = find_dissector("pcp"); dissector_add_uint("tcp.port", PMPROXY_PORT, pmproxy_handle); diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 46443a7637..5842cf00ee 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -1485,7 +1485,7 @@ void proto_register_pnrp(void) void proto_reg_handoff_pnrp(void) { dissector_handle_t pnrp_handle; - pnrp_handle = new_create_dissector_handle(dissect_pnrp, proto_pnrp); + pnrp_handle = create_dissector_handle(dissect_pnrp, proto_pnrp); dissector_add_uint("udp.port",PNRP_PORT,pnrp_handle); } diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 020940d666..89425000fa 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -5239,7 +5239,7 @@ proto_reg_handoff_ppp_raw_hdlc(void) { dissector_handle_t ppp_raw_hdlc_handle; - ppp_raw_hdlc_handle = new_create_dissector_handle(dissect_ppp_raw_hdlc, proto_ppp); + ppp_raw_hdlc_handle = create_dissector_handle(dissect_ppp_raw_hdlc, proto_ppp); dissector_add_uint("gre.proto", ETHERTYPE_CDMA2000_A10_UBS, ppp_raw_hdlc_handle); dissector_add_uint("gre.proto", ETHERTYPE_3GPP2, ppp_raw_hdlc_handle); @@ -5650,7 +5650,7 @@ proto_reg_handoff_mp(void) { dissector_handle_t mp_handle; - mp_handle = new_create_dissector_handle(dissect_mp, proto_mp); + mp_handle = create_dissector_handle(dissect_mp, proto_mp); dissector_add_uint("ppp.protocol", PPP_MP, mp_handle); } @@ -5944,7 +5944,7 @@ proto_reg_handoff_lcp(void) { dissector_handle_t lcp_handle; - lcp_handle = new_create_dissector_handle(dissect_lcp, proto_lcp); + lcp_handle = create_dissector_handle(dissect_lcp, proto_lcp); dissector_add_uint("ppp.protocol", PPP_LCP, lcp_handle); /* @@ -6011,7 +6011,7 @@ proto_reg_handoff_vsncp(void) { dissector_handle_t vsncp_handle; - vsncp_handle = new_create_dissector_handle(dissect_vsncp, proto_vsncp); + vsncp_handle = create_dissector_handle(dissect_vsncp, proto_vsncp); dissector_add_uint("ppp.protocol", PPP_VSNCP, vsncp_handle); } @@ -6039,7 +6039,7 @@ proto_reg_handoff_vsnp(void) { dissector_handle_t vsnp_handle; - vsnp_handle = new_create_dissector_handle(dissect_vsnp, proto_vsnp); + vsnp_handle = create_dissector_handle(dissect_vsnp, proto_vsnp); dissector_add_uint("ppp.protocol", PPP_VSNP, vsnp_handle); } @@ -6160,7 +6160,7 @@ proto_reg_handoff_ipcp(void) { dissector_handle_t ipcp_handle; - ipcp_handle = new_create_dissector_handle(dissect_ipcp, proto_ipcp); + ipcp_handle = create_dissector_handle(dissect_ipcp, proto_ipcp); dissector_add_uint("ppp.protocol", PPP_IPCP, ipcp_handle); /* @@ -6248,7 +6248,7 @@ proto_reg_handoff_bcp(void) eth_withfcs_handle = find_dissector("eth_withfcs"); eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); - bcp_handle = new_create_dissector_handle(dissect_bcp, proto_bcp); + bcp_handle = create_dissector_handle(dissect_bcp, proto_bcp); dissector_add_uint("ppp.protocol", PPP_BCP, bcp_handle); } @@ -6257,7 +6257,7 @@ proto_reg_handoff_osinlcp(void) { dissector_handle_t osinlcp_handle; - osinlcp_handle = new_create_dissector_handle(dissect_osinlcp, proto_osinlcp); + osinlcp_handle = create_dissector_handle(dissect_osinlcp, proto_osinlcp); dissector_add_uint("ppp.protocol", PPP_OSINLCP, osinlcp_handle); /* @@ -6413,7 +6413,7 @@ proto_reg_handoff_ccp(void) { dissector_handle_t ccp_handle; - ccp_handle = new_create_dissector_handle(dissect_ccp, proto_ccp); + ccp_handle = create_dissector_handle(dissect_ccp, proto_ccp); dissector_add_uint("ppp.protocol", PPP_CCP, ccp_handle); /* @@ -6460,7 +6460,7 @@ proto_reg_handoff_cbcp(void) { dissector_handle_t cbcp_handle; - cbcp_handle = new_create_dissector_handle(dissect_cbcp, proto_cbcp); + cbcp_handle = create_dissector_handle(dissect_cbcp, proto_cbcp); dissector_add_uint("ppp.protocol", PPP_CBCP, cbcp_handle); /* @@ -6497,7 +6497,7 @@ proto_reg_handoff_bacp(void) { dissector_handle_t bacp_handle; - bacp_handle = new_create_dissector_handle(dissect_bacp, proto_bacp); + bacp_handle = create_dissector_handle(dissect_bacp, proto_bacp); dissector_add_uint("ppp.protocol", PPP_BACP, bacp_handle); /* @@ -6555,7 +6555,7 @@ proto_reg_handoff_bap(void) { dissector_handle_t bap_handle; - bap_handle = new_create_dissector_handle(dissect_bap, proto_bap); + bap_handle = create_dissector_handle(dissect_bap, proto_bap); dissector_add_uint("ppp.protocol", PPP_BAP, bap_handle); /* @@ -6586,7 +6586,7 @@ proto_reg_handoff_comp_data(void) { dissector_handle_t comp_data_handle; - comp_data_handle = new_create_dissector_handle(dissect_comp_data, + comp_data_handle = create_dissector_handle(dissect_comp_data, proto_comp_data); dissector_add_uint("ppp.protocol", PPP_COMP, comp_data_handle); @@ -6665,7 +6665,7 @@ proto_reg_handoff_pap(void) { dissector_handle_t pap_handle; - pap_handle = new_create_dissector_handle(dissect_pap, proto_pap); + pap_handle = create_dissector_handle(dissect_pap, proto_pap); dissector_add_uint("ppp.protocol", PPP_PAP, pap_handle); /* @@ -6727,7 +6727,7 @@ proto_register_chap(void) void proto_reg_handoff_chap(void) { - dissector_handle_t chap_handle = new_create_dissector_handle(dissect_chap, + dissector_handle_t chap_handle = create_dissector_handle(dissect_chap, proto_chap); dissector_add_uint("ppp.protocol", PPP_CHAP, chap_handle); @@ -6776,7 +6776,7 @@ proto_reg_handoff_pppmuxcp(void) { dissector_handle_t muxcp_handle; - muxcp_handle = new_create_dissector_handle(dissect_pppmuxcp, proto_pppmuxcp); + muxcp_handle = create_dissector_handle(dissect_pppmuxcp, proto_pppmuxcp); dissector_add_uint("ppp.protocol", PPP_MUXCP, muxcp_handle); /* @@ -6816,7 +6816,7 @@ proto_reg_handoff_pppmux(void) { dissector_handle_t pppmux_handle; - pppmux_handle = new_create_dissector_handle(dissect_pppmux, proto_pppmux); + pppmux_handle = create_dissector_handle(dissect_pppmux, proto_pppmux); dissector_add_uint("ppp.protocol", PPP_MUX, pppmux_handle); /* @@ -6844,7 +6844,7 @@ proto_reg_handoff_mplscp(void) { dissector_handle_t mplscp_handle; - mplscp_handle = new_create_dissector_handle(dissect_mplscp, proto_mplscp); + mplscp_handle = create_dissector_handle(dissect_mplscp, proto_mplscp); dissector_add_uint("ppp.protocol", PPP_MPLSCP, mplscp_handle); /* @@ -6872,7 +6872,7 @@ proto_reg_handoff_cdpcp(void) { dissector_handle_t cdpcp_handle; - cdpcp_handle = new_create_dissector_handle(dissect_cdpcp, proto_cdpcp); + cdpcp_handle = create_dissector_handle(dissect_cdpcp, proto_cdpcp); dissector_add_uint("ppp.protocol", PPP_CDPCP, cdpcp_handle); /* @@ -6907,7 +6907,7 @@ proto_reg_handoff_ipv6cp(void) { dissector_handle_t ipv6cp_handle; - ipv6cp_handle = new_create_dissector_handle(dissect_ipv6cp, proto_ipv6cp); + ipv6cp_handle = create_dissector_handle(dissect_ipv6cp, proto_ipv6cp); dissector_add_uint("ppp.protocol", PPP_IPV6CP, ipv6cp_handle); /* @@ -7002,19 +7002,19 @@ proto_reg_handoff_iphc_crtp(void) dissector_handle_t cs_handle; dissector_handle_t cntcp_handle; - fh_handle = new_create_dissector_handle(dissect_iphc_crtp_fh, proto_iphc_crtp); + fh_handle = create_dissector_handle(dissect_iphc_crtp_fh, proto_iphc_crtp); dissector_add_uint("ppp.protocol", PPP_RTP_FH, fh_handle); - cudp16_handle = new_create_dissector_handle(dissect_iphc_crtp_cudp16, proto_iphc_crtp_cudp16); + cudp16_handle = create_dissector_handle(dissect_iphc_crtp_cudp16, proto_iphc_crtp_cudp16); dissector_add_uint("ppp.protocol", PPP_RTP_CUDP16, cudp16_handle); - cudp8_handle = new_create_dissector_handle(dissect_iphc_crtp_cudp8, proto_iphc_crtp_cudp8); + cudp8_handle = create_dissector_handle(dissect_iphc_crtp_cudp8, proto_iphc_crtp_cudp8); dissector_add_uint("ppp.protocol", PPP_RTP_CUDP8, cudp8_handle); - cs_handle = new_create_dissector_handle(dissect_iphc_crtp_cs, proto_iphc_crtp_cs); + cs_handle = create_dissector_handle(dissect_iphc_crtp_cs, proto_iphc_crtp_cs); dissector_add_uint("ppp.protocol", PPP_RTP_CS, cs_handle); - cntcp_handle = new_create_dissector_handle(dissect_iphc_crtp_cntcp, proto_iphc_crtp_cntcp); + cntcp_handle = create_dissector_handle(dissect_iphc_crtp_cntcp, proto_iphc_crtp_cntcp); dissector_add_uint("ppp.protocol", PPP_RTP_CNTCP, cntcp_handle); /* diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index fd50297171..ac3dbe538c 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -1030,7 +1030,7 @@ void proto_reg_handoff_pppoed(void) { dissector_handle_t pppoed_handle; - pppoed_handle = new_create_dissector_handle(dissect_pppoed, proto_pppoed); + pppoed_handle = create_dissector_handle(dissect_pppoed, proto_pppoed); dissector_add_uint("ethertype", ETHERTYPE_PPPOED, pppoed_handle); } @@ -1291,7 +1291,7 @@ void proto_register_pppoe(void) void proto_reg_handoff_pppoes(void) { dissector_handle_t pppoes_handle = - new_create_dissector_handle(dissect_pppoes, proto_pppoes); + create_dissector_handle(dissect_pppoes, proto_pppoes); dissector_add_uint("ethertype", ETHERTYPE_PPPOES, pppoes_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_PPP_ETHER, pppoes_handle); diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index dd2c3291fa..75ce4b91c2 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.c @@ -962,7 +962,7 @@ proto_reg_handoff_pptp(void) { dissector_handle_t pptp_handle; - pptp_handle = new_create_dissector_handle(dissect_pptp, proto_pptp); + pptp_handle = create_dissector_handle(dissect_pptp, proto_pptp); dissector_add_uint("tcp.port", TCP_PORT_PPTP, pptp_handle); data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c index 46281d7cd6..4390f0a218 100644 --- a/epan/dissectors/packet-prp.c +++ b/epan/dissectors/packet-prp.c @@ -252,7 +252,7 @@ void proto_reg_handoff_prp(void) if (!prefs_initialized) { dissector_handle_t prp_redundancy_control_trailer_handle; - prp_redundancy_control_trailer_handle = new_create_dissector_handle(dissect_prp_redundancy_control_trailer, proto_prp); + prp_redundancy_control_trailer_handle = create_dissector_handle(dissect_prp_redundancy_control_trailer, proto_prp); register_postdissector(prp_redundancy_control_trailer_handle); prefs_initialized = TRUE; diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index 0b416f747e..b46f7b8e11 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -5983,8 +5983,8 @@ proto_reg_handoff_ptp(void) dissector_handle_t ptp_handle; dissector_handle_t ethertype_ptp_handle; - ptp_handle = new_create_dissector_handle(dissect_ptp, proto_ptp); - ethertype_ptp_handle = new_create_dissector_handle(dissect_ptp_oE, proto_ptp); + ptp_handle = create_dissector_handle(dissect_ptp, proto_ptp); + ethertype_ptp_handle = create_dissector_handle(dissect_ptp_oE, proto_ptp); dissector_add_uint("udp.port", EVENT_PORT_PTP, ptp_handle); dissector_add_uint("udp.port", GENERAL_PORT_PTP, ptp_handle); diff --git a/epan/dissectors/packet-ptpip.c b/epan/dissectors/packet-ptpip.c index 6d8114a6e0..94c5086b39 100644 --- a/epan/dissectors/packet-ptpip.c +++ b/epan/dissectors/packet-ptpip.c @@ -1123,12 +1123,12 @@ void proto_reg_handoff_ptpIP( void ) { dissector_handle_t ptpIP_handle; - /* Use new_create_dissector_handle() to indicate that dissect_ptpIP() + /* Use create_dissector_handle() to indicate that dissect_ptpIP() * returns the number of bytes it dissected (or 0 if it thinks the packet * does not belong to PROTONAME). */ - ptpIP_handle = new_create_dissector_handle(dissect_ptpIP, proto_ptpIP); + ptpIP_handle = create_dissector_handle(dissect_ptpIP, proto_ptpIP); dissector_add_uint("tcp.port", PTPIP_PORT, ptpIP_handle); } diff --git a/epan/dissectors/packet-pulse.c b/epan/dissectors/packet-pulse.c index 5be79fa941..658247287f 100644 --- a/epan/dissectors/packet-pulse.c +++ b/epan/dissectors/packet-pulse.c @@ -137,7 +137,7 @@ proto_reg_handoff_pulse(void) } else { - pulse_handle = new_create_dissector_handle(dissect_pulse, + pulse_handle = create_dissector_handle(dissect_pulse, proto_pulse); initialized = TRUE; } diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 88c0e41c1f..71cbdfc3d9 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -3629,7 +3629,7 @@ proto_reg_handoff_pvfs(void) { dissector_handle_t pvfs_handle; - pvfs_handle = new_create_dissector_handle(dissect_pvfs_heur, proto_pvfs); + pvfs_handle = create_dissector_handle(dissect_pvfs_heur, proto_pvfs); dissector_add_uint("tcp.port", TCP_PORT_PVFS2, pvfs_handle); heur_dissector_add("tcp", dissect_pvfs_heur, "PVFS over TCP", "pvfs_tcp", proto_pvfs, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c index 31c7d462de..974cfadc27 100644 --- a/epan/dissectors/packet-pw-atm.c +++ b/epan/dissectors/packet-pw-atm.c @@ -1964,13 +1964,13 @@ void proto_reg_handoff_pw_atm_ata(void) { dissector_handle_t h; - h = new_create_dissector_handle( dissect_n1_cw, proto_n1_cw ); + h = create_dissector_handle( dissect_n1_cw, proto_n1_cw ); dissector_add_for_decode_as( "mpls.label", h ); - h = new_create_dissector_handle( dissect_n1_nocw, proto_n1_nocw ); + h = create_dissector_handle( dissect_n1_nocw, proto_n1_nocw ); dissector_add_for_decode_as( "mpls.label", h ); - h = new_create_dissector_handle( dissect_11_or_aal5_pdu, proto_11_or_aal5_pdu ); + h = create_dissector_handle( dissect_11_or_aal5_pdu, proto_11_or_aal5_pdu ); dissector_add_for_decode_as( "mpls.label", h ); - h = new_create_dissector_handle( dissect_aal5_sdu, proto_aal5_sdu ); + h = create_dissector_handle( dissect_aal5_sdu, proto_aal5_sdu ); dissector_add_for_decode_as( "mpls.label", h ); dh_cell = find_dissector("mpls_pw_atm_cell"); diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c index f32a3fa6f9..1ed8a30d4a 100644 --- a/epan/dissectors/packet-pw-cesopsn.c +++ b/epan/dissectors/packet-pw-cesopsn.c @@ -456,7 +456,7 @@ void proto_reg_handoff_pw_cesopsn(void) pw_padding_handle = find_dissector("pw_padding"); /* For Decode As */ - pw_cesopsn_mpls_handle = new_create_dissector_handle( dissect_pw_cesopsn_mpls, proto ); + pw_cesopsn_mpls_handle = create_dissector_handle( dissect_pw_cesopsn_mpls, proto ); dissector_add_for_decode_as("mpls.label", pw_cesopsn_mpls_handle); dissector_add_for_decode_as("udp.port", find_dissector("pw_cesopsn_udp")); diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c index 82b7a06667..88cafa67be 100644 --- a/epan/dissectors/packet-pw-eth.c +++ b/epan/dissectors/packet-pw-eth.c @@ -203,10 +203,10 @@ proto_reg_handoff_pw_eth(void) eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); - pw_eth_handle_cw = new_create_dissector_handle( dissect_pw_eth_cw, proto_pw_eth_cw ); + pw_eth_handle_cw = create_dissector_handle( dissect_pw_eth_cw, proto_pw_eth_cw ); dissector_add_for_decode_as("mpls.label", pw_eth_handle_cw); - pw_eth_handle_nocw = new_create_dissector_handle( dissect_pw_eth_nocw, proto_pw_eth_nocw ); + pw_eth_handle_nocw = create_dissector_handle( dissect_pw_eth_nocw, proto_pw_eth_nocw ); dissector_add_for_decode_as("mpls.label", pw_eth_handle_nocw); pw_eth_handle_heuristic = find_dissector("pw_eth_heuristic"); diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c index 9069c568cb..db2089c3ca 100644 --- a/epan/dissectors/packet-pw-fr.c +++ b/epan/dissectors/packet-pw-fr.c @@ -313,7 +313,7 @@ proto_reg_handoff_pw_fr(void) { dissector_handle_t pw_fr_mpls_handle; - pw_fr_mpls_handle = new_create_dissector_handle( dissect_pw_fr, proto_encaps ); + pw_fr_mpls_handle = create_dissector_handle( dissect_pw_fr, proto_encaps ); dissector_add_for_decode_as("mpls.label", pw_fr_mpls_handle); fr_stripped_address_handle = find_dissector("fr_stripped_address"); diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c index d4a347ca91..e0c1776641 100644 --- a/epan/dissectors/packet-pw-hdlc.c +++ b/epan/dissectors/packet-pw-hdlc.c @@ -224,10 +224,10 @@ void proto_reg_handoff_pw_hdlc(void) { dissector_handle_t pw_fr_handle, pw_ppp_handle; - pw_fr_handle = new_create_dissector_handle( dissect_pw_hdlc_nocw_fr, proto_pw_hdlc_nocw_fr ); + pw_fr_handle = create_dissector_handle( dissect_pw_hdlc_nocw_fr, proto_pw_hdlc_nocw_fr ); dissector_add_for_decode_as( "mpls.label", pw_fr_handle ); - pw_ppp_handle = new_create_dissector_handle( dissect_pw_hdlc_nocw_hdlc_ppp, proto_pw_hdlc_nocw_hdlc_ppp ); + pw_ppp_handle = create_dissector_handle( dissect_pw_hdlc_nocw_hdlc_ppp, proto_pw_hdlc_nocw_hdlc_ppp ); dissector_add_for_decode_as( "mpls.label", pw_ppp_handle ); ppp_handle = find_dissector( "ppp" ); diff --git a/epan/dissectors/packet-pw-oam.c b/epan/dissectors/packet-pw-oam.c index a7810e6966..6622ed7c7b 100644 --- a/epan/dissectors/packet-pw-oam.c +++ b/epan/dissectors/packet-pw-oam.c @@ -206,7 +206,7 @@ proto_reg_handoff_pw_oam(void) { dissector_handle_t pw_oam_handle; - pw_oam_handle = new_create_dissector_handle( dissect_pw_oam, proto_pw_oam ); + pw_oam_handle = create_dissector_handle( dissect_pw_oam, proto_pw_oam ); dissector_add_uint("pwach.channel_type", 0x0027, pw_oam_handle); /* KM: MPLSTP PW-OAM, RFC 6478 */ } diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c index 726367df5d..46b6a7295e 100644 --- a/epan/dissectors/packet-pw-satop.c +++ b/epan/dissectors/packet-pw-satop.c @@ -472,7 +472,7 @@ void proto_reg_handoff_pw_satop(void) pw_padding_handle = find_dissector("pw_padding"); /* For Decode As */ - pw_satop_mpls_handle = new_create_dissector_handle( dissect_pw_satop_mpls, proto ); + pw_satop_mpls_handle = create_dissector_handle( dissect_pw_satop_mpls, proto ); dissector_add_for_decode_as("mpls.label", pw_satop_mpls_handle); dissector_add_for_decode_as("udp.port", find_dissector("pw_satop_udp")); diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index fd5e40842b..5410b46f60 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -3968,7 +3968,7 @@ proto_register_q931(void) q931_handle = new_register_dissector("q931", dissect_q931, proto_q931); q931_tpkt_handle = new_register_dissector("q931.tpkt", dissect_q931_tpkt, proto_q931); - q931_tpkt_pdu_handle = new_create_dissector_handle(dissect_q931_tpkt_pdu, + q931_tpkt_pdu_handle = create_dissector_handle(dissect_q931_tpkt_pdu, proto_q931); q931_over_ip_handle = new_register_dissector("q931.over_ip", dissect_q931_over_ip, proto_q931); new_register_dissector("q931.ie", dissect_q931_ie_cs0, proto_q931); diff --git a/epan/dissectors/packet-qnet6.c b/epan/dissectors/packet-qnet6.c index 387230d63e..4e214858ac 100644 --- a/epan/dissectors/packet-qnet6.c +++ b/epan/dissectors/packet-qnet6.c @@ -5989,7 +5989,7 @@ proto_reg_handoff_qnet6(void) { dissector_handle_t qnet6_handle; - qnet6_handle = new_create_dissector_handle(dissect_qnet6, proto_qnet6_l4); + qnet6_handle = create_dissector_handle(dissect_qnet6, proto_qnet6_l4); dissector_add_uint("ethertype", ETHERTYPE_QNX_QNET6, qnet6_handle); dissector_add_uint("ip.proto", IP_PROTO_QNX, qnet6_handle); } diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c index 4784675ab8..448cda4e3f 100644 --- a/epan/dissectors/packet-quake.c +++ b/epan/dissectors/packet-quake.c @@ -636,7 +636,7 @@ proto_reg_handoff_quake(void) static guint ServerPort; if (!Initialized) { - quake_handle = new_create_dissector_handle(dissect_quake, proto_quake); + quake_handle = create_dissector_handle(dissect_quake, proto_quake); data_handle = find_dissector("data"); Initialized=TRUE; } else { diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c index 028054b478..62f7b4e4b5 100644 --- a/epan/dissectors/packet-quake2.c +++ b/epan/dissectors/packet-quake2.c @@ -854,7 +854,7 @@ proto_reg_handoff_quake2(void) static guint ServerPort; if (!Initialized) { - quake2_handle = new_create_dissector_handle(dissect_quake2, + quake2_handle = create_dissector_handle(dissect_quake2, proto_quake2); data_handle = find_dissector("data"); Initialized=TRUE; diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c index 115f718827..5d5e6b8a6c 100644 --- a/epan/dissectors/packet-quake3.c +++ b/epan/dissectors/packet-quake3.c @@ -588,7 +588,7 @@ proto_reg_handoff_quake3(void) int i; if (!initialized) { - quake3_handle = new_create_dissector_handle(dissect_quake3, + quake3_handle = create_dissector_handle(dissect_quake3, proto_quake3); data_handle = find_dissector("data"); initialized=TRUE; diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c index c7335aac1d..d6a775564a 100644 --- a/epan/dissectors/packet-quakeworld.c +++ b/epan/dissectors/packet-quakeworld.c @@ -821,7 +821,7 @@ proto_reg_handoff_quakeworld(void) static guint ServerPort; if (!Initialized) { - quakeworld_handle = new_create_dissector_handle(dissect_quakeworld, + quakeworld_handle = create_dissector_handle(dissect_quakeworld, proto_quakeworld); data_handle = find_dissector("data"); Initialized=TRUE; diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index c81c698c93..29165cd46f 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -2134,7 +2134,7 @@ proto_reg_handoff_quic(void) static int current_quics_port; if (!initialized) { - quic_handle = new_create_dissector_handle(dissect_quic, + quic_handle = create_dissector_handle(dissect_quic, proto_quic); initialized = TRUE; diff --git a/epan/dissectors/packet-raknet.c b/epan/dissectors/packet-raknet.c index 637fffada8..1a3d8ee4a7 100644 --- a/epan/dissectors/packet-raknet.c +++ b/epan/dissectors/packet-raknet.c @@ -660,7 +660,7 @@ proto_reg_handoff_raknet(void) for (i = 0; i < RAKNET_PACKET_ID_COUNT; i++) { raknet_handle_tmp = - new_create_dissector_handle(raknet_handler[i].dissector_fp, + create_dissector_handle(raknet_handler[i].dissector_fp, proto_raknet); dissector_add_uint("raknet.packet_id", raknet_handler[i].vs.value, raknet_handle_tmp); diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c index 7ba983c76e..3601a19217 100644 --- a/epan/dissectors/packet-raw.c +++ b/epan/dissectors/packet-raw.c @@ -187,7 +187,7 @@ proto_reg_handoff_raw(void) ipv6_handle = find_dissector("ipv6"); data_handle = find_dissector("data"); ppp_hdlc_handle = find_dissector("ppp_hdlc"); - raw_handle = new_create_dissector_handle(dissect_raw, proto_raw); + raw_handle = create_dissector_handle(dissect_raw, proto_raw); dissector_add_uint("wtap_encap", WTAP_ENCAP_RAW_IP, raw_handle); } diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index 2e3ced3179..449a67c0f4 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.c @@ -228,7 +228,7 @@ proto_register_redback(void) expert_redback = expert_register_protocol(proto_redback); expert_register_field_array(expert_redback, ei, array_length(ei)); - redback_handle = new_create_dissector_handle(dissect_redback, proto_redback); + redback_handle = create_dissector_handle(dissect_redback, proto_redback); } void diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index 36c3f2563c..290f09bae2 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -591,8 +591,8 @@ proto_reg_handoff_reload_framing(void) dissector_handle_t reload_framing_tcp_handle; dissector_handle_t reload_framing_udp_handle; - reload_framing_tcp_handle = new_create_dissector_handle(dissect_reload_framing_tcp, proto_reload_framing); - reload_framing_udp_handle = new_create_dissector_handle(dissect_reload_framing, proto_reload_framing); + reload_framing_tcp_handle = create_dissector_handle(dissect_reload_framing_tcp, proto_reload_framing); + reload_framing_udp_handle = create_dissector_handle(dissect_reload_framing, proto_reload_framing); reload_handle = find_dissector("reload"); diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c index a7dcccd255..c49f2c8e11 100644 --- a/epan/dissectors/packet-rgmp.c +++ b/epan/dissectors/packet-rgmp.c @@ -140,7 +140,7 @@ proto_reg_handoff_rgmp(void) { dissector_handle_t rgmp_handle; - rgmp_handle = new_create_dissector_handle(dissect_rgmp, proto_rgmp); + rgmp_handle = create_dissector_handle(dissect_rgmp, proto_rgmp); dissector_add_uint("igmp.type", IGMP_RGMP_HELLO, rgmp_handle); dissector_add_uint("igmp.type", IGMP_RGMP_BYE, rgmp_handle); dissector_add_uint("igmp.type", IGMP_RGMP_JOIN, rgmp_handle); diff --git a/epan/dissectors/packet-riemann.c b/epan/dissectors/packet-riemann.c index cb7fe50a97..3ae459d0ff 100644 --- a/epan/dissectors/packet-riemann.c +++ b/epan/dissectors/packet-riemann.c @@ -833,8 +833,8 @@ proto_reg_handoff_riemann(void) static int current_udp_port, current_tcp_port; if (!initialized) { - riemann_udp_handle = new_create_dissector_handle(dissect_riemann_udp, proto_riemann); - riemann_tcp_handle = new_create_dissector_handle(dissect_riemann_tcp, proto_riemann); + riemann_udp_handle = create_dissector_handle(dissect_riemann_udp, proto_riemann); + riemann_tcp_handle = create_dissector_handle(dissect_riemann_tcp, proto_riemann); initialized = TRUE; } else { dissector_delete_uint("udp.port", current_udp_port, riemann_udp_handle); diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c index ddebafe185..93e42c6542 100644 --- a/epan/dissectors/packet-rip.c +++ b/epan/dissectors/packet-rip.c @@ -387,7 +387,7 @@ proto_register_rip(void) prefs_register_bool_preference(rip_module, "display_routing_domain", "Display Routing Domain field", "Display the third and forth bytes of the RIPv2 header as the Routing Domain field (introduced in RFC 1388 [January 1993] and obsolete as of RFC 1723 [November 1994])", &pref_display_routing_domain); - rip_handle = new_create_dissector_handle(dissect_rip, proto_rip); + rip_handle = create_dissector_handle(dissect_rip, proto_rip); } void diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c index f5e0c82baa..7991b666b1 100644 --- a/epan/dissectors/packet-ripng.c +++ b/epan/dissectors/packet-ripng.c @@ -171,7 +171,7 @@ proto_reg_handoff_ripng(void) { dissector_handle_t ripng_handle; - ripng_handle = new_create_dissector_handle(dissect_ripng, proto_ripng); + ripng_handle = create_dissector_handle(dissect_ripng, proto_ripng); dissector_add_uint("udp.port", UDP_PORT_RIPNG, ripng_handle); } diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index a292312839..c20fcea2eb 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -577,7 +577,7 @@ void proto_register_rlogin(void) void proto_reg_handoff_rlogin(void) { /* Dissector install routine */ - dissector_handle_t rlogin_handle = new_create_dissector_handle(dissect_rlogin,proto_rlogin); + dissector_handle_t rlogin_handle = create_dissector_handle(dissect_rlogin,proto_rlogin); dissector_add_uint("tcp.port", RLOGIN_PORT, rlogin_handle); } diff --git a/epan/dissectors/packet-rmcp.c b/epan/dissectors/packet-rmcp.c index ceb7d974a0..ad5fdab0f7 100644 --- a/epan/dissectors/packet-rmcp.c +++ b/epan/dissectors/packet-rmcp.c @@ -257,7 +257,7 @@ proto_reg_handoff_rmcp(void) data_handle = find_dissector("data"); - rmcp_handle = new_create_dissector_handle(dissect_rmcp, proto_rmcp); + rmcp_handle = create_dissector_handle(dissect_rmcp, proto_rmcp); dissector_add_uint("udp.port", UDP_PORT_RMCP, rmcp_handle); } @@ -266,7 +266,7 @@ proto_reg_handoff_rsp(void) { dissector_handle_t rsp_handle; - rsp_handle = new_create_dissector_handle(dissect_rsp, proto_rsp); + rsp_handle = create_dissector_handle(dissect_rsp, proto_rsp); dissector_add_uint("udp.port", UDP_PORT_RMCP_SECURE, rsp_handle); } diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c index 9b24601554..550c6fe6cf 100644 --- a/epan/dissectors/packet-rmi.c +++ b/epan/dissectors/packet-rmi.c @@ -372,7 +372,7 @@ proto_reg_handoff_rmi(void) { dissector_handle_t rmi_handle; - rmi_handle = new_create_dissector_handle(dissect_rmi, proto_rmi); + rmi_handle = create_dissector_handle(dissect_rmi, proto_rmi); dissector_add_uint("tcp.port", TCP_PORT_RMI, rmi_handle); } diff --git a/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c index 593235b27b..c77e8e65df 100644 --- a/epan/dissectors/packet-rmt-alc.c +++ b/epan/dissectors/packet-rmt-alc.c @@ -235,7 +235,7 @@ void proto_reg_handoff_alc(void) if (!preferences_initialized) { preferences_initialized = TRUE; - handle = new_create_dissector_handle(dissect_alc, proto_rmt_alc); + handle = create_dissector_handle(dissect_alc, proto_rmt_alc); dissector_add_for_decode_as("udp.port", handle); xml_handle = find_dissector("xml"); rmt_lct_handle = find_dissector("rmt-lct"); diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c index 980b1e48c3..dff6766351 100644 --- a/epan/dissectors/packet-rmt-norm.c +++ b/epan/dissectors/packet-rmt-norm.c @@ -975,7 +975,7 @@ void proto_reg_handoff_norm(void) { static dissector_handle_t handle; - handle = new_create_dissector_handle(dissect_norm, proto_rmt_norm); + handle = create_dissector_handle(dissect_norm, proto_rmt_norm); dissector_add_for_decode_as("udp.port", handle); heur_dissector_add("udp", dissect_norm_heur, "NORM over UDP", "rmt_norm_udp", proto_rmt_norm, HEURISTIC_DISABLE); diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c index f46ee4bda3..2104bcef6d 100644 --- a/epan/dissectors/packet-roofnet.c +++ b/epan/dissectors/packet-roofnet.c @@ -358,7 +358,7 @@ void proto_reg_handoff_roofnet(void) /* Until now there is no other option than having an IPv4 payload (maybe * extended one day to IPv6 or other?) */ ip_handle = find_dissector("ip"); - roofnet_handle = new_create_dissector_handle(dissect_roofnet, proto_roofnet); + roofnet_handle = create_dissector_handle(dissect_roofnet, proto_roofnet); /* I did not put the type numbers in the ethertypes.h as they only are * experimental and not official */ dissector_add_uint("ethertype", 0x0641, roofnet_handle); diff --git a/epan/dissectors/packet-rpcrdma.c b/epan/dissectors/packet-rpcrdma.c index 213d7e8118..7d37a6af69 100644 --- a/epan/dissectors/packet-rpcrdma.c +++ b/epan/dissectors/packet-rpcrdma.c @@ -590,7 +590,7 @@ proto_reg_handoff_rpcordma(void) static gboolean initialized = FALSE; if (!initialized) { - rpcordma_handler = new_create_dissector_handle(dissect_rpcordma, proto_rpcordma); + rpcordma_handler = create_dissector_handle(dissect_rpcordma, proto_rpcordma); heur_dissector_add("infiniband.payload", dissect_rpcordma_heur, "Infiniband RPC over RDMA", "rpcordma_infiniband", proto_rpcordma, HEURISTIC_ENABLE); heur_dissector_add("infiniband.mad.cm.private", dissect_rpcordma_heur, "RPC over RDMA in PrivateData of CM packets", "rpcordma_ib_private", proto_rpcordma, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-rpki-rtr.c b/epan/dissectors/packet-rpki-rtr.c index bfc2350092..0187120e74 100644 --- a/epan/dissectors/packet-rpki-rtr.c +++ b/epan/dissectors/packet-rpki-rtr.c @@ -488,7 +488,7 @@ proto_reg_handoff_rpkirtr(void) if (!initialized) { - rpkirtr_handle = new_create_dissector_handle(dissect_rpkirtr, + rpkirtr_handle = create_dissector_handle(dissect_rpkirtr, proto_rpkirtr); ssl_handle = find_dissector("ssl"); initialized = TRUE; diff --git a/epan/dissectors/packet-rsh.c b/epan/dissectors/packet-rsh.c index de9d08a11c..8e1fa37f3d 100644 --- a/epan/dissectors/packet-rsh.c +++ b/epan/dissectors/packet-rsh.c @@ -431,7 +431,7 @@ proto_reg_handoff_rsh(void) { dissector_handle_t rsh_handle; - rsh_handle = new_create_dissector_handle(dissect_rsh, proto_rsh); + rsh_handle = create_dissector_handle(dissect_rsh, proto_rsh); dissector_add_uint("tcp.port", RSH_PORT, rsh_handle); } diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c index 7de820fa72..efd5fb6fbc 100644 --- a/epan/dissectors/packet-rsip.c +++ b/epan/dissectors/packet-rsip.c @@ -1247,7 +1247,7 @@ proto_reg_handoff_rsip(void) if (!initialized) { - rsip_handle = new_create_dissector_handle(dissect_rsip, + rsip_handle = create_dissector_handle(dissect_rsip, proto_rsip); dissector_add_uint("udp.port", UDP_PORT_RSIP, rsip_handle); dissector_add_uint("tcp.port", TCP_PORT_RSIP, rsip_handle); diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index 68b6379659..47ae3cacde 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -4465,7 +4465,7 @@ proto_reg_handoff_rsl(void) { dissector_handle_t rsl_handle; - rsl_handle = new_create_dissector_handle(dissect_rsl, proto_rsl); + rsl_handle = create_dissector_handle(dissect_rsl, proto_rsl); dissector_add_uint("lapd.gsm.sapi", LAPD_GSM_SAPI_RA_SIG_PROC, rsl_handle); gsm_cbch_handle = find_dissector("gsm_cbch"); diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index fc290b1fb8..e708a3d8db 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -9574,8 +9574,8 @@ proto_reg_handoff_rsvp(void) { dissector_handle_t rsvp_handle, rsvpe2ei_handle; - rsvp_handle = new_create_dissector_handle(dissect_rsvp, proto_rsvp); - rsvpe2ei_handle = new_create_dissector_handle(dissect_rsvp_e2ei, proto_rsvp_e2e1); + rsvp_handle = create_dissector_handle(dissect_rsvp, proto_rsvp); + rsvpe2ei_handle = create_dissector_handle(dissect_rsvp_e2ei, proto_rsvp_e2e1); dissector_add_uint("ip.proto", IP_PROTO_RSVP, rsvp_handle); dissector_add_uint("ip.proto", IP_PROTO_RSVPE2EI, rsvpe2ei_handle); dissector_add_uint("udp.port", UDP_PORT_PRSVP, rsvp_handle); diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index 23a358954b..4b483b1bb1 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -353,7 +353,7 @@ proto_register_rsync(void) " \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &rsync_desegment); - rsync_handle = new_create_dissector_handle(dissect_rsync, proto_rsync); + rsync_handle = create_dissector_handle(dissect_rsync, proto_rsync); } void proto_reg_handoff_rsync(void) diff --git a/epan/dissectors/packet-rtacser.c b/epan/dissectors/packet-rtacser.c index d89865bc9a..bd33442042 100644 --- a/epan/dissectors/packet-rtacser.c +++ b/epan/dissectors/packet-rtacser.c @@ -322,7 +322,7 @@ proto_reg_handoff_rtacser(void) /* Make sure to use RTAC Serial Protocol Preferences field to determine payload protocol to use for decoding */ if (! rtacser_prefs_initialized) { - rtacser_handle = new_create_dissector_handle(dissect_rtacser, proto_rtacser); + rtacser_handle = create_dissector_handle(dissect_rtacser, proto_rtacser); rtacser_prefs_initialized = TRUE; } diff --git a/epan/dissectors/packet-rtcdc.c b/epan/dissectors/packet-rtcdc.c index cbee3e9f3b..dfd936119d 100644 --- a/epan/dissectors/packet-rtcdc.c +++ b/epan/dissectors/packet-rtcdc.c @@ -392,7 +392,7 @@ proto_reg_handoff_rtcdc(void) static guint32 current_ppid; if (!initialized) { - rtcdc_handle = new_create_dissector_handle(dissect_rtcdc, proto_rtcdc); + rtcdc_handle = create_dissector_handle(dissect_rtcdc, proto_rtcdc); initialized = TRUE; } else { dissector_delete_uint("sctp.ppi", current_ppid, rtcdc_handle); diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index af20f77edd..3812418135 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -2934,14 +2934,14 @@ proto_reg_handoff_rtmpt(void) dissector_handle_t amf_handle; heur_dissector_add("tcp", dissect_rtmpt_heur, "RTMPT over TCP", "rtmpt_tcp", proto_rtmpt, HEURISTIC_DISABLE); - rtmpt_tcp_handle = new_create_dissector_handle(dissect_rtmpt_tcp, proto_rtmpt); + rtmpt_tcp_handle = create_dissector_handle(dissect_rtmpt_tcp, proto_rtmpt); /* dissector_add_for_decode_as("tcp.port", rtmpt_tcp_handle); */ dissector_add_uint("tcp.port", RTMP_PORT, rtmpt_tcp_handle); - rtmpt_http_handle = new_create_dissector_handle(dissect_rtmpt_http, proto_rtmpt); + rtmpt_http_handle = create_dissector_handle(dissect_rtmpt_http, proto_rtmpt); dissector_add_string("media_type", "application/x-fcs", rtmpt_http_handle); - amf_handle = new_create_dissector_handle(dissect_amf, proto_amf); + amf_handle = create_dissector_handle(dissect_amf, proto_amf); dissector_add_string("media_type", "application/x-amf", amf_handle); } diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index 24bd5a84c4..46d8515b8e 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -1326,7 +1326,7 @@ void proto_reg_handoff_rtmac(void) { dissector_handle_t rtmac_handle; - rtmac_handle = new_create_dissector_handle(dissect_rtmac, proto_rtmac); + rtmac_handle = create_dissector_handle(dissect_rtmac, proto_rtmac); dissector_add_uint("ethertype", ETHERTYPE_RTMAC, rtmac_handle); ethertype_table = find_dissector_table("ethertype"); } @@ -1336,7 +1336,7 @@ proto_reg_handoff_rtcfg(void) { dissector_handle_t rtcfg_handle; data_handle = find_dissector("data"); - rtcfg_handle = new_create_dissector_handle(dissect_rtcfg, proto_rtcfg); + rtcfg_handle = create_dissector_handle(dissect_rtcfg, proto_rtcfg); dissector_add_uint("ethertype", ETHERTYPE_RTCFG, rtcfg_handle); } diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c index 263647ac60..86e18dbe29 100644 --- a/epan/dissectors/packet-rtpproxy.c +++ b/epan/dissectors/packet-rtpproxy.c @@ -1492,8 +1492,8 @@ proto_reg_handoff_rtpproxy(void) static dissector_handle_t rtpproxy_tcp_handle, rtpproxy_udp_handle; if(!rtpproxy_initialized){ - rtpproxy_tcp_handle = new_create_dissector_handle(dissect_rtpproxy, proto_rtpproxy); - rtpproxy_udp_handle = new_create_dissector_handle(dissect_rtpproxy, proto_rtpproxy); + rtpproxy_tcp_handle = create_dissector_handle(dissect_rtpproxy, proto_rtpproxy); + rtpproxy_udp_handle = create_dissector_handle(dissect_rtpproxy, proto_rtpproxy); rtpproxy_initialized = TRUE; } diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c index 36e737bc81..3b3c32c6ce 100644 --- a/epan/dissectors/packet-rudp.c +++ b/epan/dissectors/packet-rudp.c @@ -245,7 +245,7 @@ proto_reg_handoff_rudp(void) { static guint saved_udp_port; if (!initialized) { - rudp_handle = new_create_dissector_handle(dissect_rudp, proto_rudp); + rudp_handle = create_dissector_handle(dissect_rudp, proto_rudp); dissector_add_for_decode_as("udp.port", rudp_handle); sm_handle = find_dissector("sm"); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index e98a50517c..b225101c8f 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -764,7 +764,7 @@ proto_reg_handoff_rx(void) /* Ports in the range UDP_PORT_RX_LOW to UDP_PORT_RX_HIGH are all used for various AFS services. */ - rx_handle = new_create_dissector_handle(dissect_rx, proto_rx); + rx_handle = create_dissector_handle(dissect_rx, proto_rx); for (port = UDP_PORT_RX_LOW; port <= UDP_PORT_RX_HIGH; port++) dissector_add_uint("udp.port", port, rx_handle); dissector_add_uint("udp.port", UDP_PORT_RX_AFS_BACKUPS, rx_handle); diff --git a/epan/dissectors/packet-s5066dts.c b/epan/dissectors/packet-s5066dts.c index 2655e4ee09..c388af8728 100644 --- a/epan/dissectors/packet-s5066dts.c +++ b/epan/dissectors/packet-s5066dts.c @@ -1355,9 +1355,9 @@ void proto_reg_handoff_s5066dts(void) static int currentPort; if (!initialized) { - s5066dts_handle = new_create_dissector_handle(dissect_s5066dts_raw, proto_s5066dts); + s5066dts_handle = create_dissector_handle(dissect_s5066dts_raw, proto_s5066dts); dissector_add_uint("wtap_encap", WTAP_ENCAP_STANAG_5066_D_PDU, s5066dts_handle); - s5066dts_over_tcp_handle = new_create_dissector_handle(dissect_s5066dts_tcp, proto_s5066dts); + s5066dts_over_tcp_handle = create_dissector_handle(dissect_s5066dts_tcp, proto_s5066dts); initialized = TRUE; } else { diff --git a/epan/dissectors/packet-s5066sis.c b/epan/dissectors/packet-s5066sis.c index 54fea05e87..b1120e74e9 100644 --- a/epan/dissectors/packet-s5066sis.c +++ b/epan/dissectors/packet-s5066sis.c @@ -1459,7 +1459,7 @@ proto_reg_handoff_s5066(void) static guint saved_s5066_port; if (!Initialized) { - s5066_tcp_handle = new_create_dissector_handle(dissect_s5066_tcp, proto_s5066); + s5066_tcp_handle = create_dissector_handle(dissect_s5066_tcp, proto_s5066); data_handle = find_dissector("data"); Initialized = TRUE; } else { diff --git a/epan/dissectors/packet-sametime.c b/epan/dissectors/packet-sametime.c index 3c686d728e..28db6da0d0 100644 --- a/epan/dissectors/packet-sametime.c +++ b/epan/dissectors/packet-sametime.c @@ -923,7 +923,7 @@ proto_reg_handoff_sametime(void) static guint saved_sametime_tcp_port; if (!initialized) { - sametime_handle = new_create_dissector_handle(dissect_sametime, proto_sametime); + sametime_handle = create_dissector_handle(dissect_sametime, proto_sametime); stats_tree_register("sametime", "sametime", "Sametime/Messages", 0, sametime_stats_tree_packet, sametime_stats_tree_init, NULL ); diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c index fa8689c1da..6adefd088c 100644 --- a/epan/dissectors/packet-sap.c +++ b/epan/dissectors/packet-sap.c @@ -382,7 +382,7 @@ proto_reg_handoff_sap(void) { dissector_handle_t sap_handle; - sap_handle = new_create_dissector_handle(dissect_sap, proto_sap); + sap_handle = create_dissector_handle(dissect_sap, proto_sap); dissector_add_uint("udp.port", UDP_PORT_SAP, sap_handle); /* diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index ccbccede06..7a973062ca 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -1544,7 +1544,7 @@ proto_reg_handoff_sasp(void) { dissector_handle_t sasp_handle; - sasp_handle = new_create_dissector_handle(dissect_sasp, proto_sasp); + sasp_handle = create_dissector_handle(dissect_sasp, proto_sasp); dissector_add_uint("tcp.port", SASP_GLOBAL_PORT, sasp_handle); } diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index 1e0cf524e9..a3f41e64c4 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -2330,7 +2330,7 @@ proto_reg_handoff_sbus(void) { dissector_handle_t sbus_handle; - sbus_handle = new_create_dissector_handle(dissect_sbus, proto_sbus); + sbus_handle = create_dissector_handle(dissect_sbus, proto_sbus); dissector_add_uint("udp.port", 5050, sbus_handle); } diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c index 5d2943d71c..eb23e189fd 100644 --- a/epan/dissectors/packet-sccpmg.c +++ b/epan/dissectors/packet-sccpmg.c @@ -356,7 +356,7 @@ proto_reg_handoff_sccpmg(void) { dissector_handle_t sccpmg_handle; - sccpmg_handle = new_create_dissector_handle(dissect_sccpmg, proto_sccpmg); + sccpmg_handle = create_dissector_handle(dissect_sccpmg, proto_sccpmg); /* Register for SCCP SSN=1 messages */ dissector_add_uint("sccp.ssn", SCCPMG_SSN, sccpmg_handle); diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c index 1c24602e1d..add54c5af8 100644 --- a/epan/dissectors/packet-scriptingservice.c +++ b/epan/dissectors/packet-scriptingservice.c @@ -223,7 +223,7 @@ proto_reg_handoff_ssprotocol(void) { dissector_handle_t ssprotocol_handle; - ssprotocol_handle = new_create_dissector_handle(dissect_ssprotocol, proto_ssprotocol); + ssprotocol_handle = create_dissector_handle(dissect_ssprotocol, proto_ssprotocol); dissector_add_uint("sctp.ppi", SSPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY, ssprotocol_handle); dissector_add_uint("sctp.ppi", SSP_PAYLOAD_PROTOCOL_ID, ssprotocol_handle); } diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c index b3ab0b3d98..27be134ba0 100644 --- a/epan/dissectors/packet-sdlc.c +++ b/epan/dissectors/packet-sdlc.c @@ -203,7 +203,7 @@ proto_reg_handoff_sdlc(void) sna_handle = find_dissector("sna"); data_handle = find_dissector("data"); - sdlc_handle = new_create_dissector_handle(dissect_sdlc, proto_sdlc); + sdlc_handle = create_dissector_handle(dissect_sdlc, proto_sdlc); dissector_add_uint("wtap_encap", WTAP_ENCAP_SDLC, sdlc_handle); } diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c index 1fda410216..e7530fbcb8 100644 --- a/epan/dissectors/packet-sebek.c +++ b/epan/dissectors/packet-sebek.c @@ -341,7 +341,7 @@ proto_reg_handoff_sebek(void) { dissector_handle_t sebek_handle; - sebek_handle = new_create_dissector_handle(dissect_sebek, proto_sebek); + sebek_handle = create_dissector_handle(dissect_sebek, proto_sebek); dissector_add_uint("udp.port", UDP_PORT_SEBEK, sebek_handle); } diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 96f03837c0..ff5e3ac802 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -3073,7 +3073,7 @@ proto_reg_handoff_selfm(void) /* Make sure to use SEL FM Protocol Preferences field to determine default TCP port */ if (! selfm_prefs_initialized) { - selfm_handle = new_create_dissector_handle(dissect_selfm_tcp, proto_selfm); + selfm_handle = create_dissector_handle(dissect_selfm_tcp, proto_selfm); selfm_prefs_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index f12a10908e..8b3f88f2d7 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -1636,7 +1636,7 @@ proto_reg_handoff_sercosiii(void) { dissector_handle_t siii_handle; - siii_handle = new_create_dissector_handle(dissect_siii, proto_siii); + siii_handle = create_dissector_handle(dissect_siii, proto_siii); dissector_add_uint("ethertype", ETHERTYPE_SERCOS, siii_handle); } diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 05ac3a166a..65ad71bcba 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -3518,7 +3518,7 @@ proto_reg_handoff_sflow_245(void) { static gboolean sflow_245_prefs_initialized = FALSE; if (!sflow_245_prefs_initialized) { - sflow_handle = new_create_dissector_handle(dissect_sflow_245, proto_sflow); + sflow_handle = create_dissector_handle(dissect_sflow_245, proto_sflow); data_handle = find_dissector("data"); sflow_245_prefs_initialized = TRUE; } else { diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 546b5dd1e9..bb459eefba 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -6764,7 +6764,7 @@ proto_reg_handoff_sigcomp(void) if (!Initialized) { sigcomp_handle = find_dissector("sigcomp"); - sigcomp_tcp_handle = new_create_dissector_handle(dissect_sigcomp_tcp,proto_sigcomp); + sigcomp_tcp_handle = create_dissector_handle(dissect_sigcomp_tcp,proto_sigcomp); sip_handle = find_dissector("sip"); Initialized=TRUE; } else { diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index 2c11093858..9bd27d5f7c 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.c @@ -1860,7 +1860,7 @@ proto_reg_handoff_simulcrypt(void) guint i; if (!initialized) { - simulcrypt_handle = new_create_dissector_handle(dissect_simulcrypt, proto_simulcrypt); + simulcrypt_handle = create_dissector_handle(dissect_simulcrypt, proto_simulcrypt); for(i=0;i<ECM_INTERPRETATION_SIZE;i++) { tab_ecm_inter[i].protocol_handle = find_dissector(tab_ecm_inter[i].protocol_name); diff --git a/epan/dissectors/packet-skype.c b/epan/dissectors/packet-skype.c index f75c969fb3..3a190d6b5f 100644 --- a/epan/dissectors/packet-skype.c +++ b/epan/dissectors/packet-skype.c @@ -443,7 +443,7 @@ proto_reg_handoff_skype(void) { dissector_handle_t skype_handle; - skype_handle = new_create_dissector_handle(dissect_skype_static, proto_skype); + skype_handle = create_dissector_handle(dissect_skype_static, proto_skype); dissector_add_for_decode_as("tcp.port", skype_handle); dissector_add_for_decode_as("udp.port", skype_handle); diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index 5eb6f02db5..504733e313 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -712,7 +712,7 @@ proto_reg_handoff_slimp3(void) { dissector_handle_t slimp3_handle; - slimp3_handle = new_create_dissector_handle(dissect_slimp3, proto_slimp3); + slimp3_handle = create_dissector_handle(dissect_slimp3, proto_slimp3); dissector_add_uint("udp.port", UDP_PORT_SLIMP3_V1, slimp3_handle); dissector_add_uint("udp.port", UDP_PORT_SLIMP3_V2, slimp3_handle); } diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index dbb24bf590..49830b4b26 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -335,7 +335,7 @@ proto_register_sll(void) proto_register_fields(proto_sll, hfi, array_length(hfi)); proto_register_subtree_array(ett, array_length(ett)); - sll_handle = new_create_dissector_handle(dissect_sll, proto_sll); + sll_handle = create_dissector_handle(dissect_sll, proto_sll); sll_linux_dissector_table = register_dissector_table ( "sll.ltype", diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index 8c411efeae..f1aa1c65c1 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -145,7 +145,7 @@ proto_reg_handoff_slow_protocols(void) { dissector_handle_t slow_protocols_handle; - slow_protocols_handle = new_create_dissector_handle(dissect_slow_protocols, proto_slow); + slow_protocols_handle = create_dissector_handle(dissect_slow_protocols, proto_slow); dissector_add_uint("ethertype", ETHERTYPE_SLOW_PROTOCOLS, slow_protocols_handle); dh_data = find_dissector("data"); diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index cfdf8ff17b..583fc57c54 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -2631,7 +2631,7 @@ proto_reg_handoff_slsk(void) { dissector_handle_t slsk_handle; - slsk_handle = new_create_dissector_handle(dissect_slsk, proto_slsk); + slsk_handle = create_dissector_handle(dissect_slsk, proto_slsk); dissector_add_uint("tcp.port", TCP_PORT_SLSK_1, slsk_handle); dissector_add_uint("tcp.port", TCP_PORT_SLSK_2, slsk_handle); dissector_add_uint("tcp.port", TCP_PORT_SLSK_3, slsk_handle); diff --git a/epan/dissectors/packet-sml.c b/epan/dissectors/packet-sml.c index 5ff618815c..7d405519c7 100644 --- a/epan/dissectors/packet-sml.c +++ b/epan/dissectors/packet-sml.c @@ -2826,7 +2826,7 @@ void proto_reg_handoff_sml(void) { static dissector_handle_t sml_handle; if (!initialized) { - sml_handle = new_create_dissector_handle(dissect_sml, proto_sml); + sml_handle = create_dissector_handle(dissect_sml, proto_sml); initialized = TRUE; } else { dissector_delete_uint("tcp.port", old_tcp_port, sml_handle); diff --git a/epan/dissectors/packet-snaeth.c b/epan/dissectors/packet-snaeth.c index 13da4efee4..19fa5b88e2 100644 --- a/epan/dissectors/packet-snaeth.c +++ b/epan/dissectors/packet-snaeth.c @@ -108,7 +108,7 @@ proto_reg_handoff_snaeth(void) */ llc_handle = find_dissector("llc"); - snaeth_handle = new_create_dissector_handle(dissect_snaeth, proto_snaeth); + snaeth_handle = create_dissector_handle(dissect_snaeth, proto_snaeth); dissector_add_uint("ethertype", ETHERTYPE_SNA, snaeth_handle); } diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index 9cb1d6b54e..a722d4a728 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -248,7 +248,7 @@ proto_reg_handoff_socketcan(void) { dissector_handle_t can_handle; - can_handle = new_create_dissector_handle(dissect_socketcan, proto_can); + can_handle = create_dissector_handle(dissect_socketcan, proto_can); dissector_add_uint("wtap_encap", WTAP_ENCAP_SOCKETCAN, can_handle); dissector_add_uint("sll.ltype", LINUX_SLL_P_CAN, can_handle); diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index bb4b77d995..144339d4c9 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -1307,8 +1307,8 @@ void proto_reg_handoff_socks(void) { /* dissector install routine */ - socks_udp_handle = new_create_dissector_handle(socks_udp_dissector, proto_socks); - socks_handle = new_create_dissector_handle(dissect_socks, proto_socks); + socks_udp_handle = create_dissector_handle(socks_udp_dissector, proto_socks); + socks_handle = create_dissector_handle(dissect_socks, proto_socks); dissector_add_uint("tcp.port", TCP_PORT_SOCKS, socks_handle); } diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index eef1d8a65a..2690d004dc 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -620,7 +620,7 @@ proto_register_soupbintcp(void) void proto_reg_handoff_soupbintcp(void) { - soupbintcp_handle = new_create_dissector_handle(dissect_soupbintcp_tcp, + soupbintcp_handle = create_dissector_handle(dissect_soupbintcp_tcp, proto_soupbintcp); /* For "decode-as" */ diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index 98d81364a7..32d8e8a7ab 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -1925,7 +1925,7 @@ void proto_register_spdy(void) &spdy_decompress_body); /** Create dissector handle and register for dissection. */ - spdy_handle = new_create_dissector_handle(dissect_spdy, proto_spdy); + spdy_handle = create_dissector_handle(dissect_spdy, proto_spdy); register_init_routine(&spdy_init_protocol); diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index 1d12b48e45..343e2bc872 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -4573,7 +4573,7 @@ proto_register_spice(void) void proto_reg_handoff_spice(void) { - spice_handle = new_create_dissector_handle(dissect_spice, proto_spice); + spice_handle = create_dissector_handle(dissect_spice, proto_spice); dissector_add_for_decode_as("tcp.port", spice_handle); heur_dissector_add("tcp", test_spice_protocol, "Spice over TCP", "spice_tcp", proto_spice, HEURISTIC_ENABLE); jpeg_handle = find_dissector("image-jfif"); diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c index 3e3d9adb0c..d63e72a7dd 100644 --- a/epan/dissectors/packet-spp.c +++ b/epan/dissectors/packet-spp.c @@ -271,7 +271,7 @@ proto_reg_handoff_spp(void) { dissector_handle_t spp_handle; - spp_handle = new_create_dissector_handle(dissect_spp, proto_spp); + spp_handle = create_dissector_handle(dissect_spp, proto_spp); dissector_add_uint("idp.packet_type", IDP_PACKET_TYPE_SPP, spp_handle); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index 1e1160fe6f..01f1a5b81c 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -1898,9 +1898,9 @@ void proto_reg_handoff_srvloc(void) { dissector_handle_t srvloc_handle, srvloc_tcp_handle; - srvloc_handle = new_create_dissector_handle(dissect_srvloc, proto_srvloc); + srvloc_handle = create_dissector_handle(dissect_srvloc, proto_srvloc); dissector_add_uint("udp.port", UDP_PORT_SRVLOC, srvloc_handle); - srvloc_tcp_handle = new_create_dissector_handle(dissect_srvloc_tcp, + srvloc_tcp_handle = create_dissector_handle(dissect_srvloc_tcp, proto_srvloc); dissector_add_uint("tcp.port", TCP_PORT_SRVLOC, srvloc_tcp_handle); } diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c index 1a353d4481..6ea7ed873a 100644 --- a/epan/dissectors/packet-stanag4607.c +++ b/epan/dissectors/packet-stanag4607.c @@ -1643,7 +1643,7 @@ proto_reg_handoff_stanag4607(void) { static dissector_handle_t stanag4607_handle; - stanag4607_handle = new_create_dissector_handle(dissect_stanag4607, + stanag4607_handle = create_dissector_handle(dissect_stanag4607, proto_stanag4607); dissector_add_uint("wtap_encap", WTAP_ENCAP_STANAG_4607, stanag4607_handle); } diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c index bb4d0646e7..2eb15f6eda 100644 --- a/epan/dissectors/packet-starteam.c +++ b/epan/dissectors/packet-starteam.c @@ -708,7 +708,7 @@ void proto_reg_handoff_starteam(void) { heur_dissector_add("tcp", dissect_starteam_heur, "StarTeam over TCP", "starteam_tcp", proto_starteam, HEURISTIC_ENABLE); - starteam_tcp_handle = new_create_dissector_handle(dissect_starteam_tcp, proto_starteam); + starteam_tcp_handle = create_dissector_handle(dissect_starteam_tcp, proto_starteam); } /* diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index c7affc408e..979896fa51 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -1731,8 +1731,8 @@ proto_register_stun(void) void proto_reg_handoff_stun(void) { - stun_tcp_handle = new_create_dissector_handle(dissect_stun_tcp, proto_stun); - stun_udp_handle = new_create_dissector_handle(dissect_stun_udp, proto_stun); + stun_tcp_handle = create_dissector_handle(dissect_stun_tcp, proto_stun); + stun_udp_handle = create_dissector_handle(dissect_stun_udp, proto_stun); dissector_add_uint("tcp.port", TCP_PORT_STUN, stun_tcp_handle); dissector_add_uint("udp.port", UDP_PORT_STUN, stun_udp_handle); diff --git a/epan/dissectors/packet-swipe.c b/epan/dissectors/packet-swipe.c index 1c892227da..e77d3de424 100644 --- a/epan/dissectors/packet-swipe.c +++ b/epan/dissectors/packet-swipe.c @@ -126,7 +126,7 @@ proto_reg_handoff_swipe(void) { dissector_handle_t swipe_handle; - swipe_handle = new_create_dissector_handle(dissect_swipe, proto_swipe ); + swipe_handle = create_dissector_handle(dissect_swipe, proto_swipe ); dissector_add_uint("ip.proto", IP_PROTO_SWIPE, swipe_handle); ipv6_handle = find_dissector("ipv6"); diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c index 7d8fbc376e..432b30b30b 100644 --- a/epan/dissectors/packet-symantec.c +++ b/epan/dissectors/packet-symantec.c @@ -144,7 +144,7 @@ proto_reg_handoff_symantec(void) ethertype_dissector_table = find_dissector_table("ethertype"); - symantec_handle = new_create_dissector_handle(dissect_symantec, + symantec_handle = create_dissector_handle(dissect_symantec, proto_symantec); dissector_add_uint("wtap_encap", WTAP_ENCAP_SYMANTEC, symantec_handle); } diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index d192623170..c710dcd0a1 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -1383,7 +1383,7 @@ void proto_reg_handoff_synphasor(void) static guint current_tcp_port; if (!initialized) { - synphasor_tcp_handle = new_create_dissector_handle(dissect_tcp, proto_synphasor); + synphasor_tcp_handle = create_dissector_handle(dissect_tcp, proto_synphasor); dissector_add_for_decode_as("rtacser.data", synphasor_udp_handle); initialized = TRUE; } diff --git a/epan/dissectors/packet-sysdig-event.c b/epan/dissectors/packet-sysdig-event.c index 8c0d454c87..15536903df 100644 --- a/epan/dissectors/packet-sysdig-event.c +++ b/epan/dissectors/packet-sysdig-event.c @@ -2184,11 +2184,11 @@ proto_reg_handoff_sysdig_event(void) { dissector_handle_t sysdig_event_handle; - /* Use new_create_dissector_handle() to indicate that dissect_sysdig_event() + /* Use create_dissector_handle() to indicate that dissect_sysdig_event() * returns the number of bytes it dissected (or 0 if it thinks the packet * does not belong to PROTONAME). */ - sysdig_event_handle = new_create_dissector_handle(dissect_sysdig_event, + sysdig_event_handle = create_dissector_handle(dissect_sysdig_event, proto_sysdig_event); dissector_add_uint("pcapng.block_type", BLOCK_TYPE_SYSDIG_EVENT, sysdig_event_handle); } diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index c9facbb9f7..a2b461745f 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -281,7 +281,7 @@ proto_reg_handoff_tacacs(void) { dissector_handle_t tacacs_handle; - tacacs_handle = new_create_dissector_handle(dissect_tacacs, proto_tacacs); + tacacs_handle = create_dissector_handle(dissect_tacacs, proto_tacacs); dissector_add_uint("udp.port", UDP_PORT_TACACS, tacacs_handle); } @@ -1278,7 +1278,7 @@ proto_reg_handoff_tacplus(void) { dissector_handle_t tacplus_handle; - tacplus_handle = new_create_dissector_handle(dissect_tacplus, + tacplus_handle = create_dissector_handle(dissect_tacplus, proto_tacplus); dissector_add_uint("tcp.port", TCP_PORT_TACACS, tacplus_handle); } diff --git a/epan/dissectors/packet-tcpros.c b/epan/dissectors/packet-tcpros.c index 5b3b7952a2..24a2535f01 100644 --- a/epan/dissectors/packet-tcpros.c +++ b/epan/dissectors/packet-tcpros.c @@ -482,7 +482,7 @@ proto_reg_handoff_tcpros(void) static gboolean Initialized = FALSE; if (!Initialized) { - tcpros_handle = new_create_dissector_handle(dissect_tcpros, proto_tcpros); + tcpros_handle = create_dissector_handle(dissect_tcpros, proto_tcpros); dissector_add_for_decode_as("tcp.port", tcpros_handle); /* for "decode-as" */ Initialized = TRUE; } diff --git a/epan/dissectors/packet-tdmoe.c b/epan/dissectors/packet-tdmoe.c index fab25cc0a5..38e570a922 100644 --- a/epan/dissectors/packet-tdmoe.c +++ b/epan/dissectors/packet-tdmoe.c @@ -176,7 +176,7 @@ proto_reg_handoff_tdmoe(void) { dissector_handle_t tdmoe_handle; - tdmoe_handle = new_create_dissector_handle(dissect_tdmoe, proto_tdmoe); + tdmoe_handle = create_dissector_handle(dissect_tdmoe, proto_tdmoe); dissector_add_uint("ethertype", ETHERTYPE_TDMOE, tdmoe_handle); lapd_handle = find_dissector("lapd-bitstream"); diff --git a/epan/dissectors/packet-tdmop.c b/epan/dissectors/packet-tdmop.c index 15cf7fcf47..e2b335f8eb 100644 --- a/epan/dissectors/packet-tdmop.c +++ b/epan/dissectors/packet-tdmop.c @@ -351,7 +351,7 @@ void proto_reg_handoff_tdmop(void) static guint32 current_tdmop_udpport; if (!init) { - tdmop_handle = new_create_dissector_handle(dissect_tdmop, proto_tdmop); + tdmop_handle = create_dissector_handle(dissect_tdmop, proto_tdmop); dissector_add_uint("udp.port", pref_tdmop_udpport, tdmop_handle); dissector_add_uint("ethertype", pref_tdmop_ethertype, tdmop_handle); lapd_handle = find_dissector("lapd-bitstream"); diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index 3778351ccc..db63214278 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -1231,7 +1231,7 @@ void proto_register_ts2(void) void proto_reg_handoff_ts2(void) { dissector_handle_t ts2_handle; - ts2_handle = new_create_dissector_handle(dissect_ts2, proto_ts2); + ts2_handle = create_dissector_handle(dissect_ts2, proto_ts2); dissector_add_uint("udp.port", TS2_PORT, ts2_handle); } diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c index 1883a8545d..44d8a85350 100644 --- a/epan/dissectors/packet-teimanagement.c +++ b/epan/dissectors/packet-teimanagement.c @@ -134,7 +134,7 @@ proto_reg_handoff_teimanagement(void) { dissector_handle_t teimanagement_handle; - teimanagement_handle = new_create_dissector_handle(dissect_teimanagement, + teimanagement_handle = create_dissector_handle(dissect_teimanagement, proto_tei); dissector_add_uint("lapd.sapi", LAPD_SAPI_L2, teimanagement_handle); } diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c index ddaa3f648f..536df887d5 100644 --- a/epan/dissectors/packet-telkonet.c +++ b/epan/dissectors/packet-telkonet.c @@ -105,7 +105,7 @@ proto_reg_handoff_telkonet(void) eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); - telkonet_handle = new_create_dissector_handle(dissect_telkonet, proto_telkonet); + telkonet_handle = create_dissector_handle(dissect_telkonet, proto_telkonet); dissector_add_uint("ethertype", ETHERTYPE_TELKONET, telkonet_handle); } diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index 9d4ef1837c..0a1b5cdc60 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.c @@ -397,7 +397,7 @@ proto_reg_handoff_teredo(void) { dissector_handle_t teredo_handle; - teredo_handle = new_create_dissector_handle(dissect_teredo, proto_teredo); + teredo_handle = create_dissector_handle(dissect_teredo, proto_teredo); data_handle = find_dissector("ipv6"); teredo_tap = register_tap("teredo"); diff --git a/epan/dissectors/packet-tfp.c b/epan/dissectors/packet-tfp.c index 043a3833a9..d7ae0a03dd 100644 --- a/epan/dissectors/packet-tfp.c +++ b/epan/dissectors/packet-tfp.c @@ -411,7 +411,7 @@ proto_reg_handoff_tfp(void) { dissector_handle_t tfp_handle_tcp; - tfp_handle_tcp = new_create_dissector_handle(dissect_tfp_tcp, proto_tfp); + tfp_handle_tcp = create_dissector_handle(dissect_tfp_tcp, proto_tfp); dissector_add_uint("tcp.port", tfp_PORT, tfp_handle_tcp); heur_dissector_add("usb.bulk", dissect_tfp_bulk_heur, "Tinkerforge USB bulk endpoint", "tfp_usb_bulk", proto_tfp, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-time.c b/epan/dissectors/packet-time.c index ae03e2a15b..1ca8dd8375 100644 --- a/epan/dissectors/packet-time.c +++ b/epan/dissectors/packet-time.c @@ -120,7 +120,7 @@ proto_reg_handoff_time(void) { dissector_handle_t time_handle; - time_handle = new_create_dissector_handle(dissect_time, proto_time); + time_handle = create_dissector_handle(dissect_time, proto_time); dissector_add_uint("udp.port", TIME_PORT, time_handle); dissector_add_uint("tcp.port", TIME_PORT, time_handle); } diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 6abcc13afa..5b5b771120 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -3099,8 +3099,8 @@ proto_reg_handoff_tipc(void) static range_t *tipc_udp_port_range; if (!inited) { - tipc_handle = new_create_dissector_handle(dissect_tipc, proto_tipc); - tipc_tcp_handle = new_create_dissector_handle(dissect_tipc_tcp, proto_tipc); + tipc_handle = create_dissector_handle(dissect_tipc, proto_tipc); + tipc_tcp_handle = create_dissector_handle(dissect_tipc_tcp, proto_tipc); ip_handle = find_dissector("ip"); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c index 79bfeac866..762ad20715 100644 --- a/epan/dissectors/packet-tivoconnect.c +++ b/epan/dissectors/packet-tivoconnect.c @@ -238,8 +238,8 @@ proto_reg_handoff_tivoconnect(void) { dissector_handle_t tivoconnect_tcp_handle, tivoconnect_udp_handle; - tivoconnect_tcp_handle = new_create_dissector_handle(dissect_tivoconnect_tcp, proto_tivoconnect); - tivoconnect_udp_handle = new_create_dissector_handle(dissect_tivoconnect_udp, proto_tivoconnect); + tivoconnect_tcp_handle = create_dissector_handle(dissect_tivoconnect_tcp, proto_tivoconnect); + tivoconnect_udp_handle = create_dissector_handle(dissect_tivoconnect_udp, proto_tivoconnect); dissector_add_uint("udp.port", 2190, tivoconnect_udp_handle); dissector_add_uint("tcp.port", 2190, tivoconnect_tcp_handle); } diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c index f703b89f95..f5e7341faf 100644 --- a/epan/dissectors/packet-tnef.c +++ b/epan/dissectors/packet-tnef.c @@ -830,7 +830,7 @@ proto_reg_handoff_tnef(void) { dissector_handle_t tnef_file_handle; - tnef_file_handle = new_create_dissector_handle(dissect_tnef_file, proto_tnef); + tnef_file_handle = create_dissector_handle(dissect_tnef_file, proto_tnef); dissector_add_string("media_type", "application/ms-tnef", tnef_handle); diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index ee4c7ff2b3..70ab9bfef7 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -1234,7 +1234,7 @@ proto_reg_handoff_tns(void) { dissector_handle_t tns_handle; - tns_handle = new_create_dissector_handle(dissect_tns, proto_tns); + tns_handle = create_dissector_handle(dissect_tns, proto_tns); dissector_add_uint("tcp.port", TCP_PORT_TNS, tns_handle); data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index 28adcd2410..ed39b39be0 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -660,7 +660,7 @@ proto_reg_handoff_tpkt(void) dissector_add_uint("tcp.port", TCP_PORT_TPKT, tpkt_handle); /* - tpkt_ascii_handle = new_create_dissector_handle(dissect_ascii_tpkt, proto_tpkt); + tpkt_ascii_handle = create_dissector_handle(dissect_ascii_tpkt, proto_tpkt); dissector_add_uint("tcp.port", TCP_PORT_TPKT, tpkt_ascii_handle); */ diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index b42aa9bec3..9bd255341d 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -768,7 +768,7 @@ void proto_reg_handoff_tpncp(void) { return; if (!tpncp_prefs_initialized) { - tpncp_tcp_handle = new_create_dissector_handle(dissect_tpncp_tcp, proto_tpncp); + tpncp_tcp_handle = create_dissector_handle(dissect_tpncp_tcp, proto_tpncp); tpncp_prefs_initialized = TRUE; } diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c index 94f11e9107..4ef4b14415 100644 --- a/epan/dissectors/packet-trill.c +++ b/epan/dissectors/packet-trill.c @@ -200,7 +200,7 @@ proto_reg_handoff_trill(void) { dissector_handle_t trill_handle; - trill_handle = new_create_dissector_handle(dissect_trill, proto_trill); + trill_handle = create_dissector_handle(dissect_trill, proto_trill); dissector_add_uint("ethertype", ETHERTYPE_TRILL, trill_handle); eth_dissector = find_dissector( "eth" ) ; diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c index 99f980ce09..e7ab7be488 100644 --- a/epan/dissectors/packet-tsp.c +++ b/epan/dissectors/packet-tsp.c @@ -167,7 +167,7 @@ proto_reg_handoff_tsp(void) { dissector_handle_t tsp_handle; - tsp_handle = new_create_dissector_handle(dissect_tsp, proto_tsp); + tsp_handle = create_dissector_handle(dissect_tsp, proto_tsp); dissector_add_uint("udp.port", UDP_PORT_TIMED, tsp_handle); } diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c index 92cc7ea425..25ff88553f 100644 --- a/epan/dissectors/packet-turnchannel.c +++ b/epan/dissectors/packet-turnchannel.c @@ -204,7 +204,7 @@ proto_reg_handoff_turnchannel(void) dissector_handle_t turnchannel_tcp_handle; dissector_handle_t turnchannel_udp_handle; - turnchannel_tcp_handle = new_create_dissector_handle(dissect_turnchannel_tcp, proto_turnchannel); + turnchannel_tcp_handle = create_dissector_handle(dissect_turnchannel_tcp, proto_turnchannel); turnchannel_udp_handle = find_dissector("turnchannel"); /* Register for "Decode As" in case STUN negotiation isn't captured */ diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c index 4e6a7f52d4..231daadd8a 100644 --- a/epan/dissectors/packet-tuxedo.c +++ b/epan/dissectors/packet-tuxedo.c @@ -185,7 +185,7 @@ proto_register_tuxedo(void) void proto_reg_handoff_tuxedo(void) { - tuxedo_handle = new_create_dissector_handle(dissect_tuxedo, proto_tuxedo); + tuxedo_handle = create_dissector_handle(dissect_tuxedo, proto_tuxedo); dissector_add_for_decode_as("tcp.port", tuxedo_handle); heur_dissector_add("tcp", dissect_tuxedo_heur, "Tuxedo over TCP", "tuxedo_tcp", proto_tuxedo, HEURISTIC_ENABLE); } diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index 47a211900f..05185ff82b 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -2827,7 +2827,7 @@ proto_reg_handoff_ucp(void) /* * Also register as a dissector that can be selected by a TCP port number via "decode as". */ - ucp_handle = new_create_dissector_handle(dissect_ucp_tcp, proto_ucp); + ucp_handle = create_dissector_handle(dissect_ucp_tcp, proto_ucp); dissector_add_for_decode_as("tcp.port", ucp_handle); /* Tapping setup */ diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c index 866c3b99e6..2ba0b15148 100644 --- a/epan/dissectors/packet-udld.c +++ b/epan/dissectors/packet-udld.c @@ -305,7 +305,7 @@ proto_reg_handoff_udld(void) dissector_handle_t udld_handle; data_handle = find_dissector("data"); - udld_handle = new_create_dissector_handle(dissect_udld, proto_udld); + udld_handle = create_dissector_handle(dissect_udld, proto_udld); dissector_add_uint("llc.cisco_pid", 0x0111, udld_handle); dissector_add_uint("chdlc.protocol", 0x0111, udld_handle); } diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index 7d18fece9e..d948458d97 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -1083,7 +1083,7 @@ proto_register_udp(void) proto_udplite = proto_register_protocol("Lightweight User Datagram Protocol", "UDP-Lite", "udplite"); - udplite_handle = new_create_dissector_handle(dissect_udplite, proto_udplite); + udplite_handle = create_dissector_handle(dissect_udplite, proto_udplite); hfi_udplite = proto_registrar_get_nth(proto_udplite); proto_register_fields(proto_udplite, hfi_lite, array_length(hfi_lite)); diff --git a/epan/dissectors/packet-udt.c b/epan/dissectors/packet-udt.c index d629aaed6e..c43ad31de2 100644 --- a/epan/dissectors/packet-udt.c +++ b/epan/dissectors/packet-udt.c @@ -451,7 +451,7 @@ void proto_register_udt(void) void proto_reg_handoff_udt(void) { data_handle = find_dissector("data"); - udt_handle = new_create_dissector_handle(dissect_udt, proto_udt); + udt_handle = create_dissector_handle(dissect_udt, proto_udt); heur_dissector_add("udp", dissect_udt_heur, "UDT over UDP", "udt_udp", proto_udt, HEURISTIC_ENABLE); dissector_add_for_decode_as("udp.port", udt_handle); diff --git a/epan/dissectors/packet-uhd.c b/epan/dissectors/packet-uhd.c index 92ae6c60c4..34abc96eef 100644 --- a/epan/dissectors/packet-uhd.c +++ b/epan/dissectors/packet-uhd.c @@ -290,7 +290,7 @@ proto_reg_handoff_uhd(void) static gint dissector_port; if (!uhd_prefs_initialized) { - uhd_handle = new_create_dissector_handle(dissect_uhd, proto_uhd); + uhd_handle = create_dissector_handle(dissect_uhd, proto_uhd); uhd_prefs_initialized = TRUE; } else { dissector_delete_uint("udp.port", dissector_port, uhd_handle); diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c index 1827ccfc1b..db1a55afd0 100644 --- a/epan/dissectors/packet-usb-audio.c +++ b/epan/dissectors/packet-usb-audio.c @@ -646,7 +646,7 @@ proto_reg_handoff_usb_audio(void) { dissector_handle_t usb_audio_bulk_handle, usb_audio_descr_handle; - usb_audio_descr_handle = new_create_dissector_handle( + usb_audio_descr_handle = create_dissector_handle( dissect_usb_audio_descriptor, proto_usb_audio); dissector_add_uint("usb.descriptor", IF_CLASS_AUDIO, usb_audio_descr_handle); diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c index ff1b221106..0779f3daca 100644 --- a/epan/dissectors/packet-usb-ccid.c +++ b/epan/dissectors/packet-usb-ccid.c @@ -747,7 +747,7 @@ proto_reg_handoff_ccid(void) { dissector_handle_t usb_ccid_descr_handle; - usb_ccid_descr_handle = new_create_dissector_handle( + usb_ccid_descr_handle = create_dissector_handle( dissect_usb_ccid_descriptor, proto_ccid); dissector_add_uint("usb.descriptor", IF_CLASS_SMART_CARD, usb_ccid_descr_handle); diff --git a/epan/dissectors/packet-usb-com.c b/epan/dissectors/packet-usb-com.c index 33d8cd5584..fbafc43072 100644 --- a/epan/dissectors/packet-usb-com.c +++ b/epan/dissectors/packet-usb-com.c @@ -1077,13 +1077,13 @@ proto_reg_handoff_usb_com(void) dissector_handle_t usb_com_descriptor_handle, usb_com_control_handle, usb_com_bulk_handle, usb_com_interrupt_handle; - usb_com_descriptor_handle = new_create_dissector_handle(dissect_usb_com_descriptor, proto_usb_com); + usb_com_descriptor_handle = create_dissector_handle(dissect_usb_com_descriptor, proto_usb_com); dissector_add_uint("usb.descriptor", IF_CLASS_COMMUNICATIONS, usb_com_descriptor_handle); - usb_com_control_handle = new_create_dissector_handle(dissect_usb_com_control, proto_usb_com); + usb_com_control_handle = create_dissector_handle(dissect_usb_com_control, proto_usb_com); dissector_add_uint("usb.control", IF_CLASS_COMMUNICATIONS, usb_com_control_handle); - usb_com_bulk_handle = new_create_dissector_handle(dissect_usb_com_bulk, proto_usb_com); + usb_com_bulk_handle = create_dissector_handle(dissect_usb_com_bulk, proto_usb_com); dissector_add_uint("usb.bulk", IF_CLASS_CDC_DATA, usb_com_bulk_handle); - usb_com_interrupt_handle = new_create_dissector_handle(dissect_usb_com_interrupt, proto_usb_com); + usb_com_interrupt_handle = create_dissector_handle(dissect_usb_com_interrupt, proto_usb_com); dissector_add_uint("usb.interrupt", IF_CLASS_COMMUNICATIONS, usb_com_interrupt_handle); mbim_control_handle = find_dissector("mbim.control"); mbim_descriptor_handle = find_dissector("mbim.descriptor"); diff --git a/epan/dissectors/packet-usb-dfu.c b/epan/dissectors/packet-usb-dfu.c index 412f7c580b..56cb2a5dcc 100644 --- a/epan/dissectors/packet-usb-dfu.c +++ b/epan/dissectors/packet-usb-dfu.c @@ -570,7 +570,7 @@ proto_reg_handoff_usb_dfu(void) { dissector_handle_t usf_dfu_descriptor_handle; - usf_dfu_descriptor_handle = new_create_dissector_handle(dissect_usb_dfu_descriptor, proto_usb_dfu); + usf_dfu_descriptor_handle = create_dissector_handle(dissect_usb_dfu_descriptor, proto_usb_dfu); dissector_add_uint("usb.descriptor", IF_CLASS_APPLICATION_SPECIFIC, usf_dfu_descriptor_handle); dissector_add_uint("usb.product", (0x1d50 << 16) | 0x1db5, usb_dfu_handle); /* IDBG in DFU mode */ diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index b7dfc2cb56..29175c5b3e 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -1967,11 +1967,11 @@ proto_reg_handoff_usb_hid(void) { dissector_handle_t usb_hid_control_handle, usb_hid_descr_handle; - usb_hid_control_handle = new_create_dissector_handle( + usb_hid_control_handle = create_dissector_handle( dissect_usb_hid_control, proto_usb_hid); dissector_add_uint("usb.control", IF_CLASS_HID, usb_hid_control_handle); - usb_hid_descr_handle = new_create_dissector_handle( + usb_hid_descr_handle = create_dissector_handle( dissect_usb_hid_class_descriptors, proto_usb_hid); dissector_add_uint("usb.descriptor", IF_CLASS_HID, usb_hid_descr_handle); } diff --git a/epan/dissectors/packet-usb-hub.c b/epan/dissectors/packet-usb-hub.c index ce6edb3605..e3ae73883b 100644 --- a/epan/dissectors/packet-usb-hub.c +++ b/epan/dissectors/packet-usb-hub.c @@ -822,7 +822,7 @@ proto_reg_handoff_usb_hub(void) { dissector_handle_t usb_hub_control_handle; - usb_hub_control_handle = new_create_dissector_handle(dissect_usb_hub_control, proto_usb_hub); + usb_hub_control_handle = create_dissector_handle(dissect_usb_hub_control, proto_usb_hub); dissector_add_uint("usb.control", IF_CLASS_HUB, usb_hub_control_handle); dissector_add_uint("usb.control", IF_CLASS_UNKNOWN, usb_hub_control_handle); } diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c index 48acac126f..094e34762f 100644 --- a/epan/dissectors/packet-usb-masstorage.c +++ b/epan/dissectors/packet-usb-masstorage.c @@ -463,7 +463,7 @@ proto_reg_handoff_usb_ms(void) usb_ms_bulk_handle = find_dissector("usbms"); dissector_add_uint("usb.bulk", IF_CLASS_MASS_STORAGE, usb_ms_bulk_handle); - usb_ms_control_handle = new_create_dissector_handle(dissect_usb_ms_control, proto_usb_ms); + usb_ms_control_handle = create_dissector_handle(dissect_usb_ms_control, proto_usb_ms); dissector_add_uint("usb.control", IF_CLASS_MASS_STORAGE, usb_ms_control_handle); heur_dissector_add("usb.bulk", dissect_usb_ms_bulk_heur, "Mass Storage USB bulk endpoint", "ms_usb_bulk", proto_usb_ms, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-usb-video.c b/epan/dissectors/packet-usb-video.c index 3f22c29e50..0bc292000f 100644 --- a/epan/dissectors/packet-usb-video.c +++ b/epan/dissectors/packet-usb-video.c @@ -3254,13 +3254,13 @@ proto_reg_handoff_usb_vid(void) dissector_handle_t usb_vid_descriptor_handle; dissector_handle_t usb_vid_interrupt_handle; - usb_vid_control_handle = new_create_dissector_handle(dissect_usb_vid_control, proto_usb_vid); + usb_vid_control_handle = create_dissector_handle(dissect_usb_vid_control, proto_usb_vid); dissector_add_uint("usb.control", IF_CLASS_VIDEO, usb_vid_control_handle); - usb_vid_descriptor_handle = new_create_dissector_handle(dissect_usb_vid_descriptor, proto_usb_vid); + usb_vid_descriptor_handle = create_dissector_handle(dissect_usb_vid_descriptor, proto_usb_vid); dissector_add_uint("usb.descriptor", IF_CLASS_VIDEO, usb_vid_descriptor_handle); - usb_vid_interrupt_handle = new_create_dissector_handle(dissect_usb_vid_interrupt, proto_usb_vid); + usb_vid_interrupt_handle = create_dissector_handle(dissect_usb_vid_interrupt, proto_usb_vid); dissector_add_uint("usb.interrupt", IF_CLASS_VIDEO, usb_vid_interrupt_handle); } /* diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index e4ed162131..12991cc4f9 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -4560,9 +4560,9 @@ proto_reg_handoff_usb(void) data_handle = find_dissector("data"); - linux_usb_mmapped_handle = new_create_dissector_handle(dissect_linux_usb_mmapped, + linux_usb_mmapped_handle = create_dissector_handle(dissect_linux_usb_mmapped, proto_usb); - win32_usb_handle = new_create_dissector_handle(dissect_win32_usb, proto_usb); + win32_usb_handle = create_dissector_handle(dissect_win32_usb, proto_usb); dissector_add_uint("wtap_encap", WTAP_ENCAP_USB_LINUX, linux_usb_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_USB_LINUX_MMAPPED, linux_usb_mmapped_handle); diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index eaf321b846..851051a7c7 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -1645,7 +1645,7 @@ proto_reg_handoff_v5ua(void) { dissector_handle_t v5ua_handle; - v5ua_handle = new_create_dissector_handle(dissect_v5ua, proto_v5ua); + v5ua_handle = create_dissector_handle(dissect_v5ua, proto_v5ua); q931_handle = find_dissector("q931"); v52_handle = find_dissector("v52"); diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c index d46db0c3ce..e96a95d771 100644 --- a/epan/dissectors/packet-vicp.c +++ b/epan/dissectors/packet-vicp.c @@ -115,7 +115,7 @@ void proto_register_vicp(void) void proto_reg_handoff_vicp(void) { dissector_handle_t vicp_handle; - vicp_handle = new_create_dissector_handle(dissect_vicp, proto_vicp); + vicp_handle = create_dissector_handle(dissect_vicp, proto_vicp); dissector_add_uint("tcp.port", VICP_PORT, vicp_handle); } diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index ecc494c6ec..fa58b881d4 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -418,11 +418,11 @@ proto_reg_handoff_vines_frp(void) { dissector_handle_t vines_frp_handle, vines_frp_new_handle; - vines_frp_handle = new_create_dissector_handle(dissect_vines_frp, + vines_frp_handle = create_dissector_handle(dissect_vines_frp, proto_vines_frp); dissector_add_uint("ip.proto", IP_PROTO_VINES, vines_frp_handle); - vines_frp_new_handle = new_create_dissector_handle(dissect_vines_frp_new, + vines_frp_new_handle = create_dissector_handle(dissect_vines_frp_new, proto_vines_frp); dissector_add_uint("udp.port", UDP_PORT_VINES, vines_frp_new_handle); } @@ -497,7 +497,7 @@ proto_reg_handoff_vines_llc(void) { dissector_handle_t vines_llc_handle; - vines_llc_handle = new_create_dissector_handle(dissect_vines_llc, + vines_llc_handle = create_dissector_handle(dissect_vines_llc, proto_vines_llc); dissector_add_uint("llc.dsap", SAP_VINES2, vines_llc_handle); } @@ -695,7 +695,7 @@ proto_register_vines_ip(void) vines_ip_dissector_table = register_dissector_table("vines_ip.protocol", "Vines protocol", FT_UINT8, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE); - vines_ip_handle = new_create_dissector_handle(dissect_vines_ip, + vines_ip_handle = create_dissector_handle(dissect_vines_ip, proto_vines_ip); } @@ -752,7 +752,7 @@ proto_reg_handoff_vines_echo(void) { dissector_handle_t vines_echo_handle; - vines_echo_handle = new_create_dissector_handle(dissect_vines_echo, + vines_echo_handle = create_dissector_handle(dissect_vines_echo, proto_vines_echo); dissector_add_uint("vines_llc.ptype", VINES_LLC_ECHO, vines_echo_handle); dissector_add_uint("ethertype", ETHERTYPE_VINES_ECHO, vines_echo_handle); @@ -1001,7 +1001,7 @@ proto_reg_handoff_vines_ipc(void) { dissector_handle_t vines_ipc_handle; - vines_ipc_handle = new_create_dissector_handle(dissect_vines_ipc, + vines_ipc_handle = create_dissector_handle(dissect_vines_ipc, proto_vines_ipc); dissector_add_uint("vines_ip.protocol", VIP_PROTO_IPC, vines_ipc_handle); } @@ -1169,7 +1169,7 @@ proto_reg_handoff_vines_spp(void) { dissector_handle_t vines_spp_handle; - vines_spp_handle = new_create_dissector_handle(dissect_vines_spp, + vines_spp_handle = create_dissector_handle(dissect_vines_spp, proto_vines_spp); dissector_add_uint("vines_ip.protocol", VIP_PROTO_SPP, vines_spp_handle); } @@ -1304,7 +1304,7 @@ proto_reg_handoff_vines_arp(void) { dissector_handle_t vines_arp_handle; - vines_arp_handle = new_create_dissector_handle(dissect_vines_arp, + vines_arp_handle = create_dissector_handle(dissect_vines_arp, proto_vines_arp); dissector_add_uint("vines_ip.protocol", VIP_PROTO_ARP, vines_arp_handle); } @@ -1901,7 +1901,7 @@ proto_reg_handoff_vines_rtp(void) { dissector_handle_t vines_rtp_handle; - vines_rtp_handle = new_create_dissector_handle(dissect_vines_rtp, + vines_rtp_handle = create_dissector_handle(dissect_vines_rtp, proto_vines_rtp); dissector_add_uint("vines_ip.protocol", VIP_PROTO_RTP, vines_rtp_handle); } @@ -2012,7 +2012,7 @@ proto_reg_handoff_vines_icp(void) { dissector_handle_t vines_icp_handle; - vines_icp_handle = new_create_dissector_handle(dissect_vines_icp, + vines_icp_handle = create_dissector_handle(dissect_vines_icp, proto_vines_icp); dissector_add_uint("vines_ip.protocol", VIP_PROTO_ICP, vines_icp_handle); } diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index fbbb5d32c4..4f45ef1d20 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -246,7 +246,7 @@ proto_register_vlan(void) "The (hexadecimal) Ethertype used to indicate 802.1QinQ VLAN in VLAN tunneling.", 16, &q_in_q_ethertype); - vlan_handle = new_create_dissector_handle(dissect_vlan, proto_vlan); + vlan_handle = create_dissector_handle(dissect_vlan, proto_vlan); } void diff --git a/epan/dissectors/packet-vmlab.c b/epan/dissectors/packet-vmlab.c index b9f3b35f44..ff1c2547a7 100644 --- a/epan/dissectors/packet-vmlab.c +++ b/epan/dissectors/packet-vmlab.c @@ -181,7 +181,7 @@ proto_reg_handoff_vmlab(void) { dissector_handle_t vmlab_handle; - vmlab_handle = new_create_dissector_handle(dissect_vmlab, proto_vmlab); + vmlab_handle = create_dissector_handle(dissect_vmlab, proto_vmlab); dissector_add_uint("ethertype", ETHERTYPE_VMLAB, vmlab_handle); diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 7dafb4eb9f..977edb51e5 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -4780,7 +4780,7 @@ proto_reg_handoff_vnc(void) static guint vnc_preference_alternate_port_last = 0; if(!inited) { - vnc_handle = new_create_dissector_handle(dissect_vnc, proto_vnc); + vnc_handle = create_dissector_handle(dissect_vnc, proto_vnc); dissector_add_uint("tcp.port", 5500, vnc_handle); dissector_add_uint("tcp.port", 5501, vnc_handle); diff --git a/epan/dissectors/packet-vntag.c b/epan/dissectors/packet-vntag.c index 968d8e5df9..c07ef581e7 100644 --- a/epan/dissectors/packet-vntag.c +++ b/epan/dissectors/packet-vntag.c @@ -173,7 +173,7 @@ proto_reg_handoff_vntag(void) /* XXX, add 0x8926 define to epan/etypes.h && etype_vals */ - vntag_handle = new_create_dissector_handle(dissect_vntag, proto_vntag); + vntag_handle = create_dissector_handle(dissect_vntag, proto_vntag); dissector_add_uint("ethertype", ETHERTYPE_VNTAG, vntag_handle); ethertype_handle = find_dissector("ethertype"); diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index 00da577395..89324ce1e6 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.c @@ -350,7 +350,7 @@ proto_reg_handoff_vrrp(void) { dissector_handle_t vrrp_handle; - vrrp_handle = new_create_dissector_handle(dissect_vrrp, proto_vrrp); + vrrp_handle = create_dissector_handle(dissect_vrrp, proto_vrrp); dissector_add_uint("ip.proto", IP_PROTO_VRRP, vrrp_handle); } diff --git a/epan/dissectors/packet-vrt.c b/epan/dissectors/packet-vrt.c index f6eba486e3..129136bd23 100644 --- a/epan/dissectors/packet-vrt.c +++ b/epan/dissectors/packet-vrt.c @@ -661,7 +661,7 @@ proto_reg_handoff_vrt(void) static gint dissector_port; if (!vrt_prefs_initialized) { - vrt_handle = new_create_dissector_handle(dissect_vrt, proto_vrt); + vrt_handle = create_dissector_handle(dissect_vrt, proto_vrt); vrt_prefs_initialized = TRUE; } else { dissector_delete_uint("udp.port", dissector_port, vrt_handle); diff --git a/epan/dissectors/packet-vsip.c b/epan/dissectors/packet-vsip.c index 621f4b6d1b..740a680053 100644 --- a/epan/dissectors/packet-vsip.c +++ b/epan/dissectors/packet-vsip.c @@ -2080,7 +2080,7 @@ void proto_reg_handoff_vsip(void) { dissector_handle_t vsip_handle; - vsip_handle = new_create_dissector_handle(dissect_vsip, proto_vsip); + vsip_handle = create_dissector_handle(dissect_vsip, proto_vsip); dissector_add_for_decode_as("udp.port", vsip_handle); dissector_add_for_decode_as("tcp.port", vsip_handle); } diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index d7fffa8719..3576a20baa 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.c @@ -679,7 +679,7 @@ proto_reg_handoff_vtp(void) { dissector_handle_t vtp_handle; - vtp_handle = new_create_dissector_handle(dissect_vtp, proto_vtp); + vtp_handle = create_dissector_handle(dissect_vtp, proto_vtp); dissector_add_uint("llc.cisco_pid", 0x2003, vtp_handle); } diff --git a/epan/dissectors/packet-vxlan.c b/epan/dissectors/packet-vxlan.c index 92fe9f5b35..97beca6c22 100644 --- a/epan/dissectors/packet-vxlan.c +++ b/epan/dissectors/packet-vxlan.c @@ -198,7 +198,7 @@ proto_reg_handoff_vxlan(void) eth_handle = find_dissector("eth"); - vxlan_handle = new_create_dissector_handle(dissect_vxlan, proto_vxlan); + vxlan_handle = create_dissector_handle(dissect_vxlan, proto_vxlan); dissector_add_uint("udp.port", UDP_PORT_VXLAN, vxlan_handle); dissector_add_for_decode_as("udp.port", vxlan_handle); diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index 8883b2aca3..9533434e20 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -2096,7 +2096,7 @@ proto_reg_handoff_wassp(void) dissector_handle_t wassp_handle; - wassp_handle = new_create_dissector_handle(dissect_wassp_static, proto_wassp); + wassp_handle = create_dissector_handle(dissect_wassp_static, proto_wassp); dissector_add_uint("udp.port", PORT_WASSP_DISCOVER, wassp_handle); dissector_add_uint("udp.port", PORT_WASSP_TUNNEL, wassp_handle); /* dissector_add_uint("udp.port", PORT_WASSP_PEER, wassp_handle); */ diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 3e6d046273..77ec6eebd4 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -3566,7 +3566,7 @@ proto_reg_handoff_wccp(void) { dissector_handle_t wccp_handle; - wccp_handle = new_create_dissector_handle(dissect_wccp, proto_wccp); + wccp_handle = create_dissector_handle(dissect_wccp, proto_wccp); dissector_add_uint("udp.port", UDP_PORT_WCCP, wccp_handle); } diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index b7d678e19b..97db350d83 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -790,7 +790,7 @@ proto_reg_handoff_wcp(void) { */ fr_uncompressed_handle = find_dissector("fr_uncompressed"); - wcp_handle = new_create_dissector_handle(dissect_wcp, proto_wcp); + wcp_handle = create_dissector_handle(dissect_wcp, proto_wcp); dissector_add_uint("fr.nlpid", NLPID_COMPRESSED, wcp_handle); dissector_add_uint("ethertype", ETHERTYPE_WCP, wcp_handle); } diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c index 45c170bc83..8fe5e6baa6 100644 --- a/epan/dissectors/packet-who.c +++ b/epan/dissectors/packet-who.c @@ -286,7 +286,7 @@ proto_reg_handoff_who(void) { dissector_handle_t who_handle; - who_handle = new_create_dissector_handle(dissect_who, proto_who); + who_handle = create_dissector_handle(dissect_who, proto_who); dissector_add_uint("udp.port", UDP_PORT_WHO, who_handle); } diff --git a/epan/dissectors/packet-whois.c b/epan/dissectors/packet-whois.c index d74a0f04b7..6074875fc9 100644 --- a/epan/dissectors/packet-whois.c +++ b/epan/dissectors/packet-whois.c @@ -202,7 +202,7 @@ proto_reg_handoff_whois(void) { static dissector_handle_t whois_handle; - whois_handle = new_create_dissector_handle(dissect_whois, proto_whois); + whois_handle = create_dissector_handle(dissect_whois, proto_whois); dissector_add_uint("tcp.port", WHOIS_PORT, whois_handle); } diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index e3e33849c5..a28f9e4457 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -879,7 +879,7 @@ proto_reg_handoff_winsrepl(void) { dissector_handle_t winsrepl_handle; - winsrepl_handle = new_create_dissector_handle(dissect_winsrepl, proto_winsrepl); + winsrepl_handle = create_dissector_handle(dissect_winsrepl, proto_winsrepl); dissector_add_uint("tcp.port", glb_winsrepl_tcp_port, winsrepl_handle); } diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index 4297172c4b..9c5d7ad0af 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -4103,7 +4103,7 @@ proto_reg_handoff_wlccp(void) { dissector_handle_t wlccp_handle; - wlccp_handle = new_create_dissector_handle(dissect_wlccp, proto_wlccp); + wlccp_handle = create_dissector_handle(dissect_wlccp, proto_wlccp); dissector_add_uint("ethertype", ETHERTYPE_WLCCP, wlccp_handle); dissector_add_uint("udp.port", WLCCP_UDP_PORT, wlccp_handle); diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c index ef31f3b989..eec08b8cab 100644 --- a/epan/dissectors/packet-wol.c +++ b/epan/dissectors/packet-wol.c @@ -317,11 +317,11 @@ proto_reg_handoff_wol(void) { dissector_handle_t wol_handle; -/* Use new_create_dissector_handle() to indicate that dissect_wol() +/* Use create_dissector_handle() to indicate that dissect_wol() * returns the number of bytes it dissected (or 0 if it thinks the packet * does not belong to PROTONAME). */ - wol_handle = new_create_dissector_handle(dissect_wol, proto_wol); + wol_handle = create_dissector_handle(dissect_wol, proto_wol); /* We don't really want to register with EVERY possible dissector, * do we? I know that the AMD white paper specifies that the diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c index 766de88930..c4148df6cd 100644 --- a/epan/dissectors/packet-wow.c +++ b/epan/dissectors/packet-wow.c @@ -635,7 +635,7 @@ proto_reg_handoff_wow(void) { dissector_handle_t wow_handle; - wow_handle = new_create_dissector_handle(dissect_wow, proto_wow); + wow_handle = create_dissector_handle(dissect_wow, proto_wow); dissector_add_uint("tcp.port", WOW_PORT, wow_handle); } diff --git a/epan/dissectors/packet-wreth.c b/epan/dissectors/packet-wreth.c index e022faf27a..4eaf03ea59 100644 --- a/epan/dissectors/packet-wreth.c +++ b/epan/dissectors/packet-wreth.c @@ -1997,7 +1997,7 @@ void proto_reg_handoff_wreth(void) { dissector_handle_t wreth_handle; - wreth_handle = new_create_dissector_handle(dissect_wreth, wreth_proto); + wreth_handle = create_dissector_handle(dissect_wreth, wreth_proto); dissector_add_uint("ethertype", WRETH_PORT, wreth_handle); } diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c index f159bee39a..18975569b5 100644 --- a/epan/dissectors/packet-wsmp.c +++ b/epan/dissectors/packet-wsmp.c @@ -256,7 +256,7 @@ proto_reg_handoff_wsmp(void) { dissector_handle_t wsmp_handle; - wsmp_handle = new_create_dissector_handle(dissect_wsmp, proto_wsmp); + wsmp_handle = create_dissector_handle(dissect_wsmp, proto_wsmp); dissector_add_uint("ethertype", ETHERTYPE_WSMP, wsmp_handle); data_handle = find_dissector("data"); return; diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 4f8de47932..025f5b6479 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -7165,7 +7165,7 @@ proto_register_wsp(void) new_register_dissector("wsp-cl", dissect_wsp_fromwap_cl, proto_wsp); heur_subdissector_list = register_heur_dissector_list("wsp"); - wsp_fromudp_handle = new_create_dissector_handle(dissect_wsp_fromudp, + wsp_fromudp_handle = create_dissector_handle(dissect_wsp_fromudp, proto_wsp); } @@ -7356,7 +7356,7 @@ proto_reg_handoff_sir(void) { dissector_handle_t sir_handle; - sir_handle = new_create_dissector_handle(dissect_sir, proto_sir); + sir_handle = create_dissector_handle(dissect_sir, proto_sir); /* Add dissector bindings for SIR dissection */ dissector_add_string("media_type", "application/vnd.wap.sia", sir_handle); diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c index 44786dd7fa..115c7c2c5b 100644 --- a/epan/dissectors/packet-wtls.c +++ b/epan/dissectors/packet-wtls.c @@ -1586,7 +1586,7 @@ proto_reg_handoff_wtls(void) { dissector_handle_t wtls_handle; - wtls_handle = new_create_dissector_handle(dissect_wtls, proto_wtls); + wtls_handle = create_dissector_handle(dissect_wtls, proto_wtls); dissector_add_uint("udp.port", UDP_PORT_WTLS_WSP, wtls_handle); dissector_add_uint("udp.port", UDP_PORT_WTLS_WTP_WSP, wtls_handle); dissector_add_uint("udp.port", UDP_PORT_WTLS_WSP_PUSH,wtls_handle); diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index 68180202d6..ccfb8bae75 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -5863,7 +5863,7 @@ proto_reg_handoff_x11(void) { dissector_handle_t x11_handle; - x11_handle = new_create_dissector_handle(dissect_x11, proto_x11); + x11_handle = create_dissector_handle(dissect_x11, proto_x11); dissector_add_uint("tcp.port", TCP_PORT_X11, x11_handle); dissector_add_uint("tcp.port", TCP_PORT_X11_2, x11_handle); dissector_add_uint("tcp.port", TCP_PORT_X11_3, x11_handle); diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c index cdffad2443..c2197e9f34 100644 --- a/epan/dissectors/packet-x29.c +++ b/epan/dissectors/packet-x29.c @@ -278,7 +278,7 @@ proto_reg_handoff_x29(void) { dissector_handle_t x29_handle; - x29_handle = new_create_dissector_handle(dissect_x29, proto_x29); + x29_handle = create_dissector_handle(dissect_x29, proto_x29); dissector_add_uint("x.25.spi", NLPID_SPI_X_29, x29_handle); } diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c index 59f433c76b..dbdf564703 100644 --- a/epan/dissectors/packet-xdmcp.c +++ b/epan/dissectors/packet-xdmcp.c @@ -625,7 +625,7 @@ proto_reg_handoff_xdmcp(void) { dissector_handle_t xdmcp_handle; - xdmcp_handle = new_create_dissector_handle(dissect_xdmcp, proto_xdmcp); + xdmcp_handle = create_dissector_handle(dissect_xdmcp, proto_xdmcp); dissector_add_uint("udp.port", UDP_PORT_XDMCP, xdmcp_handle); } /* diff --git a/epan/dissectors/packet-xip.c b/epan/dissectors/packet-xip.c index 86d2cf879d..ab1d191be8 100644 --- a/epan/dissectors/packet-xip.c +++ b/epan/dissectors/packet-xip.c @@ -696,7 +696,7 @@ proto_reg_handoff_xip(void) { dissector_handle_t xip_handle; - xip_handle = new_create_dissector_handle(dissect_xip, proto_xip); + xip_handle = create_dissector_handle(dissect_xip, proto_xip); dissector_add_uint("ethertype", ETHERTYPE_XIP, xip_handle); xip_serval_handle = find_dissector("xipserval"); diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index 2084053972..f64c002dbf 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -1369,7 +1369,7 @@ proto_reg_handoff_xmcp(void) static guint xmcp_tcp_port; if (!xmcp_prefs_initialized) { - xmcp_tcp_handle = new_create_dissector_handle(dissect_xmcp_tcp, proto_xmcp); + xmcp_tcp_handle = create_dissector_handle(dissect_xmcp_tcp, proto_xmcp); heur_dissector_add("tcp", dissect_xmcp_heur, "XMCP over TCP", "xmcp_tcp", proto_xmcp, HEURISTIC_ENABLE); media_type_dissector_table = find_dissector_table("media_type"); xmcp_prefs_initialized = TRUE; diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c index 29eaba8681..2f81a16cc5 100644 --- a/epan/dissectors/packet-xtp.c +++ b/epan/dissectors/packet-xtp.c @@ -1410,7 +1410,7 @@ proto_reg_handoff_xtp(void) { dissector_handle_t xtp_handle; - xtp_handle = new_create_dissector_handle(dissect_xtp, proto_xtp); + xtp_handle = create_dissector_handle(dissect_xtp, proto_xtp); dissector_add_uint("ip.proto", IP_PROTO_XTP, xtp_handle); } diff --git a/epan/dissectors/packet-xyplex.c b/epan/dissectors/packet-xyplex.c index 9f404037a2..33249887d9 100644 --- a/epan/dissectors/packet-xyplex.c +++ b/epan/dissectors/packet-xyplex.c @@ -205,7 +205,7 @@ proto_register_xyplex(void) void proto_reg_handoff_xyplex(void) { - xyplex_handle = new_create_dissector_handle(dissect_xyplex, proto_xyplex); + xyplex_handle = create_dissector_handle(dissect_xyplex, proto_xyplex); dissector_add_uint("udp.port", UDP_PORT_XYPLEX, xyplex_handle); } diff --git a/epan/dissectors/packet-yami.c b/epan/dissectors/packet-yami.c index a1e4bc91e4..cbf51c8f5e 100644 --- a/epan/dissectors/packet-yami.c +++ b/epan/dissectors/packet-yami.c @@ -596,7 +596,7 @@ proto_register_yami(void) "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &yami_desegment); - yami_handle = new_create_dissector_handle(dissect_yami, proto_yami); + yami_handle = create_dissector_handle(dissect_yami, proto_yami); } void diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index 9f76262f85..6f8d2c2920 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.c @@ -878,7 +878,7 @@ proto_reg_handoff_zebra(void) { dissector_handle_t zebra_handle; - zebra_handle = new_create_dissector_handle(dissect_zebra, proto_zebra); + zebra_handle = create_dissector_handle(dissect_zebra, proto_zebra); dissector_add_uint("tcp.port", TCP_PORT_ZEBRA, zebra_handle); } diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c index 2e7bbb57d4..08d0495033 100644 --- a/epan/dissectors/packet-ziop.c +++ b/epan/dissectors/packet-ziop.c @@ -329,7 +329,7 @@ proto_register_ziop (void) void proto_reg_handoff_ziop (void) { - ziop_tcp_handle = new_create_dissector_handle(dissect_ziop_tcp, proto_ziop); + ziop_tcp_handle = create_dissector_handle(dissect_ziop_tcp, proto_ziop); dissector_add_for_decode_as("udp.port", ziop_tcp_handle); heur_dissector_add("tcp", dissect_ziop_heur, "ZIOP over TCP", "ziop_tcp", proto_ziop, HEURISTIC_ENABLE); diff --git a/epan/dissectors/packet-zvt.c b/epan/dissectors/packet-zvt.c index 1827a0df19..ca59b75e8f 100644 --- a/epan/dissectors/packet-zvt.c +++ b/epan/dissectors/packet-zvt.c @@ -909,7 +909,7 @@ proto_reg_handoff_zvt(void) /* register by name to allow mapping to a user DLT */ new_register_dissector("zvt", dissect_zvt, proto_zvt); - zvt_tcp_handle = new_create_dissector_handle(dissect_zvt_tcp, proto_zvt); + zvt_tcp_handle = create_dissector_handle(dissect_zvt_tcp, proto_zvt); registered_dissector = TRUE; } |