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-juniper.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-juniper.c')
| -rw-r--r-- | epan/dissectors/packet-juniper.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index bf827dc779..b71641df50 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -661,10 +661,10 @@ dissect_juniper_payload_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre case PROTO_CLNP: case PROTO_MPLS_CLNP: nlpid = tvb_get_guint8(tvb, offset); - if(dissector_try_port(osinl_subdissector_table, nlpid, next_tvb, pinfo, tree)) + if(dissector_try_uint(osinl_subdissector_table, nlpid, next_tvb, pinfo, tree)) return 0; next_tvb = tvb_new_subset_remaining(tvb, offset+1); - if(dissector_try_port(osinl_excl_subdissector_table, nlpid, next_tvb, pinfo, tree)) + if(dissector_try_uint(osinl_excl_subdissector_table, nlpid, next_tvb, pinfo, tree)) return 0; break; case PROTO_Q933: @@ -1482,17 +1482,17 @@ proto_reg_handoff_juniper(void) juniper_ggsn_handle = create_dissector_handle(dissect_juniper_ggsn, proto_juniper); juniper_vp_handle = create_dissector_handle(dissect_juniper_vp, proto_juniper); - dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_ATM2, juniper_atm2_handle); - dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_ATM1, juniper_atm1_handle); - dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_PPPOE, juniper_pppoe_handle); - dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_MLPPP, juniper_mlppp_handle); - dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_MLFR, juniper_mlfr_handle); - dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_ETHER, juniper_ether_handle); - dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_PPP, juniper_ppp_handle); - dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_FRELAY, juniper_frelay_handle); - dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_CHDLC, juniper_chdlc_handle); - dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_GGSN, juniper_ggsn_handle); - dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_VP, juniper_vp_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_ATM2, juniper_atm2_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_ATM1, juniper_atm1_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_PPPOE, juniper_pppoe_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_MLPPP, juniper_mlppp_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_MLFR, juniper_mlfr_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_ETHER, juniper_ether_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_PPP, juniper_ppp_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_FRELAY, juniper_frelay_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_CHDLC, juniper_chdlc_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_GGSN, juniper_ggsn_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_JUNIPER_VP, juniper_vp_handle); } |