IPv6: Remove extra spacing from info arrays.

Internal formatting: remove extra spacing from 'hf_register_info' array
(as suggested during review), plus indentation changes. Do the same
for expert info array.

External formatting: Minor cleanups.

Change-Id: I4d8db4891824e75d413b0eb53ebcc2e7b128c0bb
Reviewed-on: https://code.wireshark.org/review/10683
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 822 insertions, 619 deletions

diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 3bbfd5db34..885885f0b9 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -2438,789 +2438,910 @@ proto_register_ipv6(void)
 {
     static hf_register_info hf[] = {
         { &hf_ipv6_version,
-          { "Version",              "ipv6.version",
-            FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }},
+            { "Version", "ipv6.version",
+                FT_UINT8, BASE_DEC, NULL, 0xF0,
+                NULL, HFILL }
+        },
         { &hf_ip_version,
-          { "Version",              "ip.version",
-            FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }},
+            { "Version", "ip.version",
+                FT_UINT8, BASE_DEC, NULL, 0xF0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_tclass,
-          { "Traffic class",        "ipv6.tclass",
-            FT_UINT32, BASE_HEX, NULL, 0x0FF00000, NULL, HFILL }},
+            { "Traffic class", "ipv6.tclass",
+                FT_UINT32, BASE_HEX, NULL, 0x0FF00000,
+                NULL, HFILL }
+        },
         { &hf_ipv6_tclass_dscp,
-          { "Differentiated Services Codepoint", "ipv6.tclass.dscp",
-            FT_UINT32, BASE_DEC | BASE_EXT_STRING, &dscp_vals_ext, 0x0FC00000, NULL, HFILL }},
+            { "Differentiated Services Codepoint", "ipv6.tclass.dscp",
+                FT_UINT32, BASE_DEC | BASE_EXT_STRING, &dscp_vals_ext, 0x0FC00000,
+                NULL, HFILL }
+        },
         { &hf_ipv6_tclass_ecn,
-          { "Explicit Congestion Notification", "ipv6.tclass.ecn",
-            FT_UINT32, BASE_DEC | BASE_EXT_STRING, &ecn_vals_ext, 0x00300000, NULL, HFILL }},
+            { "Explicit Congestion Notification", "ipv6.tclass.ecn",
+                FT_UINT32, BASE_DEC | BASE_EXT_STRING, &ecn_vals_ext, 0x00300000,
+                NULL, HFILL }
+        },
         { &hf_ipv6_flow,
-          { "Flowlabel",            "ipv6.flow",
-            FT_UINT32, BASE_HEX, NULL, 0x000FFFFF, NULL, HFILL }},
+            { "Flowlabel", "ipv6.flow",
+                FT_UINT32, BASE_HEX, NULL, 0x000FFFFF,
+                NULL, HFILL }
+        },
         { &hf_ipv6_plen,
-          { "Payload length",       "ipv6.plen",
-            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+            { "Payload length", "ipv6.plen",
+                FT_UINT16, BASE_DEC, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_nxt,
-          { "Next header",          "ipv6.nxt",
-            FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0, NULL, HFILL }},
+            { "Next header", "ipv6.nxt",
+                FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_hlim,
-          { "Hop limit",            "ipv6.hlim",
-            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+            { "Hop limit", "ipv6.hlim",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_src,
-          { "Source",               "ipv6.src",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            "Source IPv6 Address", HFILL }},
+            { "Source", "ipv6.src",
+                FT_IPv6, BASE_NONE, NULL, 0x0,
+                "Source IPv6 Address", HFILL }
+        },
         { &hf_ipv6_src_host,
-          { "Source Host",          "ipv6.src_host",
-            FT_STRING, BASE_NONE, NULL, 0x0,
-            "Source IPv6 Host", HFILL }},
+            { "Source Host", "ipv6.src_host",
+                FT_STRING, BASE_NONE, NULL, 0x0,
+                "Source IPv6 Host", HFILL }
+        },
         { &hf_ipv6_src_sa_mac,
-          { "Source SA MAC",                "ipv6.src_sa_mac",
-            FT_ETHER, BASE_NONE, NULL, 0x0,
-            "Source IPv6 Stateless Autoconfiguration MAC Address", HFILL }},
+            { "Source SA MAC", "ipv6.src_sa_mac",
+                FT_ETHER, BASE_NONE, NULL, 0x0,
+                "Source IPv6 Stateless Autoconfiguration MAC Address", HFILL }
+        },
         { &hf_ipv6_src_isatap_ipv4,
-          { "Source ISATAP IPv4",           "ipv6.src_isatap_ipv4",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            "Source IPv6 ISATAP Encapsulated IPv4 Address", HFILL }},
+            { "Source ISATAP IPv4", "ipv6.src_isatap_ipv4",
+                FT_IPv4, BASE_NONE, NULL, 0x0,
+                "Source IPv6 ISATAP Encapsulated IPv4 Address", HFILL }
+        },
         { &hf_ipv6_src_6to4_gateway_ipv4,
-          { "Source 6to4 Gateway IPv4",     "ipv6.src_6to4_gw_ipv4",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            "Source IPv6 6to4 Gateway IPv4 Address", HFILL }},
+            { "Source 6to4 Gateway IPv4", "ipv6.src_6to4_gw_ipv4",
+                FT_IPv4, BASE_NONE, NULL, 0x0,
+                "Source IPv6 6to4 Gateway IPv4 Address", HFILL }
+        },
         { &hf_ipv6_src_6to4_sla_id,
-          { "Source 6to4 SLA ID",           "ipv6.src_6to4_sla_id",
-            FT_UINT16, BASE_DEC, NULL, 0x0,
-            "Source IPv6 6to4 SLA ID", HFILL }},
+            { "Source 6to4 SLA ID", "ipv6.src_6to4_sla_id",
+                FT_UINT16, BASE_DEC, NULL, 0x0,
+                "Source IPv6 6to4 SLA ID", HFILL }
+        },
         { &hf_ipv6_src_teredo_server_ipv4,
-          { "Source Teredo Server IPv4",    "ipv6.src_ts_ipv4",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            "Source IPv6 Teredo Server Encapsulated IPv4 Address", HFILL }},
+            { "Source Teredo Server IPv4", "ipv6.src_ts_ipv4",
+                FT_IPv4, BASE_NONE, NULL, 0x0,
+                "Source IPv6 Teredo Server Encapsulated IPv4 Address", HFILL }
+        },
         { &hf_ipv6_src_teredo_port,
-          { "Source Teredo Port",           "ipv6.src_tc_port",
-            FT_UINT16, BASE_DEC, NULL, 0x0,
-            "Source IPv6 Teredo Client Mapped Port", HFILL }},
+            { "Source Teredo Port", "ipv6.src_tc_port",
+                FT_UINT16, BASE_DEC, NULL, 0x0,
+                "Source IPv6 Teredo Client Mapped Port", HFILL }
+        },
         { &hf_ipv6_src_teredo_client_ipv4,
-          { "Source Teredo Client IPv4",    "ipv6.src_tc_ipv4",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            "Source IPv6 Teredo Client Encapsulated IPv4 Address", HFILL }},
+            { "Source Teredo Client IPv4", "ipv6.src_tc_ipv4",
+                FT_IPv4, BASE_NONE, NULL, 0x0,
+                "Source IPv6 Teredo Client Encapsulated IPv4 Address", HFILL }
+        },
         { &hf_ipv6_dst,
-          { "Destination",          "ipv6.dst",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            "Destination IPv6 Address", HFILL }},
+            { "Destination", "ipv6.dst",
+                FT_IPv6, BASE_NONE, NULL, 0x0,
+                "Destination IPv6 Address", HFILL }
+        },
         { &hf_ipv6_dst_host,
-          { "Destination Host",     "ipv6.dst_host",
-            FT_STRING, BASE_NONE, NULL, 0x0,
-            "Destination IPv6 Host", HFILL }},
+            { "Destination Host", "ipv6.dst_host",
+                FT_STRING, BASE_NONE, NULL, 0x0,
+                "Destination IPv6 Host", HFILL }
+        },
         { &hf_ipv6_dst_sa_mac,
-          { "Destination SA MAC",                   "ipv6.dst_sa_mac",
-            FT_ETHER, BASE_NONE, NULL, 0x0,
-            "Destination IPv6 Stateless Autoconfiguration MAC Address", HFILL }},
+            { "Destination SA MAC", "ipv6.dst_sa_mac",
+                FT_ETHER, BASE_NONE, NULL, 0x0,
+                "Destination IPv6 Stateless Autoconfiguration MAC Address", HFILL }
+        },
         { &hf_ipv6_dst_isatap_ipv4,
-          { "Destination ISATAP IPv4",              "ipv6.dst_isatap_ipv4",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            "Destination IPv6 ISATAP Encapsulated IPv4 Address", HFILL }},
+            { "Destination ISATAP IPv4", "ipv6.dst_isatap_ipv4",
+                FT_IPv4, BASE_NONE, NULL, 0x0,
+                "Destination IPv6 ISATAP Encapsulated IPv4 Address", HFILL }
+        },
         { &hf_ipv6_dst_6to4_gateway_ipv4,
-          { "Destination 6to4 Gateway IPv4",        "ipv6.dst_6to4_gw_ipv4",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            "Destination IPv6 6to4 Gateway IPv4 Address", HFILL }},
+            { "Destination 6to4 Gateway IPv4", "ipv6.dst_6to4_gw_ipv4",
+                FT_IPv4, BASE_NONE, NULL, 0x0,
+                "Destination IPv6 6to4 Gateway IPv4 Address", HFILL }
+        },
         { &hf_ipv6_dst_6to4_sla_id,
-          { "Destination 6to4 SLA ID",               "ipv6.dst_6to4_sla_id",
-            FT_UINT16, BASE_DEC, NULL, 0x0,
-            "Destination IPv6 6to4 SLA ID", HFILL }},
+            { "Destination 6to4 SLA ID", "ipv6.dst_6to4_sla_id",
+                FT_UINT16, BASE_DEC, NULL, 0x0,
+                "Destination IPv6 6to4 SLA ID", HFILL }
+        },
         { &hf_ipv6_dst_teredo_server_ipv4,
-          { "Destination Teredo Server IPv4",         "ipv6.dst_ts_ipv4",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            "Destination IPv6 Teredo Server Encapsulated IPv4 Address", HFILL }},
+            { "Destination Teredo Server IPv4", "ipv6.dst_ts_ipv4",
+                FT_IPv4, BASE_NONE, NULL, 0x0,
+                "Destination IPv6 Teredo Server Encapsulated IPv4 Address", HFILL }
+        },
         { &hf_ipv6_dst_teredo_port,
-          { "Destination Teredo Port",                "ipv6.dst_tc_port",
-            FT_UINT16, BASE_DEC, NULL, 0x0,
-            "Destination IPv6 Teredo Client Mapped Port", HFILL }},
+            { "Destination Teredo Port", "ipv6.dst_tc_port",
+                FT_UINT16, BASE_DEC, NULL, 0x0,
+                "Destination IPv6 Teredo Client Mapped Port", HFILL }
+        },
         { &hf_ipv6_dst_teredo_client_ipv4,
-          { "Destination Teredo Client IPv4",         "ipv6.dst_tc_ipv4",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            "Destination IPv6 Teredo Client Encapsulated IPv4 Address", HFILL }},
+            { "Destination Teredo Client IPv4", "ipv6.dst_tc_ipv4",
+                FT_IPv4, BASE_NONE, NULL, 0x0,
+                "Destination IPv6 Teredo Client Encapsulated IPv4 Address", HFILL }
+        },
         { &hf_ipv6_addr,
-          { "Source or Destination Address",          "ipv6.addr",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source or Destination Address", "ipv6.addr",
+                FT_IPv6, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_host,
-          { "Source or Destination Host",             "ipv6.host",
-            FT_STRING, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Source or Destination Host", "ipv6.host",
+                FT_STRING, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_sa_mac,
-          { "SA MAC",               "ipv6.sa_mac",
-            FT_ETHER, BASE_NONE, NULL, 0x0,
-            "IPv6 Stateless Autoconfiguration MAC Address", HFILL }},
+            { "SA MAC", "ipv6.sa_mac",
+                FT_ETHER, BASE_NONE, NULL, 0x0,
+                "IPv6 Stateless Autoconfiguration MAC Address", HFILL }
+        },
         { &hf_ipv6_isatap_ipv4,
-          { "ISATAP IPv4",          "ipv6.isatap_ipv4",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            "IPv6 ISATAP Encapsulated IPv4 Address", HFILL }},
+            { "ISATAP IPv4", "ipv6.isatap_ipv4",
+                FT_IPv4, BASE_NONE, NULL, 0x0,
+                "IPv6 ISATAP Encapsulated IPv4 Address", HFILL }
+        },
         { &hf_ipv6_6to4_gateway_ipv4,
-          { "6to4 Gateway IPv4",    "ipv6.6to4_gw_ipv4",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            "IPv6 6to4 Gateway IPv4 Address", HFILL }},
+            { "6to4 Gateway IPv4", "ipv6.6to4_gw_ipv4",
+                FT_IPv4, BASE_NONE, NULL, 0x0,
+                "IPv6 6to4 Gateway IPv4 Address", HFILL }
+        },
         { &hf_ipv6_6to4_sla_id,
-          { "6to4 SLA ID",          "ipv6.6to4_sla_id",
-            FT_UINT16, BASE_DEC, NULL, 0x0,
-            "IPv6 6to4 SLA ID", HFILL }},
+            { "6to4 SLA ID", "ipv6.6to4_sla_id",
+                FT_UINT16, BASE_DEC, NULL, 0x0,
+                "IPv6 6to4 SLA ID", HFILL }
+        },
         { &hf_ipv6_teredo_server_ipv4,
-          { "Teredo Server IPv4",   "ipv6.ts_ipv4",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            "IPv6 Teredo Server Encapsulated IPv4 Address", HFILL }},
+            { "Teredo Server IPv4", "ipv6.ts_ipv4",
+                FT_IPv4, BASE_NONE, NULL, 0x0,
+                "IPv6 Teredo Server Encapsulated IPv4 Address", HFILL }
+        },
         { &hf_ipv6_teredo_port,
-          { "Teredo Port",          "ipv6.tc_port",
-            FT_UINT16, BASE_DEC, NULL, 0x0,
-            "IPv6 Teredo Client Mapped Port", HFILL }},
+            { "Teredo Port", "ipv6.tc_port",
+                FT_UINT16, BASE_DEC, NULL, 0x0,
+                "IPv6 Teredo Client Mapped Port", HFILL }
+        },
         { &hf_ipv6_teredo_client_ipv4,
-          { "Teredo Client IPv4",   "ipv6.tc_ipv4",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            "IPv6 Teredo Client Encapsulated IPv4 Address", HFILL }},
+            { "Teredo Client IPv4", "ipv6.tc_ipv4",
+                FT_IPv4, BASE_NONE, NULL, 0x0,
+                "IPv6 Teredo Client Encapsulated IPv4 Address", HFILL }
+        },
+
 #ifdef HAVE_GEOIP_V6
         { &hf_geoip_country,
-          { "Source or Destination GeoIP Country", "ipv6.geoip.country",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source or Destination GeoIP Country", "ipv6.geoip.country",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_city,
-          { "Source or Destination GeoIP City", "ipv6.geoip.city",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source or Destination GeoIP City", "ipv6.geoip.city",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_org,
-          { "Source or Destination GeoIP Organization", "ipv6.geoip.org",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source or Destination GeoIP Organization", "ipv6.geoip.org",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_isp,
-          { "Source or Destination GeoIP ISP", "ipv6.geoip.isp",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source or Destination GeoIP ISP", "ipv6.geoip.isp",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_asnum,
-          { "Source or Destination GeoIP AS Number", "ipv6.geoip.asnum",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source or Destination GeoIP AS Number", "ipv6.geoip.asnum",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_lat,
-          { "Source or Destination GeoIP Latitude", "ipv6.geoip.lat",
-            FT_DOUBLE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source or Destination GeoIP Latitude", "ipv6.geoip.lat",
+                FT_DOUBLE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_lon,
-          { "Source or Destination GeoIP Longitude", "ipv6.geoip.lon",
-            FT_DOUBLE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source or Destination GeoIP Longitude", "ipv6.geoip.lon",
+                FT_DOUBLE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_src_country,
-          { "Source GeoIP Country", "ipv6.geoip.src_country",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source GeoIP Country", "ipv6.geoip.src_country",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_src_city,
-          { "Source GeoIP City", "ipv6.geoip.src_city",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source GeoIP City", "ipv6.geoip.src_city",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_src_org,
-          { "Source GeoIP Organization", "ipv6.geoip.src_org",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source GeoIP Organization", "ipv6.geoip.src_org",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_src_isp,
-          { "Source GeoIP ISP", "ipv6.geoip.src_isp",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source GeoIP ISP", "ipv6.geoip.src_isp",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_src_asnum,
-          { "Source GeoIP AS Number", "ipv6.geoip.src_asnum",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source GeoIP AS Number", "ipv6.geoip.src_asnum",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_src_lat,
-          { "Source GeoIP Latitude", "ipv6.geoip.src_lat",
-            FT_DOUBLE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source GeoIP Latitude", "ipv6.geoip.src_lat",
+                FT_DOUBLE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_src_lon,
-          { "Source GeoIP Longitude", "ipv6.geoip.src_lon",
-            FT_DOUBLE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Source GeoIP Longitude", "ipv6.geoip.src_lon",
+                FT_DOUBLE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_dst_country,
-          { "Destination GeoIP Country", "ipv6.geoip.dst_country",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Destination GeoIP Country", "ipv6.geoip.dst_country",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_dst_city,
-          { "Destination GeoIP City", "ipv6.geoip.dst_city",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Destination GeoIP City", "ipv6.geoip.dst_city",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_dst_org,
-          { "Destination GeoIP Organization", "ipv6.geoip.dst_org",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Destination GeoIP Organization", "ipv6.geoip.dst_org",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_dst_isp,
-          { "Destination GeoIP ISP", "ipv6.geoip.dst_isp",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Destination GeoIP ISP", "ipv6.geoip.dst_isp",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_dst_asnum,
-          { "Destination GeoIP AS Number", "ipv6.geoip.dst_asnum",
-            FT_STRING, STR_UNICODE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Destination GeoIP AS Number", "ipv6.geoip.dst_asnum",
+                FT_STRING, STR_UNICODE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_dst_lat,
-          { "Destination GeoIP Latitude", "ipv6.geoip.dst_lat",
-            FT_DOUBLE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Destination GeoIP Latitude", "ipv6.geoip.dst_lat",
+                FT_DOUBLE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_geoip_dst_lon,
-          { "Destination GeoIP Longitude", "ipv6.geoip.dst_lon",
-            FT_DOUBLE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Destination GeoIP Longitude", "ipv6.geoip.dst_lon",
+                FT_DOUBLE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
 #endif /* HAVE_GEOIP_V6 */
 
         { &hf_ipv6_dstopts,
-          { "Destination Options",  "ipv6.dstopts",
-            FT_NONE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Destination Options", "ipv6.dstopts",
+                FT_NONE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_dstopts_nxt,
-          { "Next Header",          "ipv6.dstopts.nxt",
-            FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0,
-            NULL, HFILL }},
+            { "Next Header", "ipv6.dstopts.nxt",
+                FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_dstopts_length,
-          { "Length",               "ipv6.dstopts.length",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Extension Header Length", HFILL }},
+            { "Length", "ipv6.dstopts.length",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "Extension Header Length", HFILL }
+        },
         { &hf_ipv6_hopopts,
-          { "Hop-by-Hop Options",   "ipv6.hopopts",
-            FT_NONE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Hop-by-Hop Options", "ipv6.hopopts",
+                FT_NONE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_hopopts_nxt,
-          { "Next Header",          "ipv6.hopopts.nxt",
-            FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0,
-            NULL, HFILL }},
+            { "Next Header", "ipv6.hopopts.nxt",
+                FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_hopopts_length,
-          { "Length",               "ipv6.hopopts.length",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Extension Header Length", HFILL }},
+            { "Length", "ipv6.hopopts.length",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "Extension Header Length", HFILL }
+        },
         { &hf_ipv6_unknown_hdr,
-          { "Unknown Extension Header", "ipv6.unknown_hdr",
-            FT_NONE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Unknown Extension Header", "ipv6.unknown_hdr",
+                FT_NONE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_unknown_hdr_nxt,
-          { "Next Header",          "ipv6.unknown_hdr.nxt",
-            FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0,
-            NULL, HFILL }},
+            { "Next Header", "ipv6.unknown_hdr.nxt",
+                FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_unknown_hdr_length,
-          { "Length",               "ipv6.unknown_hdr.length",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Extension Header Length", HFILL }},
+            { "Length", "ipv6.unknown_hdr.length",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "Extension Header Length", HFILL }
+        },
         { &hf_ipv6_opt,
-          { "IPv6 Option",          "ipv6.opt",
-            FT_NONE, BASE_NONE, NULL, 0x0,
-            "Option", HFILL }},
+            { "IPv6 Option", "ipv6.opt",
+                FT_NONE, BASE_NONE, NULL, 0x0,
+                "Option", HFILL }
+        },
         { &hf_ipv6_opt_type,
-          { "Type",                 "ipv6.opt.type",
-            FT_UINT8, BASE_DEC, VALS(ipv6_opt_vals), 0x0,
-            "Option type", HFILL }},
+            { "Type", "ipv6.opt.type",
+                FT_UINT8, BASE_DEC, VALS(ipv6_opt_vals), 0x0,
+                "Option type", HFILL }
+        },
         { &hf_ipv6_opt_length,
-          { "Length",               "ipv6.opt.length",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Option length in octets", HFILL }},
+            { "Length", "ipv6.opt.length",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "Option length in octets", HFILL }
+        },
         { &hf_ipv6_opt_pad1,
-          { "Pad1",                 "ipv6.opt.pad1",
-            FT_NONE, BASE_NONE, NULL, 0x0,
-            "Pad1 Option", HFILL }},
+            { "Pad1", "ipv6.opt.pad1",
+                FT_NONE, BASE_NONE, NULL, 0x0,
+                "Pad1 Option", HFILL }
+        },
         { &hf_ipv6_opt_padn,
-          { "PadN",                 "ipv6.opt.padn",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            "PadN Option", HFILL }},
+            { "PadN", "ipv6.opt.padn",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                "PadN Option", HFILL }
+        },
         { &hf_ipv6_opt_rtalert,
-          { "Router Alert",         "ipv6.opt.router_alert",
-            FT_UINT16, BASE_DEC, VALS(rtalertvals), 0x0,
-            NULL, HFILL }},
+            { "Router Alert", "ipv6.opt.router_alert",
+                FT_UINT16, BASE_DEC, VALS(rtalertvals), 0x0,
+                "Router Alert Option", HFILL }
+        },
         { &hf_ipv6_opt_tel,
-          { "Tunnel Encapsulation Limit", "ipv6.opt.tel",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            "How many further levels of encapsulation are permitted", HFILL }},
+            { "Tunnel Encapsulation Limit", "ipv6.opt.tel",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "How many further levels of encapsulation are permitted", HFILL }
+        },
         { &hf_ipv6_opt_jumbo,
-          { "Payload Length",       "ipv6.opt.jumbo",
-            FT_UINT32, BASE_DEC, NULL, 0x0,
-            "Length of the IPv6 packet in octets", HFILL }},
+            { "Payload Length", "ipv6.opt.jumbo",
+                FT_UINT32, BASE_DEC, NULL, 0x0,
+                "IPv6 (Jumbo) Payload Length", HFILL }
+        },
         { &hf_ipv6_opt_calipso_doi,
-          { "CALIPSO Domain of Interpretation","ipv6.opt.calipso.doi",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            NULL, HFILL }},
+            { "CALIPSO Domain of Interpretation", "ipv6.opt.calipso.doi",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_calipso_cmpt_length,
-          { "Compartment Length","ipv6.opt.calipso.cmpt.length",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            NULL, HFILL }},
+            { "Compartment Length", "ipv6.opt.calipso.cmpt.length",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_calipso_sens_level,
-          { "Sensitivity Level","ipv6.opt.calipso.sens_level",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            NULL, HFILL }},
+            { "Sensitivity Level", "ipv6.opt.calipso.sens_level",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_calipso_checksum,
-          { "Checksum","ipv6.opt.calipso.checksum",
-            FT_UINT16, BASE_HEX, NULL, 0x0,
-            NULL, HFILL }},
+            { "Checksum", "ipv6.opt.calipso.checksum",
+                FT_UINT16, BASE_HEX, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_calipso_cmpt_bitmap,
-          { "Compartment Bitmap","ipv6.opt.calipso.cmpt_bitmap",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Compartment Bitmap", "ipv6.opt.calipso.cmpt_bitmap",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_qs_func,
-          { "Function",             "ipv6.opt.qs_func",
-            FT_UINT8, BASE_DEC, VALS(qs_func_vals), QS_FUNC_MASK,
-            NULL, HFILL }},
+            { "Function", "ipv6.opt.qs_func",
+                FT_UINT8, BASE_DEC, VALS(qs_func_vals), QS_FUNC_MASK,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_qs_rate,
-          { "Rate",                 "ipv6.opt.qs_rate",
-            FT_UINT8, BASE_DEC | BASE_EXT_STRING, &qs_rate_vals_ext, QS_RATE_MASK,
-            NULL, HFILL }},
+            { "Rate", "ipv6.opt.qs_rate",
+                FT_UINT8, BASE_DEC | BASE_EXT_STRING, &qs_rate_vals_ext, QS_RATE_MASK,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_qs_ttl,
-          { "QS TTL",               "ipv6.opt.qs_ttl",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            NULL, HFILL }},
+            { "QS TTL", "ipv6.opt.qs_ttl",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_qs_ttl_diff,
-          { "TTL Diff",             "ipv6.opt.qs_ttl_diff",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            NULL, HFILL }},
+            { "TTL Diff", "ipv6.opt.qs_ttl_diff",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_qs_unused,
-          { "Not Used",             "ipv6.opt.qs_unused",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            NULL, HFILL }},
+            { "Not Used", "ipv6.opt.qs_unused",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_qs_nonce,
-          { "QS Nonce",             "ipv6.opt.qs_nonce",
-            FT_UINT32, BASE_HEX, NULL, 0xFFFFFFFC,
-            NULL, HFILL }},
+            { "QS Nonce", "ipv6.opt.qs_nonce",
+                FT_UINT32, BASE_HEX, NULL, 0xFFFFFFFC,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_qs_reserved,
-          { "Reserved",             "ipv6.opt.qs_reserved",
-            FT_UINT32, BASE_HEX, NULL, 0x0003,
-            NULL, HFILL }},
+            { "Reserved", "ipv6.opt.qs_reserved",
+                FT_UINT32, BASE_HEX, NULL, 0x0003,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_mipv6_home_address,
-          { "MIPv6 Home Address", "ipv6.opt.mipv6.home_address",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "MIPv6 Home Address", "ipv6.opt.mipv6.home_address",
+                FT_IPv6, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_rpl_flag,
-          { "Flag",                 "ipv6.opt.rpl.flag",
-            FT_UINT8, BASE_HEX, NULL, 0x0,
-            NULL, HFILL }},
+            { "Flag", "ipv6.opt.rpl.flag",
+                FT_UINT8, BASE_HEX, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_rpl_flag_o,
-          { "Down",                 "ipv6.opt.rpl.flag.o",
-            FT_BOOLEAN, 8, NULL, 0x80,
-            "The packet is expected to progress Up or Down", HFILL }},
+            { "Down", "ipv6.opt.rpl.flag.o",
+                FT_BOOLEAN, 8, NULL, 0x80,
+                "The packet is expected to progress Up or Down", HFILL }
+        },
         { &hf_ipv6_opt_rpl_flag_r,
-          { "Rank Error",           "ipv6.opt.rpl.flag.r",
-            FT_BOOLEAN, 8, NULL, 0x40,
-            "Indicating whether a rank error was detected", HFILL }},
+            { "Rank Error", "ipv6.opt.rpl.flag.r",
+                FT_BOOLEAN, 8, NULL, 0x40,
+                "Whether a rank error was detected", HFILL }
+        },
         { &hf_ipv6_opt_rpl_flag_f,
-          { "Forwarding Error",     "ipv6.opt.rpl.flag.f",
-            FT_BOOLEAN, 8, NULL, 0x20,
-            "Indicating that this node can not forward the packet further towards the destination", HFILL }},
+            { "Forwarding Error", "ipv6.opt.rpl.flag.f",
+                FT_BOOLEAN, 8, NULL, 0x20,
+                "Set if the node cannot forward the packet further towards the destination", HFILL }
+        },
         { &hf_ipv6_opt_rpl_flag_rsv,
-          { "Reserved",     "ipv6.opt.rpl.flag.rsv",
-            FT_UINT8, BASE_HEX, NULL, 0x1F,
-            "Reserved (Must Be Zero)", HFILL }},
+            { "Reserved", "ipv6.opt.rpl.flag.rsv",
+                FT_UINT8, BASE_HEX, NULL, 0x1F,
+                "Reserved (must be zero)", HFILL }
+        },
         { &hf_ipv6_opt_rpl_instance_id,
-          { "RPLInstanceID",        "ipv6.opt.rpl.instance_id",
-            FT_UINT8, BASE_HEX, NULL, 0x0,
-            "Indicating the DODAG instance along which the packet is sent", HFILL }},
+            { "RPLInstanceID", "ipv6.opt.rpl.instance_id",
+                FT_UINT8, BASE_HEX, NULL, 0x0,
+                "The DODAG instance along which the packet is sent", HFILL }
+        },
         { &hf_ipv6_opt_rpl_senderrank,
-          { "Sender Rank",          "ipv6.opt.rpl.sender_rank",
-            FT_UINT16, BASE_HEX, NULL, 0x0,
-            "Set to zero by the source and to DAGRank(rank) by a router that forwards inside the RPL network", HFILL }},
+            { "Sender Rank", "ipv6.opt.rpl.sender_rank",
+                FT_UINT16, BASE_HEX, NULL, 0x0,
+                "Set to zero by the source and to DAGRank(rank) by a router that forwards inside the RPL network", HFILL }
+        },
         { &hf_ipv6_opt_mpl_flag,
-          { "Flag",                 "ipv6.opt.mpl.flag",
-            FT_UINT8, BASE_HEX, NULL, 0x0,
-            NULL, HFILL }},
+            { "Flag", "ipv6.opt.mpl.flag",
+                FT_UINT8, BASE_HEX, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_mpl_flag_s,
-          { "Seed ID Length",       "ipv6.opt.mpl.flag.s",
-            FT_UINT8, BASE_DEC, NULL, 0xC0,
-            "Identifies the length of Seed ID", HFILL }},
+            { "Seed ID Length", "ipv6.opt.mpl.flag.s",
+                FT_UINT8, BASE_DEC, NULL, 0xC0,
+                "Identifies the length of Seed ID", HFILL }
+        },
         { &hf_ipv6_opt_mpl_flag_m,
-          { "Largest Sequence",      "ipv6.opt.mpl.flag.m",
-            FT_BOOLEAN, 8, NULL, 0x20,
-            "Indicates Sequence is known to be the largest sequence number", HFILL }},
+            { "Largest Sequence", "ipv6.opt.mpl.flag.m",
+                FT_BOOLEAN, 8, NULL, 0x20,
+                "Indicates Sequence is known to be the largest sequence number", HFILL }
+        },
         { &hf_ipv6_opt_mpl_flag_v,
-          { "Version",               "ipv6.opt.mpl.flag.v",
-            FT_BOOLEAN, 8, NULL, 0x10,
-            "0 indicates this option conforms to RFC<TBC>", HFILL }},
+            { "Version", "ipv6.opt.mpl.flag.v",
+                FT_BOOLEAN, 8, NULL, 0x10,
+                "0 indicates this option conforms to RFC<TBC>", HFILL }
+        },
         { &hf_ipv6_opt_mpl_flag_rsv,
-          { "Reserved",              "ipv6.opt.mpl.flag.rsv",
-            FT_UINT8, BASE_HEX, NULL, 0x0F,
-            "Reserved (Must Be Zero)", HFILL }},
+            { "Reserved", "ipv6.opt.mpl.flag.rsv",
+                FT_UINT8, BASE_HEX, NULL, 0x0F,
+                "Reserved (must be zero)", HFILL }
+        },
         { &hf_ipv6_opt_mpl_sequence,
-          { "Sequence",              "ipv6.opt.mpl.sequence",
-            FT_UINT8, BASE_HEX, NULL, 0x0,
-            "Identifies relative ordering of MPL Data Messages from the MPL Seed identified by Seed ID", HFILL }},
+            { "Sequence", "ipv6.opt.mpl.sequence",
+                FT_UINT8, BASE_HEX, NULL, 0x0,
+                "Identifies relative ordering of MPL Data Messages from the MPL Seed identified by Seed ID", HFILL }
+        },
         { &hf_ipv6_opt_mpl_seed_id,
-          { "Seed ID",               "ipv6.opt.mpl.seed_id",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            "Uniquely identifies the MPL Seed that initiated dissemination of the MPL Data Message", HFILL }},
+            { "Seed ID", "ipv6.opt.mpl.seed_id",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                "Uniquely identifies the MPL Seed that initiated dissemination of the MPL Data Message", HFILL }
+        },
         { &hf_ipv6_opt_experimental,
-          { "Experimental Option","ipv6.opt.experimental",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Experimental Option", "ipv6.opt.experimental",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_opt_unknown_data,
-          { "Unknown Data", "ipv6.opt_unknown_data", FT_BYTES, BASE_NONE, NULL, 0x0,
-            "Not interpreted Data", HFILL }},
+            { "Unknown Data", "ipv6.opt_unknown_data",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                "Not interpreted data", HFILL }
+        },
         { &hf_ipv6_opt_unknown,
-          { "Unknown Option Payload","ipv6.opt.unknown",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Unknown Option Payload", "ipv6.opt.unknown",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_fraghdr,
-          { "Fragment Header",      "ipv6.fraghdr",
-            FT_NONE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Fragment Header", "ipv6.fraghdr",
+                FT_NONE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_fraghdr_nxt,
-          { "Next header",          "ipv6.fraghdr.nxt",
-            FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0,
-            NULL, HFILL }},
+            { "Next header", "ipv6.fraghdr.nxt",
+                FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_fraghdr_reserved_octet,
-          { "Reserved octet",       "ipv6.fraghdr.reserved_octet",
-            FT_UINT16, BASE_HEX, NULL, 0x0,
-            "Should always be 0", HFILL }},
+            { "Reserved octet", "ipv6.fraghdr.reserved_octet",
+                FT_UINT16, BASE_HEX, NULL, 0x0,
+                "Should always be 0", HFILL }
+        },
         { &hf_ipv6_fraghdr_offset,
-          { "Offset",               "ipv6.fraghdr.offset",
-            FT_UINT16, BASE_DEC, NULL, IP6F_OFF_MASK,
-            "Fragment Offset", HFILL }},
+            { "Offset", "ipv6.fraghdr.offset",
+                FT_UINT16, BASE_DEC, NULL, IP6F_OFF_MASK,
+                "Fragment Offset", HFILL }
+        },
         { &hf_ipv6_fraghdr_reserved_bits,
-          { "Reserved bits",        "ipv6.fraghdr.reserved_bits",
-            FT_UINT16, BASE_DEC, NULL, IP6F_RESERVED_MASK,
-            NULL, HFILL }},
+            { "Reserved bits", "ipv6.fraghdr.reserved_bits",
+                FT_UINT16, BASE_DEC, NULL, IP6F_RESERVED_MASK,
+                NULL, HFILL }
+        },
         { &hf_ipv6_fraghdr_more,
-          { "More Fragments",        "ipv6.fraghdr.more",
-            FT_BOOLEAN, 16, TFS(&tfs_yes_no), IP6F_MORE_FRAG,
-            NULL, HFILL }},
+            { "More Fragments", "ipv6.fraghdr.more",
+                FT_BOOLEAN, 16, TFS(&tfs_yes_no), IP6F_MORE_FRAG,
+                NULL, HFILL }
+        },
         { &hf_ipv6_fraghdr_ident,
-          { "Identification",        "ipv6.fraghdr.ident",
-            FT_UINT32, BASE_HEX, NULL, 0x0,
-            "Fragment Identification", HFILL }},
-
+            { "Identification", "ipv6.fraghdr.ident",
+                FT_UINT32, BASE_HEX, NULL, 0x0,
+                "Fragment Identification", HFILL }
+        },
         { &hf_ipv6_fragment,
-          { "IPv6 Fragment",        "ipv6.fragment",
-            FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "IPv6 Fragment", "ipv6.fragment",
+                FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_fragment_overlap,
-          { "Fragment overlap",     "ipv6.fragment.overlap",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-            "Fragment overlaps with other fragments", HFILL }},
-
+            { "Fragment overlap", "ipv6.fragment.overlap",
+                FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+                "Fragment overlaps with other fragments", HFILL }
+        },
         { &hf_ipv6_fragment_overlap_conflict,
-          { "Conflicting data in fragment overlap", "ipv6.fragment.overlap.conflict",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-            "Overlapping fragments contained conflicting data", HFILL }},
-
+            { "Conflicting data in fragment overlap", "ipv6.fragment.overlap.conflict",
+                FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+                "Overlapping fragments contained conflicting data", HFILL }
+        },
         { &hf_ipv6_fragment_multiple_tails,
-          { "Multiple tail fragments found", "ipv6.fragment.multipletails",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-            "Several tails were found when defragmenting the packet", HFILL }},
-
+            { "Multiple tail fragments found", "ipv6.fragment.multipletails",
+                FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+                "Several tails were found when defragmenting the packet", HFILL }
+        },
         { &hf_ipv6_fragment_too_long_fragment,
-          { "Fragment too long",    "ipv6.fragment.toolongfragment",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-            "Fragment contained data past end of packet", HFILL }},
-
+            { "Fragment too long", "ipv6.fragment.toolongfragment",
+                FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+                "Fragment contained data past end of packet", HFILL }
+        },
         { &hf_ipv6_fragment_error,
-          { "Defragmentation error", "ipv6.fragment.error",
-            FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-            "Defragmentation error due to illegal fragments", HFILL }},
-
+            { "Defragmentation error", "ipv6.fragment.error",
+                FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+                "Defragmentation error due to illegal fragments", HFILL }
+        },
         { &hf_ipv6_fragment_count,
-          { "Fragment count",       "ipv6.fragment.count",
-            FT_UINT32, BASE_DEC, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Fragment count", "ipv6.fragment.count",
+                FT_UINT32, BASE_DEC, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_fragments,
-          { "IPv6 Fragments",       "ipv6.fragments",
-            FT_NONE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "IPv6 Fragments", "ipv6.fragments",
+                FT_NONE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_reassembled_in,
-          { "Reassembled IPv6 in frame", "ipv6.reassembled_in",
-            FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-            "This IPv6 packet is reassembled in this frame", HFILL }},
-
+            { "Reassembled IPv6 in frame", "ipv6.reassembled.in",
+                FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+                "This IPv6 packet is reassembled in this frame", HFILL }
+        },
         { &hf_ipv6_reassembled_length,
-          { "Reassembled IPv6 length", "ipv6.reassembled.length",
-            FT_UINT32, BASE_DEC, NULL, 0x0,
-            "The total length of the reassembled payload", HFILL }},
-
+            { "Reassembled IPv6 length", "ipv6.reassembled.length",
+                FT_UINT32, BASE_DEC, NULL, 0x0,
+                "The total length of the reassembled payload", HFILL }
+        },
         { &hf_ipv6_reassembled_data,
-          { "Reassembled IPv6 data", "ipv6.reassembled.data",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            "The reassembled payload", HFILL }},
-
+            { "Reassembled IPv6 data", "ipv6.reassembled.data",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                "The reassembled payload", HFILL }
+        },
         { &hf_ipv6_padding,
-          { "Padding", "ipv6.padding",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Padding", "ipv6.padding",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
 
         /* IPv6 Routing Header */
         { &hf_ipv6_routing,
-          { "Routing Header",       "ipv6.routing",
-            FT_NONE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Routing Header", "ipv6.routing",
+                FT_NONE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_routing_nxt,
-          { "Next Header",          "ipv6.routing.nxt",
-            FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0,
-            NULL, HFILL }},
-
+            { "Next Header", "ipv6.routing.nxt",
+                FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_routing_length,
-          { "Length",               "ipv6.routing.length",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Extension Header Length", HFILL }},
-
+            { "Length", "ipv6.routing.length",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "Extension Header Length", HFILL }
+        },
         { &hf_ipv6_routing_type,
-          { "Type",                 "ipv6.routing.type",
-            FT_UINT8, BASE_DEC, VALS(routing_header_type), 0x0,
-            "Routing Header Type", HFILL }},
-
+            { "Type", "ipv6.routing.type",
+                FT_UINT8, BASE_DEC, VALS(routing_header_type), 0x0,
+                "Routing Header Type", HFILL }
+        },
         { &hf_ipv6_routing_segleft,
-          { "Segments Left",        "ipv6.routing.segleft",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Routing Header Segments Left", HFILL }},
+            { "Segments Left", "ipv6.routing.segleft",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "Routing Header Segments Left", HFILL }
+        },
 
         /* Source Routing Header */
         { &hf_ipv6_routing_src_reserved,
-          { "Reserved",             "ipv6.routing.src.reserved",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            "Must be zero", HFILL }},
-
+            { "Reserved", "ipv6.routing.src.reserved",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                "Must be zero", HFILL }
+        },
         { &hf_ipv6_routing_src_addr,
-          { "Address",              "ipv6.routing.src.addr",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            "Source Routing Header Address", HFILL }},
+            { "Address", "ipv6.routing.src.addr",
+                FT_IPv6, BASE_NONE, NULL, 0x0,
+                "Source Routing Header Address", HFILL }},
 
         /* Mobile IPv6 */
         { &hf_ipv6_routing_mipv6_reserved,
-          { "Reserved",             "ipv6.routing.mipv6.reserved",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            "Must be zero", HFILL }},
-
+            { "Reserved", "ipv6.routing.mipv6.reserved",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                "Must be zero", HFILL }
+        },
         { &hf_ipv6_routing_mipv6_home_address,
-          { "Home Address",         "ipv6.routing.mipv6.home_address",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "Home Address", "ipv6.routing.mipv6.home_address",
+                FT_IPv6, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
 
         /* RPL Routing Header */
         { &hf_ipv6_routing_rpl_cmprI,
-          { "Compressed Internal Octets (CmprI)", "ipv6.routing.rpl.cmprI",
-            FT_UINT32, BASE_DEC, NULL, IP6RRPL_BITMASK_CMPRI,
-            "Elided octets from all but last segment", HFILL }},
-
+            { "Compressed Internal Octets (CmprI)", "ipv6.routing.rpl.cmprI",
+                FT_UINT32, BASE_DEC, NULL, IP6RRPL_BITMASK_CMPRI,
+                "Elided octets from all but last segment", HFILL }
+        },
         { &hf_ipv6_routing_rpl_cmprE,
-          { "Compressed Final Octets (CmprE)", "ipv6.routing.rpl.cmprE",
-            FT_UINT32, BASE_DEC, NULL, IP6RRPL_BITMASK_CMPRE,
-            "Elided octets from last segment address", HFILL }},
-
+            { "Compressed Final Octets (CmprE)", "ipv6.routing.rpl.cmprE",
+                FT_UINT32, BASE_DEC, NULL, IP6RRPL_BITMASK_CMPRE,
+                "Elided octets from last segment address", HFILL }
+        },
         { &hf_ipv6_routing_rpl_pad,
-          { "Padding Bytes", "ipv6.routing.rpl.pad",
-            FT_UINT32, BASE_DEC, NULL, IP6RRPL_BITMASK_PAD,
-            NULL, HFILL }},
-
+            { "Padding Bytes", "ipv6.routing.rpl.pad",
+                FT_UINT32, BASE_DEC, NULL, IP6RRPL_BITMASK_PAD,
+                NULL, HFILL }
+        },
         { &hf_ipv6_routing_rpl_reserved,
-          { "Reserved", "ipv6.routing.rpl.reserved",
-            FT_UINT32, BASE_DEC, NULL, IP6RRPL_BITMASK_RESERVED,
-            "Must be Zero", HFILL }},
-
+            { "Reserved", "ipv6.routing.rpl.reserved",
+                FT_UINT32, BASE_DEC, NULL, IP6RRPL_BITMASK_RESERVED,
+                "Must be zero", HFILL }
+        },
         { &hf_ipv6_routing_rpl_segments,
-          { "Total Address Count", "ipv6.routing.rpl.segments",
-            FT_INT32, BASE_DEC, NULL, 0,
-            NULL, HFILL }},
-
+            { "Total Address Count", "ipv6.routing.rpl.segments",
+                FT_INT32, BASE_DEC, NULL, 0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_routing_rpl_addr,
-          { "Address", "ipv6.routing.rpl.address",
-            FT_BYTES, BASE_NONE, NULL, 0,
-            NULL, HFILL }},
-
+            { "Address", "ipv6.routing.rpl.address",
+                FT_BYTES, BASE_NONE, NULL, 0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_routing_rpl_fulladdr,
-          { "Full Address", "ipv6.routing.rpl.full_address",
-            FT_IPv6, BASE_NONE, NULL, 0,
-            "Uncompressed IPv6 Address", HFILL }},
+            { "Full Address", "ipv6.routing.rpl.full_address",
+                FT_IPv6, BASE_NONE, NULL, 0,
+                "Uncompressed IPv6 Address", HFILL }
+        },
 
         /* SHIM6 */
         { &hf_ipv6_shim6,
-          { "SHIM6",                "ipv6.shim6",
-            FT_NONE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "SHIM6", "ipv6.shim6",
+                FT_NONE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_nxt,
-          { "Next Header",          "ipv6.shim6.nxt",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Next Header", "ipv6.shim6.nxt",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_len,
-          { "Header Ext Length",    "ipv6.shim6.len",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Length", "ipv6.shim6.length",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "Extension Header Length", HFILL }
+        },
         { &hf_ipv6_shim6_p,
-          { "P Bit",                "ipv6.shim6.p",
-            FT_BOOLEAN, 8, NULL, SHIM6_BITMASK_P,
-            NULL, HFILL }},
-
+            { "P Bit", "ipv6.shim6.p",
+                FT_BOOLEAN, 8, NULL, SHIM6_BITMASK_P,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_ct,
-          { "Context Tag",          "ipv6.shim6.ct",
-            FT_NONE, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Context Tag", "ipv6.shim6.ct",
+                FT_NONE, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_type,
-          { "Message Type",         "ipv6.shim6.type",
-            FT_UINT8, BASE_DEC,
-            VALS(shimctrlvals), SHIM6_BITMASK_TYPE,
-            NULL, HFILL }},
-
+            { "Message Type", "ipv6.shim6.type",
+                FT_UINT8, BASE_DEC, VALS(shimctrlvals), SHIM6_BITMASK_TYPE,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_proto,
-          { "Protocol",             "ipv6.shim6.proto",
-            FT_UINT8, BASE_DEC,
-            VALS(shim6_protocol), SHIM6_BITMASK_PROTOCOL,
-            NULL, HFILL }},
-
+            { "Protocol", "ipv6.shim6.proto",
+                FT_UINT8, BASE_DEC, VALS(shim6_protocol), SHIM6_BITMASK_PROTOCOL,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_checksum,
-          { "Checksum",             "ipv6.shim6.checksum",
-            FT_UINT16, BASE_HEX, NULL, 0x0,
-            "Shim6 Checksum", HFILL }},
+            { "Checksum", "ipv6.shim6.checksum",
+                FT_UINT16, BASE_HEX, NULL, 0x0,
+                "Shim6 Checksum", HFILL }
+        },
         { &hf_ipv6_shim6_checksum_bad,
-          { "Bad Checksum",         "ipv6.shim6.checksum_bad",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-            "Shim6 Bad Checksum", HFILL }},
-
+            { "Bad Checksum", "ipv6.shim6.checksum_bad",
+                FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+                "Shim6 Bad Checksum", HFILL }
+        },
         { &hf_ipv6_shim6_checksum_good,
-          { "Good Checksum",        "ipv6.shim6.checksum_good",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Good Checksum", "ipv6.shim6.checksum_good",
+                FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_inonce,
-          { "Initiator Nonce",      "ipv6.shim6.inonce",
-            FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Initiator Nonce", "ipv6.shim6.inonce",
+                FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_rnonce,
-          { "Responder Nonce",      "ipv6.shim6.rnonce",
-            FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Responder Nonce", "ipv6.shim6.rnonce",
+                FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_reserved,
-          { "Reserved",      "ipv6.shim6.reserved",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Reserved", "ipv6.shim6.reserved",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_reserved2,
-          { "Reserved2",      "ipv6.shim6.reserved2",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Reserved2", "ipv6.shim6.reserved2",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_precvd,
-          { "Probes Received",      "ipv6.shim6.precvd",
-            FT_UINT8, BASE_DEC, NULL, SHIM6_BITMASK_PRECVD,
-            NULL, HFILL }},
-
+            { "Probes Received", "ipv6.shim6.precvd",
+                FT_UINT8, BASE_DEC, NULL, SHIM6_BITMASK_PRECVD,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_psent,
-          { "Probes Sent",          "ipv6.shim6.psent",
-            FT_UINT8, BASE_DEC, NULL, SHIM6_BITMASK_PSENT,
-            NULL, HFILL }},
-
+            { "Probes Sent", "ipv6.shim6.psent",
+                FT_UINT8, BASE_DEC, NULL, SHIM6_BITMASK_PSENT,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_psrc,
-          { "Source Address",       "ipv6.shim6.psrc",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            "Shim6 Probe Source Address", HFILL }},
-
+            { "Source Address", "ipv6.shim6.psrc",
+                FT_IPv6, BASE_NONE, NULL, 0x0,
+                "Shim6 Probe Source Address", HFILL }
+        },
         { &hf_ipv6_shim6_pdst,
-          { "Destination Address",  "ipv6.shim6.pdst",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            "Shim6 Probe Destination Address", HFILL }},
-
+            { "Destination Address", "ipv6.shim6.pdst",
+                FT_IPv6, BASE_NONE, NULL, 0x0,
+                "Shim6 Probe Destination Address", HFILL }
+        },
         { &hf_ipv6_shim6_pnonce,
-          { "Nonce",                "ipv6.shim6.pnonce",
-            FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
-            "Shim6 Probe Nonce", HFILL }},
-
+            { "Nonce", "ipv6.shim6.pnonce",
+                FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
+                "Shim6 Probe Nonce", HFILL }
+        },
         { &hf_ipv6_shim6_pdata,
-          { "Data",                 "ipv6.shim6.pdata",
-            FT_UINT32, BASE_HEX, NULL, 0x0,
-            "Shim6 Probe Data", HFILL }},
-
+            { "Data", "ipv6.shim6.pdata",
+                FT_UINT32, BASE_HEX, NULL, 0x0,
+                "Shim6 Probe Data", HFILL }
+        },
         { &hf_ipv6_shim6_sulid,
-          { "Sender ULID",          "ipv6.shim6.sulid",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            "Shim6 Sender ULID", HFILL }},
-
+            { "Sender ULID", "ipv6.shim6.sulid",
+                FT_IPv6, BASE_NONE, NULL, 0x0,
+                "Shim6 Sender ULID", HFILL }
+        },
         { &hf_ipv6_shim6_rulid,
-          { "Receiver ULID",        "ipv6.shim6.rulid",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            "Shim6 Receiver ULID", HFILL }},
-
+            { "Receiver ULID", "ipv6.shim6.rulid",
+                FT_IPv6, BASE_NONE, NULL, 0x0,
+                "Shim6 Receiver ULID", HFILL }
+        },
         { &hf_ipv6_shim6_reap,
-          { "REAP State",           "ipv6.shim6.reap",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "REAP State", "ipv6.shim6.reap",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_opt_type,
-          { "Option Type",          "ipv6.shim6.opt.type",
-            FT_UINT16, BASE_DEC,
-            VALS(shimoptvals), SHIM6_BITMASK_OPT_TYPE,
-            "Shim6 Option Type", HFILL }},
-
+            { "Option Type", "ipv6.shim6.opt.type",
+                FT_UINT16, BASE_DEC, VALS(shimoptvals), SHIM6_BITMASK_OPT_TYPE,
+                "Shim6 Option Type", HFILL }
+        },
         { &hf_ipv6_shim6_opt_critical,
-          { "Option Critical Bit",  "ipv6.shim6.opt.critical",
-            FT_BOOLEAN, 8,
-            TFS(&tfs_yes_no),
-            SHIM6_BITMASK_CRITICAL,
-            "TRUE : option is critical, FALSE: option is not critical",
-            HFILL }},
-
+            { "Option Critical Bit", "ipv6.shim6.opt.critical",
+                FT_BOOLEAN, 8, TFS(&tfs_yes_no), SHIM6_BITMASK_CRITICAL,
+                "TRUE: option is critical, FALSE: option is not critical", HFILL }
+        },
         { &hf_ipv6_shim6_opt_len,
-          { "Content Length",       "ipv6.shim6.opt.len",
-            FT_UINT16, BASE_DEC, NULL, 0x0,
-            "Content Length Option", HFILL }},
-
+            { "Content Length", "ipv6.shim6.opt.len",
+                FT_UINT16, BASE_DEC, NULL, 0x0,
+                "Content Length Option", HFILL }
+        },
         { &hf_ipv6_shim6_opt_total_len,
-          { "Total Length",         "ipv6.shim6.opt.total_len",
-            FT_UINT16, BASE_DEC, NULL, 0x0,
-            "Total Option Length", HFILL }},
-
+            { "Total Length", "ipv6.shim6.opt.total_len",
+                FT_UINT16, BASE_DEC, NULL, 0x0,
+                "Total Option Length", HFILL }
+        },
         { &hf_ipv6_shim6_opt_loc_verif_methods,
-          { "Verification Method",  "ipv6.shim6.opt.verif_method",
-            FT_UINT8, BASE_DEC,
-            VALS(shimverifmethods), 0x0,
-            "Locator Verification Method", HFILL }},
-
+            { "Verification Method", "ipv6.shim6.opt.verif_method",
+                FT_UINT8, BASE_DEC, VALS(shimverifmethods), 0x0,
+                "Locator Verification Method", HFILL }
+        },
         { &hf_ipv6_shim6_opt_loclist,
-          { "Locator List Generation", "ipv6.shim6.opt.loclist",
-            FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Locator List Generation", "ipv6.shim6.opt.loclist",
+                FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_locator,
-          { "Locator",              "ipv6.shim6.locator",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            "Shim6 Locator", HFILL }},
-
+            { "Locator", "ipv6.shim6.locator",
+                FT_IPv6, BASE_NONE, NULL, 0x0,
+                "Shim6 Locator", HFILL }
+        },
         { &hf_ipv6_shim6_opt_locnum,
-          { "Num Locators",         "ipv6.shim6.opt.locnum",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Number of Locators in Locator List", HFILL }},
-
+            { "Num Locators", "ipv6.shim6.opt.locnum",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "Number of locators in Locator List", HFILL }
+        },
         { &hf_ipv6_shim6_opt_elemlen,
-          { "Element Length",       "ipv6.shim6.opt.elemlen",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Length of Elements in Locator Preferences Option", HFILL }},
+            { "Element Length", "ipv6.shim6.opt.elemlen",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "Length of Elements in Locator Preferences Option", HFILL }
+        },
         { &hf_ipv6_shim6_loc_flag,
-          { "Flags",                "ipv6.shim6.loc.flags",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Locator Preferences Flags", HFILL }},
-
+            { "Flags", "ipv6.shim6.loc.flags",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "Locator Preferences Flags", HFILL }
+        },
         { &hf_ipv6_shim6_loc_prio,
-          { "Priority",             "ipv6.shim6.loc.prio",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Locator Preferences Priority", HFILL }},
-
+            { "Priority", "ipv6.shim6.loc.prio",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "Locator Preferences Priority", HFILL }
+        },
         { &hf_ipv6_shim6_loc_weight,
-          { "Weight",               "ipv6.shim6.loc.weight",
-            FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Locator Preferences Weight", HFILL }},
-
+            { "Weight", "ipv6.shim6.loc.weight",
+                FT_UINT8, BASE_DEC, NULL, 0x0,
+                "Locator Preferences Weight", HFILL }
+        },
         { &hf_ipv6_shim6_opt_fii,
-          { "Forked Instance Identifier", "ipv6.shim6.opt.fii",
-            FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Forked Instance Identifier", "ipv6.shim6.opt.fii",
+                FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_validator,
-          { "Validator", "ipv6.shim6.validator",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "Validator", "ipv6.shim6.validator",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_cga_parameter_data_structure,
-          { "CGA Parameter Data Structure", "ipv6.shim6.cga_parameter_data_structure",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
-
+            { "CGA Parameter Data Structure", "ipv6.shim6.cga_parameter_data_structure",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
         { &hf_ipv6_shim6_cga_signature,
-          { "CGA Signature", "ipv6.shim6.cga_signature",
-            FT_BYTES, BASE_NONE, NULL, 0x0,
-            NULL, HFILL }},
+            { "CGA Signature", "ipv6.shim6.cga_signature",
+                FT_BYTES, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }
+        },
     };
+
     static gint *ett[] = {
         &ett_ipv6,
         &ett_ipv6_opt,
@@ -3245,34 +3366,116 @@ proto_register_ipv6(void)
         &ett_geoip_info
 #endif /* HAVE_GEOIP_V6 */
     };
+
     static ei_register_info ei[] = {
-        { &ei_ipv6_dst_addr_not_multicast, { "ipv6.dst_addr.not_multicast", PI_PROTOCOL, PI_WARN, "Destination address must not be a multicast address", EXPFILL }},
-        { &ei_ipv6_src_route_list_mult_inst_same_addr, { "ipv6.src_route_list.mult_inst_same_addr", PI_PROTOCOL, PI_ERROR, "Multiple instances of the same address must not appear in the source route list", EXPFILL }},
-        { &ei_ipv6_src_route_list_src_addr, { "ipv6.src_route_list.src_addr", PI_PROTOCOL, PI_ERROR, "Source address must not appear in the source route list", EXPFILL }},
-        { &ei_ipv6_src_route_list_dst_addr, { "ipv6.src_route_list.dst_addr", PI_PROTOCOL, PI_ERROR, "Destination address must not appear in the source route list", EXPFILL }},
-        { &ei_ipv6_src_route_list_multicast_addr, { "ipv6.src_route_list.multicast_addr", PI_PROTOCOL, PI_ERROR, "Multicast addresses must not appear in the source route list", EXPFILL }},
-        { &ei_ipv6_routing_rpl_cmpri_cmpre_pad, { "ipv6.routing.rpl.cmprI_cmprE_pad", PI_PROTOCOL, PI_WARN, "When cmprI equals 0 and cmprE equals 0, pad MUST equal 0 but instead was X", EXPFILL }},
-        { &ei_ipv6_routing_rpl_segments_ge0, { "ipv6.routing.rpl.segments_ge0", PI_MALFORMED, PI_ERROR, "Calculated total address count must be greater than or equal to 0, instead was X", EXPFILL }},
-        { &ei_ipv6_routing_rpl_reserved, { "ipv6.routing.rpl.reserved_not0", PI_PROTOCOL, PI_WARN, "Reserved field must equal 0 but instead was X", EXPFILL }},
-        { &ei_ipv6_opt_tel_invalid_len, { "ipv6.opt.tel.invalid_len", PI_MALFORMED, PI_ERROR, "Tunnel Encapsulation Limit: Invalid length", EXPFILL }},
-        { &ei_ipv6_opt_jumbo_invalid_len, { "ipv6.opt.jumbo.invalid_len", PI_MALFORMED, PI_ERROR, "Jumbo Payload: Invalid length", EXPFILL }},
-        { &ei_ipv6_opt_jumbo_missing, { "ipv6.opt.jumbo.missing", PI_PROTOCOL, PI_ERROR, "IPv6 payload length equals 0 and Hop-By-Hop present and Jumbo Payload option missing", EXPFILL }},
-        { &ei_ipv6_opt_jumbo_prohibited, { "ipv6.opt.jumbo.prohibited", PI_PROTOCOL, PI_ERROR, "When IPv6 payload length does not equal 0 a Jumbo Payload option must not be present", EXPFILL }},
-        { &ei_ipv6_opt_jumbo_truncated, { "ipv6.opt.jumbo.truncated", PI_PROTOCOL, PI_ERROR, "Jumbo Payload option present and jumbo length < 65536", EXPFILL }},
-        { &ei_ipv6_opt_jumbo_fragment, { "ipv6.opt.jumbo.fragment", PI_PROTOCOL, PI_ERROR, "Jumbo Payload option cannot be used with a fragment header", EXPFILL }},
-        { &ei_ipv6_opt_jumbo_not_hopbyhop, { "ipv6.opt.jumbo.not_hopbyhop", PI_PROTOCOL, PI_ERROR, "Jumbo Payload option must be a hop-by-hop option", EXPFILL }},
-        { &ei_ipv6_opt_rtalert_invalid_len, { "ipv6.opt.router_alert.invalid_len", PI_MALFORMED, PI_ERROR, "Router alert: Invalid Length", EXPFILL }},
-        { &ei_ipv6_opt_unknown_data, { "ipv6.opt.unknown_data.expert", PI_UNDECODED, PI_NOTE, "Unknown Data (not interpreted)", EXPFILL }},
-        { &ei_ipv6_mipv6_home_address_invalid_len, { "ipv6.mipv6_home_address.invalid_len", PI_MALFORMED, PI_ERROR, "Home Address: Invalid length", EXPFILL }},
-        { &ei_ipv6_shim6_opt_elemlen_invalid, { "ipv6.shim6.opt.elemlen.invalid", PI_MALFORMED, PI_ERROR, "Invalid element length", EXPFILL }},
-        { &ei_ipv6_shim6_checksum_bad, { "ipv6.shim6.checksum_bad.expert", PI_CHECKSUM, PI_ERROR, "Bad checksum", EXPFILL }},
-        { &ei_ipv6_hopopts_not_first, { "ipv6.hopopts.not_first", PI_PROTOCOL, PI_ERROR, "IPv6 Hop-by-Hop extension header must appear immediately after IPv6 header", EXPFILL }},
-        { &ei_ipv6_bogus_ipv6_length, { "ipv6.bogus_ipv6_length", PI_PROTOCOL, PI_ERROR, "Bogus IPv6 length", EXPFILL }},
-        { &ei_ipv6_bogus_payload_length, { "ipv6.bogus_payload_length", PI_PROTOCOL, PI_WARN, "IPv6 payload length does not match expected framing length", EXPFILL }},
-        { &ei_ipv6_bogus_ipv6_version, { "ipv6.bogus_ipv6_version", PI_PROTOCOL, PI_ERROR, "Bogus IP version", EXPFILL }},
-        { &ei_ipv6_invalid_header, { "ipv6.invalid_header", PI_MALFORMED, PI_ERROR, "IPv6 header must be exactly 40 bytes", EXPFILL }},
-        { &ei_ipv6_routing_invalid_length, { "ipv6.routing.invalid_length", PI_MALFORMED, PI_ERROR, "Invalid IPv6 Routing header length", EXPFILL }},
-        { &ei_ipv6_routing_invalid_segleft, { "ipv6.routing.invalid_segleft", PI_PROTOCOL, PI_ERROR, "IPv6 Routing Header segments left field must not exceed address count", EXPFILL }},
+        { &ei_ipv6_dst_addr_not_multicast,
+            { "ipv6.dst_addr.not_multicast", PI_PROTOCOL, PI_WARN,
+                "Destination address must not be a multicast address", EXPFILL }
+        },
+        { &ei_ipv6_src_route_list_mult_inst_same_addr,
+            { "ipv6.src_route_list.mult_inst_same_addr", PI_PROTOCOL, PI_ERROR,
+                "Multiple instances of the same address must not appear in the source route list", EXPFILL }
+        },
+        { &ei_ipv6_src_route_list_src_addr,
+            { "ipv6.src_route_list.src_addr", PI_PROTOCOL, PI_ERROR,
+                "Source address must not appear in the source route list", EXPFILL }
+        },
+        { &ei_ipv6_src_route_list_dst_addr,
+            { "ipv6.src_route_list.dst_addr", PI_PROTOCOL, PI_ERROR,
+                "Destination address must not appear in the source route list", EXPFILL }
+        },
+        { &ei_ipv6_src_route_list_multicast_addr,
+            { "ipv6.src_route_list.multicast_addr", PI_PROTOCOL, PI_ERROR,
+                "Multicast addresses must not appear in the source route list", EXPFILL }
+        },
+        { &ei_ipv6_routing_rpl_cmpri_cmpre_pad,
+            { "ipv6.routing.rpl.cmprI_cmprE_pad", PI_PROTOCOL, PI_WARN,
+                "When cmprI equals 0 and cmprE equals 0, pad MUST equal 0 but instead was X", EXPFILL }
+        },
+        { &ei_ipv6_routing_rpl_segments_ge0,
+            { "ipv6.routing.rpl.segments_ge0", PI_MALFORMED, PI_ERROR,
+                "Calculated total address count must be greater than or equal to 0, instead was X", EXPFILL }
+        },
+        { &ei_ipv6_routing_rpl_reserved,
+            { "ipv6.routing.rpl.reserved_not0", PI_PROTOCOL, PI_WARN,
+                "Reserved field must equal 0 but instead was X", EXPFILL }
+        },
+        { &ei_ipv6_opt_tel_invalid_len,
+            { "ipv6.opt.tel.invalid_len", PI_MALFORMED, PI_ERROR,
+                "Tunnel Encapsulation Limit: Invalid length", EXPFILL }
+        },
+        { &ei_ipv6_opt_jumbo_invalid_len,
+            { "ipv6.opt.jumbo.invalid_len", PI_MALFORMED, PI_ERROR,
+                "Jumbo Payload: Invalid length", EXPFILL }
+        },
+        { &ei_ipv6_opt_jumbo_missing,
+            { "ipv6.opt.jumbo.missing", PI_PROTOCOL, PI_ERROR,
+                "IPv6 payload length equals 0 and Hop-By-Hop present and Jumbo Payload option missing", EXPFILL }
+        },
+        { &ei_ipv6_opt_jumbo_prohibited,
+            { "ipv6.opt.jumbo.prohibited", PI_PROTOCOL, PI_ERROR,
+                "When IPv6 payload length does not equal 0 a Jumbo Payload option must not be present", EXPFILL }
+        },
+        { &ei_ipv6_opt_jumbo_truncated,
+            { "ipv6.opt.jumbo.truncated", PI_PROTOCOL, PI_ERROR,
+                "Jumbo Payload option present and jumbo length < 65536", EXPFILL }
+        },
+        { &ei_ipv6_opt_jumbo_fragment,
+            { "ipv6.opt.jumbo.fragment", PI_PROTOCOL, PI_ERROR,
+                "Jumbo Payload option cannot be used with a fragment header", EXPFILL }
+        },
+        { &ei_ipv6_opt_jumbo_not_hopbyhop,
+            { "ipv6.opt.jumbo.not_hopbyhop", PI_PROTOCOL, PI_ERROR,
+                "Jumbo Payload option must be a hop-by-hop option", EXPFILL }
+        },
+        { &ei_ipv6_opt_rtalert_invalid_len,
+            { "ipv6.opt.router_alert.invalid_len", PI_MALFORMED, PI_ERROR,
+                "Router alert: Invalid Length", EXPFILL }
+        },
+        { &ei_ipv6_opt_unknown_data,
+            { "ipv6.opt.unknown_data.expert", PI_UNDECODED, PI_NOTE,
+                "Unknown Data (not interpreted)", EXPFILL }
+        },
+        { &ei_ipv6_mipv6_home_address_invalid_len,
+            { "ipv6.mipv6_home_address.invalid_len", PI_MALFORMED, PI_ERROR,
+                "Home Address: Invalid length", EXPFILL }
+        },
+        { &ei_ipv6_shim6_opt_elemlen_invalid,
+            { "ipv6.shim6.opt.elemlen.invalid", PI_MALFORMED, PI_ERROR,
+                "Invalid element length", EXPFILL }
+        },
+        { &ei_ipv6_shim6_checksum_bad,
+            { "ipv6.shim6.checksum_bad.expert", PI_CHECKSUM, PI_ERROR,
+                "Bad checksum", EXPFILL }
+        },
+        { &ei_ipv6_hopopts_not_first,
+            { "ipv6.hopopts.not_first", PI_PROTOCOL, PI_ERROR,
+                "IPv6 Hop-by-Hop extension header must appear immediately after IPv6 header", EXPFILL }
+        },
+        { &ei_ipv6_bogus_ipv6_length,
+            { "ipv6.bogus_ipv6_length", PI_PROTOCOL, PI_ERROR,
+                "Bogus IPv6 length", EXPFILL }
+        },
+        { &ei_ipv6_bogus_payload_length,
+            { "ipv6.bogus_payload_length", PI_PROTOCOL, PI_WARN,
+                "IPv6 payload length does not match expected framing length", EXPFILL }
+        },
+        { &ei_ipv6_bogus_ipv6_version,
+            { "ipv6.bogus_ipv6_version", PI_PROTOCOL, PI_ERROR,
+                "Bogus IP version", EXPFILL }
+            },
+        { &ei_ipv6_invalid_header,
+            { "ipv6.invalid_header", PI_MALFORMED, PI_ERROR,
+                "IPv6 header must be exactly 40 bytes", EXPFILL }
+        },
+        { &ei_ipv6_routing_invalid_length,
+            { "ipv6.routing.invalid_length", PI_MALFORMED, PI_ERROR,
+                "Invalid IPv6 Routing header length", EXPFILL }
+            },
+        { &ei_ipv6_routing_invalid_segleft,
+            { "ipv6.routing.invalid_segleft", PI_PROTOCOL, PI_ERROR,
+                "IPv6 Routing Header segments left field must not exceed address count", EXPFILL }
+        },
     };
 
     /* Decode As handling */