osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Alexis La Goutte 2017-10-13 14:01:56 +02:00 committed by Michael Mann
parent 1e0dcf8daf
commit 68ef879711
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/docsis/packet-vendor.c
View File

@ -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}
},