diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-10-13 14:01:56 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-10-13 12:15:18 +0000 |
| commit | 68ef8797118b6015ac47130c789cd93e73b03597 (patch) | |
| tree | eca0f8378aafcb3389d1c3d1bb8d68014ce1a3c0 /plugins | |
| parent | 1e0dcf8dafafd2261c863471e191c65c768e02ea (diff) | |
docsis: fix 'docsis_vsif.gex.sav.spr.static_prefix_address/.gex.imja.imja_ssr_source_prefix_address/.imja.imja_ssr_group_prefix_address' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
Change-Id: I7c978870eb3cc54e718fe3c810f7b4e7f6ea67c9
Reviewed-on: https://code.wireshark.org/review/23897
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/docsis/packet-vendor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/docsis/packet-vendor.c b/plugins/docsis/packet-vendor.c index 4a870138fd..08f00c63ab 100644 --- a/plugins/docsis/packet-vendor.c +++ b/plugins/docsis/packet-vendor.c @@ -733,12 +733,12 @@ proto_register_docsis_vsif (void) "General Extension Information - SAV -Static Prefix Rule", HFILL} }, {&hf_docsis_vsif_gex_sav_static_prefix_addressv4, - {"...1 SAV Static Prefix Address", "docsis_vsif.gex.sav.spr.static_prefix_address", + {"...1 SAV Static Prefix Address", "docsis_vsif.gex.sav.spr.static_prefix_address4", FT_IPv4, BASE_NONE, NULL, 0x0, "General Extension Information - SAV -Static Prefix Rule - Static Prefix Address", HFILL} }, {&hf_docsis_vsif_gex_sav_static_prefix_addressv6, - {"...1 SAV Static Prefix Address", "docsis_vsif.gex.sav.spr.static_prefix_address", + {"...1 SAV Static Prefix Address", "docsis_vsif.gex.sav.spr.static_prefix_address6", FT_IPv6, BASE_NONE, NULL, 0x0, "General Extension Information - SAV -Static Prefix Rule - Static Prefix Address", HFILL} }, @@ -798,12 +798,12 @@ proto_register_docsis_vsif (void) "General Extension Information - IP Multicast Join Authorization - IP Multicast Profile Join Authorization Static Session Rule - Rule Priority", HFILL} }, {&hf_docsis_vsif_gex_imja_ssr_source_prefix_addressv4, - {"...3 Source Prefix Address", "docsis_vsif.gex.imja.imja_ssr_source_prefix_address", + {"...3 Source Prefix Address", "docsis_vsif.gex.imja.imja_ssr_source_prefix_address4", FT_IPv4, BASE_NONE, NULL, 0x0, "General Extension Information - IP Multicast Join Authorization - IP Multicast Profile Join Authorization Static Session Rule - Source Prefix Address", HFILL} }, {&hf_docsis_vsif_gex_imja_ssr_source_prefix_addressv6, - {"...3 Source Prefix Address", "docsis_vsif.gex.imja.imja_ssr_source_prefix_address", + {"...3 Source Prefix Address", "docsis_vsif.gex.imja.imja_ssr_source_prefix_address6", FT_IPv6, BASE_NONE, NULL, 0x0, "General Extension Information - IP Multicast Join Authorization - IP Multicast Profile Join Authorization Static Session Rule - Source Prefix Address", HFILL} }, @@ -813,12 +813,12 @@ proto_register_docsis_vsif (void) "General Extension Information - IP Multicast Join Authorization - IP Multicast Profile Join Authorization Static Session Rule - Source Prefix Length", HFILL} }, {&hf_docsis_vsif_gex_imja_ssr_group_prefix_addressv4, - {"...5 Group Prefix Address", "docsis_vsif.gex.imja.imja_ssr_group_prefix_address", + {"...5 Group Prefix Address", "docsis_vsif.gex.imja.imja_ssr_group_prefix_address4", FT_IPv4, BASE_NONE, NULL, 0x0, "General Extension Information - IP Multicast Join Authorization - IP Multicast Profile Join Authorization Static Session Rule - Group Prefix Address", HFILL} }, {&hf_docsis_vsif_gex_imja_ssr_group_prefix_addressv6, - {"...5 Group Prefix Address", "docsis_vsif.gex.imja.imja_ssr_group_prefix_address", + {"...5 Group Prefix Address", "docsis_vsif.gex.imja.imja_ssr_group_prefix_address6", FT_IPv6, BASE_NONE, NULL, 0x0, "General Extension Information - IP Multicast Join Authorization - IP Multicast Profile Join Authorization Static Session Rule - Group Prefix Address", HFILL} }, |