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-nhrp.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-nhrp.c')
| -rw-r--r-- | epan/dissectors/packet-nhrp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 7604d6d96b..15a6fabbd2 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -751,7 +751,7 @@ void dissect_nhrp_mand(tvbuff_t *tvb, * the protocol type should * be the Ethertype, but.... */ - dissected = dissector_try_port( + dissected = dissector_try_uint( ethertype_subdissector_table, hdr->ar_pro_type_pid, sub_tvb, pinfo, ind_tree); @@ -762,7 +762,7 @@ void dissect_nhrp_mand(tvbuff_t *tvb, * just dissect as data. */ if (oui_info != NULL) { - dissected = dissector_try_port( + dissected = dissector_try_uint( oui_info->table, hdr->ar_pro_type_pid, sub_tvb, pinfo, @@ -774,11 +774,11 @@ void dissect_nhrp_mand(tvbuff_t *tvb, /* * Dissect based on the NLPID. */ - dissected = dissector_try_port( + dissected = dissector_try_uint( osinl_subdissector_table, hdr->ar_pro_type, sub_tvb, pinfo, ind_tree) || - dissector_try_port( + dissector_try_uint( osinl_excl_subdissector_table, hdr->ar_pro_type, sub_tvb, pinfo, ind_tree); @@ -793,7 +793,7 @@ void dissect_nhrp_mand(tvbuff_t *tvb, /* Experimental/Local use */ dissected = FALSE; } else { - dissected = dissector_try_port( + dissected = dissector_try_uint( ethertype_subdissector_table, hdr->ar_pro_type, sub_tvb, pinfo, ind_tree); } @@ -1201,7 +1201,7 @@ proto_reg_handoff_nhrp(void) ethertype_subdissector_table = find_dissector_table("ethertype"); nhrp_handle = create_dissector_handle(dissect_nhrp, proto_nhrp); - dissector_add("ip.proto", IP_PROTO_NARP, nhrp_handle); - dissector_add("gre.proto", GRE_NHRP, nhrp_handle); - dissector_add("llc.iana_pid", IANA_PID_MARS_NHRP_CONTROL, nhrp_handle); + dissector_add_uint("ip.proto", IP_PROTO_NARP, nhrp_handle); + dissector_add_uint("gre.proto", GRE_NHRP, nhrp_handle); + dissector_add_uint("llc.iana_pid", IANA_PID_MARS_NHRP_CONTROL, nhrp_handle); } |