diff options
author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-09-12 20:34:19 +0000 |
---|---|---|
committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-09-12 20:34:19 +0000 |
commit | ac7ecb10d2c2fbd474991f0f22257587cb2b31f1 (patch) | |
tree | 1475a95da9a463c1160f9cf27bba735613eb9a07 | |
parent | aa8fbf09d261e8baa62ad0bf98320d24825e5ba5 (diff) |
More dissector table name related changes (a continuation of r51904).
svn path=/trunk/; revision=51982
-rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-clnp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-enip.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-esis.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-fr.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-isis.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-juniper.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-mip.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-nhrp.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-osi.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-redback.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-sll.c | 2 |
12 files changed, 35 insertions, 35 deletions
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index f4c6a70380..ad4fd7d51a 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -972,8 +972,8 @@ proto_register_btrfcomm(void) expert_btrfcomm = expert_register_protocol(proto_btrfcomm); expert_register_field_array(expert_btrfcomm, ei, array_length(ei)); - rfcomm_service_dissector_table = register_dissector_table("btrfcomm.service", "RFCOMM SERVICE", FT_UINT16, BASE_HEX); - rfcomm_channel_dissector_table = register_dissector_table("btrfcomm.channel", "RFCOMM Channel", FT_UINT16, BASE_DEC); + rfcomm_service_dissector_table = register_dissector_table("btrfcomm.service", "BT RFCOMM Service", FT_UINT16, BASE_HEX); + rfcomm_channel_dissector_table = register_dissector_table("btrfcomm.channel", "BT RFCOMM Channel", FT_UINT16, BASE_DEC); module = prefs_register_protocol(proto_btrfcomm, NULL); prefs_register_static_text_preference(module, "rfcomm.version", diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index ade326d76b..5fefc60725 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -767,8 +767,8 @@ proto_reg_handoff_clnp(void) data_handle = find_dissector("data"); clnp_handle = create_dissector_handle(dissect_clnp, proto_clnp); - dissector_add_uint("osinl", NLPID_ISO8473_CLNP, clnp_handle); - dissector_add_uint("osinl", NLPID_NULL, clnp_handle); /* Inactive subset */ + dissector_add_uint("osinl.incl", NLPID_ISO8473_CLNP, clnp_handle); + dissector_add_uint("osinl.incl", NLPID_NULL, clnp_handle); /* Inactive subset */ dissector_add_uint("x.25.spi", NLPID_ISO8473_CLNP, clnp_handle); } diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 86deaf59dc..0c10ab2286 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -2375,7 +2375,7 @@ dissect_dlr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) proto_tree_add_item( dlr_tree, hf_dlr_advadvertiseinterval, tvb, DLR_ADV_ADVERTISE_INTERVAL, 4, ENC_BIG_ENDIAN ); proto_tree_add_item( dlr_tree, hf_dlr_advadvertisetimeout, tvb, DLR_ADV_ADVERTISE_TIMEOUT, 4, ENC_BIG_ENDIAN ); proto_tree_add_item( dlr_tree, hf_dlr_advlearningupdateenable, tvb, DLR_ADV_LEARNING_UPDATE_ENABLE, 1, ENC_BIG_ENDIAN ); - proto_tree_add_item( dlr_tree, hf_dlr_advreserved, tvb, DLR_ADV_RESERVED, 19, ENC_NA ); + proto_tree_add_item( dlr_tree, hf_dlr_advreserved, tvb, DLR_ADV_RESERVED, 19, ENC_NA ); } else if( dlr_frametype == DLR_FT_FLUSH_TABLES ) { @@ -3227,12 +3227,12 @@ proto_register_enip(void) { &hf_dlr_rgc_red_gateway_enable, { "Redundant Gateway Enable", "cip.dlr.rgc.gateway_enable", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_dlr_rgc_gateway_precedence, { "Gateway Precedence", "cip.dlr.rgc.gateway_precedence", FT_UINT8, BASE_DEC, NULL, 0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_dlr_rgc_advertise_interval, { "Advertise Interval", "cip.dlr.rgc.advertise_interval", @@ -3263,7 +3263,7 @@ proto_register_enip(void) { "Active Gateway Physical Address", "cip.dlr.aga.physical_address", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }}, - + { &hf_dlr_active_gateway_precedence, { "Active Gateway Precedence", "cip.dlr.active_gateway_precedence", FT_UINT8, BASE_DEC, NULL, 0, @@ -3563,10 +3563,10 @@ proto_register_enip(void) FALSE); subdissector_sud_table = register_dissector_table("enip.sud.iface", - "SendUnitData.Interface Handle", FT_UINT32, BASE_HEX); + "ENIP SendUnitData.Interface Handle", FT_UINT32, BASE_HEX); subdissector_srrd_table = register_dissector_table("enip.srrd.iface", - "SendRequestReplyData.Interface Handle", FT_UINT32, BASE_HEX); + "ENIP SendRequestReplyData.Interface Handle", FT_UINT32, BASE_HEX); register_init_routine(&enip_init_protocol); diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c index 35a06eb292..1c3bef7c06 100644 --- a/epan/dissectors/packet-esis.c +++ b/epan/dissectors/packet-esis.c @@ -459,5 +459,5 @@ proto_reg_handoff_esis(void) dissector_handle_t esis_handle; esis_handle = find_dissector("esis"); - dissector_add_uint("osinl", NLPID_ISO9542_ESIS, esis_handle); + dissector_add_uint("osinl.incl", NLPID_ISO9542_ESIS, esis_handle); } diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index b19171e07b..f0fa3fccad 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -111,7 +111,7 @@ static dissector_handle_t eth_withfcs_handle; static dissector_handle_t gprs_ns_handle; static dissector_handle_t data_handle; -static dissector_table_t osinl_subdissector_table; +static dissector_table_t osinl_incl_subdissector_table; /* * Encapsulation type. @@ -724,7 +724,7 @@ dissect_fr_nlpid(tvbuff_t *tvb, int offset, packet_info *pinfo, * Either that, or it's Q.933 iff the DLCI is 0. */ next_tvb = tvb_new_subset_remaining(tvb,offset); - if (dissector_try_uint(osinl_subdissector_table, fr_nlpid, next_tvb, + if (dissector_try_uint(osinl_incl_subdissector_table, fr_nlpid, next_tvb, pinfo, tree) || dissector_try_uint(fr_osinl_subdissector_table, fr_nlpid, next_tvb, pinfo, tree)) { @@ -1004,5 +1004,5 @@ proto_reg_handoff_fr(void) gprs_ns_handle = find_dissector("gprs_ns"); data_handle = find_dissector("data"); - osinl_subdissector_table = find_dissector_table("osinl"); + osinl_incl_subdissector_table = find_dissector_table("osinl.incl"); } diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c index 4abb540b59..04860dd140 100644 --- a/epan/dissectors/packet-isis.c +++ b/epan/dissectors/packet-isis.c @@ -315,6 +315,6 @@ proto_register_isis(void) { void proto_reg_handoff_isis(void) { - dissector_add_uint("osinl", NLPID_ISO10589_ISIS, isis_handle); + dissector_add_uint("osinl.incl", NLPID_ISO10589_ISIS, isis_handle); dissector_add_uint("ethertype", ETHERTYPE_L2ISIS, isis_handle); } diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index 6cdad9be59..da9dcd3614 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -387,7 +387,7 @@ static dissector_handle_t frelay_handle; static dissector_handle_t chdlc_handle; static dissector_handle_t data_handle; -static dissector_table_t osinl_subdissector_table; +static dissector_table_t osinl_incl_subdissector_table; static dissector_table_t osinl_excl_subdissector_table; static int dissect_juniper_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *ti, guint8 *flags); @@ -657,7 +657,7 @@ 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_uint(osinl_subdissector_table, nlpid, next_tvb, pinfo, tree)) + if(dissector_try_uint(osinl_incl_subdissector_table, nlpid, next_tvb, pinfo, tree)) return 0; next_tvb = tvb_new_subset_remaining(tvb, offset+1); if(dissector_try_uint(osinl_excl_subdissector_table, nlpid, next_tvb, pinfo, tree)) @@ -1478,7 +1478,7 @@ proto_reg_handoff_juniper(void) dissector_handle_t juniper_vp_handle; dissector_handle_t juniper_svcs_handle; - osinl_subdissector_table = find_dissector_table("osinl"); + osinl_incl_subdissector_table = find_dissector_table("osinl.incl"); osinl_excl_subdissector_table = find_dissector_table("osinl.excl"); eth_handle = find_dissector("eth_withoutfcs"); diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index 0dcd14426a..958b7dd273 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -718,7 +718,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info /*Verizon CVSE type*/ proto_tree_add_item(ext_tree, hf_mip_cvse_verizon_cvse_type, tvb, cvse_local_offset, 2, ENC_BIG_ENDIAN); }else if( cvse_vendor_id == VENDOR_THE3GPP2 ){ - /*THE3GPP2 CVSE type*/ + /*THE3GPP2 CVSE type*/ cvse_3gpp2_type = tvb_get_ntohs(tvb, cvse_local_offset); /* THE3GPP2 CVSE Value */ if(cvse_3gpp2_type == GRE_KEY_EXT){ @@ -1359,7 +1359,7 @@ void proto_register_mip(void) { "3GPP2 CVSE Type","mip.ext.cvse.3gpp2_type", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } - }, + }, { &hf_mip_cvse_3gpp2_grekey, { "GRE Key","mip.ext.cvse.3gpp2_grekey", FT_UINT16, BASE_DEC, NULL, 0, @@ -1456,8 +1456,8 @@ void proto_register_mip(void) proto_register_field_array(proto_mip, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - mip_nvse_ext_dissector_table = register_dissector_table("mip.nvse_ext", "Normal Vendor/Organization Specific Extension", FT_UINT32, BASE_DEC); - + mip_nvse_ext_dissector_table = register_dissector_table("mip.nvse_ext", + "MIP Normal Vendor/Organization Specific Extension", FT_UINT32, BASE_DEC); } void @@ -1470,8 +1470,8 @@ proto_reg_handoff_mip(void) dissector_add_uint("udp.port", UDP_PORT_MIP, mip_handle); /* Register as dissector for 3GPP2 NVSE */ - dissector_add_uint("mip.nvse_ext", VENDOR_THE3GPP2, new_create_dissector_handle(dissect_mip_priv_ext_3gpp2, proto_mip)); - + dissector_add_uint("mip.nvse_ext", VENDOR_THE3GPP2, + new_create_dissector_handle(dissect_mip_priv_ext_3gpp2, proto_mip)); } /* diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 2200dc5053..7e390c5a03 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -253,7 +253,7 @@ static const value_string nhrp_cie_code_vals[] = { { 0, NULL } }; -static dissector_table_t osinl_subdissector_table; +static dissector_table_t osinl_incl_subdissector_table; static dissector_table_t osinl_excl_subdissector_table; static dissector_table_t ethertype_subdissector_table; @@ -778,7 +778,7 @@ void dissect_nhrp_mand(tvbuff_t *tvb, * Dissect based on the NLPID. */ dissected = dissector_try_uint( - osinl_subdissector_table, + osinl_incl_subdissector_table, hdr->ar_pro_type, sub_tvb, pinfo, ind_tree) || dissector_try_uint( @@ -1407,7 +1407,7 @@ proto_reg_handoff_nhrp(void) data_handle = find_dissector("data"); - osinl_subdissector_table = find_dissector_table("osinl"); + osinl_incl_subdissector_table = find_dissector_table("osinl.incl"); osinl_excl_subdissector_table = find_dissector_table("osinl.excl"); ethertype_subdissector_table = find_dissector_table("ethertype"); diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c index 1e7fa8357b..848334a678 100644 --- a/epan/dissectors/packet-osi.c +++ b/epan/dissectors/packet-osi.c @@ -444,7 +444,7 @@ const value_string nlpid_vals[] = { { 0, NULL }, }; -static dissector_table_t osinl_subdissector_table; +static dissector_table_t osinl_incl_subdissector_table; static dissector_table_t osinl_excl_subdissector_table; static dissector_handle_t data_handle, ppp_handle; @@ -465,7 +465,7 @@ static void dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nlpid = tvb_get_guint8(tvb, 0); /* try lookup with the subdissector tables that includes the nlpid */ - if (dissector_try_uint(osinl_subdissector_table, nlpid, tvb, pinfo, tree)) + if (dissector_try_uint(osinl_incl_subdissector_table, nlpid, tvb, pinfo, tree)) return; /* try lookup with the subdissector tables that excludes the nlpid */ new_tvb = tvb_new_subset_remaining(tvb, 1); @@ -542,8 +542,8 @@ proto_register_osi(void) all protocols that require inclusion of the NLPID should register here */ - osinl_subdissector_table = register_dissector_table("osinl", - "OSI incl NLPID", FT_UINT8, BASE_HEX); + osinl_incl_subdissector_table = register_dissector_table("osinl.incl", + "OSI incl NLPID", FT_UINT8, BASE_HEX); /* This dissector table is for those protocols whose PDUs * aren't* defined to begin with an NLPID. diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index 394b697b50..17f67f9340 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.c @@ -32,7 +32,7 @@ static int proto_redback = -1; static gint ett_redback = -1; -static dissector_table_t osinl_subdissector_table; +static dissector_table_t osinl_incl_subdissector_table; static dissector_table_t osinl_excl_subdissector_table; static dissector_handle_t ipv4_handle; @@ -113,7 +113,7 @@ dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(ethnofcs_handle, next_tvb, pinfo, tree); } else { guint8 nlpid = tvb_get_guint8(tvb, dataoff); - if(dissector_try_uint(osinl_subdissector_table, nlpid, next_tvb, pinfo, tree)) + if(dissector_try_uint(osinl_incl_subdissector_table, nlpid, next_tvb, pinfo, tree)) break; next_tvb = tvb_new_subset_remaining(tvb, dataoff+1); if(dissector_try_uint(osinl_excl_subdissector_table, nlpid, next_tvb, pinfo, tree)) @@ -206,7 +206,7 @@ proto_reg_handoff_redback(void) { dissector_handle_t redback_handle; - osinl_subdissector_table = find_dissector_table("osinl"); + osinl_incl_subdissector_table = find_dissector_table("osinl.incl"); osinl_excl_subdissector_table = find_dissector_table("osinl.excl"); ipv4_handle = find_dissector("ip"); diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index 2987b84dda..85a7414114 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -321,7 +321,7 @@ proto_register_sll(void) sll_linux_dissector_table = register_dissector_table ( "sll.ltype", - "Linux protocol type", + "Linux SLL protocol type", FT_UINT16, BASE_HEX ); |