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-null.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-null.c')
-rw-r--r-- | epan/dissectors/packet-null.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c index ed4914e361..fc169ab770 100644 --- a/epan/dissectors/packet-null.c +++ b/epan/dissectors/packet-null.c @@ -430,7 +430,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } next_tvb = tvb_new_subset_remaining(tvb, 4); - if (!dissector_try_port(ethertype_dissector_table, + if (!dissector_try_uint(ethertype_dissector_table, (guint16) null_header, next_tvb, pinfo, tree)) call_dissector(data_handle, next_tvb, pinfo, tree); } else { @@ -443,7 +443,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } next_tvb = tvb_new_subset_remaining(tvb, 4); - if (!dissector_try_port(null_dissector_table, null_header, + if (!dissector_try_uint(null_dissector_table, null_header, next_tvb, pinfo, tree)) { /* No sub-dissector found. Label rest of packet as "Data" */ call_dissector(data_handle,next_tvb, pinfo, tree); @@ -494,5 +494,5 @@ proto_reg_handoff_null(void) ethertype_dissector_table = find_dissector_table("ethertype"); null_handle = create_dissector_handle(dissect_null, proto_null); - dissector_add("wtap_encap", WTAP_ENCAP_NULL, null_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_NULL, null_handle); } |