diff options
Diffstat (limited to 'plugins')
63 files changed, 82 insertions, 82 deletions
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c index d5b88260db..4719c16778 100644 --- a/plugins/asn1/packet-asn1.c +++ b/plugins/asn1/packet-asn1.c @@ -5101,42 +5101,42 @@ static void register_tcp_port(guint32 port) { if (port != 0) - dissector_add("tcp.port", port, asn1_handle); + dissector_add_uint("tcp.port", port, asn1_handle); } static void unregister_tcp_port(guint32 port) { if (port != 0) - dissector_delete("tcp.port", port, asn1_handle); + dissector_delete_uint("tcp.port", port, asn1_handle); } static void register_udp_port(guint32 port) { if (port != 0) - dissector_add("udp.port", port, asn1_handle); + dissector_add_uint("udp.port", port, asn1_handle); } static void unregister_udp_port(guint32 port) { if (port != 0) - dissector_delete("udp.port", port, asn1_handle); + dissector_delete_uint("udp.port", port, asn1_handle); } static void register_sctp_port(guint32 port) { if (port != 0) - dissector_add("sctp.port", port, asn1_handle); + dissector_add_uint("sctp.port", port, asn1_handle); } static void unregister_sctp_port(guint32 port) { if (port != 0) - dissector_delete("sctp.port", port, asn1_handle); + dissector_delete_uint("sctp.port", port, asn1_handle); } void diff --git a/plugins/docsis/packet-bintrngreq.c b/plugins/docsis/packet-bintrngreq.c index 2e822a5112..efa74f56af 100644 --- a/plugins/docsis/packet-bintrngreq.c +++ b/plugins/docsis/packet-bintrngreq.c @@ -152,5 +152,5 @@ proto_reg_handoff_docsis_bintrngreq (void) dissector_handle_t docsis_bintrngreq_handle; docsis_bintrngreq_handle = find_dissector ("docsis_bintrngreq"); - dissector_add ("docsis_mgmt", 0x22, docsis_bintrngreq_handle); + dissector_add_uint ("docsis_mgmt", 0x22, docsis_bintrngreq_handle); } diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c index 85e44412ff..6d9e677f76 100644 --- a/plugins/docsis/packet-bpkmattr.c +++ b/plugins/docsis/packet-bpkmattr.c @@ -566,6 +566,6 @@ proto_reg_handoff_docsis_bpkmattr (void) dissector_handle_t docsis_bpkmattr_handle; docsis_bpkmattr_handle = find_dissector ("docsis_bpkmattr"); - dissector_add ("docsis", 0xFE, docsis_bpkmattr_handle); + dissector_add_uint ("docsis", 0xFE, docsis_bpkmattr_handle); } diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c index 5119bc5ce3..9416a4951e 100644 --- a/plugins/docsis/packet-bpkmreq.c +++ b/plugins/docsis/packet-bpkmreq.c @@ -161,6 +161,6 @@ proto_reg_handoff_docsis_bpkmreq (void) docsis_bpkmreq_handle = find_dissector ("docsis_bpkmreq"); attrs_handle = find_dissector ("docsis_bpkmattr"); - dissector_add ("docsis_mgmt", 0x0C, docsis_bpkmreq_handle); + dissector_add_uint ("docsis_mgmt", 0x0C, docsis_bpkmreq_handle); } diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c index 9e65816ce7..0826c9b2ea 100644 --- a/plugins/docsis/packet-bpkmrsp.c +++ b/plugins/docsis/packet-bpkmrsp.c @@ -160,6 +160,6 @@ proto_reg_handoff_docsis_bpkmrsp (void) docsis_bpkmrsp_handle = find_dissector ("docsis_bpkmrsp"); attrs_handle = find_dissector ("docsis_bpkmattr"); - dissector_add ("docsis_mgmt", 0x0D, docsis_bpkmrsp_handle); + dissector_add_uint ("docsis_mgmt", 0x0D, docsis_bpkmrsp_handle); } diff --git a/plugins/docsis/packet-cmctrlreq.c b/plugins/docsis/packet-cmctrlreq.c index a745634cef..7ed5b2599a 100644 --- a/plugins/docsis/packet-cmctrlreq.c +++ b/plugins/docsis/packet-cmctrlreq.c @@ -118,5 +118,5 @@ proto_reg_handoff_docsis_cmctrlreq (void) docsis_cmctrlreq_handle = find_dissector ("docsis_cmctrlreq"); cmctrl_tlv_handle = find_dissector ("cmctrl_tlv"); - dissector_add ("docsis_mgmt", 0x2A, docsis_cmctrlreq_handle); + dissector_add_uint ("docsis_mgmt", 0x2A, docsis_cmctrlreq_handle); } diff --git a/plugins/docsis/packet-cmctrlrsp.c b/plugins/docsis/packet-cmctrlrsp.c index 88b3911f98..cb255126e6 100644 --- a/plugins/docsis/packet-cmctrlrsp.c +++ b/plugins/docsis/packet-cmctrlrsp.c @@ -126,5 +126,5 @@ proto_reg_handoff_docsis_cmctrlrsp (void) docsis_cmctrlrsp_handle = find_dissector ("docsis_cmctrlrsp"); cmctrl_tlv_handle = find_dissector ("cmctrl_tlv"); - dissector_add ("docsis_mgmt", 0x2B, docsis_cmctrlrsp_handle); + dissector_add_uint ("docsis_mgmt", 0x2B, docsis_cmctrlrsp_handle); } diff --git a/plugins/docsis/packet-dbcack.c b/plugins/docsis/packet-dbcack.c index cb726c48b8..d8a50f7dde 100644 --- a/plugins/docsis/packet-dbcack.c +++ b/plugins/docsis/packet-dbcack.c @@ -113,5 +113,5 @@ proto_reg_handoff_docsis_dbcack (void) docsis_dbcack_handle = find_dissector ("docsis_dbcack"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x26, docsis_dbcack_handle); + dissector_add_uint ("docsis_mgmt", 0x26, docsis_dbcack_handle); } diff --git a/plugins/docsis/packet-dbcreq.c b/plugins/docsis/packet-dbcreq.c index 20061a740c..6e90d996d3 100644 --- a/plugins/docsis/packet-dbcreq.c +++ b/plugins/docsis/packet-dbcreq.c @@ -129,5 +129,5 @@ proto_reg_handoff_docsis_dbcreq (void) docsis_dbcreq_handle = find_dissector ("docsis_dbcreq"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x24, docsis_dbcreq_handle); + dissector_add_uint ("docsis_mgmt", 0x24, docsis_dbcreq_handle); } diff --git a/plugins/docsis/packet-dbcrsp.c b/plugins/docsis/packet-dbcrsp.c index 13d8fab1e9..305f98796e 100644 --- a/plugins/docsis/packet-dbcrsp.c +++ b/plugins/docsis/packet-dbcrsp.c @@ -126,5 +126,5 @@ proto_reg_handoff_docsis_dbcrsp (void) docsis_dbcrsp_handle = find_dissector ("docsis_dbcrsp"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x25, docsis_dbcrsp_handle); + dissector_add_uint ("docsis_mgmt", 0x25, docsis_dbcrsp_handle); } diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c index 278fa87e50..01d69ca493 100644 --- a/plugins/docsis/packet-dccack.c +++ b/plugins/docsis/packet-dccack.c @@ -171,6 +171,6 @@ proto_reg_handoff_docsis_dccack (void) dissector_handle_t docsis_dccack_handle; docsis_dccack_handle = find_dissector ("docsis_dccack"); - dissector_add ("docsis_mgmt", 0x19, docsis_dccack_handle); + dissector_add_uint ("docsis_mgmt", 0x19, docsis_dccack_handle); } diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c index ba88ed41f3..ce7d84f42d 100644 --- a/plugins/docsis/packet-dccreq.c +++ b/plugins/docsis/packet-dccreq.c @@ -602,6 +602,6 @@ proto_reg_handoff_docsis_dccreq (void) dissector_handle_t docsis_dccreq_handle; docsis_dccreq_handle = find_dissector ("docsis_dccreq"); - dissector_add ("docsis_mgmt", 0x17, docsis_dccreq_handle); + dissector_add_uint ("docsis_mgmt", 0x17, docsis_dccreq_handle); } diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c index 07bbf4056b..87d2e10506 100644 --- a/plugins/docsis/packet-dccrsp.c +++ b/plugins/docsis/packet-dccrsp.c @@ -259,6 +259,6 @@ proto_reg_handoff_docsis_dccrsp (void) dissector_handle_t docsis_dccrsp_handle; docsis_dccrsp_handle = find_dissector ("docsis_dccrsp"); - dissector_add ("docsis_mgmt", 0x18, docsis_dccrsp_handle); + dissector_add_uint ("docsis_mgmt", 0x18, docsis_dccrsp_handle); } diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c index 987dd026c7..20a05401ea 100644 --- a/plugins/docsis/packet-dcd.c +++ b/plugins/docsis/packet-dcd.c @@ -848,6 +848,6 @@ proto_reg_handoff_docsis_dcd (void) dissector_handle_t docsis_dcd_handle; docsis_dcd_handle = find_dissector ("docsis_dcd"); - dissector_add ("docsis_mgmt", 0x20, docsis_dcd_handle); + dissector_add_uint ("docsis_mgmt", 0x20, docsis_dcd_handle); } diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index e69e8801ef..fcf8fcbedc 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -745,7 +745,7 @@ proto_reg_handoff_docsis (void) docsis_handle = find_dissector ("docsis"); data_handle = find_dissector ("data"); - dissector_add ("wtap_encap", WTAP_ENCAP_DOCSIS, docsis_handle); + dissector_add_uint ("wtap_encap", WTAP_ENCAP_DOCSIS, docsis_handle); docsis_mgmt_handle = find_dissector ("docsis_mgmt"); eth_withoutfcs_handle = find_dissector ("eth_withoutfcs"); diff --git a/plugins/docsis/packet-dpvreq.c b/plugins/docsis/packet-dpvreq.c index 91668e31d4..565e3810ec 100644 --- a/plugins/docsis/packet-dpvreq.c +++ b/plugins/docsis/packet-dpvreq.c @@ -178,5 +178,5 @@ proto_reg_handoff_docsis_dpvreq (void) dissector_handle_t docsis_dpvreq_handle; docsis_dpvreq_handle = find_dissector ("docsis_dpvreq"); - dissector_add ("docsis_mgmt", 0x27, docsis_dpvreq_handle); + dissector_add_uint ("docsis_mgmt", 0x27, docsis_dpvreq_handle); } diff --git a/plugins/docsis/packet-dpvrsp.c b/plugins/docsis/packet-dpvrsp.c index 96cd5b707e..df320a8458 100644 --- a/plugins/docsis/packet-dpvrsp.c +++ b/plugins/docsis/packet-dpvrsp.c @@ -178,5 +178,5 @@ proto_reg_handoff_docsis_dpvrsp (void) dissector_handle_t docsis_dpvrsp_handle; docsis_dpvrsp_handle = find_dissector ("docsis_dpvrsp"); - dissector_add ("docsis_mgmt", 0x28, docsis_dpvrsp_handle); + dissector_add_uint ("docsis_mgmt", 0x28, docsis_dpvrsp_handle); } diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c index 54ea240ce3..98fdb9b7fe 100644 --- a/plugins/docsis/packet-dsaack.c +++ b/plugins/docsis/packet-dsaack.c @@ -133,6 +133,6 @@ proto_reg_handoff_docsis_dsaack (void) docsis_dsaack_handle = find_dissector ("docsis_dsaack"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x11, docsis_dsaack_handle); + dissector_add_uint ("docsis_mgmt", 0x11, docsis_dsaack_handle); } diff --git a/plugins/docsis/packet-dsareq.c b/plugins/docsis/packet-dsareq.c index 024a10aea7..5724ee5a77 100644 --- a/plugins/docsis/packet-dsareq.c +++ b/plugins/docsis/packet-dsareq.c @@ -122,6 +122,6 @@ proto_reg_handoff_docsis_dsareq (void) docsis_dsareq_handle = find_dissector ("docsis_dsareq"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x0F, docsis_dsareq_handle); + dissector_add_uint ("docsis_mgmt", 0x0F, docsis_dsareq_handle); } diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c index f695827ca2..ec9745bb55 100644 --- a/plugins/docsis/packet-dsarsp.c +++ b/plugins/docsis/packet-dsarsp.c @@ -136,6 +136,6 @@ proto_reg_handoff_docsis_dsarsp (void) docsis_dsarsp_handle = find_dissector ("docsis_dsarsp"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x10, docsis_dsarsp_handle); + dissector_add_uint ("docsis_mgmt", 0x10, docsis_dsarsp_handle); } diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c index cacd65d33a..75ec51fa2a 100644 --- a/plugins/docsis/packet-dscack.c +++ b/plugins/docsis/packet-dscack.c @@ -135,6 +135,6 @@ proto_reg_handoff_docsis_dscack (void) docsis_dscack_handle = find_dissector ("docsis_dscack"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x14, docsis_dscack_handle); + dissector_add_uint ("docsis_mgmt", 0x14, docsis_dscack_handle); } diff --git a/plugins/docsis/packet-dscreq.c b/plugins/docsis/packet-dscreq.c index d4fbe90a3d..be580e258d 100644 --- a/plugins/docsis/packet-dscreq.c +++ b/plugins/docsis/packet-dscreq.c @@ -123,6 +123,6 @@ proto_reg_handoff_docsis_dscreq (void) docsis_dscreq_handle = find_dissector ("docsis_dscreq"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x12, docsis_dscreq_handle); + dissector_add_uint ("docsis_mgmt", 0x12, docsis_dscreq_handle); } diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c index 72e06bb094..9a9affb7fa 100644 --- a/plugins/docsis/packet-dscrsp.c +++ b/plugins/docsis/packet-dscrsp.c @@ -134,6 +134,6 @@ proto_reg_handoff_docsis_dscrsp (void) docsis_dscrsp_handle = find_dissector ("docsis_dscrsp"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x13, docsis_dscrsp_handle); + dissector_add_uint ("docsis_mgmt", 0x13, docsis_dscrsp_handle); } diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c index 2236051dad..2c060f4a0a 100644 --- a/plugins/docsis/packet-dsdreq.c +++ b/plugins/docsis/packet-dsdreq.c @@ -137,6 +137,6 @@ proto_reg_handoff_docsis_dsdreq (void) docsis_dsdreq_handle = find_dissector ("docsis_dsdreq"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x15, docsis_dsdreq_handle); + dissector_add_uint ("docsis_mgmt", 0x15, docsis_dsdreq_handle); } diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c index 016070969f..a7df2931ab 100644 --- a/plugins/docsis/packet-dsdrsp.c +++ b/plugins/docsis/packet-dsdrsp.c @@ -134,6 +134,6 @@ proto_reg_handoff_docsis_dsdrsp (void) dissector_handle_t docsis_dsdrsp_handle; docsis_dsdrsp_handle = find_dissector ("docsis_dsdrsp"); - dissector_add ("docsis_mgmt", 0x16, docsis_dsdrsp_handle); + dissector_add_uint ("docsis_mgmt", 0x16, docsis_dsdrsp_handle); } diff --git a/plugins/docsis/packet-intrngreq.c b/plugins/docsis/packet-intrngreq.c index 5f2d89b480..0042a138ba 100644 --- a/plugins/docsis/packet-intrngreq.c +++ b/plugins/docsis/packet-intrngreq.c @@ -133,6 +133,6 @@ proto_reg_handoff_docsis_intrngreq (void) dissector_handle_t docsis_intrngreq_handle; docsis_intrngreq_handle = find_dissector ("docsis_intrngreq"); - dissector_add ("docsis_mgmt", 0x1E, docsis_intrngreq_handle); + dissector_add_uint ("docsis_mgmt", 0x1E, docsis_intrngreq_handle); } diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c index 934f181d3a..430e9091a5 100644 --- a/plugins/docsis/packet-macmgmt.c +++ b/plugins/docsis/packet-macmgmt.c @@ -200,7 +200,7 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) msg_len = tvb_get_ntohs (tvb, 12); payload_tvb = tvb_new_subset (tvb, 20, msg_len - 6, msg_len - 6); - if (dissector_try_port + if (dissector_try_uint (docsis_mgmt_dissector_table, type, payload_tvb, pinfo, tree)) return; else @@ -305,5 +305,5 @@ proto_reg_handoff_docsis_mgmt (void) docsis_mgmt_handle = find_dissector ("docsis_mgmt"); data_handle = find_dissector ("data"); - dissector_add ("docsis", 0x03, docsis_mgmt_handle); + dissector_add_uint ("docsis", 0x03, docsis_mgmt_handle); } diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c index 18d4513973..5eef44901b 100644 --- a/plugins/docsis/packet-map.c +++ b/plugins/docsis/packet-map.c @@ -276,6 +276,6 @@ proto_reg_handoff_docsis_map (void) dissector_handle_t docsis_map_handle; docsis_map_handle = find_dissector ("docsis_map"); - dissector_add ("docsis_mgmt", 0x03, docsis_map_handle); + dissector_add_uint ("docsis_mgmt", 0x03, docsis_map_handle); } diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c index daaaeb2491..3a542c3c5f 100644 --- a/plugins/docsis/packet-mdd.c +++ b/plugins/docsis/packet-mdd.c @@ -762,5 +762,5 @@ proto_reg_handoff_docsis_mdd (void) dissector_handle_t docsis_mdd_handle; docsis_mdd_handle = find_dissector ("docsis_mdd"); - dissector_add ("docsis_mgmt", 33, docsis_mdd_handle); + dissector_add_uint ("docsis_mgmt", 33, docsis_mdd_handle); } diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c index 1cdfdf36d4..9544fecc3c 100644 --- a/plugins/docsis/packet-regack.c +++ b/plugins/docsis/packet-regack.c @@ -133,6 +133,6 @@ proto_reg_handoff_docsis_regack (void) docsis_regack_handle = find_dissector ("docsis_regack"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x0e, docsis_regack_handle); + dissector_add_uint ("docsis_mgmt", 0x0e, docsis_regack_handle); } diff --git a/plugins/docsis/packet-regreq.c b/plugins/docsis/packet-regreq.c index d80743eca4..1a6cce5bc8 100644 --- a/plugins/docsis/packet-regreq.c +++ b/plugins/docsis/packet-regreq.c @@ -125,6 +125,6 @@ proto_reg_handoff_docsis_regreq (void) docsis_regreq_handle = find_dissector ("docsis_regreq"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x06, docsis_regreq_handle); + dissector_add_uint ("docsis_mgmt", 0x06, docsis_regreq_handle); } diff --git a/plugins/docsis/packet-regreqmp.c b/plugins/docsis/packet-regreqmp.c index bf4021e326..d2326ec90c 100644 --- a/plugins/docsis/packet-regreqmp.c +++ b/plugins/docsis/packet-regreqmp.c @@ -132,5 +132,5 @@ proto_reg_handoff_docsis_regreqmp (void) docsis_tlv_handle = find_dissector ("docsis_tlv"); docsis_regreqmp_handle = find_dissector ("docsis_regreqmp"); - dissector_add ("docsis_mgmt", 44, docsis_regreqmp_handle); + dissector_add_uint ("docsis_mgmt", 44, docsis_regreqmp_handle); } diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c index 19c550aefe..f868d22ff9 100644 --- a/plugins/docsis/packet-regrsp.c +++ b/plugins/docsis/packet-regrsp.c @@ -131,6 +131,6 @@ proto_reg_handoff_docsis_regrsp (void) docsis_regrsp_handle = find_dissector ("docsis_regrsp"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x07, docsis_regrsp_handle); + dissector_add_uint ("docsis_mgmt", 0x07, docsis_regrsp_handle); } diff --git a/plugins/docsis/packet-regrspmp.c b/plugins/docsis/packet-regrspmp.c index a8a857c1af..272a033f37 100644 --- a/plugins/docsis/packet-regrspmp.c +++ b/plugins/docsis/packet-regrspmp.c @@ -144,5 +144,5 @@ proto_reg_handoff_docsis_regrspmp (void) docsis_tlv_handle = find_dissector ("docsis_tlv"); docsis_regrspmp_handle = find_dissector ("docsis_regrspmp"); - dissector_add ("docsis_mgmt", 45, docsis_regrspmp_handle); + dissector_add_uint ("docsis_mgmt", 45, docsis_regrspmp_handle); } diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c index 985734bc51..1fbb5f25c5 100644 --- a/plugins/docsis/packet-rngreq.c +++ b/plugins/docsis/packet-rngreq.c @@ -136,6 +136,6 @@ proto_reg_handoff_docsis_rngreq (void) dissector_handle_t docsis_rngreq_handle; docsis_rngreq_handle = find_dissector ("docsis_rngreq"); - dissector_add ("docsis_mgmt", 0x04, docsis_rngreq_handle); + dissector_add_uint ("docsis_mgmt", 0x04, docsis_rngreq_handle); } diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c index f2cb2c197c..3ec82d4f99 100644 --- a/plugins/docsis/packet-rngrsp.c +++ b/plugins/docsis/packet-rngrsp.c @@ -274,6 +274,6 @@ proto_reg_handoff_docsis_rngrsp (void) dissector_handle_t docsis_rngrsp_handle; docsis_rngrsp_handle = find_dissector ("docsis_rngrsp"); - dissector_add ("docsis_mgmt", 0x05, docsis_rngrsp_handle); + dissector_add_uint ("docsis_mgmt", 0x05, docsis_rngrsp_handle); } diff --git a/plugins/docsis/packet-sync.c b/plugins/docsis/packet-sync.c index 94e42a31ee..a21e54d30f 100644 --- a/plugins/docsis/packet-sync.c +++ b/plugins/docsis/packet-sync.c @@ -106,5 +106,5 @@ proto_reg_handoff_docsis_sync (void) dissector_handle_t docsis_sync_handle; docsis_sync_handle = find_dissector ("docsis_sync"); - dissector_add ("docsis_mgmt", 1, docsis_sync_handle); + dissector_add_uint ("docsis_mgmt", 1, docsis_sync_handle); } diff --git a/plugins/docsis/packet-tlv-cmctrl.c b/plugins/docsis/packet-tlv-cmctrl.c index b466ac465e..b988f5608b 100644 --- a/plugins/docsis/packet-tlv-cmctrl.c +++ b/plugins/docsis/packet-tlv-cmctrl.c @@ -350,6 +350,6 @@ proto_reg_handoff_cmctrl_tlv (void) cmctrl_tlv_handle = find_dissector ("cmctrl_tlv"); - dissector_add ("docsis", 0xFE, cmctrl_tlv_handle); + dissector_add_uint ("docsis", 0xFE, cmctrl_tlv_handle); } diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c index c664c9948d..7d0ed83a5e 100644 --- a/plugins/docsis/packet-tlv.c +++ b/plugins/docsis/packet-tlv.c @@ -5411,6 +5411,6 @@ proto_reg_handoff_docsis_tlv (void) docsis_vsif_handle = find_dissector("docsis_vsif"); docsis_ucd_handle = find_dissector("docsis_ucd"); - dissector_add ("docsis", 0xFF, docsis_tlv_handle); + dissector_add_uint ("docsis", 0xFF, docsis_tlv_handle); } diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c index c33032fc9d..ba812b2ac1 100644 --- a/plugins/docsis/packet-type29ucd.c +++ b/plugins/docsis/packet-type29ucd.c @@ -1061,6 +1061,6 @@ proto_reg_handoff_docsis_type29ucd (void) dissector_handle_t docsis_type29ucd_handle; docsis_type29ucd_handle = find_dissector ("docsis_type29ucd"); - dissector_add ("docsis_mgmt", 0x1D, docsis_type29ucd_handle); + dissector_add_uint ("docsis_mgmt", 0x1D, docsis_type29ucd_handle); } diff --git a/plugins/docsis/packet-uccreq.c b/plugins/docsis/packet-uccreq.c index f9b80da9e9..c6bd21c676 100644 --- a/plugins/docsis/packet-uccreq.c +++ b/plugins/docsis/packet-uccreq.c @@ -124,6 +124,6 @@ proto_reg_handoff_docsis_uccreq (void) docsis_uccreq_handle = find_dissector ("docsis_uccreq"); docsis_tlv_handle = find_dissector ("docsis_tlv"); - dissector_add ("docsis_mgmt", 0x08, docsis_uccreq_handle); + dissector_add_uint ("docsis_mgmt", 0x08, docsis_uccreq_handle); } diff --git a/plugins/docsis/packet-uccrsp.c b/plugins/docsis/packet-uccrsp.c index 8f07607ba1..0006ebe561 100644 --- a/plugins/docsis/packet-uccrsp.c +++ b/plugins/docsis/packet-uccrsp.c @@ -116,6 +116,6 @@ proto_reg_handoff_docsis_uccrsp (void) dissector_handle_t docsis_uccrsp_handle; docsis_uccrsp_handle = find_dissector ("docsis_uccrsp"); - dissector_add ("docsis_mgmt", 0x09, docsis_uccrsp_handle); + dissector_add_uint ("docsis_mgmt", 0x09, docsis_uccrsp_handle); } diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c index 80b2c9eb6d..f542c40814 100644 --- a/plugins/docsis/packet-ucd.c +++ b/plugins/docsis/packet-ucd.c @@ -821,6 +821,6 @@ proto_reg_handoff_docsis_ucd (void) dissector_handle_t docsis_ucd_handle; docsis_ucd_handle = find_dissector ("docsis_ucd"); - dissector_add ("docsis_mgmt", 0x02, docsis_ucd_handle); + dissector_add_uint ("docsis_mgmt", 0x02, docsis_ucd_handle); } diff --git a/plugins/docsis/packet-vendor.c b/plugins/docsis/packet-vendor.c index 9b1623074f..f65a704e00 100644 --- a/plugins/docsis/packet-vendor.c +++ b/plugins/docsis/packet-vendor.c @@ -294,6 +294,6 @@ proto_reg_handoff_docsis_vsif (void) dissector_handle_t docsis_vsif_handle; docsis_vsif_handle = find_dissector ("docsis_vsif"); - dissector_add ("docsis", 0xFD, docsis_vsif_handle); + dissector_add_uint ("docsis", 0xFD, docsis_vsif_handle); } diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c index 4793e813ad..d0fa5df216 100644 --- a/plugins/ethercat/packet-ams.c +++ b/plugins/ethercat/packet-ams.c @@ -1207,6 +1207,6 @@ void proto_reg_handoff_ams(void) dissector_handle_t ams_handle; ams_handle = find_dissector("ams"); - dissector_add("tcp.port", 0xbf02, ams_handle); - dissector_add("ecatf.type", 2, ams_handle); + dissector_add_uint("tcp.port", 0xbf02, ams_handle); + dissector_add_uint("ecatf.type", 2, ams_handle); } diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c index 7aee5d7430..6d538e35df 100644 --- a/plugins/ethercat/packet-ecatmb.c +++ b/plugins/ethercat/packet-ecatmb.c @@ -2039,7 +2039,7 @@ void proto_reg_handoff_ecat_mailbox(void) /* Register this dissector as a sub dissector to E88A4 based on ether type. */ ecat_mailbox_handle = find_dissector("ecat_mailbox"); - dissector_add("ecatf.type", 5, ecat_mailbox_handle); + dissector_add_uint("ecatf.type", 5, ecat_mailbox_handle); eth_handle = find_dissector("eth_withoutfcs"); ams_handle = find_dissector("ams"); diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index 564c100462..493ba8f424 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -1713,7 +1713,7 @@ void proto_reg_handoff_ecat(void) /* Register this dissector as a sub dissector to EtherCAT frame based on ether type. */ ecat_handle = create_dissector_handle(dissect_ecat_datagram, proto_ecat_datagram); - dissector_add("ecatf.type", 1 /* EtherCAT type */, ecat_handle); + dissector_add_uint("ecatf.type", 1 /* EtherCAT type */, ecat_handle); ecat_mailbox_handle = find_dissector("ecat_mailbox"); } diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c index 9ef143b9dc..ba0669e394 100644 --- a/plugins/ethercat/packet-ethercat-frame.c +++ b/plugins/ethercat/packet-ethercat-frame.c @@ -94,7 +94,7 @@ static void dissect_ethercat_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree handle the rest of the PDU. */ next_tvb = tvb_new_subset_remaining (tvb, offset); - if (!dissector_try_port(ethercat_frame_dissector_table, hdr.v.protocol, + if (!dissector_try_uint(ethercat_frame_dissector_table, hdr.v.protocol, next_tvb, pinfo, tree)) { col_add_fstr (pinfo->cinfo, COL_PROTOCOL, "0x%04x", hdr.v.protocol); @@ -150,8 +150,8 @@ void proto_reg_handoff_ethercat_frame(void) dissector_handle_t ethercat_frame_handle; ethercat_frame_handle = find_dissector("ecatf"); - dissector_add("ethertype", ETHERTYPE_ECATF, ethercat_frame_handle); - dissector_add("udp.port", ETHERTYPE_ECATF, ethercat_frame_handle); - dissector_add("tcp.port", ETHERTYPE_ECATF, ethercat_frame_handle); + dissector_add_uint("ethertype", ETHERTYPE_ECATF, ethercat_frame_handle); + dissector_add_uint("udp.port", ETHERTYPE_ECATF, ethercat_frame_handle); + dissector_add_uint("tcp.port", ETHERTYPE_ECATF, ethercat_frame_handle); ethercat_frame_data_handle = find_dissector("data"); } diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/ethercat/packet-ioraw.c index cc1cf59a56..546219fd28 100644 --- a/plugins/ethercat/packet-ioraw.c +++ b/plugins/ethercat/packet-ioraw.c @@ -117,5 +117,5 @@ void proto_reg_handoff_ioraw(void) dissector_handle_t ioraw_handle; ioraw_handle = create_dissector_handle(dissect_ioraw, proto_ioraw); - dissector_add("ecatf.type", 3, ioraw_handle); + dissector_add_uint("ecatf.type", 3, ioraw_handle); } diff --git a/plugins/ethercat/packet-nv.c b/plugins/ethercat/packet-nv.c index 6fee4f589e..6a05fdb370 100644 --- a/plugins/ethercat/packet-nv.c +++ b/plugins/ethercat/packet-nv.c @@ -237,5 +237,5 @@ void proto_reg_handoff_nv(void) dissector_handle_t nv_handle; nv_handle = create_dissector_handle(dissect_nv, proto_nv); - dissector_add("ecatf.type", 4, nv_handle); + dissector_add_uint("ecatf.type", 4, nv_handle); } diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c index 4f139e3cf4..c4b4524a5a 100644 --- a/plugins/gryphon/packet-gryphon.c +++ b/plugins/gryphon/packet-gryphon.c @@ -2290,5 +2290,5 @@ proto_reg_handoff_gryphon(void) dissector_handle_t gryphon_handle; gryphon_handle = create_dissector_handle(dissect_gryphon, proto_gryphon); - dissector_add("tcp.port", 7000, gryphon_handle); + dissector_add_uint("tcp.port", 7000, gryphon_handle); } diff --git a/plugins/interlink/packet-interlink.c b/plugins/interlink/packet-interlink.c index 8b24a25146..c11bcef2bc 100644 --- a/plugins/interlink/packet-interlink.c +++ b/plugins/interlink/packet-interlink.c @@ -157,7 +157,7 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) next_tvb = tvb_new_subset_remaining(tvb, offset); /* Probably a sub-dissector exists for this type/version combination. */ - handle = dissector_get_port_handle(subdissector_table, type_version); + handle = dissector_get_uint_handle(subdissector_table, type_version); /* Without a proper sub-dissector, we use "data". */ if (handle == NULL) handle = data_handle; diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 3a17547dbf..9c122275f9 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -2242,7 +2242,7 @@ void proto_reg_handoff_irda(void) dissector_handle_t irda_handle; irda_handle = find_dissector("irda"); - dissector_add("wtap_encap", WTAP_ENCAP_IRDA, irda_handle); - dissector_add("sll.ltype", LINUX_SLL_P_IRDA_LAP, irda_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_IRDA, irda_handle); + dissector_add_uint("sll.ltype", LINUX_SLL_P_IRDA_LAP, irda_handle); data_handle = find_dissector("data"); } diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c index 54f844e906..ad17b65771 100644 --- a/plugins/irda/packet-sir.c +++ b/plugins/irda/packet-sir.c @@ -180,7 +180,7 @@ dissect_sir(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root) void proto_reg_handoff_irsir(void) { - dissector_add("tcp.port", TCP_PORT_SIR, find_dissector("sir")); + dissector_add_uint("tcp.port", TCP_PORT_SIR, find_dissector("sir")); data_handle = find_dissector("data"); irda_handle = find_dissector("irda"); diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index 2aeee687bb..6aac56312f 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -779,7 +779,7 @@ void proto_reg_handoff_m2m(void) dissector_handle_t m2m_handle; m2m_handle = create_dissector_handle(dissect_m2m, proto_m2m); - dissector_add("ethertype", ETHERTYPE_WMX_M2M, m2m_handle); + dissector_add_uint("ethertype", ETHERTYPE_WMX_M2M, m2m_handle); /* find the wimax handlers */ wimax_cdma_code_burst_handle = find_dissector("wimax_cdma_code_burst_handler"); diff --git a/plugins/opcua/opcua.c b/plugins/opcua/opcua.c index 2de50733a2..683ed5bfcb 100644 --- a/plugins/opcua/opcua.c +++ b/plugins/opcua/opcua.c @@ -243,13 +243,13 @@ static void dissect_opcua_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree static void register_tcp_port(guint32 port) { if (port != 0) - dissector_add("tcp.port", port, opcua_handle); + dissector_add_uint("tcp.port", port, opcua_handle); } static void unregister_tcp_port(guint32 port) { if (port != 0) - dissector_delete("tcp.port", port, opcua_handle); + dissector_delete_uint("tcp.port", port, opcua_handle); } void proto_reg_handoff_opcua(void) diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c index fce2d08457..9c34ea4430 100644 --- a/plugins/profinet/packet-pn-mrp.c +++ b/plugins/profinet/packet-pn-mrp.c @@ -454,6 +454,6 @@ proto_reg_handoff_pn_mrp (void) mrp_handle = create_dissector_handle(dissect_PNMRP,proto_pn_mrp); - dissector_add("ethertype", ETHERTYPE_MRP, mrp_handle); + dissector_add_uint("ethertype", ETHERTYPE_MRP, mrp_handle); } diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c index 1b289ec576..50b42a347d 100644 --- a/plugins/profinet/packet-pn-rt.c +++ b/plugins/profinet/packet-pn-rt.c @@ -769,8 +769,8 @@ proto_reg_handoff_pn_rt(void) pn_rt_handle = create_dissector_handle(dissect_pn_rt, proto_pn_rt); - dissector_add("ethertype", ETHERTYPE_PROFINET, pn_rt_handle); - dissector_add("udp.port", 0x8892, pn_rt_handle); + dissector_add_uint("ethertype", ETHERTYPE_PROFINET, pn_rt_handle); + dissector_add_uint("udp.port", 0x8892, pn_rt_handle); heur_dissector_add("pn_rt", dissect_CSF_SDU_heur, proto_pn_rt); heur_dissector_add("pn_rt", dissect_FRAG_PDU_heur, proto_pn_rt); diff --git a/plugins/sercosiii/packet-sercosiii_1v1.c b/plugins/sercosiii/packet-sercosiii_1v1.c index fa4288aee5..e0af9e8386 100644 --- a/plugins/sercosiii/packet-sercosiii_1v1.c +++ b/plugins/sercosiii/packet-sercosiii_1v1.c @@ -114,5 +114,5 @@ proto_reg_handoff_sercosiii(void) dissector_handle_t siii_handle; siii_handle = create_dissector_handle(dissect_siii, proto_siii); - dissector_add("ethertype", ETHERTYPE_SERCOS, siii_handle); + dissector_add_uint("ethertype", ETHERTYPE_SERCOS, siii_handle); } diff --git a/plugins/tpg/packet-http.c b/plugins/tpg/packet-http.c index c54df654bc..7da2b0cbe5 100644 --- a/plugins/tpg/packet-http.c +++ b/plugins/tpg/packet-http.c @@ -97,8 +97,8 @@ static void proto_register_http(void) { static void proto_reg_handoff_http(void) { http_handle = create_dissector_handle(dissect_http, proto_http); - dissector_delete("tcp.port", 80, NULL); - dissector_add("tcp.port", 80, http_handle); + dissector_delete_uint("tcp.port", 80, NULL); + dissector_add_uint("tcp.port", 80, http_handle); } diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index cfec629c36..2f1bb21c68 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -4022,12 +4022,12 @@ proto_reg_handoff_unistim(void) { initialized=TRUE; } else { if (unistim_port != 0) { - dissector_delete("udp.port",unistim_port,unistim_handle); + dissector_delete_uint("udp.port",unistim_port,unistim_handle); } } if (global_unistim_port != 0) { - dissector_add("udp.port",global_unistim_port,unistim_handle); + dissector_add_uint("udp.port",global_unistim_port,unistim_handle); } unistim_port = global_unistim_port; } diff --git a/plugins/wimax/packet-wmx.c b/plugins/wimax/packet-wmx.c index 784d9f89bf..6e19f45479 100644 --- a/plugins/wimax/packet-wmx.c +++ b/plugins/wimax/packet-wmx.c @@ -903,12 +903,12 @@ proto_reg_handoff_wimax(void) wimax_handle = create_dissector_handle(dissect_wimax, proto_wimax); wimax_prefs_initialized = TRUE; } else { - dissector_delete("wimax.max_basic_cid", global_cid_max_basic, wimax_handle); - dissector_delete("wimax.corrigendum_2_version", include_cor2_changes, wimax_handle); + dissector_delete_uint("wimax.max_basic_cid", global_cid_max_basic, wimax_handle); + dissector_delete_uint("wimax.corrigendum_2_version", include_cor2_changes, wimax_handle); } - dissector_add("wimax.max_basic_cid", global_cid_max_basic, wimax_handle); - dissector_add("wimax.corrigendum_2_version", include_cor2_changes, wimax_handle); + dissector_add_uint("wimax.max_basic_cid", global_cid_max_basic, wimax_handle); + dissector_add_uint("wimax.corrigendum_2_version", include_cor2_changes, wimax_handle); #endif } diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index 7281ee2b72..4b1f2caad6 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -3533,12 +3533,12 @@ proto_reg_handoff_wimaxasncp(void) if (currentPort != -1) { /* Remove any previous registered port */ - dissector_delete("udp.port", currentPort, wimaxasncp_handle); + dissector_delete_uint("udp.port", currentPort, wimaxasncp_handle); } /* Add the new one from preferences */ currentPort = global_wimaxasncp_udp_port; - dissector_add("udp.port", currentPort, wimaxasncp_handle); + dissector_add_uint("udp.port", currentPort, wimaxasncp_handle); /* Find the EAP dissector */ eap_handle = find_dissector("eap"); |