diff options
author | Guy Harris <guy@alum.mit.edu> | 2010-12-20 05:35:29 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2010-12-20 05:35:29 +0000 |
commit | a8bc4a0d136d7a68e8f006aec75a8e63191948c9 (patch) | |
tree | 2587cbb5c31f65afc60711d38d5dcc79a5a689e6 /epan/dissectors/packet-pgm.c | |
parent | 7e16ec5b991b12020f7bdc135fd4943858bc3218 (diff) |
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
Diffstat (limited to 'epan/dissectors/packet-pgm.c')
-rw-r--r-- | epan/dissectors/packet-pgm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 14bd013d26..e817e89ebe 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -784,12 +784,12 @@ decode_pgm_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, next_tvb = tvb_new_subset_remaining(tvb, offset); /* do lookup with the subdissector table */ - found = dissector_try_port(subdissector_table, pgmhdr_sport, + found = dissector_try_uint(subdissector_table, pgmhdr_sport, next_tvb, pinfo, tree); if (found) return; - found = dissector_try_port(subdissector_table, pgmhdr_dport, + found = dissector_try_uint(subdissector_table, pgmhdr_dport, next_tvb, pinfo, tree); if (found) return; @@ -1445,23 +1445,23 @@ proto_reg_handoff_pgm(void) if (! initialized) { pgm_handle = create_dissector_handle(dissect_pgm, proto_pgm); dissector_add_handle("udp.port", pgm_handle); /* for 'decode-as' */ - dissector_add("ip.proto", IP_PROTO_PGM, pgm_handle); + dissector_add_uint("ip.proto", IP_PROTO_PGM, pgm_handle); data_handle = find_dissector("data"); initialized = TRUE; } else { if (old_udp_encap_ucast_port != 0) { - dissector_delete("udp.port", old_udp_encap_ucast_port, pgm_handle); + dissector_delete_uint("udp.port", old_udp_encap_ucast_port, pgm_handle); } if (old_udp_encap_mcast_port != 0) { - dissector_delete("udp.port", old_udp_encap_mcast_port, pgm_handle); + dissector_delete_uint("udp.port", old_udp_encap_mcast_port, pgm_handle); } } if (udp_encap_ucast_port != 0) { - dissector_add("udp.port", udp_encap_ucast_port, pgm_handle); + dissector_add_uint("udp.port", udp_encap_ucast_port, pgm_handle); } if (udp_encap_mcast_port != 0) { - dissector_add("udp.port", udp_encap_mcast_port, pgm_handle); + dissector_add_uint("udp.port", udp_encap_mcast_port, pgm_handle); } old_udp_encap_ucast_port = udp_encap_ucast_port; old_udp_encap_mcast_port = udp_encap_mcast_port; |