opcua: format all hf_register_info tables by aligning them to longest value

Change-Id: I0b533edd7bad52922dd1e0aaa2c980e56dd88b78
Reviewed-on: https://code.wireshark.org/review/4149
Reviewed-by: Michael Mann <mmann78@netscape.net>

5 files changed, 89 insertions, 176 deletions

diff --git a/plugins/opcua/opcua.c b/plugins/opcua/opcua.c
index a516bc2267..ba12d0101d 100644
--- a/plugins/opcua/opcua.c
+++ b/plugins/opcua/opcua.c
@@ -394,38 +394,17 @@ void proto_register_opcua(void)
 
     static hf_register_info hf[] =
     {
-        {&hf_opcua_fragments,
-            {"Message fragments", "opcua.fragments",
-            FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } },
-        {&hf_opcua_fragment,
-            {"Message fragment", "opcua.fragment",
-            FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
-        {&hf_opcua_fragment_overlap,
-            {"Message fragment overlap", "opcua.fragment.overlap",
-            FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL } },
-        {&hf_opcua_fragment_overlap_conflicts,
-            {"Message fragment overlapping with conflicting data",
-            "opcua.fragment.overlap.conflicts",
-            FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL } },
-        {&hf_opcua_fragment_multiple_tails,
-            {"Message has multiple tail fragments",
-            "opcua.fragment.multiple_tails",
-            FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL } },
-        {&hf_opcua_fragment_too_long_fragment,
-            {"Message fragment too long", "opcua.fragment.too_long_fragment",
-            FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL } },
-        {&hf_opcua_fragment_error,
-            {"Message defragmentation error", "opcua.fragment.error",
-            FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
-        {&hf_opcua_fragment_count,
-            {"Message fragment count", "opcua.fragment.count",
-            FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } },
-        {&hf_opcua_reassembled_in,
-            {"Reassembled in", "opcua.reassembled.in",
-            FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
-        {&hf_opcua_reassembled_length,
-            {"Reassembled length", "opcua.reassembled.length",
-            FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }
+        /* id                                    full name                                              abbreviation                        type            display     strings bitmask blurb HFILL */
+        {&hf_opcua_fragments,                   {"Message fragments",                                   "opcua.fragments",                  FT_NONE,        BASE_NONE,  NULL,   0x00,   NULL, HFILL}},
+        {&hf_opcua_fragment,                    {"Message fragment",                                    "opcua.fragment",                   FT_FRAMENUM,    BASE_NONE,  NULL,   0x00,   NULL, HFILL}},
+        {&hf_opcua_fragment_overlap,            {"Message fragment overlap",                            "opcua.fragment.overlap",           FT_BOOLEAN,     0,          NULL,   0x00,   NULL, HFILL}},
+        {&hf_opcua_fragment_overlap_conflicts,  {"Message fragment overlapping with conflicting data",  "opcua.fragment.overlap.conflicts", FT_BOOLEAN,     0,          NULL,   0x00,   NULL, HFILL}},
+        {&hf_opcua_fragment_multiple_tails,     {"Message has multiple tail fragments",                 "opcua.fragment.multiple_tails",    FT_BOOLEAN,     0,          NULL,   0x00,   NULL, HFILL}},
+        {&hf_opcua_fragment_too_long_fragment,  {"Message fragment too long",                           "opcua.fragment.too_long_fragment", FT_BOOLEAN,     0,          NULL,   0x00,   NULL, HFILL}},
+        {&hf_opcua_fragment_error,              {"Message defragmentation error",                       "opcua.fragment.error",             FT_FRAMENUM,    BASE_NONE,  NULL,   0x00,   NULL, HFILL}},
+        {&hf_opcua_fragment_count,              {"Message fragment count",                              "opcua.fragment.count",             FT_UINT32,      BASE_DEC,   NULL,   0x00,   NULL, HFILL}},
+        {&hf_opcua_reassembled_in,              {"Reassembled in",                                      "opcua.reassembled.in",             FT_FRAMENUM,    BASE_NONE,  NULL,   0x00,   NULL, HFILL}},
+        {&hf_opcua_reassembled_length,          {"Reassembled length",                                  "opcua.reassembled.length",         FT_UINT32,      BASE_DEC,   NULL,   0x00,   NULL, HFILL}}
     };
 
     /** Setup protocol subtree array */
diff --git a/plugins/opcua/opcua_application_layer.c b/plugins/opcua/opcua_application_layer.c
index 1c29778942..021898368b 100644
--- a/plugins/opcua/opcua_application_layer.c
+++ b/plugins/opcua/opcua_application_layer.c
@@ -50,15 +50,10 @@ void registerApplicationLayerTypes(int proto)
     /** header field definitions */
     static hf_register_info hf[] =
     {
-        { &hf_opcua_nodeid_encodingmask,
-        {  "NodeId EncodingMask",        "application.nodeid.encodingmask", FT_UINT8,   BASE_HEX,  VALS(g_nodeidmasks), 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_app_nsid,
-        {  "NodeId EncodingMask",        "application.nodeid.nsid",         FT_UINT8,   BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_app_numeric,
-        {  "NodeId Identifier Numeric",  "application.nodeid.numeric",      FT_UINT32,  BASE_DEC,  VALS(g_requesttypes), 0x0,    NULL,    HFILL }
-        }
+        /* id                               full name                    abbreviation                       type       display   strings               bitmask blurb HFILL */
+        {&hf_opcua_nodeid_encodingmask,    {"NodeId EncodingMask",       "application.nodeid.encodingmask", FT_UINT8,  BASE_HEX, VALS(g_nodeidmasks),  0x0,    NULL, HFILL}},
+        {&hf_opcua_app_nsid,               {"NodeId EncodingMask",       "application.nodeid.nsid",         FT_UINT8,  BASE_DEC, NULL,                 0x0,    NULL, HFILL}},
+        {&hf_opcua_app_numeric,            {"NodeId Identifier Numeric", "application.nodeid.numeric",      FT_UINT32, BASE_DEC, VALS(g_requesttypes), 0x0,    NULL, HFILL}}
     };
 
     proto_register_field_array(proto, hf, array_length(hf));
diff --git a/plugins/opcua/opcua_security_layer.c b/plugins/opcua/opcua_security_layer.c
index b68f8aa36c..04a90b8a77 100644
--- a/plugins/opcua/opcua_security_layer.c
+++ b/plugins/opcua/opcua_security_layer.c
@@ -36,15 +36,10 @@ void registerSecurityLayerTypes(int proto)
 {
     static hf_register_info hf[] =
     {
-        { &hf_opcua_security_tokenid,
-        {  "Security Token Id",        "security.tokenid",   FT_UINT32, BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_security_seq,
-        {  "Security Sequence Number", "security.seq",       FT_UINT32, BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_security_rqid,
-        {  "Security RequestId",       "security.rqid",      FT_UINT32, BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        }
+        /* id                           full name                   abbreviation        type       display   strings bitmask blurb HFILL */
+        {&hf_opcua_security_tokenid,   {"Security Token Id",        "security.tokenid", FT_UINT32, BASE_DEC, NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_security_seq,       {"Security Sequence Number", "security.seq",     FT_UINT32, BASE_DEC, NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_security_rqid,      {"Security RequestId",       "security.rqid",    FT_UINT32, BASE_DEC, NULL,   0x0,    NULL, HFILL}}
     };
     proto_register_field_array(proto, hf, array_length(hf));
 }
diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/opcua/opcua_simpletypes.c
index 04e6e86e1b..462114aa88 100644
--- a/plugins/opcua/opcua_simpletypes.c
+++ b/plugins/opcua/opcua_simpletypes.c
@@ -357,80 +357,58 @@ void registerSimpleTypes(int proto)
 {
     static hf_register_info hf[] =
     {
-        /* full name  ,           abbreviation  ,       type     , display  , strings, bitmask, blurb, id, parent, ref_count */
-        { &hf_opcua_diag_mask_symbolicflag,
-        {  "has symbolic id",           "opcua.has_symbolic_id", FT_BOOLEAN, 8, NULL, DIAGNOSTICINFO_ENCODINGMASK_SYMBOLICID_FLAG, NULL, HFILL }
-        },
-        { &hf_opcua_diag_mask_namespaceflag,
-        {  "has namespace",             "opcua.has_namespace", FT_BOOLEAN, 8, NULL, DIAGNOSTICINFO_ENCODINGMASK_NAMESPACE_FLAG, NULL, HFILL }
-        },
-        { &hf_opcua_diag_mask_localizedtextflag,
-        {  "has localizedtext",         "opcua.has_localizedtext", FT_BOOLEAN, 8, NULL, DIAGNOSTICINFO_ENCODINGMASK_LOCALIZEDTEXT_FLAG, NULL, HFILL }
-        },
-        { &hf_opcua_diag_mask_localeflag,
-        {  "has locale",                "opcua.has_locale", FT_BOOLEAN, 8, NULL, DIAGNOSTICINFO_ENCODINGMASK_LOCALE_FLAG, NULL, HFILL }
-        },
-        { &hf_opcua_diag_mask_additionalinfoflag,
-        {  "has additional info",       "opcua.has_additional_info", FT_BOOLEAN, 8, NULL, DIAGNOSTICINFO_ENCODINGMASK_ADDITIONALINFO_FLAG, NULL, HFILL }
-        },
-        { &hf_opcua_diag_mask_innerstatuscodeflag,
-        {  "has inner statuscode",      "opcua.has_inner_statuscode", FT_BOOLEAN, 8, NULL, DIAGNOSTICINFO_ENCODINGMASK_INNERSTATUSCODE_FLAG, NULL, HFILL }
-        },
-        { &hf_opcua_diag_mask_innerdiaginfoflag,
-        {  "has inner diagnostic info", "opcua.has_inner_diagnostic_code", FT_BOOLEAN, 8, NULL, DIAGNOSTICINFO_ENCODINGMASK_INNERDIAGNOSTICINFO_FLAG, NULL, HFILL }
-        },
-        { &hf_opcua_loctext_mask_localeflag,
-        {  "has locale information", "opcua.has_locale_information", FT_BOOLEAN, 8, NULL, LOCALIZEDTEXT_ENCODINGBYTE_LOCALE, NULL, HFILL }
-        },
-        { &hf_opcua_loctext_mask_textflag,
-        {  "has text", "opcua.has_text", FT_BOOLEAN, 8, NULL, LOCALIZEDTEXT_ENCODINGBYTE_TEXT, NULL, HFILL }
-        },
-        { &hf_opcua_nodeid_encodingmask,
-        {  "NodeId EncodingMask",        "application.nodeid.encodingmask", FT_UINT8,   BASE_HEX,  VALS(g_nodeidmasks), 0x0F,    NULL,    HFILL }
-        },
-        { &hf_opcua_nodeid_nsindex,
-        {  "NodeId Namespace Index",        "application.nodeid.nsindex",         FT_UINT16,  BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_nodeid_numeric, {  "NodeId Identifier Numeric", "application.nodeid.numeric", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_nodeid_string, { "NodeId Identifier String", "application.nodeid.string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_nodeid_guid, { "NodeId Identifier Guid", "application.nodeid.guid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_nodeid_bytestring, { "NodeId Identifier ByteString", "application.nodeid.bytestring", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_expandednodeid_mask_namespaceuri, {  "has namespace uri", "opcua.has_namespace_uri", FT_BOOLEAN, 8, NULL, NODEID_NAMESPACEURIFLAG, NULL, HFILL } },
-        { &hf_opcua_expandednodeid_mask_serverindex, {  "has server index", "opcua.has_server_index", FT_BOOLEAN, 8, NULL, NODEID_SERVERINDEXFLAG, NULL, HFILL } },
-        { &hf_opcua_localizedtext_locale, { "Locale", "opcua.Locale", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_localizedtext_text,   { "Text", "opcua.Text", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_qualifiedname_id,     { "Id", "opcua.Id", FT_UINT16, BASE_DEC,  NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_qualifiedname_name,   { "Name", "opcua.Name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_datavalue_mask_valueflag,           {  "has value", "opcua.has_value",            FT_BOOLEAN, 8, NULL, DATAVALUE_ENCODINGBYTE_VALUE, NULL, HFILL } },
-        { &hf_opcua_datavalue_mask_statuscodeflag,      {  "has statuscode", "opcua.has_statuscode",       FT_BOOLEAN, 8, NULL, DATAVALUE_ENCODINGBYTE_STATUSCODE, NULL, HFILL } },
-        { &hf_opcua_datavalue_mask_sourcetimestampflag, {  "has source timestamp", "opcua.has_source_timestamp", FT_BOOLEAN, 8, NULL, DATAVALUE_ENCODINGBYTE_SOURCETIMESTAMP, NULL, HFILL } },
-        { &hf_opcua_datavalue_mask_servertimestampflag, {  "has server timestamp", "opcua.has_server_timestamp", FT_BOOLEAN, 8, NULL, DATAVALUE_ENCODINGBYTE_SERVERTIMESTAMP, NULL, HFILL } },
-        { &hf_opcua_datavalue_mask_sourcepicoseconds, {  "has source picoseconds", "opcua.has_source_picoseconds", FT_BOOLEAN, 8, NULL, DATAVALUE_ENCODINGBYTE_SOURCEPICOSECONDS, NULL, HFILL } },
-        { &hf_opcua_datavalue_mask_serverpicoseconds, {  "has server picoseconds", "opcua.has_server_picoseconds", FT_BOOLEAN, 8, NULL, DATAVALUE_ENCODINGBYTE_SERVERPICOSECONDS, NULL, HFILL } },
-        { &hf_opcua_variant_encodingmask, { "Variant Type", "opcua.has_value", FT_UINT8, BASE_HEX, VALS(g_VariantTypes), 0x0, NULL, HFILL } },
-        { &hf_opcua_SourceTimestamp, { "SourceTimestamp", "opcua.SourceTimestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_SourcePicoseconds, { "SourcePicoseconds", "opcua.SourcePicoseconds", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_ServerTimestamp, { "ServerTimestamp", "opcua.ServerTimestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_ServerPicoseconds, { "ServerPicoseconds", "opcua.ServerPicoseconds", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_diag_symbolicid,      { "SymbolicId", "opcua.SymbolicId",       FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_diag_namespace,       { "Namespace", "opcua.Namespace",       FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_diag_localizedtext,   { "LocalizedText", "opcua.LocalizedText",   FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_diag_locale,          { "Locale", "opcua.Locale",   FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_diag_additionalinfo,  { "AdditionalInfo", "opcua.AdditionalInfo",  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_diag_innerstatuscode, { "InnerStatusCode", "opcua.InnerStatusCode", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_extobj_mask_binbodyflag, {  "has binary body", "opcua.has_binary_body", FT_BOOLEAN, 8, NULL, EXTOBJ_ENCODINGMASK_BINBODY_FLAG, NULL, HFILL } },
-        { &hf_opcua_extobj_mask_xmlbodyflag, {  "has xml body",    "opcua.has_xml_body", FT_BOOLEAN, 8, NULL, EXTOBJ_ENCODINGMASK_XMLBODY_FLAG, NULL, HFILL } },
-        { &hf_opcua_ArraySize, { "ArraySize", "opcua.ArraySize", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_ServerIndex, { "ServerIndex", "opcua.ServerIndex", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
-        { &hf_opcua_status_StructureChanged, {  "StructureChanged", "opcua.statuscode.structureChanged", FT_BOOLEAN, 16, NULL, STATUSCODE_STRUCTURECHANGED, NULL, HFILL } },
-        { &hf_opcua_status_SemanticsChanged, {  "SemanticsChanged", "opcua.statuscode.semanticsChanged", FT_BOOLEAN, 16, NULL, STATUSCODE_SEMANTICSCHANGED, NULL, HFILL } },
-        { &hf_opcua_status_InfoBit_Limit_Overflow, {  "Overflow", "opcua.statuscode.overflow", FT_BOOLEAN, 16, NULL, STATUSCODE_INFOBIT_OVERFLOW, NULL, HFILL } },
-        { &hf_opcua_status_InfoBit_Historian_Partial, {  "HistorianBit: Partial", "opcua.statuscode.historian.partial", FT_BOOLEAN, 16, NULL, STATUSCODE_INFOBIT_HISTORIAN_PARTIAL, NULL, HFILL } },
-        { &hf_opcua_status_InfoBit_Historian_ExtraData, {  "HistorianBit: ExtraData", "opcua.statuscode.historian.extraData", FT_BOOLEAN, 16, NULL, STATUSCODE_INFOBIT_HISTORIAN_EXTRADATA, NULL, HFILL } },
-        { &hf_opcua_status_InfoBit_Historian_MultiValue, {  "HistorianBit: MultiValue", "opcua.statuscode.historian.multiValue", FT_BOOLEAN, 16, NULL, STATUSCODE_INFOBIT_HISTORIAN_MULTIVALUE, NULL, HFILL } },
-        { &hf_opcua_status_InfoType, { "InfoType", "opcua.statuscode.infoType", FT_UINT16, BASE_HEX, VALS(g_infotype), 0x0C00, NULL, HFILL } },
-        { &hf_opcua_status_Limit, { "Limit", "opcua.statuscode.limit", FT_UINT16, BASE_HEX, VALS(g_limit), 0x0300, NULL, HFILL } },
-        { &hf_opcua_status_Historian, { "Historian", "opcua.statuscode.historian", FT_UINT16, BASE_HEX, VALS(g_historian), 0x0003, NULL, HFILL } },
+        /* id                                            full name                          abbreviation                                type                display                 strings                 bitmask                                                 blurb HFILL */
+        {&hf_opcua_diag_mask_symbolicflag,              {"has symbolic id",                 "opcua.has_symbolic_id",                    FT_BOOLEAN,         8,                      NULL,                   DIAGNOSTICINFO_ENCODINGMASK_SYMBOLICID_FLAG,            NULL, HFILL}},
+        {&hf_opcua_diag_mask_namespaceflag,             {"has namespace",                   "opcua.has_namespace",                      FT_BOOLEAN,         8,                      NULL,                   DIAGNOSTICINFO_ENCODINGMASK_NAMESPACE_FLAG,             NULL, HFILL}},
+        {&hf_opcua_diag_mask_localizedtextflag,         {"has localizedtext",               "opcua.has_localizedtext",                  FT_BOOLEAN,         8,                      NULL,                   DIAGNOSTICINFO_ENCODINGMASK_LOCALIZEDTEXT_FLAG,         NULL, HFILL}},
+        {&hf_opcua_diag_mask_localeflag,                {"has locale",                      "opcua.has_locale",                         FT_BOOLEAN,         8,                      NULL,                   DIAGNOSTICINFO_ENCODINGMASK_LOCALE_FLAG,                NULL, HFILL}},
+        {&hf_opcua_diag_mask_additionalinfoflag,        {"has additional info",             "opcua.has_additional_info",                FT_BOOLEAN,         8,                      NULL,                   DIAGNOSTICINFO_ENCODINGMASK_ADDITIONALINFO_FLAG,        NULL, HFILL}},
+        {&hf_opcua_diag_mask_innerstatuscodeflag,       {"has inner statuscode",            "opcua.has_inner_statuscode",               FT_BOOLEAN,         8,                      NULL,                   DIAGNOSTICINFO_ENCODINGMASK_INNERSTATUSCODE_FLAG,       NULL, HFILL}},
+        {&hf_opcua_diag_mask_innerdiaginfoflag,         {"has inner diagnostic info",       "opcua.has_inner_diagnostic_code",          FT_BOOLEAN,         8,                      NULL,                   DIAGNOSTICINFO_ENCODINGMASK_INNERDIAGNOSTICINFO_FLAG,   NULL, HFILL}},
+        {&hf_opcua_loctext_mask_localeflag,             {"has locale information",          "opcua.has_locale_information",             FT_BOOLEAN,         8,                      NULL,                   LOCALIZEDTEXT_ENCODINGBYTE_LOCALE,                      NULL, HFILL}},
+        {&hf_opcua_loctext_mask_textflag,               {"has text",                        "opcua.has_text",                           FT_BOOLEAN,         8,                      NULL,                   LOCALIZEDTEXT_ENCODINGBYTE_TEXT,                        NULL, HFILL}},
+        {&hf_opcua_nodeid_encodingmask,                 {"NodeId EncodingMask",             "application.nodeid.encodingmask",          FT_UINT8,           BASE_HEX,               VALS(g_nodeidmasks),    0x0F,                                                   NULL, HFILL}},
+        {&hf_opcua_nodeid_nsindex,                      {"NodeId Namespace Index",          "application.nodeid.nsindex",               FT_UINT16,          BASE_DEC,               NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_nodeid_numeric,                      {"NodeId Identifier Numeric",       "application.nodeid.numeric",               FT_UINT32,          BASE_DEC,               NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_nodeid_string,                       {"NodeId Identifier String",        "application.nodeid.string",                FT_STRING,          BASE_NONE,              NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_nodeid_guid,                         {"NodeId Identifier Guid",          "application.nodeid.guid",                  FT_GUID,            BASE_NONE,              NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_nodeid_bytestring,                   {"NodeId Identifier ByteString",    "application.nodeid.bytestring",            FT_BYTES,           BASE_NONE,              NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_expandednodeid_mask_namespaceuri,    {"has namespace uri",               "opcua.has_namespace_uri",                  FT_BOOLEAN,         8,                      NULL,                   NODEID_NAMESPACEURIFLAG,                                NULL, HFILL}},
+        {&hf_opcua_expandednodeid_mask_serverindex,     {"has server index",                "opcua.has_server_index",                   FT_BOOLEAN,         8,                      NULL,                   NODEID_SERVERINDEXFLAG,                                 NULL, HFILL}},
+        {&hf_opcua_localizedtext_locale,                {"Locale",                          "opcua.Locale",                             FT_STRING,          BASE_NONE,              NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_localizedtext_text,                  {"Text",                            "opcua.Text",                               FT_STRING,          BASE_NONE,              NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_qualifiedname_id,                    {"Id",                              "opcua.Id",                                 FT_UINT16,          BASE_DEC,               NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_qualifiedname_name,                  {"Name",                            "opcua.Name",                               FT_STRING,          BASE_NONE,              NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_datavalue_mask_valueflag,            {"has value",                       "opcua.has_value",                          FT_BOOLEAN,         8,                      NULL,                   DATAVALUE_ENCODINGBYTE_VALUE,                           NULL, HFILL}},
+        {&hf_opcua_datavalue_mask_statuscodeflag,       {"has statuscode",                  "opcua.has_statuscode",                     FT_BOOLEAN,         8,                      NULL,                   DATAVALUE_ENCODINGBYTE_STATUSCODE,                      NULL, HFILL}},
+        {&hf_opcua_datavalue_mask_sourcetimestampflag,  {"has source timestamp",            "opcua.has_source_timestamp",               FT_BOOLEAN,         8,                      NULL,                   DATAVALUE_ENCODINGBYTE_SOURCETIMESTAMP,                 NULL, HFILL}},
+        {&hf_opcua_datavalue_mask_servertimestampflag,  {"has server timestamp",            "opcua.has_server_timestamp",               FT_BOOLEAN,         8,                      NULL,                   DATAVALUE_ENCODINGBYTE_SERVERTIMESTAMP,                 NULL, HFILL}},
+        {&hf_opcua_datavalue_mask_sourcepicoseconds,    {"has source picoseconds",          "opcua.has_source_picoseconds",             FT_BOOLEAN,         8,                      NULL,                   DATAVALUE_ENCODINGBYTE_SOURCEPICOSECONDS,               NULL, HFILL}},
+        {&hf_opcua_datavalue_mask_serverpicoseconds,    {"has server picoseconds",          "opcua.has_server_picoseconds",             FT_BOOLEAN,         8,                      NULL,                   DATAVALUE_ENCODINGBYTE_SERVERPICOSECONDS,               NULL, HFILL}},
+        {&hf_opcua_variant_encodingmask,                {"Variant Type",                    "opcua.has_value",                          FT_UINT8,           BASE_HEX,               VALS(g_VariantTypes),   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_SourceTimestamp,                     {"SourceTimestamp",                 "opcua.SourceTimestamp",                    FT_ABSOLUTE_TIME,   ABSOLUTE_TIME_LOCAL,    NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_SourcePicoseconds,                   {"SourcePicoseconds",               "opcua.SourcePicoseconds",                  FT_UINT16,          BASE_DEC,               NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_ServerTimestamp,                     {"ServerTimestamp",                 "opcua.ServerTimestamp",                    FT_ABSOLUTE_TIME,   ABSOLUTE_TIME_LOCAL,    NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_ServerPicoseconds,                   {"ServerPicoseconds",               "opcua.ServerPicoseconds",                  FT_UINT16,          BASE_DEC,               NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_diag_symbolicid,                     {"SymbolicId",                      "opcua.SymbolicId",                         FT_INT32,           BASE_DEC,               NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_diag_namespace,                      {"Namespace",                       "opcua.Namespace",                          FT_INT32,           BASE_DEC,               NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_diag_localizedtext,                  {"LocalizedText",                   "opcua.LocalizedText",                      FT_INT32,           BASE_DEC,               NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_diag_locale,                         {"Locale",                          "opcua.Locale",                             FT_INT32,           BASE_DEC,               NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_diag_additionalinfo,                 {"AdditionalInfo",                  "opcua.AdditionalInfo",                     FT_STRING,          BASE_NONE,              NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_diag_innerstatuscode,                {"InnerStatusCode",                 "opcua.InnerStatusCode",                    FT_UINT32,          BASE_HEX,               NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_extobj_mask_binbodyflag,             {"has binary body",                 "opcua.has_binary_body",                    FT_BOOLEAN,         8,                      NULL,                   EXTOBJ_ENCODINGMASK_BINBODY_FLAG,                       NULL, HFILL}},
+        {&hf_opcua_extobj_mask_xmlbodyflag,             {"has xml body",                    "opcua.has_xml_body",                       FT_BOOLEAN,         8,                      NULL,                   EXTOBJ_ENCODINGMASK_XMLBODY_FLAG,                       NULL, HFILL}},
+        {&hf_opcua_ArraySize,                           {"ArraySize",                       "opcua.ArraySize",                          FT_INT32,           BASE_DEC,               NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_ServerIndex,                         {"ServerIndex",                     "opcua.ServerIndex",                        FT_UINT32,          BASE_DEC,               NULL,                   0x0,                                                    NULL, HFILL}},
+        {&hf_opcua_status_StructureChanged,             {"StructureChanged",                "opcua.statuscode.structureChanged",        FT_BOOLEAN,         16,                     NULL,                   STATUSCODE_STRUCTURECHANGED,                            NULL, HFILL}},
+        {&hf_opcua_status_SemanticsChanged,             {"SemanticsChanged",                "opcua.statuscode.semanticsChanged",        FT_BOOLEAN,         16,                     NULL,                   STATUSCODE_SEMANTICSCHANGED,                            NULL, HFILL}},
+        {&hf_opcua_status_InfoBit_Limit_Overflow,       {"Overflow",                        "opcua.statuscode.overflow",                FT_BOOLEAN,         16,                     NULL,                   STATUSCODE_INFOBIT_OVERFLOW,                            NULL, HFILL}},
+        {&hf_opcua_status_InfoBit_Historian_Partial,    {"HistorianBit: Partial",           "opcua.statuscode.historian.partial",       FT_BOOLEAN,         16,                     NULL,                   STATUSCODE_INFOBIT_HISTORIAN_PARTIAL,                   NULL, HFILL}},
+        {&hf_opcua_status_InfoBit_Historian_ExtraData,  {"HistorianBit: ExtraData",         "opcua.statuscode.historian.extraData",     FT_BOOLEAN,         16,                     NULL,                   STATUSCODE_INFOBIT_HISTORIAN_EXTRADATA,                 NULL, HFILL}},
+        {&hf_opcua_status_InfoBit_Historian_MultiValue, {"HistorianBit: MultiValue",        "opcua.statuscode.historian.multiValue",    FT_BOOLEAN,         16,                     NULL,                   STATUSCODE_INFOBIT_HISTORIAN_MULTIVALUE,                NULL, HFILL}},
+        {&hf_opcua_status_InfoType,                     {"InfoType",                        "opcua.statuscode.infoType",                FT_UINT16,          BASE_HEX,               VALS(g_infotype),       0x0C00,                                                 NULL, HFILL}},
+        {&hf_opcua_status_Limit,                        {"Limit",                           "opcua.statuscode.limit",                   FT_UINT16,          BASE_HEX,               VALS(g_limit),          0x0300,                                                 NULL, HFILL}},
+        {&hf_opcua_status_Historian,                    {"Historian",                       "opcua.statuscode.historian",               FT_UINT16,          BASE_HEX,               VALS(g_historian),      0x0003,                                                 NULL, HFILL}},
     };
 
     proto_register_field_array(proto, hf, array_length(hf));
diff --git a/plugins/opcua/opcua_transport_layer.c b/plugins/opcua/opcua_transport_layer.c
index f4db2ed42a..226b3227e6 100644
--- a/plugins/opcua/opcua_transport_layer.c
+++ b/plugins/opcua/opcua_transport_layer.c
@@ -56,58 +56,24 @@ void registerTransportLayerTypes(int proto)
 {
     static hf_register_info hf[] =
     {
-        { &hf_opcua_transport_type,
-        /* full name  ,           abbreviation  ,       type     , display  , strings, bitmask, blurb, id, parent, ref_count */
-        {  "Message Type",        "transport.type",     FT_STRING, BASE_NONE, NULL,    0x0,     NULL,    HFILL }
-        },
-        { &hf_opcua_transport_chunk,
-        {  "Chunk Type",          "transport.chunk",    FT_STRING, BASE_NONE, NULL,    0x0,     NULL,    HFILL }
-        },
-        { &hf_opcua_transport_size,
-        {  "Message Size",        "transport.size",     FT_UINT32, BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_ver,
-        {  "Version",             "transport.ver",      FT_UINT32, BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_scid,
-        {  "SecureChannelId",     "transport.scid",     FT_UINT32, BASE_DEC, NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_rbs,
-        {  "ReceiveBufferSize",   "transport.rbs",      FT_UINT32, BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_sbs,
-        {  "SendBufferSize",      "transport.sbs",      FT_UINT32, BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_mms,
-        {  "MaxMessageSize",      "transport.mms",      FT_UINT32, BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_mcc,
-        {  "MaxChunkCount",       "transport.mcc",      FT_UINT32, BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_endpoint,
-        {  "EndPointUrl",         "transport.endpoint", FT_STRING, BASE_NONE, NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_error,
-        {  "Error",               "transport.error",    FT_UINT32, BASE_HEX,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_reason,
-        {  "Reason",              "transport.reason",   FT_STRING, BASE_NONE,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_spu,
-        {  "SecurityPolicyUri",   "security.spu",      FT_STRING, BASE_NONE,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_scert,
-        {  "SenderCertificate",   "security.scert",    FT_BYTES,  BASE_NONE,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_rcthumb,
-        {  "ReceiverCertificateThumbprint", "security.rcthumb", FT_BYTES,  BASE_NONE,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_seq,
-        {  "SequenceNumber", "security.seq",           FT_UINT32,  BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        },
-        { &hf_opcua_transport_rqid,
-        {  "RequestId", "security.rqid",                FT_UINT32,  BASE_DEC,  NULL, 0x0,    NULL,    HFILL }
-        },
+        /* id                           full name                        abbreviation          type       display    strings bitmask blurb HFILL */
+        {&hf_opcua_transport_type,     {"Message Type",                  "transport.type",     FT_STRING, BASE_NONE, NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_chunk,    {"Chunk Type",                    "transport.chunk",    FT_STRING, BASE_NONE, NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_size,     {"Message Size",                  "transport.size",     FT_UINT32, BASE_DEC,  NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_ver,      {"Version",                       "transport.ver",      FT_UINT32, BASE_DEC,  NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_scid,     {"SecureChannelId",               "transport.scid",     FT_UINT32, BASE_DEC,  NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_rbs,      {"ReceiveBufferSize",             "transport.rbs",      FT_UINT32, BASE_DEC,  NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_sbs,      {"SendBufferSize",                "transport.sbs",      FT_UINT32, BASE_DEC,  NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_mms,      {"MaxMessageSize",                "transport.mms",      FT_UINT32, BASE_DEC,  NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_mcc,      {"MaxChunkCount",                 "transport.mcc",      FT_UINT32, BASE_DEC,  NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_endpoint, {"EndPointUrl",                   "transport.endpoint", FT_STRING, BASE_NONE, NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_error,    {"Error",                         "transport.error",    FT_UINT32, BASE_HEX,  NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_reason,   {"Reason",                        "transport.reason",   FT_STRING, BASE_NONE, NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_spu,      {"SecurityPolicyUri",             "security.spu",       FT_STRING, BASE_NONE, NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_scert,    {"SenderCertificate",             "security.scert",     FT_BYTES,  BASE_NONE, NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_rcthumb,  {"ReceiverCertificateThumbprint", "security.rcthumb",   FT_BYTES,  BASE_NONE, NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_seq,      {"SequenceNumber",                "security.seq",       FT_UINT32, BASE_DEC,  NULL,   0x0,    NULL, HFILL}},
+        {&hf_opcua_transport_rqid,     {"RequestId",                     "security.rqid",      FT_UINT32, BASE_DEC,  NULL,   0x0,    NULL, HFILL}},
     };
 
     proto_register_field_array(proto, hf, array_length(hf));