CPHA: Update versions lists

Use also value_string ext

Request from Hugo van der Kooij

Bug:10723
Change-Id: I0603687215b7e82a987a4a6cde00eb996b04a77c
Reviewed-on: https://code.wireshark.org/review/5466
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 106 insertions, 5 deletions

diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c
index ce551b802e..f28fa739f2 100644
--- a/epan/dissectors/packet-cpha.c
+++ b/epan/dissectors/packet-cpha.c
@@ -131,12 +131,113 @@ static const value_string ha_mode_vals[] = {
 
 static const value_string ha_version_vals[] = {
   { 1, "4.1" },
-  { 6, "NG Feature Pack 2" },
-  { 530, "NG Feature Pack 3" },
-  { 540, "NG with Application Intelligence (Early Availability)" },
-  { 514, "NG with Application Intelligence" },
+  { 2, "NG (FP0)" },
+  { 3, "NG FP1" },
+  { 6, "NG FP2" },
+  { 530, "NG FP3" },
+  { 534, "VSX NG AIR2" },
+  { 537, "VSX NGX EA" },
+  { 538, "VSX NGX GA" },
+  { 540, "NG AIR54 EA" },
+  { 541, "NG AIR54 GA" },
+  { 550, "NG AIR55 (up to HFA_16)" },
+  { 551, "NG AIR55 HFA_17" },
+  { 552, "NG AIR55W" },
+  { 553, "NG AIR55 HFA_18" },
+  { 591, "NG AIR55 LSV" },
+  { 593, "NGXR60 EA" },
+  { 601, "NGXR60 GA / NGXR60 HFA_01" },
+  { 602, "NGXR60 HFA_02" },
+  { 646, "NGXR60 Multicast acceleration" },
+  { 650, "NGXR60 with Anti-Virus" },
+  { 665, "NGXR61 EA2" },
+  { 667, "NGXR61 GA" },
+  { 690, "NGXR62 EA" },
+  { 691, "NGXR62 GA" },
+  { 700, "Connectra NGXR61 EA" },
+  { 705, "Connectra NGXR61 GA" },
+  { 710, "Connectra NGXR66 GA" },
+  { 800, "NGXR65 EA" },
+  { 801, "NGXR65 GA" },
+  { 802, "NGXR65 HFA_01" },
+  { 803, "NGXR65 HFA_02" },
+  { 804, "NGXR65 HFA_02 / Connectra NGXR66.1" },
+  { 805, "NGXR65 HFA_03" },
+  { 810, "NGXR65 HFA_03 GA" },
+  { 811, "NGXR65 HFA_40" },
+  { 813, "NGXR65 HFA_50" },
+  { 814, "NGXR65 HFA_50" },
+  { 815, "NGXR65 HFA_60" },
+  { 816, "NGXR65 HFA_70" },
+  { 850, "VSX NGX Scalability Pack" },
+  { 900, "VSX NGXR65 GA" },
+  { 901, "VSX NGXR65 HFA_10" },
+  { 902, "VSX NGXR65 HFA_20" },
+  { 1000, "NGXR65 with CoreXL LE" },
+  { 1001, "VSX NGXR67 GA" },
+  { 1010, "VSX NGXR67 EA" },
+  { 1100, "VSX NGXR68 GA" },
+  { 1500, "R70 EA" },
+  { 1501, "R70 GA" },
+  { 1502, "R70.1 EA /R70.1 IPv6Pack HCC" },
+  { 1505, "R70.1 GA" },
+  { 1506, "2R70.1 IPv6Pack" },
+  { 1508, "R70.12" },
+  { 1516, "R70.20" },
+  { 1518, "R70.30" },
+  { 1520, "R70.40 / GX 5.0 HCC" },
+  { 1523, "R70.50" },
+  { 1555, "R71.10 /R71 VE" },
+  { 1557, "R71.20" },
+  { 1559, "R71.30" },
+  { 1561, "R71.40" },
+  { 1562, "R71.45" },
+  { 1563, "R71.50" },
+  { 2000, "R75 GA / R75.050 for 61000 /R75.051 for 61000 /R75.052 for 61000" },
+  { 2005, "R75.10" },
+  { 2010, "R75.20" },
+  { 2020, "R75.30" },
+  { 2210, "R75.40 32-bit" },
+  { 2211, "R75.40 64-bit" },
+  { 2220, "R75.45 32-bit" },
+  { 2221, "R75.45 64-bit" },
+  { 2225, "R75.46 32-bit" },
+  { 2226, "R75.46 64-bit" },
+  { 2230, "R75.47 32-bit" },
+  { 2231, "R75.47 64-bit" },
+  { 2500, "R75.40VS 32-bit" },
+  { 2501, "R75.40VS 64-bit" },
+  { 2502, "R75.40VS in VSX mode" },
+  { 2700, "R76 32-bit" },
+  { 2701, "DR76 64-bit" },
+  { 2702, "R76 in VSX mode" },
+  { 2720, "R76.10 32-bit" },
+  { 2721, "R76.10 64-bit" },
+  { 2722, "R76.10 in VSX mode" },
+  { 2900, "R77 32-bit" },
+  { 2901, "R77 64-bit" },
+  { 2902, "R77 in VSX mode" },
+  { 2905, "R77.10 32-bit" },
+  { 2906, "R77.10 64-bit" },
+  { 2907, "R77.10 in VSX mode" },
+  { 2910, "R77.20 32-bit" },
+  { 2911, "R77.20 64-bit" },
+  { 2912, "R77.20 in VSX mode" },
+  { 2920, "R77.30 32-bit" },
+  { 2921, "R77.30 64-bit" },
+  { 2922, "R77.30 in VSX mode" },
+  { 62700, "R76SP for 61000 32-bit" },
+  { 62701, "R76SP for 61000 64-bit" },
+  { 62702, "R76SP for 61000 in VSX mode" },
+  { 62710, "R76SP.10 for 61000 32-bit" },
+  { 62711, "R76SP.10 for 61000 64-bit" },
+  { 62712, "R76SP.10 for 61000 in VSX mode" },
   { 0, NULL },
 };
+
+static value_string_ext ha_version_vals_ext = VALUE_STRING_EXT_INIT(ha_version_vals);
+
+
 static const value_string report_code_vals[] = {
   { 1, "Machine information included" },
   { 2, "Interface information included" },
@@ -352,7 +453,7 @@ proto_register_cpha(void)
     { &hf_magic_number,
     { "Magic Number", "cpha.magic_number", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     { &hf_cpha_protocol_ver,
-    { "Protocol Version", "cpha.version", FT_UINT16, BASE_DEC, VALS(ha_version_vals), 0x0, "CPHAP Version", HFILL}},
+    { "Protocol Version", "cpha.version", FT_UINT16, BASE_DEC|BASE_EXT_STRING, &ha_version_vals_ext, 0x0, "CPHAP Version", HFILL}},
     { &hf_cluster_number,
     { "Cluster Number", "cpha.cluster_number", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_opcode,