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

6 files changed, 10 insertions, 10 deletions

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);
 }