From a8bc4a0d136d7a68e8f006aec75a8e63191948c9 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 20 Dec 2010 05:35:29 +0000 Subject: Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224 --- epan/dissectors/packet-lapd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'epan/dissectors/packet-lapd.c') diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index 0c25fb96d2..b55dfd5517 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -530,11 +530,11 @@ dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (XDLC_IS_INFORMATION(control)) { /* call next protocol */ if(global_lapd_gsm_sapis){ - if (!dissector_try_port(lapd_gsm_sapi_dissector_table, sapi, + if (!dissector_try_uint(lapd_gsm_sapi_dissector_table, sapi, next_tvb, pinfo, tree)) call_dissector(data_handle,next_tvb, pinfo, tree); }else{ - if (!dissector_try_port(lapd_sapi_dissector_table, sapi, + if (!dissector_try_uint(lapd_sapi_dissector_table, sapi, next_tvb, pinfo, tree)) call_dissector(data_handle,next_tvb, pinfo, tree); } @@ -694,7 +694,7 @@ proto_reg_handoff_lapd(void) dissector_handle_t lapd_handle; lapd_handle = find_dissector("lapd"); - dissector_add("wtap_encap", WTAP_ENCAP_LINUX_LAPD, lapd_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_LINUX_LAPD, lapd_handle); lapd_bitstream_handle = create_dissector_handle(dissect_lapd_bitstream, proto_lapd); data_handle = find_dissector("data"); @@ -702,11 +702,11 @@ proto_reg_handoff_lapd(void) init = TRUE; } else { if ((lapd_rtp_payload_type > 95) && (lapd_rtp_payload_type < 128)) - dissector_delete("rtp.pt", lapd_rtp_payload_type, lapd_bitstream_handle); + dissector_delete_uint("rtp.pt", lapd_rtp_payload_type, lapd_bitstream_handle); } lapd_rtp_payload_type = pref_lapd_rtp_payload_type; if ((lapd_rtp_payload_type > 95) && (lapd_rtp_payload_type < 128)) - dissector_add("rtp.pt", lapd_rtp_payload_type, lapd_bitstream_handle); + dissector_add_uint("rtp.pt", lapd_rtp_payload_type, lapd_bitstream_handle); } -- cgit v1.2.3